GeoDirectory / geodirectory

language.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 define('LISTING_DETAILS_TEXT', __('Enter Listing Details', 'geodirectory'));

 

 define('PLACE_TITLE_TEXT', __('Listing Title', 'geodirectory')); // depreciated @since 1.6.3

-define('PLACE_DESC_TEXT', __('Listing Description', 'geodirectory'));// depreciated @since 1.6.3

+define('PLACE_DESC_TEXT', __('Listing Description', 'geodirectory')); // depreciated @since 1.6.3

 

 define('LISTING_ADDRESS_TEXT', __('Listing Address:', 'geodirectory'));

 define('PLACE_ADDRESS', __('Address:', 'geodirectory'));

geodirectory-templates/listing-detail.php

Indentation +31 added lines, -31 removed lines

@@ -11,7 +11,7 @@ 
 

 // We are submitting iframes etc so we turn this off to allow them to show on preview.

 if(geodir_is_page('preview')){

-    header("X-XSS-Protection: 0");

+	header("X-XSS-Protection: 0");

 }

 

 

@@ -38,12 +38,12 @@ 
 

 ###### SIDEBAR ON LEFT ######

 if (get_option('geodir_detail_sidebar_left_section')) {

-    /**

-     * Adds the details page sidebar to the details template page.

-     *

-     * @since 1.1.0

-     */

-    do_action('geodir_detail_sidebar');

+	/**

+	 * Adds the details page sidebar to the details template page.

+	 *

+	 * @since 1.1.0

+	 */

+	do_action('geodir_detail_sidebar');

 }

 

 ###### MAIN CONTENT WRAPPERS OPEN ######

@@ -72,29 +72,29 @@ 
 // this call the main page content

 global $preview;

 if (have_posts() && !$preview) {

-    the_post();

-    global $post, $post_images;

-    /**

-     * Calls the details page main content on the details template page.

-     *

-     * @since 1.1.0

-     * @param object $post The current post object.

-     */

-    do_action('geodir_details_main_content', $post);

+	the_post();

+	global $post, $post_images;

+	/**

+	 * Calls the details page main content on the details template page.

+	 *

+	 * @since 1.1.0

+	 * @param object $post The current post object.

+	 */

+	do_action('geodir_details_main_content', $post);

 } elseif ($preview) {

-    /**

-     * Called on the details page if the page is being previewed.

-     *

-     * This sets the value of `$post` to the preview values before the main content is called.

-     *

-     * @since 1.1.0

-     */

-    do_action('geodir_action_geodir_set_preview_post'); // set the $post to the preview values

-    if (defined( 'GD_TESTING_MODE' )) {

-        global $post;

-    }

-    /** This action is documented in geodirectory-templates/listing-detail.php */

-    do_action('geodir_details_main_content', $post);

+	/**

+	 * Called on the details page if the page is being previewed.

+	 *

+	 * This sets the value of `$post` to the preview values before the main content is called.

+	 *

+	 * @since 1.1.0

+	 */

+	do_action('geodir_action_geodir_set_preview_post'); // set the $post to the preview values

+	if (defined( 'GD_TESTING_MODE' )) {

+		global $post;

+	}

+	/** This action is documented in geodirectory-templates/listing-detail.php */

+	do_action('geodir_details_main_content', $post);

 }

 

 /** This action is documented in geodirectory-templates/geodir-home.php */

@@ -118,8 +118,8 @@ 
 

 ###### SIDEBAR ON RIGHT ######

 if (!get_option('geodir_detail_sidebar_left_section')) {

-    /** This action is documented in geodirectory-templates/listing-detail.php */

-    do_action('geodir_detail_sidebar');

+	/** This action is documented in geodirectory-templates/listing-detail.php */

+	do_action('geodir_detail_sidebar');

 }

 

 

Spacing +3 added lines, -3 removed lines

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

 

 // We are submitting iframes etc so we turn this off to allow them to show on preview.

-if(geodir_is_page('preview')){

+if (geodir_is_page('preview')) {

     header("X-XSS-Protection: 0");

 }

 

@@ -63,7 +63,7 @@ 
  * @param string $itemtype The itemtype value of the HTML element.

  * @see 'geodir_article_close'

  */

-do_action('geodir_article_open', 'details-page', 'post-' . get_the_ID(), get_post_class(), '');

+do_action('geodir_article_open', 'details-page', 'post-'.get_the_ID(), get_post_class(), '');

 

 ###### MAIN CONTENT ######

 /** This action is documented in geodirectory-templates/geodir-home.php */

@@ -90,7 +90,7 @@ 
      * @since 1.1.0

      */

     do_action('geodir_action_geodir_set_preview_post'); // set the $post to the preview values

-    if (defined( 'GD_TESTING_MODE' )) {

+    if (defined('GD_TESTING_MODE')) {

         global $post;

     }

     /** This action is documented in geodirectory-templates/listing-detail.php */

geodirectory-functions/general_functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -2301,7 +2301,7 @@ 
  * @global string $table_prefix  WordPress Database Table prefix.

  *

  * @param array $query_args      The query array.

- * @param  int|bool $count_only  If true returns listings count only, otherwise returns array

+ * @param  boolean $count_only  If true returns listings count only, otherwise returns array

  *

  * @return mixed Result object.

  */

@@ -3958,7 +3958,7 @@ 
  * @since   1.0.0

  * @since   1.6.1 Fixed add listing page load time.

  * @package GeoDirectory

- * @return bool

+ * @return null|boolean

  */

 function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {

 	if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {

Braces +5 added lines, -3 removed lines

@@ -763,7 +763,7 @@ 
 			$post_author = get_post_field( 'post_author', $post_id );

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

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

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

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

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

 			}

 

@@ -1623,12 +1623,14 @@ 
 	 */

 	function geodir_allow_wpadmin() {

 		global $wpdb;

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

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

 		{

 			if ( current_user_can( 'administrator' ) ) {

 			} else {

 

-				wp_redirect( home_url() );

+				wp_redirect( home_url() );
+		}
 				exit;

 			}

 

Indentation +39 added lines, -39 removed lines

@@ -327,7 +327,7 @@ 
 			break;

 		case 'preview':

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

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

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

 			) {

 				return true;

 			}

@@ -528,9 +528,9 @@ 
 

 //check if homepage

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

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

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

-		     && is_page_geodir_home()

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

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

+			 && is_page_geodir_home()

 		) {

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

 		}

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

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

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

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

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

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

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

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

 		$distance       = $earthMeanRadius * $c;

 

@@ -3866,10 +3866,10 @@ 
 			$gridview_columns_widget = '';

 		}

 			/**

-		 * Filter the widget listing listview template path.

-		 *

-		 * @since 1.0.0

-		 */

+			 * Filter the widget listing listview template path.

+			 *

+			 * @since 1.0.0

+			 */

 		$template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) );

 		if ( ! isset( $character_count ) ) {

 			/**

@@ -5234,7 +5234,7 @@ 
  * @param string $name The name of the string which helps to know what's being translated.

  */

 function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {

-    do_action( 'wpml_register_single_string', $domain, $name, $string );

+	do_action( 'wpml_register_single_string', $domain, $name, $string );

 }

 

 /**

@@ -5250,7 +5250,7 @@ 
  * @return string The translated string.

  */

 function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {

-    return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code );

+	return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code );

 }

 

 /**

@@ -5266,34 +5266,34 @@ 
  * @param array $data Post data.

  */

 function geodir_send_listing_edited_notification( $post_ID, $data ) {

-    global $gd_notified_edited, $gd_set_listing_edited;

+	global $gd_notified_edited, $gd_set_listing_edited;

     

-    if ( !empty( $gd_set_listing_edited[ $post_ID ] ) && empty( $gd_notified_edited[ $post_ID ] ) ) {

-        if ( !empty( $gd_notified_edited ) ) {

-            $gd_notified_edited = array();

-        }

-        $gd_notified_edited[ $post_ID ] = true;

+	if ( !empty( $gd_set_listing_edited[ $post_ID ] ) && empty( $gd_notified_edited[ $post_ID ] ) ) {

+		if ( !empty( $gd_notified_edited ) ) {

+			$gd_notified_edited = array();

+		}

+		$gd_notified_edited[ $post_ID ] = true;

         

-        $from_email   = get_option( 'site_email' );

-        $from_name    = get_site_emailName();

-        $to_email     = get_option( 'admin_email' );

-        $to_name      = get_option( 'name' );

-        $message_type = 'listing_edited';

-

-        $notify_edited = true;

-        /**

-         * Send notification when listing edited by author?

-         *

-         * @since 1.6.0

-         *

-         * @param bool $notify_edited Notify on listing edited by author?

-         * @param object $post        The current post object.

-         */

-        $notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post_ID );

-

-        if ( $notify_edited ) {

-            geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID );

-        }

-    }

+		$from_email   = get_option( 'site_email' );

+		$from_name    = get_site_emailName();

+		$to_email     = get_option( 'admin_email' );

+		$to_name      = get_option( 'name' );

+		$message_type = 'listing_edited';

+

+		$notify_edited = true;

+		/**

+		 * Send notification when listing edited by author?

+		 *

+		 * @since 1.6.0

+		 *

+		 * @param bool $notify_edited Notify on listing edited by author?

+		 * @param object $post        The current post object.

+		 */

+		$notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post_ID );

+

+		if ( $notify_edited ) {

+			geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID );

+		}

+	}

 }

 add_action( 'geodir_after_save_listing', 'geodir_send_listing_edited_notification', 1000, 2 );
\ No newline at end of file

Spacing +1318 added lines, -1318 removed lines

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

  * Get All Plugin functions from WordPress

  */

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

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

 

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

 /* Helper functions */

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

  */

 function geodir_plugin_url() {

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

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

 	/*

 	if ( is_ssl() ) :

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

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

  */

 function geodir_plugin_path() {

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

-		return dirname( dirname( __FILE__ ) );

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

+		return dirname(dirname(__FILE__));

 	} else {

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

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

 	}

 }

 

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

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

  */

-function geodir_is_plugin_active( $plugin ) {

-	$active_plugins = get_option( 'active_plugins' );

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

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

+function geodir_is_plugin_active($plugin) {

+	$active_plugins = get_option('active_plugins');

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

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

 			return true;

 		}

 	}

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

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

  */

-function geodir_get_formated_date( $date ) {

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

+function geodir_get_formated_date($date) {

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

 }

 

 /**

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

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

  */

-function geodir_get_formated_time( $time ) {

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

+function geodir_get_formated_time($time) {

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

 }

 

 

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

  * @return string Formatted link.

  */

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

-	if ( $use_existing_arguments ) {

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

+	if ($use_existing_arguments) {

 		$params = $params + $_GET;

 	}

-	if ( ! $params ) {

+	if (!$params) {

 		return $url;

 	}

 	$link = $url;

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

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

 		$link .= '?';

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

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

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

 		$link .= '&';

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

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

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

 		$link .= '&';

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

 

 	$params_arr = array();

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

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

-			foreach ( $value as $val ) {

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

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

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

+			foreach ($value as $val) {

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

 			}

 		} else {

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

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

 		}

 	}

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

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

 

 	return $link;

 }

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

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

  */

-function geodir_get_addlisting_link( $post_type = '' ) {

+function geodir_get_addlisting_link($post_type = '') {

 	global $wpdb;

 

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

 	$check_pkg = 1;

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

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

 

-		$add_listing_link = get_page_link( geodir_add_listing_page_id() );

+		$add_listing_link = get_page_link(geodir_add_listing_page_id());

 

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

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

 	} else {

-		return get_bloginfo( 'url' );

+		return get_bloginfo('url');

 	}

 }

 

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

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

 		// to the URI string.

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

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

 	} else {

 		/*

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

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

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

 		 */

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

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

 		

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

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

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

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

 		}

 	}

 	

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

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

 	 */

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

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

 }

 

 /**

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

  * @return string Cleaned variable.

  */

-function geodir_clean( $string ) {

+function geodir_clean($string) {

 

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

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

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

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

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

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

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

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

 

 	return $string;

 }

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

 function geodir_get_weekday() {

 	return array(

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

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

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

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

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

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

-		__( 'Saturday', 'geodirectory' )

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

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

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

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

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

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

+		__('Saturday', 'geodirectory')

 	);

 }

 

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

 function geodir_get_weeks() {

 	return array(

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

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

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

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

-		__( 'Last', 'geodirectory' )

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

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

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

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

+		__('Last', 'geodirectory')

 	);

 }

 

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

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

  */

-function geodir_is_page( $gdpage = '' ) {

+function geodir_is_page($gdpage = '') {

 

 	global $wp_query, $post, $wp;

 	//if(!is_admin()):

 

-	switch ( $gdpage ):

+	switch ($gdpage):

 		case 'add-listing':

 

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

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

 				return true;

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

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

 				return true;

 			}

 

 			break;

 		case 'preview':

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

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

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

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

 			) {

 				return true;

 			}

 			break;

 		case 'listing-success':

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

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

 				return true;

 			}

 			break;

 		case 'detail':

-			$post_type = get_query_var( 'post_type' );

-			if ( is_array( $post_type ) ) {

-				$post_type = reset( $post_type );

+			$post_type = get_query_var('post_type');

+			if (is_array($post_type)) {

+				$post_type = reset($post_type);

 			}

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

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

 				return true;

 			}

 			break;

 		case 'pt':

-			$post_type = get_query_var( 'post_type' );

-			if ( is_array( $post_type ) ) {

-				$post_type = reset( $post_type );

+			$post_type = get_query_var('post_type');

+			if (is_array($post_type)) {

+				$post_type = reset($post_type);

 			}

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

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

 				return true;

 			}

 

 			break;

 		case 'listing':

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

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

 				global $current_term, $taxonomy, $term;

 

 				return true;

 			}

-			$post_type = get_query_var( 'post_type' );

-			if ( is_array( $post_type ) ) {

-				$post_type = reset( $post_type );

+			$post_type = get_query_var('post_type');

+			if (is_array($post_type)) {

+				$post_type = reset($post_type);

 			}

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

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

 				return true;

 			}

 

 			break;

 		case 'home':

 

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

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

 				return true;

 			}

 

 			break;

 		case 'location':

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

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

 				return true;

 			}

 			break;

 		case 'author':

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

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

 				return true;

 			}

 

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

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

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

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

 					return true;

 				}

 			}

 			break;

 		case 'search':

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

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

 				return true;

 			}

 			break;

 		case 'info':

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

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

 				return true;

 			}

 			break;

 		case 'login':

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

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

 				return true;

 			}

 			break;

 		case 'checkout':

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

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

 				return true;

 			}

 			break;

 		case 'invoices':

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

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

 				return true;

 			}

 			break;

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

  * @param object $wp WordPress object.

  */

-function geodir_set_is_geodir_page( $wp ) {

-	if ( ! is_admin() ) {

+function geodir_set_is_geodir_page($wp) {

+	if (!is_admin()) {

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

 		//print_r()

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

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

 				'preview',

 				'page',

 				'paged',

 				'cpage'

-			) )

+			))

 		) {

-			if ( geodir_is_page( 'home' ) ) {

+			if (geodir_is_page('home')) {

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

 			}

 

 

 		}

 

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

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

 			if (

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

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

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

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

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

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

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

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

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

 			) {

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

 			}

 		}

 

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

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

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

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

 

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

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

 					$page->ID == geodir_add_listing_page_id()

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

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

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

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

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

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

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

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

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

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

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

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

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

 				)

 			) {

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

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

 

 

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

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

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

 			// check if this post type is geodirectory post types

 			$post_type_array = geodir_get_posttypes();

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

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

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

 			}

 		}

 

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

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

-			if ( ! empty( $geodir_taxonomis ) ) {

-				foreach ( $geodir_taxonomis as $taxonomy ) {

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

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

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

+			if (!empty($geodir_taxonomis)) {

+				foreach ($geodir_taxonomis as $taxonomy) {

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

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

 						break;

 					}

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

 		}

 

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

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

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

 		}

 

 

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

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

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

 		}

 

 

 //check if homepage

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

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

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

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

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

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

 		     && is_page_geodir_home()

 		) {

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

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

 function geodir_is_geodir_page() {

 	global $wp;

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

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

 		return true;

 	} else {

 		return false;

 	}

 }

 

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

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

 	/**

 	 * Get image size using the size key .

 	 *

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

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

 	 */

-	function geodir_get_imagesize( $size = '' ) {

+	function geodir_get_imagesize($size = '') {

 

 		$imagesizes = array(

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

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

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

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

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

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

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

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

 		);

 

 		/**

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

 		 * @param array $imagesizes Image size array.

 		 */

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

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

 

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

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

 			/**

 			 * Filters image size of the passed key.

 			 *

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

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

 			 */

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

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

 

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

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

 

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

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

 

 		}

 

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

 

 

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

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

 	/**

 	 * Creates random string.

 	 *

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

 	function createRandomString() {

 		$chars = "abcdefghijkmlnopqrstuvwxyz1023456789";

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

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

 		$i       = 0;

 		$rstring = '';

-		while ( $i <= 25 ) {

+		while ($i <= 25) {

 			$num     = rand() % 33;

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

-			$rstring = $rstring . $tmp;

-			$i ++;

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

+			$rstring = $rstring.$tmp;

+			$i++;

 		}

 

 		return $rstring;

 	}

 }

 

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

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

 	/**

 	 * Calculates the distance radius.

 	 *

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

 	 * @return float The mean radius.

 	 */

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

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

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

-		switch ( geodir_strtolower( $uom ) ):

+		switch (geodir_strtolower($uom)):

 			case 'km'    :

 				$earthMeanRadius = 6371.009; // km

 				break;

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

 

 

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

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

 	/**

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

 	 *

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

 	 * @return float The distance.

 	 */

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

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

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

 

-		$earthMeanRadius = geodir_getDistanceRadius( $uom );

+		$earthMeanRadius = geodir_getDistanceRadius($uom);

 

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

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

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

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

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

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

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

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

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

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

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

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

 		$distance       = $earthMeanRadius * $c;

 

 		return $distance;

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

 

 

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

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

 	/**

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

 	 *

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

 	 * @param string $user_id       The user ID.

 	 */

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

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

 		$login_details = '';

 

 		// strip slashes from subject & message text

-		$to_subject = stripslashes_deep( $to_subject );

-		$to_message = stripslashes_deep( $to_message );

+		$to_subject = stripslashes_deep($to_subject);

+		$to_message = stripslashes_deep($to_message);

 

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

-			$subject = get_option( 'geodir_email_friend_subject' );

-			$message = get_option( 'geodir_email_friend_content' );

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

-			$subject = get_option( 'geodir_email_enquiry_subject' );

-			$message = get_option( 'geodir_email_enquiry_content' );

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

+			$subject = get_option('geodir_email_friend_subject');

+			$message = get_option('geodir_email_friend_content');

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

+			$subject = get_option('geodir_email_enquiry_subject');

+			$message = get_option('geodir_email_enquiry_content');

 

 			// change to name in some cases

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

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

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

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

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

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

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

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

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

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

 			}

 

 

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

-			$subject       = get_option( 'geodir_forgot_password_subject' );

-			$message       = get_option( 'geodir_forgot_password_content' );

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

+			$subject       = get_option('geodir_forgot_password_subject');

+			$message       = get_option('geodir_forgot_password_content');

 			$login_details = $to_message;

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

-			$subject       = get_option( 'geodir_registration_success_email_subject' );

-			$message       = get_option( 'geodir_registration_success_email_content' );

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

+			$subject       = get_option('geodir_registration_success_email_subject');

+			$message       = get_option('geodir_registration_success_email_content');

 			$login_details = $to_message;

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

-			$subject = get_option( 'geodir_post_submited_success_email_subject' );

-			$message = get_option( 'geodir_post_submited_success_email_content' );

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

-			$subject = get_option( 'geodir_post_published_email_subject' );

-			$message = get_option( 'geodir_post_published_email_content' );

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

-			$subject = get_option( 'geodir_post_edited_email_subject_admin' );

-			$message = get_option( 'geodir_post_edited_email_content_admin' );

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

+			$subject = get_option('geodir_post_submited_success_email_subject');

+			$message = get_option('geodir_post_submited_success_email_content');

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

+			$subject = get_option('geodir_post_published_email_subject');

+			$message = get_option('geodir_post_published_email_content');

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

+			$subject = get_option('geodir_post_edited_email_subject_admin');

+			$message = get_option('geodir_post_edited_email_content_admin');

 		}

 

-		if ( ! empty( $subject ) ) {

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

+		if (!empty($subject)) {

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

 		}

 

-		if ( ! empty( $message ) ) {

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

+		if (!empty($message)) {

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

 		}

 

-		$to_message        = nl2br( $to_message );

-		$sitefromEmail     = get_option( 'site_email' );

+		$to_message        = nl2br($to_message);

+		$sitefromEmail     = get_option('site_email');

 		$sitefromEmailName = get_site_emailName();

-		$productlink       = get_permalink( $post_id );

+		$productlink       = get_permalink($post_id);

 

 		$user_login = '';

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

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

 			$user_login = $user_info->user_login;

 		}

 

 		$posted_date = '';

 		$listingLink = '';

 

-		$post_info = get_post( $post_id );

+		$post_info = get_post($post_id);

 

-		if ( $post_info ) {

+		if ($post_info) {

 			$posted_date = $post_info->post_date;

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

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

 		}

 		$siteurl       = home_url();

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

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

 		$loginurl      = geodir_login_url();

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

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

         

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

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

-		$post_author_name = geodir_get_client_name( $post_author_id );

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

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

-

-		if ( $fromEmail == '' ) {

-			$fromEmail = get_option( 'site_email' );

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

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

+		$post_author_name = geodir_get_client_name($post_author_id);

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

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

+

+		if ($fromEmail == '') {

+			$fromEmail = get_option('site_email');

 		}

 

-		if ( $fromEmailName == '' ) {

-			$fromEmailName = get_option( 'site_email_name' );

+		if ($fromEmailName == '') {

+			$fromEmailName = get_option('site_email_name');

 		}

 

-		$search_array  = array(

+		$search_array = array(

 			'[#listing_link#]',

 			'[#site_name_url#]',

 			'[#post_id#]',

@@ -875,7 +875,7 @@ 
 			$post_author_email,

 			$current_date,

 		);

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

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

 

 		$search_array  = array(

 			'[#listing_link#]',

@@ -913,12 +913,12 @@ 
 			$post_author_email,

 			$current_date

 		);

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

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

 

-		$headers =  array();

+		$headers = array();

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

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

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

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

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

 

 		$to = $toEmail;

 

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

 		 * @param string $user_id       The user ID.

 		 */

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

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

 		/**

 		 * Filter the client email subject.

 		 *

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

 		 * @param string $user_id       The user ID.

 		 */

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

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

 		/**

 		 * Filter the client email message.

 		 *

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

 		 * @param string $user_id       The user ID.

 		 */

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

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

 		/**

 		 * Filter the client email headers.

 		 *

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

 		 * @param string $user_id       The user ID.

 		 */

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

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

 

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

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

 

-		if ( ! $sent ) {

-			if ( is_array( $to ) ) {

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

+		if (!$sent) {

+			if (is_array($to)) {

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

 			}

 			$log_message = sprintf(

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

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

 				$message_type,

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

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

 				$to,

 				$subject

 			);

-			geodir_error_log( $log_message );

+			geodir_error_log($log_message);

 		}

 

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

-		$adminEmail = get_bloginfo( 'admin_email' );

+		$adminEmail = get_bloginfo('admin_email');

 		$to         = $adminEmail;

 

 		$admin_bcc = false;

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

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

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

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

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

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

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

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

 		}

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

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

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

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

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

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

 

-			$search_array  = array(

+			$search_array = array(

 				'[#listing_link#]',

 				'[#site_name_url#]',

 				'[#post_id#]',

@@ -1065,7 +1065,7 @@ 
 				$user_login,

 				$post_author_email,

 			);

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

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

 

 			$search_array  = array(

 				'[#listing_link#]',

@@ -1097,26 +1097,26 @@ 
 				$user_login,

 				$post_author_email,

 			);

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

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

 

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

 

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

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

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

-		} elseif ( $message_type == 'send_friend' && get_option( 'geodir_bcc_friend' ) ) {

+		} elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

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

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

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

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

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

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

 		}

 

-		if ( $admin_bcc === true ) {

+		if ($admin_bcc === true) {

 

 			/**

 			 * Filter the client email subject.

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

 			 * @param string $user_id       The user ID.

 			 */

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

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

 			/**

 			 * Filter the client email message.

 			 *

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

 			 * @param string $user_id       The user ID.

 			 */

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

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

 

 

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

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

 

-			if ( ! $sent ) {

-				if ( is_array( $to ) ) {

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

+			if (!$sent) {

+				if (is_array($to)) {

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

 				}

 				$log_message = sprintf(

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

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

 					$message_type,

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

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

 					$to,

 					$subject

 				);

-				geodir_error_log( $log_message );

+				geodir_error_log($log_message);

 			}

 		}

 

@@ -1187,51 +1187,51 @@ 
  */

 function geodir_taxonomy_breadcrumb() {

 

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

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

 	$parent = $term->parent;

 

-	while ( $parent ):

+	while ($parent):

 		$parents[]  = $parent;

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

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

 		$parent     = $new_parent->parent;

 	endwhile;

 

-	if ( ! empty( $parents ) ):

-		$parents = array_reverse( $parents );

+	if (!empty($parents)):

+		$parents = array_reverse($parents);

 

-		foreach ( $parents as $parent ):

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

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

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

+		foreach ($parents as $parent):

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

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

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

 		endforeach;

 

 	endif;

 

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

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

 }

 

-function geodir_wpml_post_type_archive_link($link, $post_type){

+function geodir_wpml_post_type_archive_link($link, $post_type) {

 	if (geodir_is_wpml()) {

-		$post_types   = get_option( 'geodir_post_types' );

+		$post_types = get_option('geodir_post_types');

 		

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

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

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

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

 

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

-			if ( geodir_wpml_is_post_type_translated( $post_type ) ) {

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

+			if (geodir_wpml_is_post_type_translated($post_type)) {

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

 

 					$org_slug = $slug;

-					$slug     = apply_filters( 'wpml_translate_single_string',

+					$slug     = apply_filters('wpml_translate_single_string',

 						$slug,

 						'WordPress',

-						'URL slug: ' . $slug,

-						$language_code );

+						'URL slug: '.$slug,

+						$language_code);

                     

-					if ( ! $slug ) {

+					if (!$slug) {

 						$slug = $org_slug;

 					} else {

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

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

 					}

 				}

 			}

@@ -1240,7 +1240,7 @@ 
 

 	return $link;

 }

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

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

 

 /**

  * Main function that generates breadcrumb for all pages.

@@ -1261,9 +1261,9 @@ 
 	 *

 	 * @since 1.0.0

 	 */

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

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

 

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

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

 		$breadcrumb    = '';

 		$url_categoris = '';

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

@@ -1272,167 +1272,167 @@ 
 		 *

 		 * @since 1.0.0

 		 */

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

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

 

 		$gd_post_type   = geodir_get_current_posttype();

-		$post_type_info = get_post_type_object( $gd_post_type );

+		$post_type_info = get_post_type_object($gd_post_type);

 

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

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

 

-		$listing_link = get_post_type_archive_link( $gd_post_type );

+		$listing_link = get_post_type_archive_link($gd_post_type);

 

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

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

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

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

 		$listing_link .= '/';

 

 		$post_type_for_location_link = $listing_link;

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

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

 

 		global $wp, $gd_session;

 		$location_link = $post_type_for_location_link;

 

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

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

 			global $post;

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

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

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

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

 

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

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

 				$location_terms = array(

 					'gd_country' => $post->country_slug,

 					'gd_region'  => $post->region_slug,

 					'gd_city'    => $post->city_slug

 				);

 

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

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

 					$location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

 				}

 			}

 

-			$geodir_show_location_url = get_option( 'geodir_show_location_url' );

+			$geodir_show_location_url = get_option('geodir_show_location_url');

 

 			$hide_url_part = array();

-			if ( $location_manager ) {

-				$hide_country_part = get_option( 'geodir_location_hide_country_part' );

-				$hide_region_part  = get_option( 'geodir_location_hide_region_part' );

-

-				if ( $hide_region_part && $hide_country_part ) {

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

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

-					$hide_url_part = array( 'gd_region' );

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

-					$hide_url_part = array( 'gd_country' );

+			if ($location_manager) {

+				$hide_country_part = get_option('geodir_location_hide_country_part');

+				$hide_region_part  = get_option('geodir_location_hide_region_part');

+

+				if ($hide_region_part && $hide_country_part) {

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

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

+					$hide_url_part = array('gd_region');

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

+					$hide_url_part = array('gd_country');

 				}

 			}

 

 			$hide_text_part = array();

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

-				$hide_text_part = array( 'gd_region' );

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

+				$hide_text_part = array('gd_region');

 

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

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

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

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

 				}

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

-				$hide_text_part = array( 'gd_country' );

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

+				$hide_text_part = array('gd_country');

 

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

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

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

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

 				}

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

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

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

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

 

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

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

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

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

 				}

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

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

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

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

 				}

 			}

 

 			$is_location_last = '';

 			$is_taxonomy_last = '';

 			$breadcrumb .= '<li>';

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

-				$gd_taxonomy = $gd_post_type . 'category';

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

-				$gd_taxonomy = $gd_post_type . '_tags';

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

+				$gd_taxonomy = $gd_post_type.'category';

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

+				$gd_taxonomy = $gd_post_type.'_tags';

 			}

 

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

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

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

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

 				$is_location_last = false;

 			} else {

 				$is_location_last = true;

 			}

 

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

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

 				$is_taxonomy_last = true;

 			} else {

 				$is_taxonomy_last = false;

 			}

 

-			if ( ! empty( $location_terms ) ) {

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

+			if (!empty($location_terms)) {

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

 

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

-					if ( $location_term != '' ) {

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

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

+					if ($location_term != '') {

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

 							continue;

 						}

 

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

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

-						$gd_location_link_text = geodir_utf8_ucfirst( $gd_location_link_text );

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

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

+						$gd_location_link_text = geodir_utf8_ucfirst($gd_location_link_text);

 

 						$location_term_actual_country = '';

 						$location_term_actual_region  = '';

 						$location_term_actual_city    = '';

 						$location_term_actual_neighbourhood = '';

-						if ( $geodir_get_locations ) {

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

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

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

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

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

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

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

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

+						if ($geodir_get_locations) {

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

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

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

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

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

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

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

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

 							}

 						} else {

 							$location_info = geodir_get_location();

 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 								}

 							}

 						}

 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 						} else {

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

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

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

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

 							} else {

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

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

 							}

 

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

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

 								$gd_location_link_text = $location_term_actual_country;

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

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

 								$gd_location_link_text = $location_term_actual_region;

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

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

 								$gd_location_link_text = $location_term_actual_city;

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

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

 								$gd_location_link_text = $location_term_actual_neighbourhood;

 							}

 

@@ -1442,77 +1442,77 @@ 
                             }

                             */

 

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

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

 						}

 					}

 				}

 			}

 

-			if ( ! empty( $gd_taxonomy ) ) {

+			if (!empty($gd_taxonomy)) {

 				$term_index = 1;

 

 				//if(get_option('geodir_add_categories_url'))

 				{

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

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

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

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

 					} else {

 						$cat_link = $listing_link;

 					}

 

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

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

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

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

 							continue;

 						}

 

-						if ( $location_term != '' ) {

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

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

+						if ($location_term != '') {

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

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

 							}

 						}

 					}

 

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

-					foreach ( $term_array as $term ) {

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

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

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

+					foreach ($term_array as $term) {

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

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

 

 						// get term actual name

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

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

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

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

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

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

 						} else {

 							continue;

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

 						}

 

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

-							$breadcrumb .= $separator . $term_link_text;

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

+							$breadcrumb .= $separator.$term_link_text;

 						} else {

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

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

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

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

 						}

-						$term_index ++;

+						$term_index++;

 					}

 				}

 

 

 			}

 

-			if ( geodir_is_page( 'detail' ) ) {

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

+			if (geodir_is_page('detail')) {

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

 			}

 

 			$breadcrumb .= '</li>';

 

 

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

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

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

 			$user_id             = get_current_user_id();

-			$author_link         = get_author_posts_url( $user_id );

-			$default_author_link = geodir_getlink( $author_link, array(

+			$author_link         = get_author_posts_url($user_id);

+			$default_author_link = geodir_getlink($author_link, array(

 				'geodir_dashbord' => 'true',

 				'stype'           => $dashboard_post_type

-			), false );

+			), false);

 

 			/**

 			 * Filter author page link.

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

 			 * @param int $user_id                Author ID.

 			 */

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

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

 

 			$breadcrumb .= '<li>';

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

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

 

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

-				$author_link = geodir_getlink( $author_link, array(

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

+				$author_link = geodir_getlink($author_link, array(

 					'geodir_dashbord' => 'true',

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

-				), false );

+				), false);

 

 				/**

 				 * Filter author page link.

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

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

 				 */

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

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

 

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

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

-					$breadcrumb .= $separator . MY_FAVOURITE_TEXT;

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

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

+					$breadcrumb .= $separator.MY_FAVOURITE_TEXT;

 				}

 

 			} else {

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

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

 			}

 

 			$breadcrumb .= '</li>';

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

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

 			$category = get_the_category();

-			if ( is_category() ) {

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

+			if (is_category()) {

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

 			}

-			if ( is_single() ) {

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

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

+			if (is_single()) {

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

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

 			}

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

-		} else if ( is_page() ) {

+		} else if (is_page()) {

 			$page_title = get_the_title();

 

-			if ( geodir_is_page( 'location' ) ) {

+			if (geodir_is_page('location')) {

 				$location_page_id = geodir_location_page_id();

-				$loc_post         = get_post( $location_page_id );

+				$loc_post         = get_post($location_page_id);

 				$post_name        = $loc_post->post_name;

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

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

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

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

 			}

 

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

-			$breadcrumb .= stripslashes_deep( $page_title );

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

+			$breadcrumb .= stripslashes_deep($page_title);

 			$breadcrumb .= '</li>';

-		} else if ( is_tag() ) {

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

-		} else if ( is_day() ) {

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

-			the_time( 'F jS, Y' );

+		} else if (is_tag()) {

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

+		} else if (is_day()) {

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

+			the_time('F jS, Y');

 			$breadcrumb .= '</li>';

-		} else if ( is_month() ) {

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

-			the_time( 'F, Y' );

+		} else if (is_month()) {

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

+			the_time('F, Y');

 			$breadcrumb .= '</li>';

-		} else if ( is_year() ) {

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

-			the_time( 'Y' );

+		} else if (is_year()) {

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

+			the_time('Y');

 			$breadcrumb .= '</li>';

-		} else if ( is_author() ) {

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

+		} else if (is_author()) {

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

 			$breadcrumb .= '</li>';

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

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

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

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

 			$breadcrumb .= '</li>';

-		} else if ( is_search() ) {

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

+		} else if (is_search()) {

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

 			$breadcrumb .= '</li>';

 		}

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

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

 		 * @param string $separator  Breadcrumb separator.

 		 */

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

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

 	}

 }

 

 

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

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

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

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

 	/**

 	 * Allow only admins to access wp-admin.

 	 *

@@ -1630,12 +1630,12 @@ 
 	 */

 	function geodir_allow_wpadmin() {

 		global $wpdb;

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

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

 		{

-			if ( current_user_can( 'administrator' ) ) {

+			if (current_user_can('administrator')) {

 			} else {

 

-				wp_redirect( home_url() );

+				wp_redirect(home_url());

 				exit;

 			}

 

@@ -1654,23 +1654,23 @@ 
  *

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

  */

-function fetch_remote_file( $url ) {

+function fetch_remote_file($url) {

 	// extract the file name and extension from the url

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

-	$file_name = basename( $url );

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

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

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

+	$file_name = basename($url);

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

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

 	}

 	$dummy        = false;

 	$add_to_cache = false;

 	$key          = null;

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

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

 		$dummy = true;

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

-		$value = get_transient( 'cached_dummy_images' );

-		if ( $value ) {

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

-				return $value[ $key ];

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

+		$value = get_transient('cached_dummy_images');

+		if ($value) {

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

+				return $value[$key];

 			} else {

 				$add_to_cache = true;

 			}

@@ -1681,62 +1681,62 @@ 
 

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

 

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

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

 

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

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

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

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

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

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

 	}

 

 

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

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

 

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

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

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

 

 	$log_message = '';

-	if ( is_wp_error( $headers ) ) {

-		echo 'file: ' . $url;

+	if (is_wp_error($headers)) {

+		echo 'file: '.$url;

 

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

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

 	}

 

 	// clear cache to make compat with EWWW Image Optimizer

-	if(defined( 'EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE')){

+	if (defined('EWWW_IMAGE_OPTIMIZER_PLUGIN_FILE')) {

 		clearstatcache();

 	}

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

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

 	// request failed

-	if ( ! $headers ) {

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

+	if (!$headers) {

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

 	} // make sure the fetch was successful

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

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

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

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

-	} elseif ( 0 == $filesize ) {

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

-	}

-

-	if ( $log_message ) {

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

-		if ( ! $del ) {

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

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

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

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

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

+	} elseif (0 == $filesize) {

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

+	}

+

+	if ($log_message) {

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

+		if (!$del) {

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

 		}

 

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

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

 	}

 

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

-		$images = get_transient( 'cached_dummy_images' );

-		if ( is_array( $images ) ) {

-			$images[ $key ] = $upload;

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

+		$images = get_transient('cached_dummy_images');

+		if (is_array($images)) {

+			$images[$key] = $upload;

 		} else {

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

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

 		}

 

 		//setting the cache using the WP Transient API

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

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

 	}

 

 	return $upload;

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

  */

 function geodir_max_upload_size() {

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

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

 

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

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

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

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

 	} else {

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

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

 	}

 

 	/**

@@ -1765,7 +1765,7 @@ 
 	 *

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

 	 */

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

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

 }

 

 /**

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

  */

 function geodir_dummy_folder_exists() {

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

-	if ( ! is_dir( $path ) ) {

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

+	if (!is_dir($path)) {

 		return false;

 	} else {

 		return true;

@@ -1798,17 +1798,17 @@ 
  *

  * @return object Author info.

  */

-function geodir_get_author_info( $aid ) {

+function geodir_get_author_info($aid) {

 	global $wpdb;

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

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

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

-	if ( $info ) {

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

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

+	if ($info) {

 		return $info[0];

 	}

 }

 

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

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

 	/**

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

 	 *

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

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

 	 */

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

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

 		global $wpdb;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+		} elseif ($message_type == 'claim_requested') {

+			$subject        = __(get_option('claim_email_subject_admin'), 'geodirectory');

+			$client_message = __(get_option('claim_email_content_admin'), 'geodirectory');

+		} elseif ($message_type == 'auto_claim') {

+			$subject        = __(get_option('auto_claim_email_subject'), 'geodirectory');

+			$client_message = __(get_option('auto_claim_email_content'), 'geodirectory');

+		} elseif ($message_type == 'payment_success') {

+			$subject        = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');

+			$client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');

+		} elseif ($message_type == 'payment_fail') {

+			$subject        = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');

+			$client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');

 		}

 		$transaction_details = $custom_1;

-		$fromEmail           = get_option( 'site_email' );

+		$fromEmail           = get_option('site_email');

 		$fromEmailName       = get_site_emailName();

 //$alivedays = get_post_meta($page_id,'alive_days',true);

-		$pkg_limit            = get_property_price_info_listing( $page_id );

+		$pkg_limit            = get_property_price_info_listing($page_id);

 		$alivedays            = $pkg_limit['days'];

-		$productlink          = get_permalink( $page_id );

-		$post_info            = get_post( $page_id );

-		$post_date            = date( 'dS F,Y', strtotime( $post_info->post_date ) );

-		$listingLink          = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>';

+		$productlink          = get_permalink($page_id);

+		$post_info            = get_post($page_id);

+		$post_date            = date('dS F,Y', strtotime($post_info->post_date));

+		$listingLink          = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>';

 		$loginurl             = geodir_login_url();

-		$loginurl_link        = '<a href="' . $loginurl . '">login</a>';

+		$loginurl_link        = '<a href="'.$loginurl.'">login</a>';

 		$siteurl              = home_url();

-		$siteurl_link         = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>';

-		$user_info            = get_userdata( $user_id );

+		$siteurl_link         = '<a href="'.$siteurl.'">'.$fromEmailName.'</a>';

+		$user_info            = get_userdata($user_id);

 		$user_email           = $user_info->user_email;

-		$display_name         = geodir_get_client_name( $user_id );

+		$display_name         = geodir_get_client_name($user_id);

 		$user_login           = $user_info->user_login;

-		$number_of_grace_days = get_option( 'ptthemes_listing_preexpiry_notice_days' );

-		if ( $number_of_grace_days == '' ) {

+		$number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');

+		if ($number_of_grace_days == '') {

 			$number_of_grace_days = 1;

 		}

-		if ( $post_info->post_type == 'event' ) {

+		if ($post_info->post_type == 'event') {

 			$post_type = 'event';

 		} else {

 			$post_type = 'listing';

 		}

-		$renew_link     = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>';

+		$renew_link     = '<a href="'.$siteurl.'?ptype=post_'.$post_type.'&renew=1&pid='.$page_id.'">'.RENEW_LINK.'</a>';

 		$search_array   = array(

 			'[#client_name#]',

 			'[#listing_link#]',

@@ -1897,7 +1897,7 @@ 
 			'[#site_name#]',

 			'[#transaction_details#]'

 		);

-		$replace_array  = array(

+		$replace_array = array(

 			$display_name,

 			$listingLink,

 			$post_date,

@@ -1912,13 +1912,13 @@ 
 			$fromEmailName,

 			$transaction_details

 		);

-		$client_message = str_replace( $search_array, $replace_array, $client_message );

-		$subject        = str_replace( $search_array, $replace_array, $subject );

+		$client_message = str_replace($search_array, $replace_array, $client_message);

+		$subject        = str_replace($search_array, $replace_array, $subject);

 		

 		

-		$headers  = array();

+		$headers = array();

 		$headers[] = 'Content-type: text/html; charset=UTF-8';

-		$headers[] = 'From: ' . $fromEmailName . ' <' . $fromEmail . '>';

+		$headers[] = 'From: '.$fromEmailName.' <'.$fromEmail.'>';

 

 		$to      = $fromEmail;

 		$message = $client_message;

@@ -1936,7 +1936,7 @@ 
 		 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 		 * @param string $custom_1     Custom data to be sent.

 		 */

-		$to = apply_filters( 'geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1 );

+		$to = apply_filters('geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1);

 		/**

 		 * Filter the admin email subject.

 		 *

@@ -1949,7 +1949,7 @@ 
 		 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 		 * @param string $custom_1     Custom data to be sent.

 		 */

-		$subject = apply_filters( 'geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1 );

+		$subject = apply_filters('geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1);

 		/**

 		 * Filter the admin email message.

 		 *

@@ -1962,7 +1962,7 @@ 
 		 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 		 * @param string $custom_1     Custom data to be sent.

 		 */

-		$message = apply_filters( 'geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1 );

+		$message = apply_filters('geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1);

 		/**

 		 * Filter the admin email headers.

 		 *

@@ -1975,22 +1975,22 @@ 
 		 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 		 * @param string $custom_1     Custom data to be sent.

 		 */

-		$headers = apply_filters( 'geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1 );

+		$headers = apply_filters('geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1);

 

 

-		$sent = wp_mail( $to, $subject, $message, $headers );

-		if ( ! $sent ) {

-			if ( is_array( $to ) ) {

-				$to = implode( ',', $to );

+		$sent = wp_mail($to, $subject, $message, $headers);

+		if (!$sent) {

+			if (is_array($to)) {

+				$to = implode(',', $to);

 			}

 			$log_message = sprintf(

-				__( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+				__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

 				$message_type,

-				date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+				date_i18n('F j Y H:i:s', current_time('timestamp')),

 				$to,

 				$subject

 			);

-			geodir_error_log( $log_message );

+			geodir_error_log($log_message);

 		}

 	}

 }

@@ -2010,12 +2010,12 @@ 
  *

  * @return array Category IDs.

  */

-function gd_lang_object_ids( $ids_array, $type ) {

-	if ( geodir_is_wpml() ) {

+function gd_lang_object_ids($ids_array, $type) {

+	if (geodir_is_wpml()) {

 		$res = array();

-		foreach ( $ids_array as $id ) {

-			$xlat = geodir_wpml_object_id( $id, $type, false );

-			if ( ! is_null( $xlat ) ) {

+		foreach ($ids_array as $id) {

+			$xlat = geodir_wpml_object_id($id, $type, false);

+			if (!is_null($xlat)) {

 				$res[] = $xlat;

 			}

 		}

@@ -2039,20 +2039,20 @@ 
  *

  * @return array Modified Body CSS classes.

  */

-function geodir_custom_posts_body_class( $classes ) {

+function geodir_custom_posts_body_class($classes) {

 	global $wpdb, $wp;

-	$post_types = geodir_get_posttypes( 'object' );

-	if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {

+	$post_types = geodir_get_posttypes('object');

+	if (!empty($post_types) && count((array) $post_types) > 1) {

 		$classes[] = 'geodir_custom_posts';

 	}

 

 	// fix body class for signup page

-	if ( geodir_is_page( 'login' ) ) {

+	if (geodir_is_page('login')) {

 		$new_classes   = array();

 		$new_classes[] = 'signup page-geodir-signup';

-		if ( ! empty( $classes ) ) {

-			foreach ( $classes as $class ) {

-				if ( $class && $class != 'home' && $class != 'blog' ) {

+		if (!empty($classes)) {

+			foreach ($classes as $class) {

+				if ($class && $class != 'home' && $class != 'blog') {

 					$new_classes[] = $class;

 				}

 			}

@@ -2060,14 +2060,14 @@ 
 		$classes = $new_classes;

 	}

 

-	if ( geodir_is_geodir_page() ) {

+	if (geodir_is_geodir_page()) {

 		$classes[] = 'geodir-page';

 	}

 

 	return $classes;

 }

 

-add_filter( 'body_class', 'geodir_custom_posts_body_class' ); // let's add a class to the body so we can style the new addition to the search

+add_filter('body_class', 'geodir_custom_posts_body_class'); // let's add a class to the body so we can style the new addition to the search

 

 

 /**

@@ -2083,7 +2083,7 @@ 
 	 *

 	 * @since 1.0.0

 	 */

-	return apply_filters( 'geodir_map_zoom_level', array(

+	return apply_filters('geodir_map_zoom_level', array(

 		1,

 		2,

 		3,

@@ -2103,7 +2103,7 @@ 
 		17,

 		18,

 		19

-	) );

+	));

 

 }

 

@@ -2116,12 +2116,12 @@ 
  *

  * @param string $geodir_option_name Option key.

  */

-function geodir_option_version_backup( $geodir_option_name ) {

+function geodir_option_version_backup($geodir_option_name) {

 	$version_date  = time();

-	$geodir_option = get_option( $geodir_option_name );

+	$geodir_option = get_option($geodir_option_name);

 

-	if ( ! empty( $geodir_option ) ) {

-		add_option( $geodir_option_name . '_' . $version_date, $geodir_option );

+	if (!empty($geodir_option)) {

+		add_option($geodir_option_name.'_'.$version_date, $geodir_option);

 	}

 }

 

@@ -2135,10 +2135,10 @@ 
  *

  * @return int Page ID.

  */

-function get_page_id_geodir_add_listing_page( $page_id ) {

-	if ( geodir_wpml_multilingual_status() ) {

+function get_page_id_geodir_add_listing_page($page_id) {

+	if (geodir_wpml_multilingual_status()) {

 		$post_type = 'post_page';

-		$page_id   = geodir_get_wpml_element_id( $page_id, $post_type );

+		$page_id   = geodir_get_wpml_element_id($page_id, $post_type);

 	}

 

 	return $page_id;

@@ -2152,7 +2152,7 @@ 
  * @return bool Returns true when sitepress multilingual CMS active. else returns false.

  */

 function geodir_wpml_multilingual_status() {

-	if ( geodir_is_wpml() ) {

+	if (geodir_is_wpml()) {

 		return true;

 	}

 

@@ -2170,19 +2170,19 @@ 
  *

  * @return int Element ID when exists. Else the page id.

  */

-function geodir_get_wpml_element_id( $page_id, $post_type ) {

+function geodir_get_wpml_element_id($page_id, $post_type) {

 	global $sitepress;

-	if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {

-		$trid = $sitepress->get_element_trid( $page_id, $post_type );

+	if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {

+		$trid = $sitepress->get_element_trid($page_id, $post_type);

 

-		if ( $trid > 0 ) {

-			$translations = $sitepress->get_element_translations( $trid, $post_type );

+		if ($trid > 0) {

+			$translations = $sitepress->get_element_translations($trid, $post_type);

 

 			$lang = $sitepress->get_current_language();

 			$lang = $lang ? $lang : $sitepress->get_default_language();

 

-			if ( ! empty( $translations ) && ! empty( $lang ) && isset( $translations[ $lang ] ) && isset( $translations[ $lang ]->element_id ) && ! empty( $translations[ $lang ]->element_id ) ) {

-				$page_id = $translations[ $lang ]->element_id;

+			if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {

+				$page_id = $translations[$lang]->element_id;

 			}

 		}

 	}

@@ -2199,15 +2199,15 @@ 
  */

 function geodir_wpml_check_element_id() {

 	global $sitepress;

-	if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {

+	if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {

 		$el_type      = 'post_page';

-		$el_id        = get_option( 'geodir_add_listing_page' );

+		$el_id        = get_option('geodir_add_listing_page');

 		$default_lang = $sitepress->get_default_language();

-		$el_details   = $sitepress->get_element_language_details( $el_id, $el_type );

+		$el_details   = $sitepress->get_element_language_details($el_id, $el_type);

 

-		if ( ! ( $el_id > 0 && $default_lang && ! empty( $el_details ) && isset( $el_details->language_code ) && $el_details->language_code == $default_lang ) ) {

-			if ( ! $el_details->source_language_code ) {

-				$sitepress->set_element_language_details( $el_id, $el_type, '', $default_lang );

+		if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {

+			if (!$el_details->source_language_code) {

+				$sitepress->set_element_language_details($el_id, $el_type, '', $default_lang);

 				$sitepress->icl_translations_cache->clear();

 			}

 		}

@@ -2227,44 +2227,44 @@ 
  *

  * @return string Orderby SQL.

  */

-function geodir_widget_listings_get_order( $query_args ) {

+function geodir_widget_listings_get_order($query_args) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

-		return $wpdb->posts . ".post_date DESC, ";

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

+		return $wpdb->posts.".post_date DESC, ";

 	}

 

-	$post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type'];

-	$table     = $plugin_prefix . $post_type . '_detail';

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

+	$table     = $plugin_prefix.$post_type.'_detail';

 

-	$sort_by = ! empty( $query_args['order_by'] ) ? $query_args['order_by'] : '';

+	$sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : '';

 

-	switch ( $sort_by ) {

+	switch ($sort_by) {

 		case 'latest':

 		case 'newest':

-			$orderby = $wpdb->posts . ".post_date DESC, ";

+			$orderby = $wpdb->posts.".post_date DESC, ";

 			break;

 		case 'featured':

-			$orderby = $table . ".is_featured ASC, ". $wpdb->posts . ".post_date DESC, ";

+			$orderby = $table.".is_featured ASC, ".$wpdb->posts.".post_date DESC, ";

 			break;

 		case 'az':

-			$orderby = $wpdb->posts . ".post_title ASC, ";

+			$orderby = $wpdb->posts.".post_title ASC, ";

 			break;

 		case 'high_review':

-			$orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

+			$orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, ";

 			break;

 		case 'high_rating':

-			$orderby = "( " . $table . ".overall_rating  ) DESC, ";

+			$orderby = "( ".$table.".overall_rating  ) DESC, ";

 			break;

 		case 'random':

 			$orderby = "RAND(), ";

 			break;

 		default:

-			if ( $custom_orderby = geodir_prepare_custom_sorting( $sort_by, $table ) ) {

-				$orderby = $custom_orderby . ", ";

+			if ($custom_orderby = geodir_prepare_custom_sorting($sort_by, $table)) {

+				$orderby = $custom_orderby.", ";

 			} else {

-				$orderby = $wpdb->posts . ".post_title ASC, ";

+				$orderby = $wpdb->posts.".post_title ASC, ";

 			}

 			break;

 	}

@@ -2289,16 +2289,16 @@ 
  *

  * @return mixed Result object.

  */

-function geodir_get_widget_listings( $query_args = array(), $count_only = false ) {

+function geodir_get_widget_listings($query_args = array(), $count_only = false) {

 	global $wpdb, $plugin_prefix, $table_prefix;

 	$GLOBALS['gd_query_args_widgets'] = $query_args;

 	$gd_query_args_widgets            = $query_args;

 

-	$post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type'];

-	$table     = $plugin_prefix . $post_type . '_detail';

-	$supports_wpml = geodir_wpml_is_post_type_translated( $post_type );

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

+	$table     = $plugin_prefix.$post_type.'_detail';

+	$supports_wpml = geodir_wpml_is_post_type_translated($post_type);

 

-	$fields = $wpdb->posts . ".*, " . $table . ".*";

+	$fields = $wpdb->posts.".*, ".$table.".*";

 	/**

 	 * Filter widget listing fields string part that is being used for query.

 	 *

@@ -2308,17 +2308,17 @@ 
 	 * @param string $table     Table name.

 	 * @param string $post_type Post type.

 	 */

-	$fields = apply_filters( 'geodir_filter_widget_listings_fields', $fields, $table, $post_type );

+	$fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);

 

-	$join = "INNER JOIN " . $table . " ON (" . $table . ".post_id = " . $wpdb->posts . ".ID)";

+	$join = "INNER JOIN ".$table." ON (".$table.".post_id = ".$wpdb->posts.".ID)";

 

 	########### WPML ###########

 

-	if ( $supports_wpml ) {

+	if ($supports_wpml) {

 		global $sitepress;

 		$lang_code = ICL_LANGUAGE_CODE;

-		if ( $lang_code ) {

-			$join .= " JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

+		if ($lang_code) {

+			$join .= " JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID";

 		}

 	}

 

@@ -2332,15 +2332,15 @@ 
 	 * @param string $join      Join clause string.

 	 * @param string $post_type Post type.

 	 */

-	$join = apply_filters( 'geodir_filter_widget_listings_join', $join, $post_type );

+	$join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);

 

-	$post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : '';

+	$post_status = is_super_admin() ? " OR ".$wpdb->posts.".post_status = 'private'" : '';

 

-	$where = " AND ( " . $wpdb->posts . ".post_status = 'publish' " . $post_status . " ) AND " . $wpdb->posts . ".post_type = '" . $post_type . "'";

+	$where = " AND ( ".$wpdb->posts.".post_status = 'publish' ".$post_status." ) AND ".$wpdb->posts.".post_type = '".$post_type."'";

 

 	########### WPML ###########

-	if ( $supports_wpml ) {

-		if ( $lang_code ) {

+	if ($supports_wpml) {

+		if ($lang_code) {

 			$where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' ";

 		}

 	}

@@ -2353,8 +2353,8 @@ 
 	 * @param string $where     Where clause string.

 	 * @param string $post_type Post type.

 	 */

-	$where = apply_filters( 'geodir_filter_widget_listings_where', $where, $post_type );

-	$where = $where != '' ? " WHERE 1=1 " . $where : '';

+	$where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);

+	$where = $where != '' ? " WHERE 1=1 ".$where : '';

 

 	$groupby = " GROUP BY $wpdb->posts.ID "; //@todo is this needed? faster without

 	/**

@@ -2365,15 +2365,15 @@ 
 	 * @param string $groupby   Group by clause string.

 	 * @param string $post_type Post type.

 	 */

-	$groupby = apply_filters( 'geodir_filter_widget_listings_groupby', $groupby, $post_type );

+	$groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);

 

-	if ( $count_only ) {

-		$sql  = "SELECT COUNT(DISTINCT " . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . "

-			" . $join . "

+	if ($count_only) {

+		$sql  = "SELECT COUNT(DISTINCT ".$wpdb->posts.".ID) AS total FROM ".$wpdb->posts."

+			" . $join."

 			" . $where;

-		$rows = (int) $wpdb->get_var( $sql );

+		$rows = (int) $wpdb->get_var($sql);

 	} else {

-		$orderby = geodir_widget_listings_get_order( $query_args );

+		$orderby = geodir_widget_listings_get_order($query_args);

 		/**

 		 * Filter widget listing orderby clause string part that is being used for query.

 		 *

@@ -2383,33 +2383,33 @@ 
 		 * @param string $table     Table name.

 		 * @param string $post_type Post type.

 		 */

-		$orderby = apply_filters( 'geodir_filter_widget_listings_orderby', $orderby, $table, $post_type );

+		$orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);

 		

 		$second_orderby = array();

-		if ( strpos( $orderby, strtolower( $table . ".is_featured" )  ) === false ) {

-			$second_orderby[] = $table . ".is_featured ASC";

+		if (strpos($orderby, strtolower($table.".is_featured")) === false) {

+			$second_orderby[] = $table.".is_featured ASC";

 		}

 		

-		if ( strpos( $orderby, strtolower( $wpdb->posts . ".post_date" )  ) === false ) {

-			$second_orderby[] = $wpdb->posts . ".post_date DESC";

+		if (strpos($orderby, strtolower($wpdb->posts.".post_date")) === false) {

+			$second_orderby[] = $wpdb->posts.".post_date DESC";

 		}

 		

-		if ( strpos( $orderby, strtolower( $wpdb->posts . ".post_title" )  ) === false ) {

-			$second_orderby[] = $wpdb->posts . ".post_title ASC";

+		if (strpos($orderby, strtolower($wpdb->posts.".post_title")) === false) {

+			$second_orderby[] = $wpdb->posts.".post_title ASC";

 		}

 		

-		if ( !empty( $second_orderby ) ) {

-			$orderby .= implode( ', ', $second_orderby );

+		if (!empty($second_orderby)) {

+			$orderby .= implode(', ', $second_orderby);

 		}

 		

-		if ( !empty( $orderby ) ) {

-			$orderby = trim( $orderby );

-			$orderby = rtrim( $orderby, "," );

+		if (!empty($orderby)) {

+			$orderby = trim($orderby);

+			$orderby = rtrim($orderby, ",");

 		}

 		

-		$orderby = $orderby != '' ? " ORDER BY " . $orderby : '';

+		$orderby = $orderby != '' ? " ORDER BY ".$orderby : '';

 

-		$limit = ! empty( $query_args['posts_per_page'] ) ? $query_args['posts_per_page'] : 5;

+		$limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5;

 		/**

 		 * Filter widget listing limit that is being used for query.

 		 *

@@ -2418,27 +2418,27 @@ 
 		 * @param int $limit        Query results limit.

 		 * @param string $post_type Post type.

 		 */

-		$limit = apply_filters( 'geodir_filter_widget_listings_limit', $limit, $post_type );

+		$limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);

 

-		$page = ! empty( $query_args['pageno'] ) ? absint( $query_args['pageno'] ) : 1;

-		if ( ! $page ) {

+		$page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1;

+		if (!$page) {

 			$page = 1;

 		}

 

-		$limit = (int) $limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int) $limit ) . ", " . (int) $limit : "";

+		$limit = (int) $limit > 0 ? " LIMIT ".absint(($page - 1) * (int) $limit).", ".(int) $limit : "";

 

 		//@todo removed SQL_CALC_FOUND_ROWS from below as don't think it is needed and query is faster without

-		$sql  = "SELECT " . $fields . " FROM " . $wpdb->posts . "

-			" . $join . "

-			" . $where . "

-			" . $groupby . "

-			" . $orderby . "

+		$sql = "SELECT ".$fields." FROM ".$wpdb->posts."

+			" . $join."

+			" . $where."

+			" . $groupby."

+			" . $orderby."

 			" . $limit;

-		$rows = $wpdb->get_results( $sql );

+		$rows = $wpdb->get_results($sql);

 	}

 

-	unset( $GLOBALS['gd_query_args_widgets'] );

-	unset( $gd_query_args_widgets );

+	unset($GLOBALS['gd_query_args_widgets']);

+	unset($gd_query_args_widgets);

 

 	return $rows;

 }

@@ -2455,11 +2455,11 @@ 
  *

  * @return string Modified fields SQL.

  */

-function geodir_function_widget_listings_fields( $fields ) {

+function geodir_function_widget_listings_fields($fields) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $fields;

 	}

 

@@ -2478,24 +2478,24 @@ 
  *

  * @return string Modified join clause SQL.

  */

-function geodir_function_widget_listings_join( $join ) {

+function geodir_function_widget_listings_join($join) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $join;

 	}

 

-	$post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type'];

-	$table     = $plugin_prefix . $post_type . '_detail';

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

+	$table     = $plugin_prefix.$post_type.'_detail';

 

-	if ( ! empty( $query_args['with_pics_only'] ) ) {

-		$join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

+	if (!empty($query_args['with_pics_only'])) {

+		$join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )";

 	}

 

-	if ( ! empty( $query_args['tax_query'] ) ) {

-		$tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' );

-		if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {

+	if (!empty($query_args['tax_query'])) {

+		$tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID');

+		if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {

 			$join .= $tax_queries['join'];

 		}

 	}

@@ -2516,67 +2516,67 @@ 
  *

  * @return string Modified where clause SQL.

  */

-function geodir_function_widget_listings_where( $where ) {

+function geodir_function_widget_listings_where($where) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $where;

 	}

-	$post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type'];

-	$table     = $plugin_prefix . $post_type . '_detail';

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

+	$table     = $plugin_prefix.$post_type.'_detail';

 

-	if ( ! empty( $query_args ) ) {

-		if ( ! empty( $query_args['gd_location'] ) && function_exists( 'geodir_default_location_where' ) ) {

-			$where = geodir_default_location_where( $where, $table );

+	if (!empty($query_args)) {

+		if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {

+			$where = geodir_default_location_where($where, $table);

 		}

 

-		if ( ! empty( $query_args['post_author'] ) ) {

-			$where .= " AND " . $wpdb->posts . ".post_author = " . (int) $query_args['post_author'];

+		if (!empty($query_args['post_author'])) {

+			$where .= " AND ".$wpdb->posts.".post_author = ".(int) $query_args['post_author'];

 		}

 

-		if ( ! empty( $query_args['show_featured_only'] ) ) {

-			$where .= " AND " . $table . ".is_featured = '1'";

+		if (!empty($query_args['show_featured_only'])) {

+			$where .= " AND ".$table.".is_featured = '1'";

 		}

 

-		if ( ! empty( $query_args['show_special_only'] ) ) {

-			$where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

+		if (!empty($query_args['show_special_only'])) {

+			$where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )";

 		}

 

-		if ( ! empty( $query_args['with_pics_only'] ) ) {

-			$where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL ";

+		if (!empty($query_args['with_pics_only'])) {

+			$where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL ";

 		}

 

-		if ( ! empty( $query_args['featured_image_only'] ) ) {

-			$where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' ";

+		if (!empty($query_args['featured_image_only'])) {

+			$where .= " AND ".$table.".featured_image IS NOT NULL AND ".$table.".featured_image!='' ";

 		}

 

-		if ( ! empty( $query_args['with_videos_only'] ) ) {

-			$where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

+		if (!empty($query_args['with_videos_only'])) {

+			$where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )";

 		}

         

-		if ( ! empty( $query_args['show_favorites_only'] ) ) {

+		if (!empty($query_args['show_favorites_only'])) {

 			$user_favorites = '-1';

 			

-			if ( !empty( $query_args['favorites_by_user'] ) ) {

+			if (!empty($query_args['favorites_by_user'])) {

 

 				$site_id = '';

-				if ( is_multisite() ) {

+				if (is_multisite()) {

 					$blog_id = get_current_blog_id();

-					if($blog_id && $blog_id!='1'){$site_id  = '_' . $blog_id ;}

+					if ($blog_id && $blog_id != '1') {$site_id = '_'.$blog_id; }

 				}

 				

-				$user_favorites = geodir_get_user_favourites( (int)$query_args['favorites_by_user'] );

+				$user_favorites = geodir_get_user_favourites((int) $query_args['favorites_by_user']);

 				$user_favorites = !empty($user_favorites) && is_array($user_favorites) ? implode("','", $user_favorites) : '-1';

 			}

 			

-			$where .= " AND `" . $wpdb->posts . "`.`ID` IN('" . $user_favorites . "')";

+			$where .= " AND `".$wpdb->posts."`.`ID` IN('".$user_favorites."')";

 		}

 

-		if ( ! empty( $query_args['tax_query'] ) ) {

-			$tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' );

+		if (!empty($query_args['tax_query'])) {

+			$tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID');

 

-			if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {

+			if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {

 				$where .= $tax_queries['where'];

 			}

 		}

@@ -2597,11 +2597,11 @@ 
  *

  * @return string Modified orderby clause SQL.

  */

-function geodir_function_widget_listings_orderby( $orderby ) {

+function geodir_function_widget_listings_orderby($orderby) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $orderby;

 	}

 

@@ -2620,15 +2620,15 @@ 
  *

  * @return int Query limit.

  */

-function geodir_function_widget_listings_limit( $limit ) {

+function geodir_function_widget_listings_limit($limit) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $limit;

 	}

 

-	if ( ! empty( $query_args ) && ! empty( $query_args['posts_per_page'] ) ) {

+	if (!empty($query_args) && !empty($query_args['posts_per_page'])) {

 		$limit = (int) $query_args['posts_per_page'];

 	}

 

@@ -2646,12 +2646,12 @@ 
  *

  * @return int Large size width.

  */

-function geodir_media_image_large_width( $default = 800, $params = '' ) {

-	$large_size_w = get_option( 'large_size_w' );

+function geodir_media_image_large_width($default = 800, $params = '') {

+	$large_size_w = get_option('large_size_w');

 	$large_size_w = $large_size_w > 0 ? $large_size_w : $default;

-	$large_size_w = absint( $large_size_w );

+	$large_size_w = absint($large_size_w);

 

-	if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {

+	if (!get_option('geodir_use_wp_media_large_size')) {

 		$large_size_w = 800;

 	}

 

@@ -2664,7 +2664,7 @@ 
 	 * @param int $default         Default width.

 	 * @param string|array $params Image parameters.

 	 */

-	$large_size_w = apply_filters( 'geodir_filter_media_image_large_width', $large_size_w, $default, $params );

+	$large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);

 

 	return $large_size_w;

 }

@@ -2680,12 +2680,12 @@ 
  *

  * @return int Large size height.

  */

-function geodir_media_image_large_height( $default = 800, $params = '' ) {

-	$large_size_h = get_option( 'large_size_h' );

+function geodir_media_image_large_height($default = 800, $params = '') {

+	$large_size_h = get_option('large_size_h');

 	$large_size_h = $large_size_h > 0 ? $large_size_h : $default;

-	$large_size_h = absint( $large_size_h );

+	$large_size_h = absint($large_size_h);

 

-	if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {

+	if (!get_option('geodir_use_wp_media_large_size')) {

 		$large_size_h = 800;

 	}

 

@@ -2698,7 +2698,7 @@ 
 	 * @param int $default         Default height.

 	 * @param string|array $params Image parameters.

 	 */

-	$large_size_h = apply_filters( 'geodir_filter_media_image_large_height', $large_size_h, $default, $params );

+	$large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);

 

 	return $large_size_h;

 }

@@ -2715,8 +2715,8 @@ 
  *

  * @return string Sanitized name.

  */

-function geodir_sanitize_location_name( $type, $name, $translate = true ) {

-	if ( $name == '' ) {

+function geodir_sanitize_location_name($type, $name, $translate = true) {

+	if ($name == '') {

 		return null;

 	}

 

@@ -2725,13 +2725,13 @@ 
 	$type = $type == 'gd_city' ? 'city' : $type;

 

 	$return = $name;

-	if ( function_exists( 'get_actual_location_name' ) ) {

-		$return = get_actual_location_name( $type, $name, $translate );

+	if (function_exists('get_actual_location_name')) {

+		$return = get_actual_location_name($type, $name, $translate);

 	} else {

-		$return = preg_replace( '/-(\d+)$/', '', $return );

-		$return = preg_replace( '/[_-]/', ' ', $return );

-		$return = geodir_ucwords( $return );

-		$return = $translate ? __( $return, 'geodirectory' ) : $return;

+		$return = preg_replace('/-(\d+)$/', '', $return);

+		$return = preg_replace('/[_-]/', ' ', $return);

+		$return = geodir_ucwords($return);

+		$return = $translate ? __($return, 'geodirectory') : $return;

 	}

 

 	return $return;

@@ -2749,26 +2749,26 @@ 
  *

  * @param int $number Comments number.

  */

-function geodir_comments_number( $number ) {

+function geodir_comments_number($number) {

 	global $post;

 	

-	if ( !empty( $post->post_type ) && geodir_cpt_has_rating_disabled( $post->post_type ) ) {

+	if (!empty($post->post_type) && geodir_cpt_has_rating_disabled($post->post_type)) {

 		$number = get_comments_number();

 		

-		if ( $number > 1 ) {

-			$output = str_replace( '%', number_format_i18n( $number ), __( '% Comments', 'geodirectory' ) );

-		} elseif ( $number == 0 || $number == '' ) {

-			$output = __( 'No Comments', 'geodirectory' );

+		if ($number > 1) {

+			$output = str_replace('%', number_format_i18n($number), __('% Comments', 'geodirectory'));

+		} elseif ($number == 0 || $number == '') {

+			$output = __('No Comments', 'geodirectory');

 		} else { // must be one

-			$output = __( '1 Comment', 'geodirectory' );

+			$output = __('1 Comment', 'geodirectory');

 		}

 	} else {    

-		if ( $number > 1 ) {

-			$output = str_replace( '%', number_format_i18n( $number ), __( '% Reviews', 'geodirectory' ) );

-		} elseif ( $number == 0 || $number == '' ) {

-			$output = __( 'No Reviews', 'geodirectory' );

+		if ($number > 1) {

+			$output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));

+		} elseif ($number == 0 || $number == '') {

+			$output = __('No Reviews', 'geodirectory');

 		} else { // must be one

-			$output = __( '1 Review', 'geodirectory' );

+			$output = __('1 Review', 'geodirectory');

 		}

 	}

 	

@@ -2785,18 +2785,18 @@ 
  */

 function is_page_geodir_home() {

 	global $wpdb;

-	$cur_url = str_replace( array( "https://", "http://", "www." ), array( '', '', '' ), geodir_curPageURL() );

-	if ( function_exists( 'geodir_location_geo_home_link' ) ) {

-		remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 );

+	$cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());

+	if (function_exists('geodir_location_geo_home_link')) {

+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

 	}

-	$home_url = home_url( '', 'http' );

-	if ( function_exists( 'geodir_location_geo_home_link' ) ) {

-		add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 );

+	$home_url = home_url('', 'http');

+	if (function_exists('geodir_location_geo_home_link')) {

+		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

 	}

-	$home_url = str_replace( "www.", "", $home_url );

-	if ( ( strpos( $home_url, $cur_url ) !== false || strpos( $home_url . '/', $cur_url ) !== false ) && ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) ) {

+	$home_url = str_replace("www.", "", $home_url);

+	if ((strpos($home_url, $cur_url) !== false || strpos($home_url.'/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page'))) {

 		return true;

-	} elseif ( get_query_var( 'page_id' ) == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) {

+	} elseif (get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page')) {

 		return true;

 	} else {

 		return false;

@@ -2816,18 +2816,18 @@ 
  *

  * @return string The canonical URL.

  */

-function geodir_wpseo_homepage_canonical( $url ) {

+function geodir_wpseo_homepage_canonical($url) {

 	global $post;

 

-	if ( is_page_geodir_home() ) {

+	if (is_page_geodir_home()) {

 		return home_url();

 	}

 

 	return $url;

 }

 

-add_filter( 'wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10 );

-add_filter( 'aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10 );

+add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);

+add_filter('aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10);

 

 /**

  * Add extra fields to google maps script call.

@@ -2840,20 +2840,20 @@ 
  *

  * @return string Modified extra string.

  */

-function geodir_googlemap_script_extra_details_page( $extra ) {

+function geodir_googlemap_script_extra_details_page($extra) {

 	global $post;

 	$add_google_places_api = false;

-	if ( isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {

+	if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

 		$add_google_places_api = true;

 	}

-	if ( ! str_replace( 'libraries=places', '', $extra ) && ( geodir_is_page( 'detail' ) || $add_google_places_api ) ) {

+	if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {

 		$extra .= "&amp;libraries=places";

 	}

 

 	return $extra;

 }

 

-add_filter( 'geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1 );

+add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);

 

 

 /**

@@ -2872,122 +2872,122 @@ 
  *                                          after_widget.

  * @param array|string $instance            The settings for the particular instance of the widget.

  */

-function geodir_popular_post_category_output( $args = '', $instance = '' ) {

+function geodir_popular_post_category_output($args = '', $instance = '') {

 	// prints the widget

 	global $wpdb, $plugin_prefix, $geodir_post_category_str;

-	extract( $args, EXTR_SKIP );

+	extract($args, EXTR_SKIP);

 

 	echo $before_widget;

 

 	/** This filter is documented in geodirectory_widgets.php */

-	$title = empty( $instance['title'] ) ? __( 'Popular Categories', 'geodirectory' ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 

 	$gd_post_type = geodir_get_current_posttype();

 

-	$category_limit = isset( $instance['category_limit'] ) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15;

+	$category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15;

 	if (!isset($category_restrict)) {

 		$category_restrict = false;

 	}

-	if ( ! empty( $gd_post_type ) ) {

+	if (!empty($gd_post_type)) {

 		$default_post_type = $gd_post_type;

-	} elseif ( isset( $instance['default_post_type'] ) && gdsc_is_post_type_valid( $instance['default_post_type'] ) ) {

+	} elseif (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type'])) {

 		$default_post_type = $instance['default_post_type'];

 	} else {

 		$all_gd_post_type  = geodir_get_posttypes();

-		$default_post_type = ( isset( $all_gd_post_type[0] ) ) ? $all_gd_post_type[0] : '';

+		$default_post_type = (isset($all_gd_post_type[0])) ? $all_gd_post_type[0] : '';

 	}

-	$parent_only = !empty( $instance['parent_only'] ) ? true : false;

+	$parent_only = !empty($instance['parent_only']) ? true : false;

 

 	$taxonomy = array();

-	if ( ! empty( $gd_post_type ) ) {

-		$taxonomy[] = $gd_post_type . "category";

+	if (!empty($gd_post_type)) {

+		$taxonomy[] = $gd_post_type."category";

 	} else {

-		$taxonomy = geodir_get_taxonomies( $gd_post_type );

+		$taxonomy = geodir_get_taxonomies($gd_post_type);

 	}

 

 	$taxonomy = apply_filters('geodir_pp_category_taxonomy', $taxonomy);

 

-	$term_args = array( 'taxonomy' => $taxonomy );

-	if ( $parent_only ) {

+	$term_args = array('taxonomy' => $taxonomy);

+	if ($parent_only) {

 		$term_args['parent'] = 0;

 	}

 

-	$terms   = get_terms( $term_args );

+	$terms   = get_terms($term_args);

 	$a_terms = array();

 	$b_terms = array();

 

-	foreach ( $terms as $term ) {

-		if ( $term->count > 0 ) {

-			$a_terms[ $term->taxonomy ][] = $term;

+	foreach ($terms as $term) {

+		if ($term->count > 0) {

+			$a_terms[$term->taxonomy][] = $term;

 		}

 	}

 

-	if ( ! empty( $a_terms ) ) {

+	if (!empty($a_terms)) {

 		// Sort CPT taxonomies in categories widget.

-		if ( !empty( $taxonomy ) && is_array( $taxonomy ) && count( $taxonomy ) > 1 ) {

+		if (!empty($taxonomy) && is_array($taxonomy) && count($taxonomy) > 1) {

 			$gd_post_types = geodir_get_posttypes();

 			$sort_taxonomies = array();

 			

-			foreach ( $gd_post_types as $gd_post_type ) {

-				$taxonomy_name = $gd_post_type . 'category';

+			foreach ($gd_post_types as $gd_post_type) {

+				$taxonomy_name = $gd_post_type.'category';

 				

-				if ( !empty( $a_terms[$taxonomy_name] ) ) {

+				if (!empty($a_terms[$taxonomy_name])) {

 					$sort_taxonomies[$taxonomy_name] = $a_terms[$taxonomy_name];

 				}

 			}

-			$a_terms = !empty( $sort_taxonomies ) ? $sort_taxonomies : $a_terms;

+			$a_terms = !empty($sort_taxonomies) ? $sort_taxonomies : $a_terms;

 		}

 

 		$sort_by = apply_filters('geodir_pp_category_sort', 'count');

-		foreach ( $a_terms as $b_key => $b_val ) {

-			$b_terms[ $b_key ] = geodir_sort_terms( $b_val, $sort_by );

+		foreach ($a_terms as $b_key => $b_val) {

+			$b_terms[$b_key] = geodir_sort_terms($b_val, $sort_by);

 		}

 

-		$default_taxonomy = $default_post_type != '' && isset( $b_terms[ $default_post_type . 'category' ] ) ? $default_post_type . 'category' : '';

+		$default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type.'category']) ? $default_post_type.'category' : '';

 

 		$tax_change_output = '';

-		if ( count( $b_terms ) > 1 ) {

-			$tax_change_output .= "<select data-limit='$category_limit' data-parent='" . (int)$parent_only . "' class='geodir-cat-list-tax'  onchange='geodir_get_post_term(this);'>";

-			foreach ( $b_terms as $key => $val ) {

-				$ptype    = get_post_type_object( str_replace( "category", "", $key ) );

-				$cpt_name = __( $ptype->labels->singular_name, 'geodirectory' );

-				$tax_change_output .= "<option value='$key' " . selected( $key, $default_taxonomy, false ) . ">" . sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ) . "</option>";

+		if (count($b_terms) > 1) {

+			$tax_change_output .= "<select data-limit='$category_limit' data-parent='".(int) $parent_only."' class='geodir-cat-list-tax'  onchange='geodir_get_post_term(this);'>";

+			foreach ($b_terms as $key => $val) {

+				$ptype    = get_post_type_object(str_replace("category", "", $key));

+				$cpt_name = __($ptype->labels->singular_name, 'geodirectory');

+				$tax_change_output .= "<option value='$key' ".selected($key, $default_taxonomy, false).">".sprintf(__('%s Categories', 'geodirectory'), $cpt_name)."</option>";

 			}

 			$tax_change_output .= "</select>";

 		}

 

-		if ( ! empty( $b_terms ) ) {

-			$terms = $default_taxonomy != '' && isset( $b_terms[ $default_taxonomy ] ) ? $b_terms[ $default_taxonomy ] : reset( $b_terms );// get the first array

-			global $cat_count;//make global so we can change via function

+		if (!empty($b_terms)) {

+			$terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array

+			global $cat_count; //make global so we can change via function

 			$cat_count = 0;

 			?>

 			<div class="geodir-category-list-in clearfix">

 				<div class="geodir-cat-list clearfix">

 					<?php

-					echo $before_title . __( $title ) . $after_title;

+					echo $before_title.__($title).$after_title;

 

 					echo $tax_change_output;

 

 					echo '<ul class="geodir-popular-cat-list">';

 

-					geodir_helper_cat_list_output( $terms, $category_limit, $category_restrict);

+					geodir_helper_cat_list_output($terms, $category_limit, $category_restrict);

 

 					echo '</ul>';

 					?>

 				</div>

 				<?php

-				if ( empty( $category_restrict ) ) { 

+				if (empty($category_restrict)) { 

 					$hide = '';

-					if ( $cat_count < $category_limit ) {

+					if ($cat_count < $category_limit) {

 						$hide = 'style="display:none;"';

 					}

 					echo "<div class='geodir-cat-list-more' $hide >";

-					echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __( 'More Categories', 'geodirectory' ) . '</a>';

-					echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __( 'Less Categories', 'geodirectory' ) . '</a>';

+					echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">'.__('More Categories', 'geodirectory').'</a>';

+					echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">'.__('Less Categories', 'geodirectory').'</a>';

 					echo "</div>";

 				}

 				/* add scripts */

-				add_action( 'wp_footer', 'geodir_popular_category_add_scripts', 100 );

+				add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);

 				?>

 			</div>

 			<?php

@@ -3007,28 +3007,28 @@ 
  * @param int $category_limit               Number of categories to display by default.

  * @param bool $category_restrict           If the cat limit should be hidden or not shown.

  */

-function geodir_helper_cat_list_output( $terms, $category_limit , $category_restrict=false) {

+function geodir_helper_cat_list_output($terms, $category_limit, $category_restrict = false) {

 	global $geodir_post_category_str, $cat_count;

 	$term_icons = geodir_get_term_icon();

 

 	$geodir_post_category_str = array();

 

 

-	foreach ( $terms as $cat ) {

-		$post_type     = str_replace( "category", "", $cat->taxonomy );

-		$term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $cat->term_id ] ) ? $term_icons[ $cat->term_id ] : '';

+	foreach ($terms as $cat) {

+		$post_type     = str_replace("category", "", $cat->taxonomy);

+		$term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : '';

 

-		$cat_count ++;

+		$cat_count++;

 

-		$geodir_post_category_str[] = array( 'posttype' => $post_type, 'termid' => $cat->term_id );

+		$geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);

 

-		$class_row  = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show';

-		if($category_restrict && $cat_count > $category_limit ){

+		$class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show';

+		if ($category_restrict && $cat_count > $category_limit) {

 			continue;

 		}

 		$total_post = $cat->count;

 

-		$term_link = get_term_link( $cat, $cat->taxonomy );

+		$term_link = get_term_link($cat, $cat->taxonomy);

 		/**

 		 * Filer the category term link.

 		 *

@@ -3038,11 +3038,11 @@ 
 		 * @param int $cat          ->term_id The term id.

 		 * @param string $post_type Wordpress post type.

 		 */

-		$term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type );

+		$term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);

 

-		echo '<li class="' . $class_row . '"><a href="' . $term_link . '">';

-		echo '<img alt="' . esc_attr( $cat->name ) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">';

-		echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';

+		echo '<li class="'.$class_row.'"><a href="'.$term_link.'">';

+		echo '<img alt="'.esc_attr($cat->name).' icon" style="height:20px;vertical-align:middle;" src="'.$term_icon_url.'"/> <span class="cat-link">';

+		echo $cat->name.'</span> <span class="geodir_term_class geodir_link_span geodir_category_class_'.$post_type.'_'.$cat->term_id.'">('.$total_post.')</span> ';

 		echo '</a></li>';

 	}

 }

@@ -3057,14 +3057,14 @@ 
  * @param array|string $args     Display arguments including before_title, after_title, before_widget, and after_widget.

  * @param array|string $instance The settings for the particular instance of the widget.

  */

-function geodir_listing_slider_widget_output( $args = '', $instance = '' ) {

+function geodir_listing_slider_widget_output($args = '', $instance = '') {

 	// prints the widget

-	extract( $args, EXTR_SKIP );

+	extract($args, EXTR_SKIP);

 

 	echo $before_widget;

 

 	/** This filter is documented in geodirectory_widgets.php */

-	$title = empty( $instance['title'] ) ? '' : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 	/**

 	 * Filter the widget post type.

 	 *

@@ -3072,7 +3072,7 @@ 
 	 *

 	 * @param string $instance ['post_type'] Post type of listing.

 	 */

-	$post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] );

+	$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);

 	/**

 	 * Filter the widget's term.

 	 *

@@ -3080,7 +3080,7 @@ 
 	 *

 	 * @param string $instance ['category'] Filter by term. Can be any valid term.

 	 */

-	$category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] );

+	$category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);

 	/**

 	 * Filter widget's "add_location_filter" value.

 	 *

@@ -3088,7 +3088,7 @@ 
 	 *

 	 * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0.

 	 */

-	$add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] );

+	$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);

 	/**

 	 * Filter the widget listings limit.

 	 *

@@ -3096,7 +3096,7 @@ 
 	 *

 	 * @param string $instance ['post_number'] Number of listings to display.

 	 */

-	$post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] );

+	$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);

 	/**

 	 * Filter the widget listings limit shown at one time.

 	 *

@@ -3104,7 +3104,7 @@ 
 	 *

 	 * @param string $instance ['max_show'] Number of listings to display on screen.

 	 */

-	$max_show = empty( $instance['max_show'] ) ? '1' : apply_filters( 'widget_max_show', $instance['max_show'] );

+	$max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);

 	/**

 	 * Filter the widget slide width.

 	 *

@@ -3112,7 +3112,7 @@ 
 	 *

 	 * @param string $instance ['slide_width'] Width of the slides shown.

 	 */

-	$slide_width = empty( $instance['slide_width'] ) ? '' : apply_filters( 'widget_slide_width', $instance['slide_width'] );

+	$slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);

 	/**

 	 * Filter widget's "show title" value.

 	 *

@@ -3120,7 +3120,7 @@ 
 	 *

 	 * @param string|bool $instance ['show_title'] Do you want to display title? Can be 1 or 0.

 	 */

-	$show_title = empty( $instance['show_title'] ) ? '' : apply_filters( 'widget_show_title', $instance['show_title'] );

+	$show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);

 	/**

 	 * Filter widget's "slideshow" value.

 	 *

@@ -3128,7 +3128,7 @@ 
 	 *

 	 * @param int $instance ['slideshow'] Setup a slideshow for the slider to animate automatically.

 	 */

-	$slideshow = empty( $instance['slideshow'] ) ? 0 : apply_filters( 'widget_slideshow', $instance['slideshow'] );

+	$slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);

 	/**

 	 * Filter widget's "animationLoop" value.

 	 *

@@ -3136,7 +3136,7 @@ 
 	 *

 	 * @param int $instance ['animationLoop'] Gives the slider a seamless infinite loop.

 	 */

-	$animationLoop = empty( $instance['animationLoop'] ) ? 0 : apply_filters( 'widget_animationLoop', $instance['animationLoop'] );

+	$animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);

 	/**

 	 * Filter widget's "directionNav" value.

 	 *

@@ -3144,7 +3144,7 @@ 
 	 *

 	 * @param int $instance ['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0.

 	 */

-	$directionNav = empty( $instance['directionNav'] ) ? 0 : apply_filters( 'widget_directionNav', $instance['directionNav'] );

+	$directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);

 	/**

 	 * Filter widget's "slideshowSpeed" value.

 	 *

@@ -3152,7 +3152,7 @@ 
 	 *

 	 * @param int $instance ['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds.

 	 */

-	$slideshowSpeed = empty( $instance['slideshowSpeed'] ) ? 5000 : apply_filters( 'widget_slideshowSpeed', $instance['slideshowSpeed'] );

+	$slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);

 	/**

 	 * Filter widget's "animationSpeed" value.

 	 *

@@ -3160,7 +3160,7 @@ 
 	 *

 	 * @param int $instance ['animationSpeed'] Set the speed of animations, in milliseconds.

 	 */

-	$animationSpeed = empty( $instance['animationSpeed'] ) ? 600 : apply_filters( 'widget_animationSpeed', $instance['animationSpeed'] );

+	$animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);

 	/**

 	 * Filter widget's "animation" value.

 	 *

@@ -3168,7 +3168,7 @@ 
 	 *

 	 * @param string $instance ['animation'] Controls the animation type, "fade" or "slide".

 	 */

-	$animation = empty( $instance['animation'] ) ? 'slide' : apply_filters( 'widget_animation', $instance['animation'] );

+	$animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);

 	/**

 	 * Filter widget's "list_sort" type.

 	 *

@@ -3176,10 +3176,10 @@ 
 	 *

 	 * @param string $instance ['list_sort'] Listing sort by type.

 	 */

-	$list_sort          = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] );

-	$show_featured_only = ! empty( $instance['show_featured_only'] ) ? 1 : null;

+	$list_sort          = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);

+	$show_featured_only = !empty($instance['show_featured_only']) ? 1 : null;

 

-	wp_enqueue_script( 'geodirectory-jquery-flexslider-js' );

+	wp_enqueue_script('geodirectory-jquery-flexslider-js');

 	?>

 		<script type="text/javascript">

 		jQuery(window).load(function () {

@@ -3198,7 +3198,7 @@ 
 				itemWidth: 75,

 				itemMargin: 5,

 				asNavFor: '#geodir_widget_slider',

-				rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>,

+				rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>,

 				start: function (slider) {

 					// chrome 53 introduced a bug, so we need to repaint the slider when shown.

 					jQuery('.geodir-slides', jQuery(slider)).removeClass('flexslider-fix-rtl');

@@ -3206,19 +3206,19 @@ 
 			});

 			

 			jQuery('#geodir_widget_slider').flexslider({

-				animation: "<?php echo $animation;?>",

+				animation: "<?php echo $animation; ?>",

 				selector: ".geodir-slides > li",

 				namespace: "geodir-",

 				controlNav: true,

-				animationLoop: <?php echo $animationLoop;?>,

-				slideshow: <?php echo $slideshow;?>,

-				slideshowSpeed: <?php echo $slideshowSpeed;?>,

-				animationSpeed: <?php echo $animationSpeed;?>,

-				directionNav: <?php echo $directionNav;?>,

-				maxItems: <?php echo $max_show;?>,

+				animationLoop: <?php echo $animationLoop; ?>,

+				slideshow: <?php echo $slideshow; ?>,

+				slideshowSpeed: <?php echo $slideshowSpeed; ?>,

+				animationSpeed: <?php echo $animationSpeed; ?>,

+				directionNav: <?php echo $directionNav; ?>,

+				maxItems: <?php echo $max_show; ?>,

 				move: 1,

-				<?php if ( $slide_width ) {

-				echo "itemWidth: " . $slide_width . ",";

+				<?php if ($slide_width) {

+				echo "itemWidth: ".$slide_width.",";

 			}?>

 				sync: "#geodir_widget_carousel",

 				start: function (slider) {

@@ -3229,7 +3229,7 @@ 
 					jQuery('#geodir_widget_slider').css({'visibility': 'visible'});

 					jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});

 				},

-				rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>

+				rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>

 			});

 		});

 	</script>

@@ -3242,62 +3242,62 @@ 
 		'order_by'       => $list_sort

 	);

 

-	if ( $show_featured_only ) {

+	if ($show_featured_only) {

 		$query_args['show_featured_only'] = 1;

 	}

 

-	if ( $category != 0 || $category != '' ) {

-		$category_taxonomy = geodir_get_taxonomies( $post_type );

+	if ($category != 0 || $category != '') {

+		$category_taxonomy = geodir_get_taxonomies($post_type);

 		$tax_query         = array(

 			'taxonomy' => $category_taxonomy[0],

 			'field'    => 'id',

 			'terms'    => $category

 		);

 

-		$query_args['tax_query'] = array( $tax_query );

+		$query_args['tax_query'] = array($tax_query);

 	}

 

 	// we want listings with featured image only

 	$query_args['featured_image_only'] = 1;

 

-	if ( $post_type == 'gd_event' ) {

+	if ($post_type == 'gd_event') {

 		$query_args['gedir_event_listing_filter'] = 'upcoming';

 	}// show only upcoming events

 

-	$widget_listings = geodir_get_widget_listings( $query_args );

-	if ( ! empty( $widget_listings ) || ( isset( $with_no_results ) && $with_no_results ) ) {

-		if ( $title ) {

-			echo $before_title . $title . $after_title;

+	$widget_listings = geodir_get_widget_listings($query_args);

+	if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {

+		if ($title) {

+			echo $before_title.$title.$after_title;

 		}

 

 		global $post;

 

-		$current_post = $post;// keep current post info

+		$current_post = $post; // keep current post info

 

 		$widget_main_slides = '';

 		$nav_slides         = '';

 		$widget_slides      = 0;

 

-		foreach ( $widget_listings as $widget_listing ) {

+		foreach ($widget_listings as $widget_listing) {

 			global $gd_widget_listing_type;

 			$post         = $widget_listing;

-			$widget_image = geodir_get_featured_image( $post->ID, 'thumbnail', get_option( 'geodir_listing_no_img' ) );

+			$widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

 

-			if ( ! empty( $widget_image ) ) {

-				if ( $widget_image->height >= 200 ) {

+			if (!empty($widget_image)) {

+				if ($widget_image->height >= 200) {

 					$widget_spacer_height = 0;

 				} else {

-					$widget_spacer_height = ( ( 200 - $widget_image->height ) / 2 );

+					$widget_spacer_height = ((200 - $widget_image->height) / 2);

 				}

 

-				$widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:' . $widget_spacer_height . 'px !important;margin:0 auto;" width="100" />';

+				$widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="'.geodir_plugin_url()."/geodirectory-assets/images/spacer.gif".'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:'.$widget_spacer_height.'px !important;margin:0 auto;" width="100" />';

 

 				$title = '';

-				if ( $show_title ) {

-					$title_html     = '<div class="geodir-slider-title"><a href="' . get_permalink( $post->ID ) . '">' . get_the_title( $post->ID ) . '</a></div>';

+				if ($show_title) {

+					$title_html     = '<div class="geodir-slider-title"><a href="'.get_permalink($post->ID).'">'.get_the_title($post->ID).'</a></div>';

 					$post_id        = $post->ID;

-					$post_permalink = get_permalink( $post->ID );

-					$post_title     = get_the_title( $post->ID );

+					$post_permalink = get_permalink($post->ID);

+					$post_title     = get_the_title($post->ID);

 					/**

 					 * Filter the listing slider widget title.

 					 *

@@ -3308,12 +3308,12 @@ 
 					 * @param string $post_permalink The post permalink url.

 					 * @param string $post_title     The post title text.

 					 */

-					$title = apply_filters( 'geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title );

+					$title = apply_filters('geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title);

 				}

 

-				$widget_main_slides .= $title . '<a href="' . get_permalink( $post->ID ) . '"><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:200px;margin:0 auto;" /></a></li>';

-				$nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

-				$widget_slides ++;

+				$widget_main_slides .= $title.'<a href="'.get_permalink($post->ID).'"><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:200px;margin:0 auto;" /></a></li>';

+				$nav_slides .= '<li><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:48px;margin:0 auto;" /></li>';

+				$widget_slides++;

 			}

 		}

 		?>

@@ -3322,7 +3322,7 @@ 
 			<div id="geodir_widget_slider" class="geodir_flexslider">

 				<ul class="geodir-slides clearfix"><?php echo $widget_main_slides; ?></ul>

 			</div>

-			<?php if ( $widget_slides > 1 ) { ?>

+			<?php if ($widget_slides > 1) { ?>

 				<div id="geodir_widget_carousel" class="geodir_flexslider">

 					<ul class="geodir-slides clearfix"><?php echo $nav_slides; ?></ul>

 				</div>

@@ -3330,7 +3330,7 @@ 
 		</div>

 		<?php

 		$GLOBALS['post'] = $current_post;

-		setup_postdata( $current_post );

+		setup_postdata($current_post);

 	}

 	echo $after_widget;

 }

@@ -3346,50 +3346,50 @@ 
  * @param array|string $args     Display arguments including before_title, after_title, before_widget, and after_widget.

  * @param array|string $instance The settings for the particular instance of the widget.

  */

-function geodir_loginwidget_output( $args = '', $instance = '' ) {

+function geodir_loginwidget_output($args = '', $instance = '') {

 	//print_r($args);

 	//print_r($instance);

 	// prints the widget

-	extract( $args, EXTR_SKIP );

+	extract($args, EXTR_SKIP);

 

 	/** This filter is documented in geodirectory_widgets.php */

-	$title = empty( $instance['title'] ) ? __( 'My Dashboard', 'geodirectory' ) : apply_filters( 'my_dashboard_widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('my_dashboard_widget_title', __($instance['title'], 'geodirectory'));

 

 	echo $before_widget;

-	echo $before_title . $title . $after_title;

+	echo $before_title.$title.$after_title;

 

 //	global $gd_session;

 //	print_r($gd_session);

 //	print_r($_SESSION);

 

-	if ( is_user_logged_in() ) {

+	if (is_user_logged_in()) {

 		global $current_user;

 

-		$author_link = get_author_posts_url( $current_user->data->ID );

-		$author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );

+		$author_link = get_author_posts_url($current_user->data->ID);

+		$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);

 

 		echo '<ul class="geodir-loginbox-list">';

 		ob_start();

 		?>

 		<li><a class="signin"

-		       href="<?php echo wp_logout_url( home_url() ); ?>"><?php _e( 'Logout', 'geodirectory' ); ?></a></li>

+		       href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>

 		<?php

-		$post_types                           = geodir_get_posttypes( 'object' );

-		$show_add_listing_post_types_main_nav = get_option( 'geodir_add_listing_link_user_dashboard' );

-		$geodir_allow_posttype_frontend       = get_option( 'geodir_allow_posttype_frontend' );

+		$post_types                           = geodir_get_posttypes('object');

+		$show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');

+		$geodir_allow_posttype_frontend       = get_option('geodir_allow_posttype_frontend');

 

-		if ( ! empty( $show_add_listing_post_types_main_nav ) ) {

+		if (!empty($show_add_listing_post_types_main_nav)) {

 			$addlisting_links = '';

-			foreach ( $post_types as $key => $postobj ) {

+			foreach ($post_types as $key => $postobj) {

 

-				if ( in_array( $key, $show_add_listing_post_types_main_nav ) ) {

+				if (in_array($key, $show_add_listing_post_types_main_nav)) {

 

-					if ( $add_link = geodir_get_addlisting_link( $key ) ) {

+					if ($add_link = geodir_get_addlisting_link($key)) {

 

 						$name = $postobj->labels->name;

 

 						$selected = '';

-						if ( geodir_get_current_posttype() == $key && geodir_is_page( 'add-listing' ) ) {

+						if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {

 							$selected = 'selected="selected"';

 						}

 

@@ -3402,23 +3402,23 @@ 
 						 * @param string $key       Add listing array key.

 						 * @param int $current_user ->ID Current user ID.

 						 */

-						$add_link = apply_filters( 'geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID );

-						$name = apply_filters( 'geodir_dashboard_label_add_listing', $name, $key, $current_user->ID );

+						$add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);

+						$name = apply_filters('geodir_dashboard_label_add_listing', $name, $key, $current_user->ID);

 

-						$addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>';

+						$addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>';

 

 					}

 				}

 

 			}

 

-			if ( $addlisting_links != '' ) { ?>

+			if ($addlisting_links != '') { ?>

 

 				<li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value"

 				            option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false"

-				            data-placeholder="<?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?>">

+				            data-placeholder="<?php echo esc_attr(__('Add Listing', 'geodirectory')); ?>">

 						<option value="" disabled="disabled" selected="selected"

-						        style='display:none;'><?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?></option>

+						        style='display:none;'><?php echo esc_attr(__('Add Listing', 'geodirectory')); ?></option>

 						<?php echo $addlisting_links; ?>

 					</select></li> <?php

 

@@ -3426,24 +3426,24 @@ 
 

 		}

 		// My Favourites in Dashboard

-		$show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );

+		$show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');

 		$user_favourite                    = geodir_user_favourite_listing_count();

 

-		if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {

+		if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {

 			$favourite_links = '';

 

-			foreach ( $post_types as $key => $postobj ) {

-				if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {

+			foreach ($post_types as $key => $postobj) {

+				if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {

 					$name           = $postobj->labels->name;

 					$fav_author_link = apply_filters('gd_dash_fav_author_link', $author_link, $current_user->data->ID);

-					$post_type_link = geodir_getlink( $fav_author_link, array(

+					$post_type_link = geodir_getlink($fav_author_link, array(

 						'stype' => $key,

 						'list'  => 'favourite'

-					), false );

+					), false);

 

 					$selected = '';

 

-					if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {

+					if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {

 						$selected = 'selected="selected"';

 					}

 					/**

@@ -3455,20 +3455,20 @@ 
 					 * @param string $key            Favorite listing array key.

 					 * @param int $current_user      ->ID Current user ID.

 					 */

-					$post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID );

+					$post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);

 

-					$favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>';

+					$favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>';

 				}

 			}

 

-			if ( $favourite_links != '' ) {

+			if ($favourite_links != '') {

 				?>

 				<li>

 					<select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value"

 					        option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false"

-					        data-placeholder="<?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?>">

+					        data-placeholder="<?php echo esc_attr(__('My Favorites', 'geodirectory')); ?>">

 						<option value="" disabled="disabled" selected="selected"

-						        style='display:none;'><?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?></option>

+						        style='display:none;'><?php echo esc_attr(__('My Favorites', 'geodirectory')); ?></option>

 						<?php echo $favourite_links; ?>

 					</select>

 				</li>

@@ -3477,20 +3477,20 @@ 
 		}

 

 

-		$show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );

+		$show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');

 		$user_listing                     = geodir_user_post_listing_count();

 

-		if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {

+		if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {

 			$listing_links = '';

 

-			foreach ( $post_types as $key => $postobj ) {

-				if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {

+			foreach ($post_types as $key => $postobj) {

+				if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {

 					$name         = $postobj->labels->name;

 					$listing_author_link = apply_filters('gd_dash_listing_author_link', $author_link, $current_user->data->ID);

-					$listing_link = geodir_getlink( $listing_author_link, array( 'stype' => $key ), false );

+					$listing_link = geodir_getlink($listing_author_link, array('stype' => $key), false);

 

 					$selected = '';

-					if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {

+					if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {

 						$selected = 'selected="selected"';

 					}

 

@@ -3503,20 +3503,20 @@ 
 					 * @param string $key          My listing array key.

 					 * @param int $current_user    ->ID Current user ID.

 					 */

-					$listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID );

+					$listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);

 

-					$listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __( geodir_utf8_ucfirst( $name ), 'geodirectory' ) . '</option>';

+					$listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>';

 				}

 			}

 

-			if ( $listing_links != '' ) {

+			if ($listing_links != '') {

 				?>

 				<li>

 					<select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value"

 					        option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false"

-					        data-placeholder="<?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?>">

+					        data-placeholder="<?php echo esc_attr(__('My Listings', 'geodirectory')); ?>">

 						<option value="" disabled="disabled" selected="selected"

-						        style='display:none;'><?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?></option>

+						        style='display:none;'><?php echo esc_attr(__('My Listings', 'geodirectory')); ?></option>

 						<?php echo $listing_links; ?>

 					</select>

 				</li>

@@ -3532,7 +3532,7 @@ 
 		 *

 		 * @param string $dashboard_link Dashboard links HTML.

 		 */

-		echo apply_filters( 'geodir_dashboard_links', $dashboard_link );

+		echo apply_filters('geodir_dashboard_links', $dashboard_link);

 		echo '</ul>';

 

 		/**

@@ -3540,7 +3540,7 @@ 
 		 *

 		 * @since 1.6.6

 		 */

-		do_action( 'geodir_after_loginwidget_form_logged_in' );

+		do_action('geodir_after_loginwidget_form_logged_in');

 

 

 	} else {

@@ -3555,18 +3555,18 @@ 
 		<form name="loginform" class="loginform1"

 		      action="<?php echo geodir_login_url(); ?>"

 		      method="post">

-			<div class="geodir_form_row"><input placeholder="<?php echo apply_filters('gd_login_wid_login_placeholder', __( 'Email', 'geodirectory' )); ?>" name="<?php echo apply_filters('gd_login_wid_login_name', 'log'); ?>"

+			<div class="geodir_form_row"><input placeholder="<?php echo apply_filters('gd_login_wid_login_placeholder', __('Email', 'geodirectory')); ?>" name="<?php echo apply_filters('gd_login_wid_login_name', 'log'); ?>"

 			                                    type="text" class="textfield user_login1"/> <span

 					class="user_loginInfo"></span></div>

-			<div class="geodir_form_row"><input placeholder="<?php _e( 'Password', 'geodirectory' ); ?>"

+			<div class="geodir_form_row"><input placeholder="<?php _e('Password', 'geodirectory'); ?>"

 			                                    name="<?php echo apply_filters('gd_login_wid_login_pwd', 'pwd'); ?>" type="password"

 			                                    class="textfield user_pass1 input-text"/><span

 					class="user_passInfo"></span></div>

 

-			<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars( geodir_curPageURL() ); ?>"/>

+			<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(geodir_curPageURL()); ?>"/>

 			<input type="hidden" name="testcookie" value="1"/>

 

-				<?php do_action( 'login_form' ); ?>

+				<?php do_action('login_form'); ?>

 

 			<div class="geodir_form_row clearfix"><input type="submit" name="submit"

 			                                             value="<?php echo SIGN_IN_BUTTON; ?>" class="b_signin"/>

@@ -3578,11 +3578,11 @@ 
 					 *

 					 * @since 1.0.0

 					 */

-					$is_enable_signup = get_option( 'users_can_register' );

+					$is_enable_signup = get_option('users_can_register');

 					

-					if ( $is_enable_signup ) {

+					if ($is_enable_signup) {

 					?>

-						<a href="<?php echo geodir_login_url( array( 'signup' => true ) ); ?>"

+						<a href="<?php echo geodir_login_url(array('signup' => true)); ?>"

 						   class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a>

 

 					<?php

@@ -3593,7 +3593,7 @@ 
 					 * @since 1.0.0

 					 */

 					?>

-					<a href="<?php echo geodir_login_url( array( 'forgot' => true ) ); ?>"

+					<a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"

 					   class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div>

 		</form>

 		<?php

@@ -3602,7 +3602,7 @@ 
 		 *

 		 * @since 1.6.6

 		 */

-		do_action( 'geodir_after_loginwidget_form_logged_out' );

+		do_action('geodir_after_loginwidget_form_logged_out');

 	}

 

 	echo $after_widget;

@@ -3625,14 +3625,14 @@ 
  *                                         after_widget.

  * @param array|string $instance           The settings for the particular instance of the widget.

  */

-function geodir_popular_postview_output( $args = '', $instance = '' ) {

+function geodir_popular_postview_output($args = '', $instance = '') {

 	global $gd_session;

 

 	// prints the widget

-	extract( $args, EXTR_SKIP );

+	extract($args, EXTR_SKIP);

 

 	/** This filter is documented in geodirectory_widgets.php */

-	$title = empty( $instance['title'] ) ? geodir_ucwords( $instance['category_title'] ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 	/**

 	 * Filter the widget post type.

 	 *

@@ -3640,7 +3640,7 @@ 
 	 *

 	 * @param string $instance ['post_type'] Post type of listing.

 	 */

-	$post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] );

+	$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);

 	/**

 	 * Filter the widget's term.

 	 *

@@ -3648,7 +3648,7 @@ 
 	 *

 	 * @param string $instance ['category'] Filter by term. Can be any valid term.

 	 */

-	$category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] );

+	$category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);

 	/**

 	 * Filter the widget listings limit.

 	 *

@@ -3656,7 +3656,7 @@ 
 	 *

 	 * @param string $instance ['post_number'] Number of listings to display.

 	 */

-	$post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] );

+	$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);

 	/**

 	 * Filter widget's "layout" type.

 	 *

@@ -3664,7 +3664,7 @@ 
 	 *

 	 * @param string $instance ['layout'] Widget layout type.

 	 */

-	$layout = empty( $instance['layout'] ) ? 'gridview_onehalf' : apply_filters( 'widget_layout', $instance['layout'] );

+	$layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);

 	/**

 	 * Filter widget's "add_location_filter" value.

 	 *

@@ -3672,7 +3672,7 @@ 
 	 *

 	 * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0.

 	 */

-	$add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] );

+	$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);

 	/**

 	 * Filter widget's listing width.

 	 *

@@ -3680,7 +3680,7 @@ 
 	 *

 	 * @param string $instance ['listing_width'] Listing width.

 	 */

-	$listing_width = empty( $instance['listing_width'] ) ? '' : apply_filters( 'widget_listing_width', $instance['listing_width'] );

+	$listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);

 	/**

 	 * Filter widget's "list_sort" type.

 	 *

@@ -3688,36 +3688,36 @@ 
 	 *

 	 * @param string $instance ['list_sort'] Listing sort by type.

 	 */

-	$list_sort             = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] );

-	$use_viewing_post_type = ! empty( $instance['use_viewing_post_type'] ) ? true : false;

+	$list_sort             = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);

+	$use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false;

 

 	// set post type to current viewing post type

-	if ( $use_viewing_post_type ) {

+	if ($use_viewing_post_type) {

 		$current_post_type = geodir_get_current_posttype();

-		if ( $current_post_type != '' && $current_post_type != $post_type ) {

+		if ($current_post_type != '' && $current_post_type != $post_type) {

 			$post_type = $current_post_type;

 			$category  = array(); // old post type category will not work for current changed post type

 		}

 	}

 	// replace widget title dynamically

-	$posttype_plural_label   = __( get_post_type_plural_label( $post_type ), 'geodirectory' );

-	$posttype_singular_label = __( get_post_type_singular_label( $post_type ), 'geodirectory' );

+	$posttype_plural_label   = __(get_post_type_plural_label($post_type), 'geodirectory');

+	$posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory');

 

-	$title = str_replace( "%posttype_plural_label%", $posttype_plural_label, $title );

-	$title = str_replace( "%posttype_singular_label%", $posttype_singular_label, $title );

+	$title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);

+	$title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);

     

 	$categories = $category;

-	if ( ! empty( $category ) && $category[0] != '0' ) {

-		$category_taxonomy = geodir_get_taxonomies( $post_type );

+	if (!empty($category) && $category[0] != '0') {

+		$category_taxonomy = geodir_get_taxonomies($post_type);

 		

 		######### WPML #########

-		if ( geodir_wpml_is_taxonomy_translated( $category_taxonomy[0] ) ) {

-			$category = gd_lang_object_ids( $category, $category_taxonomy[0] );

+		if (geodir_wpml_is_taxonomy_translated($category_taxonomy[0])) {

+			$category = gd_lang_object_ids($category, $category_taxonomy[0]);

 		}

 		######### WPML #########

 	}

 

-	if ( isset( $instance['character_count'] ) ) {

+	if (isset($instance['character_count'])) {

 		/**

 		 * Filter the widget's excerpt character count.

 		 *

@@ -3725,38 +3725,38 @@ 
 		 *

 		 * @param int $instance ['character_count'] Excerpt character count.

 		 */

-		$character_count = apply_filters( 'widget_list_character_count', $instance['character_count'] );

+		$character_count = apply_filters('widget_list_character_count', $instance['character_count']);

 	} else {

 		$character_count = '';

 	}

 

-	if ( empty( $title ) || $title == 'All' ) {

-		$post_type_name = __( get_post_type_plural_label( $post_type ), 'geodirectory' );

-		$title = !empty( $title ) ? wp_sprintf( __( 'All %s', 'geodirectory' ), $post_type_name ) : $post_type_name;

+	if (empty($title) || $title == 'All') {

+		$post_type_name = __(get_post_type_plural_label($post_type), 'geodirectory');

+		$title = !empty($title) ? wp_sprintf(__('All %s', 'geodirectory'), $post_type_name) : $post_type_name;

 	}

 

 	$location_url = array();

-	$city         = get_query_var( 'gd_city' );

-	if ( ! empty( $city ) ) {

-		$country = get_query_var( 'gd_country' );

-		$region  = get_query_var( 'gd_region' );

+	$city         = get_query_var('gd_city');

+	if (!empty($city)) {

+		$country = get_query_var('gd_country');

+		$region  = get_query_var('gd_region');

 

-		$geodir_show_location_url = get_option( 'geodir_show_location_url' );

+		$geodir_show_location_url = get_option('geodir_show_location_url');

 

-		if ( $geodir_show_location_url == 'all' ) {

-			if ( $country != '' ) {

+		if ($geodir_show_location_url == 'all') {

+			if ($country != '') {

 				$location_url[] = $country;

 			}

 

-			if ( $region != '' ) {

+			if ($region != '') {

 				$location_url[] = $region;

 			}

-		} else if ( $geodir_show_location_url == 'country_city' ) {

-			if ( $country != '' ) {

+		} else if ($geodir_show_location_url == 'country_city') {

+			if ($country != '') {

 				$location_url[] = $country;

 			}

-		} else if ( $geodir_show_location_url == 'region_city' ) {

-			if ( $region != '' ) {

+		} else if ($geodir_show_location_url == 'region_city') {

+			if ($region != '') {

 				$location_url[] = $region;

 			}

 		}

@@ -3764,54 +3764,54 @@ 
 		$location_url[] = $city;

 	}

 

-	$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-	$location_url  = implode( '/', $location_url );

+	$location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

+	$location_url  = implode('/', $location_url);

 	$skip_location = false;

-	if ( ! $add_location_filter && $gd_session->get( 'gd_multi_location' ) ) {

+	if (!$add_location_filter && $gd_session->get('gd_multi_location')) {

 		$skip_location = true;

-		$gd_session->un_set( 'gd_multi_location' );

+		$gd_session->un_set('gd_multi_location');

 	}

 

-	if ( $location_allowed && $add_location_filter && $gd_session->get( 'all_near_me' ) && geodir_is_page( 'location' ) ) {

-		$viewall_url = add_query_arg( array( 

+	if ($location_allowed && $add_location_filter && $gd_session->get('all_near_me') && geodir_is_page('location')) {

+		$viewall_url = add_query_arg(array( 

 			'geodir_search' => 1, 

 			'stype' => $post_type,

 			's' => '',

-			'snear' => __( 'Near:', 'geodiradvancesearch' ) . ' ' . __( 'Me', 'geodiradvancesearch' ),

-			'sgeo_lat' => $gd_session->get( 'user_lat' ),

-			'sgeo_lon' => $gd_session->get( 'user_lon' )

-		), geodir_search_page_base_url() );

+			'snear' => __('Near:', 'geodiradvancesearch').' '.__('Me', 'geodiradvancesearch'),

+			'sgeo_lat' => $gd_session->get('user_lat'),

+			'sgeo_lon' => $gd_session->get('user_lon')

+		), geodir_search_page_base_url());

 

-		if ( ! empty( $category ) && !in_array( '0', $category ) ) {

-			$viewall_url = add_query_arg( array( 's' . $post_type . 'category' => $category ), $viewall_url );

+		if (!empty($category) && !in_array('0', $category)) {

+			$viewall_url = add_query_arg(array('s'.$post_type.'category' => $category), $viewall_url);

 		}

 	} else {

-		if ( get_option( 'permalink_structure' ) ) {

-			$viewall_url = get_post_type_archive_link( $post_type );

+		if (get_option('permalink_structure')) {

+			$viewall_url = get_post_type_archive_link($post_type);

 		} else {

-			$viewall_url = get_post_type_archive_link( $post_type );

+			$viewall_url = get_post_type_archive_link($post_type);

 		}

 

-		if ( ! empty( $category ) && $category[0] != '0' ) {

+		if (!empty($category) && $category[0] != '0') {

 			global $geodir_add_location_url;

 

 			$geodir_add_location_url = '0';

 

-			if ( $add_location_filter != '0' ) {

+			if ($add_location_filter != '0') {

 				$geodir_add_location_url = '1';

 			}

 

-			$viewall_url = get_term_link( (int) $category[0], $post_type . 'category' );

+			$viewall_url = get_term_link((int) $category[0], $post_type.'category');

 

 			$geodir_add_location_url = null;

 		}

 	}

 

-	if ( $skip_location ) {

-		$gd_session->set( 'gd_multi_location', 1 );

+	if ($skip_location) {

+		$gd_session->set('gd_multi_location', 1);

 	}

 

-	if ( is_wp_error( $viewall_url ) ) {

+	if (is_wp_error($viewall_url)) {

 		$viewall_url = '';

 	}

 

@@ -3823,43 +3823,43 @@ 
 		'order_by'       => $list_sort

 	);

 

-	if ( $character_count ) {

+	if ($character_count) {

 		$query_args['excerpt_length'] = $character_count;

 	}

 

-	if ( ! empty( $instance['show_featured_only'] ) ) {

+	if (!empty($instance['show_featured_only'])) {

 		$query_args['show_featured_only'] = 1;

 	}

 

-	if ( ! empty( $instance['show_special_only'] ) ) {

+	if (!empty($instance['show_special_only'])) {

 		$query_args['show_special_only'] = 1;

 	}

 

-	if ( ! empty( $instance['with_pics_only'] ) ) {

+	if (!empty($instance['with_pics_only'])) {

 		$query_args['with_pics_only']      = 0;

 		$query_args['featured_image_only'] = 1;

 	}

 

-	if ( ! empty( $instance['with_videos_only'] ) ) {

+	if (!empty($instance['with_videos_only'])) {

 		$query_args['with_videos_only'] = 1;

 	}

-	$hide_if_empty = ! empty( $instance['hide_if_empty'] ) ? true : false;

+	$hide_if_empty = !empty($instance['hide_if_empty']) ? true : false;

 

-	if ( ! empty( $categories ) && $categories[0] != '0' && !empty( $category_taxonomy ) ) {

+	if (!empty($categories) && $categories[0] != '0' && !empty($category_taxonomy)) {

 		$tax_query = array(

 			'taxonomy' => $category_taxonomy[0],

 			'field'    => 'id',

 			'terms'    => $category

 		);

 

-		$query_args['tax_query'] = array( $tax_query );

+		$query_args['tax_query'] = array($tax_query);

 	}

 

 	global $gridview_columns_widget, $geodir_is_widget_listing;

 

-	$widget_listings = geodir_get_widget_listings( $query_args );

+	$widget_listings = geodir_get_widget_listings($query_args);

     

-	if ( $hide_if_empty && empty( $widget_listings ) ) {

+	if ($hide_if_empty && empty($widget_listings)) {

 		return;

 	}

     

@@ -3874,11 +3874,11 @@ 
 		 *

 		 * @since 1.0.0

 		 */

-		do_action( 'geodir_before_view_all_link_in_widget' ); ?>

+		do_action('geodir_before_view_all_link_in_widget'); ?>

 		<div class="geodir_list_heading clearfix">

-			<?php echo $before_title . $title . $after_title; ?>

+			<?php echo $before_title.$title.$after_title; ?>

 			<a href="<?php echo $viewall_url; ?>"

-			   class="geodir-viewall"><?php _e( 'View all', 'geodirectory' ); ?></a>

+			   class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>

 		</div>

 		<?php

 		/**

@@ -3886,10 +3886,10 @@ 
 		 *

 		 * @since 1.0.0

 		 */

-		do_action( 'geodir_after_view_all_link_in_widget' ); ?>

+		do_action('geodir_after_view_all_link_in_widget'); ?>

 		<?php

-		if ( strstr( $layout, 'gridview' ) ) {

-			$listing_view_exp        = explode( '_', $layout );

+		if (strstr($layout, 'gridview')) {

+			$listing_view_exp        = explode('_', $layout);

 			$gridview_columns_widget = $layout;

 			$layout                  = $listing_view_exp[0];

 		} else {

@@ -3900,8 +3900,8 @@ 
 		 *

 		 * @since 1.0.0

 		 */

-		$template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) );

-		if ( ! isset( $character_count ) ) {

+		$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));

+		if (!isset($character_count)) {

 			/**

 			 * Filter the widget's excerpt character count.

 			 *

@@ -3909,7 +3909,7 @@ 
 			 *

 			 * @param int $instance ['character_count'] Excerpt character count.

 			 */

-			$character_count = $character_count == '' ? 50 : apply_filters( 'widget_character_count', $character_count );

+			$character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);

 		}

 

 		global $post, $map_jason, $map_canvas_arr;

@@ -3924,13 +3924,13 @@ 
 		 *

 		 * @since 1.0.0

 		 */

-		include( $template );

+		include($template);

 

 		$geodir_is_widget_listing = false;

 

 		$GLOBALS['post'] = $current_post;

-		if ( ! empty( $current_post ) ) {

-			setup_postdata( $current_post );

+		if (!empty($current_post)) {

+			setup_postdata($current_post);

 		}

 		$map_jason      = $current_map_jason;

 		$map_canvas_arr = $current_map_canvas_arr;

@@ -3959,12 +3959,12 @@ 
  *

  * @return int Reviews count.

  */

-function geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ) {

+function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type) {

 	global $wpdb, $plugin_prefix;

 

-	$detail_table = $plugin_prefix . $post_type . '_detail';

+	$detail_table = $plugin_prefix.$post_type.'_detail';

 

-	$sql = "SELECT COALESCE(SUM(rating_count),0) FROM " . $detail_table . " WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(" . $term_id . ", " . $taxonomy . ")";

+	$sql = "SELECT COALESCE(SUM(rating_count),0) FROM ".$detail_table." WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(".$term_id.", ".$taxonomy.")";

 

 	/**

 	 * Filter count review sql query.

@@ -3976,9 +3976,9 @@ 
 	 * @param int $taxonomy     The taxonomy Id.

 	 * @param string $post_type The post type.

 	 */

-	$sql = apply_filters( 'geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type );

+	$sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);

 

-	$count = $wpdb->get_var( $sql );

+	$count = $wpdb->get_var($sql);

 

 	return $count;

 }

@@ -3996,7 +3996,7 @@ 
  *

  * @return array Term array data.

  */

-function geodir_count_reviews_by_terms( $force_update = false, $post_ID = 0 ) {

+function geodir_count_reviews_by_terms($force_update = false, $post_ID = 0) {

 	/**

 	 * Filter review count option data.

 	 *

@@ -4006,78 +4006,78 @@ 
 	 * @param bool $force_update Force update option value?. Default.false.

 	 * @param int $post_ID       The post id to update if any.

 	 */

-	$option_data = apply_filters( 'geodir_count_reviews_by_terms_before', '', $force_update, $post_ID );

-	if ( ! empty( $option_data ) ) {

+	$option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update, $post_ID);

+	if (!empty($option_data)) {

 		return $option_data;

 	}

 

-	$option_data = get_option( 'geodir_global_review_count' );

+	$option_data = get_option('geodir_global_review_count');

 

-	if ( ! $option_data || $force_update ) {

-		if ( (int) $post_ID > 0 ) { // Update reviews count for specific post categories only.

+	if (!$option_data || $force_update) {

+		if ((int) $post_ID > 0) { // Update reviews count for specific post categories only.

 			global $gd_session;

 			$term_array = (array) $option_data;

-			$post_type  = get_post_type( $post_ID );

-			$taxonomy   = $post_type . 'category';

-			$terms      = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) );

-

-			if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {

-				foreach ( $terms as $term_id ) {

-					$count                  = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type );

-					$children               = get_term_children( $term_id, $taxonomy );

-					$term_array[ $term_id ] = $count;

+			$post_type  = get_post_type($post_ID);

+			$taxonomy   = $post_type.'category';

+			$terms      = wp_get_object_terms($post_ID, $taxonomy, array('fields' => 'ids'));

+

+			if (!empty($terms) && !is_wp_error($terms)) {

+				foreach ($terms as $term_id) {

+					$count                  = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type);

+					$children               = get_term_children($term_id, $taxonomy);

+					$term_array[$term_id] = $count;

 				}

 			}

 

-			$session_listing = $gd_session->get( 'listing' );

+			$session_listing = $gd_session->get('listing');

 

 			$terms = array();

-			if ( isset( $_POST['post_category'][ $taxonomy ] ) ) {

-				$terms = (array) $_POST['post_category'][ $taxonomy ];

-			} else if ( ! empty( $session_listing ) && isset( $session_listing['post_category'][ $taxonomy ] ) ) {

-				$terms = (array) $session_listing['post_category'][ $taxonomy ];

+			if (isset($_POST['post_category'][$taxonomy])) {

+				$terms = (array) $_POST['post_category'][$taxonomy];

+			} else if (!empty($session_listing) && isset($session_listing['post_category'][$taxonomy])) {

+				$terms = (array) $session_listing['post_category'][$taxonomy];

 			}

 

-			if ( ! empty( $terms ) ) {

-				foreach ( $terms as $term_id ) {

-					if ( $term_id > 0 ) {

-						$count                  = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type );

-						$children               = get_term_children( $term_id, $taxonomy );

-						$term_array[ $term_id ] = $count;

+			if (!empty($terms)) {

+				foreach ($terms as $term_id) {

+					if ($term_id > 0) {

+						$count                  = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type);

+						$children               = get_term_children($term_id, $taxonomy);

+						$term_array[$term_id] = $count;

 					}

 				}

 			}

 		} else { // Update reviews count for all post categories.

 			$term_array = array();

 			$post_types = geodir_get_posttypes();

-			foreach ( $post_types as $post_type ) {

+			foreach ($post_types as $post_type) {

 

-				$taxonomy = geodir_get_taxonomies( $post_type );

+				$taxonomy = geodir_get_taxonomies($post_type);

 				$taxonomy = $taxonomy[0];

 

 				$args = array(

 					'hide_empty' => false

 				);

 

-				$terms = get_terms( $taxonomy, $args );

+				$terms = get_terms($taxonomy, $args);

 

-				foreach ( $terms as $term ) {

-					$count    = geodir_count_reviews_by_term_id( $term->term_id, $taxonomy, $post_type );

-					$children = get_term_children( $term->term_id, $taxonomy );

+				foreach ($terms as $term) {

+					$count    = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type);

+					$children = get_term_children($term->term_id, $taxonomy);

 					/*if ( is_array( $children ) ) {

                         foreach ( $children as $child_id ) {

                             $child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type);

                             $count = $count + $child_count;

                         }

                     }*/

-					$term_array[ $term->term_id ] = $count;

+					$term_array[$term->term_id] = $count;

 				}

 			}

 		}

 

-		update_option( 'geodir_global_review_count', $term_array );

+		update_option('geodir_global_review_count', $term_array);

 		//clear cache

-		wp_cache_delete( 'geodir_global_review_count' );

+		wp_cache_delete('geodir_global_review_count');

 

 		return $term_array;

 	} else {

@@ -4093,39 +4093,39 @@ 
  * @package GeoDirectory

  * @return bool

  */

-function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {

-	if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {

+function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '') {

+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {

 		return; // do not run if importing listings

 	}

 

-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {

+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {

 		return;

 	}

 

 	$post_ID = 0;

-	if ( ! empty( $post ) ) {

-		if ( isset( $post->post_type ) && strpos( $post->post_type, 'gd_' ) !== 0 ) {

+	if (!empty($post)) {

+		if (isset($post->post_type) && strpos($post->post_type, 'gd_') !== 0) {

 			return;

 		}

 

-		if ( $new_status == 'auto-draft' && $old_status == 'new' ) {

+		if ($new_status == 'auto-draft' && $old_status == 'new') {

 			return;

 		}

 

-		if ( ! empty( $post->ID ) ) {

+		if (!empty($post->ID)) {

 			$post_ID = $post->ID;

 		}

 	}

 

-	if ( $new_status != $old_status ) {

-		geodir_count_reviews_by_terms( true, $post_ID );

+	if ($new_status != $old_status) {

+		geodir_count_reviews_by_terms(true, $post_ID);

 	}

 

 	return true;

 }

 

-function geodir_term_review_count_force_update_single_post( $post_id ) {

-	geodir_count_reviews_by_terms( true, $post_id );

+function geodir_term_review_count_force_update_single_post($post_id) {

+	geodir_count_reviews_by_terms(true, $post_id);

 }

 

 /*-----------------------------------------------------------------------------------*/

@@ -4142,11 +4142,11 @@ 
  *

  * @return int Post count.

  */

-function geodir_count_posts_by_term( $data, $term ) {

+function geodir_count_posts_by_term($data, $term) {

 

-	if ( $data ) {

-		if ( isset( $data[ $term->term_id ] ) ) {

-			return $data[ $term->term_id ];

+	if ($data) {

+		if (isset($data[$term->term_id])) {

+			return $data[$term->term_id];

 		} else {

 			return 0;

 		}

@@ -4163,8 +4163,8 @@ 
  * param array $terms An array of term objects.

  * @return array Sorted terms array.

  */

-function geodir_sort_terms_by_count( $terms ) {

-	usort( $terms, "geodir_sort_by_count_obj" );

+function geodir_sort_terms_by_count($terms) {

+	usort($terms, "geodir_sort_by_count_obj");

 

 	return $terms;

 }

@@ -4179,8 +4179,8 @@ 
  *

  * @return array Sorted terms array.

  */

-function geodir_sort_terms_by_review_count( $terms ) {

-	usort( $terms, "geodir_sort_by_review_count_obj" );

+function geodir_sort_terms_by_review_count($terms) {

+	usort($terms, "geodir_sort_by_review_count_obj");

 

 	return $terms;

 }

@@ -4196,12 +4196,12 @@ 
  *

  * @return array Sorted terms array.

  */

-function geodir_sort_terms( $terms, $sort = 'count' ) {

-	if ( $sort == 'count' ) {

-		return geodir_sort_terms_by_count( $terms );

+function geodir_sort_terms($terms, $sort = 'count') {

+	if ($sort == 'count') {

+		return geodir_sort_terms_by_count($terms);

 	}

-	if ( $sort == 'review_count' ) {

-		return geodir_sort_terms_by_review_count( $terms );

+	if ($sort == 'review_count') {

+		return geodir_sort_terms_by_review_count($terms);

 	}

 	return $terms;

 }

@@ -4220,7 +4220,7 @@ 
  *

  * @return bool

  */

-function geodir_sort_by_count( $a, $b ) {

+function geodir_sort_by_count($a, $b) {

 	return $a['count'] < $b['count'];

 }

 

@@ -4235,7 +4235,7 @@ 
  *

  * @return bool

  */

-function geodir_sort_by_count_obj( $a, $b ) {

+function geodir_sort_by_count_obj($a, $b) {

 	return $a->count < $b->count;

 }

 

@@ -4250,7 +4250,7 @@ 
  *

  * @return bool

  */

-function geodir_sort_by_review_count_obj( $a, $b ) {

+function geodir_sort_by_review_count_obj($a, $b) {

 	return $a->review_count < $b->review_count;

 }

 

@@ -4267,35 +4267,35 @@ 
 	 * @since   1.4.2

 	 * @package GeoDirectory

 	 */

-	$locale = apply_filters( 'plugin_locale', get_locale(), 'geodirectory' );

+	$locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');

 

-	load_textdomain( 'geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo' );

-	load_plugin_textdomain( 'geodirectory', false, plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/geodirectory-languages' );

+	load_textdomain('geodirectory', WP_LANG_DIR.'/'.'geodirectory'.'/'.'geodirectory'.'-'.$locale.'.mo');

+	load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))).'/geodirectory-languages');

 

 	/**

 	 * Define language constants.

 	 *

 	 * @since 1.0.0

 	 */

-	require_once( geodir_plugin_path() . '/language.php' );

+	require_once(geodir_plugin_path().'/language.php');

 

-	$language_file = geodir_plugin_path() . '/db-language.php';

+	$language_file = geodir_plugin_path().'/db-language.php';

 

 	// Load language string file if not created yet

-	if ( ! file_exists( $language_file ) ) {

+	if (!file_exists($language_file)) {

 		geodirectory_load_db_language();

 	}

 

-	if ( file_exists( $language_file ) ) {

+	if (file_exists($language_file)) {

 		/**

 		 * Language strings from database.

 		 *

 		 * @since 1.4.2

 		 */

 		try {

-			require_once( $language_file );

-		} catch ( Exception $e ) {

-			error_log( 'Language Error: ' . $e->getMessage() );

+			require_once($language_file);

+		} catch (Exception $e) {

+			error_log('Language Error: '.$e->getMessage());

 		}

 	}

 }

@@ -4312,19 +4312,19 @@ 
  */

 function geodirectory_load_db_language() {

 	global $wp_filesystem;

-	if ( empty( $wp_filesystem ) ) {

-		require_once( ABSPATH . '/wp-admin/includes/file.php' );

+	if (empty($wp_filesystem)) {

+		require_once(ABSPATH.'/wp-admin/includes/file.php');

 		WP_Filesystem();

 		global $wp_filesystem;

 	}

 

-	$language_file = geodir_plugin_path() . '/db-language.php';

+	$language_file = geodir_plugin_path().'/db-language.php';

 

-	if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {

+	if (is_file($language_file) && !is_writable($language_file)) {

 		return false;

 	} // Not possible to create.

 

-	if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {

+	if (!is_file($language_file) && !is_writable(dirname($language_file))) {

 		return false;

 	} // Not possible to create.

 

@@ -4338,9 +4338,9 @@ 
 	 *

 	 * @param array $contents_strings Array of strings.

 	 */

-	$contents_strings = apply_filters( 'geodir_load_db_language', $contents_strings );

+	$contents_strings = apply_filters('geodir_load_db_language', $contents_strings);

 

-	$contents_strings = array_unique( $contents_strings );

+	$contents_strings = array_unique($contents_strings);

 

 	$contents_head   = array();

 	$contents_head[] = "<?php";

@@ -4357,21 +4357,21 @@ 
 	$contents_foot[] = "";

 	$contents_foot[] = "";

 

-	$contents = implode( PHP_EOL, $contents_head );

+	$contents = implode(PHP_EOL, $contents_head);

 

-	if ( ! empty( $contents_strings ) ) {

-		foreach ( $contents_strings as $string ) {

-			if ( is_scalar( $string ) && $string != '' ) {

-				$string = str_replace( "'", "\'", $string );

-				geodir_wpml_register_string( $string );

-				$contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";

+	if (!empty($contents_strings)) {

+		foreach ($contents_strings as $string) {

+			if (is_scalar($string) && $string != '') {

+				$string = str_replace("'", "\'", $string);

+				geodir_wpml_register_string($string);

+				$contents .= PHP_EOL."__('".$string."', 'geodirectory');";

 			}

 		}

 	}

 

-	$contents .= implode( PHP_EOL, $contents_foot );

+	$contents .= implode(PHP_EOL, $contents_foot);

 

-	if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {

+	if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE)) {

 		return false;

 	} // Failure; could not write file.

 

@@ -4392,49 +4392,49 @@ 
  *

  * @return array Translation texts.

  */

-function geodir_load_custom_field_translation( $translation_texts = array() ) {

+function geodir_load_custom_field_translation($translation_texts = array()) {

 	global $wpdb;

 

 	// Custom fields table

-	$sql  = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM " . GEODIR_CUSTOM_FIELDS_TABLE;

-	$rows = $wpdb->get_results( $sql );

+	$sql  = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM ".GEODIR_CUSTOM_FIELDS_TABLE;

+	$rows = $wpdb->get_results($sql);

 

-	if ( ! empty( $rows ) ) {

-		foreach ( $rows as $row ) {

-			if ( ! empty( $row->admin_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->admin_title );

+	if (!empty($rows)) {

+		foreach ($rows as $row) {

+			if (!empty($row->admin_title)) {

+				$translation_texts[] = stripslashes_deep($row->admin_title);

 			}

 

-			if ( ! empty( $row->admin_desc ) ) {

-				$translation_texts[] = stripslashes_deep( $row->admin_desc );

+			if (!empty($row->admin_desc)) {

+				$translation_texts[] = stripslashes_deep($row->admin_desc);

 			}

 

-			if ( ! empty( $row->site_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->site_title );

+			if (!empty($row->site_title)) {

+				$translation_texts[] = stripslashes_deep($row->site_title);

 			}

 

-			if ( ! empty( $row->clabels ) ) {

-				$translation_texts[] = stripslashes_deep( $row->clabels );

+			if (!empty($row->clabels)) {

+				$translation_texts[] = stripslashes_deep($row->clabels);

 			}

 

-			if ( ! empty( $row->required_msg ) ) {

-				$translation_texts[] = stripslashes_deep( $row->required_msg );

+			if (!empty($row->required_msg)) {

+				$translation_texts[] = stripslashes_deep($row->required_msg);

 			}

             

-			if ( ! empty( $row->validation_msg ) ) {

-				$translation_texts[] = stripslashes_deep( $row->validation_msg );

+			if (!empty($row->validation_msg)) {

+				$translation_texts[] = stripslashes_deep($row->validation_msg);

 			}

 

-			if ( ! empty( $row->default_value ) ) {

-				$translation_texts[] = stripslashes_deep( $row->default_value );

+			if (!empty($row->default_value)) {

+				$translation_texts[] = stripslashes_deep($row->default_value);

 			}

 

-			if ( ! empty( $row->option_values ) ) {

-				$option_values = geodir_string_values_to_options( stripslashes_deep( $row->option_values ) );

+			if (!empty($row->option_values)) {

+				$option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values));

 

-				if ( ! empty( $option_values ) ) {

-					foreach ( $option_values as $option_value ) {

-						if ( ! empty( $option_value['label'] ) ) {

+				if (!empty($option_values)) {

+					foreach ($option_values as $option_value) {

+						if (!empty($option_value['label'])) {

 							$translation_texts[] = $option_value['label'];

 						}

 					}

@@ -4444,56 +4444,56 @@ 
 	}

 

 	// Custom sorting fields table

-	$sql  = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE;

-	$rows = $wpdb->get_results( $sql );

+	$sql  = "SELECT site_title, asc_title, desc_title FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE;

+	$rows = $wpdb->get_results($sql);

 

-	if ( ! empty( $rows ) ) {

-		foreach ( $rows as $row ) {

-			if ( ! empty( $row->site_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->site_title );

+	if (!empty($rows)) {

+		foreach ($rows as $row) {

+			if (!empty($row->site_title)) {

+				$translation_texts[] = stripslashes_deep($row->site_title);

 			}

 

-			if ( ! empty( $row->asc_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->asc_title );

+			if (!empty($row->asc_title)) {

+				$translation_texts[] = stripslashes_deep($row->asc_title);

 			}

 

-			if ( ! empty( $row->desc_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->desc_title );

+			if (!empty($row->desc_title)) {

+				$translation_texts[] = stripslashes_deep($row->desc_title);

 			}

 		}

 	}

 

 	// Advance search filter fields table

-	if ( defined( 'GEODIR_ADVANCE_SEARCH_TABLE' ) ) {

-		$sql  = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE;

-		$rows = $wpdb->get_results( $sql );

-

-		if ( ! empty( $rows ) ) {

-			foreach ( $rows as $row ) {

-				if ( ! empty( $row->field_site_name ) ) {

-					$translation_texts[] = stripslashes_deep( $row->field_site_name );

+	if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {

+		$sql  = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM ".GEODIR_ADVANCE_SEARCH_TABLE;

+		$rows = $wpdb->get_results($sql);

+

+		if (!empty($rows)) {

+			foreach ($rows as $row) {

+				if (!empty($row->field_site_name)) {

+					$translation_texts[] = stripslashes_deep($row->field_site_name);

 				}

 

-				if ( ! empty( $row->front_search_title ) ) {

-					$translation_texts[] = stripslashes_deep( $row->front_search_title );

+				if (!empty($row->front_search_title)) {

+					$translation_texts[] = stripslashes_deep($row->front_search_title);

 				}

 

-				if ( ! empty( $row->first_search_text ) ) {

-					$translation_texts[] = stripslashes_deep( $row->first_search_text );

+				if (!empty($row->first_search_text)) {

+					$translation_texts[] = stripslashes_deep($row->first_search_text);

 				}

 

-				if ( ! empty( $row->last_search_text ) ) {

-					$translation_texts[] = stripslashes_deep( $row->last_search_text );

+				if (!empty($row->last_search_text)) {

+					$translation_texts[] = stripslashes_deep($row->last_search_text);

 				}

 

-				if ( ! empty( $row->field_desc ) ) {

-					$translation_texts[] = stripslashes_deep( $row->field_desc );

+				if (!empty($row->field_desc)) {

+					$translation_texts[] = stripslashes_deep($row->field_desc);

 				}

 			}

 		}

 	}

 

-	$translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts;

+	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

 	return $translation_texts;

 }

@@ -4515,7 +4515,7 @@ 
 	 *

 	 * @param array $geodir_allowed_mime_types and file extensions.

 	 */

-	return apply_filters( 'geodir_allowed_mime_types', array(

+	return apply_filters('geodir_allowed_mime_types', array(

 			'Image'       => array( // Image formats.

 				'jpg'  => 'image/jpeg',

 				'jpe'  => 'image/jpeg',

@@ -4584,18 +4584,18 @@ 
  *

  * @return string User display name.

  */

-function geodir_get_client_name( $user_id ) {

+function geodir_get_client_name($user_id) {

 	$client_name = '';

 

-	$user_data = get_userdata( $user_id );

+	$user_data = get_userdata($user_id);

 

-	if ( ! empty( $user_data ) ) {

-		if ( isset( $user_data->display_name ) && trim( $user_data->display_name ) != '' ) {

-			$client_name = trim( $user_data->display_name );

-		} else if ( isset( $user_data->user_nicename ) && trim( $user_data->user_nicename ) != '' ) {

-			$client_name = trim( $user_data->user_nicename );

+	if (!empty($user_data)) {

+		if (isset($user_data->display_name) && trim($user_data->display_name) != '') {

+			$client_name = trim($user_data->display_name);

+		} else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {

+			$client_name = trim($user_data->user_nicename);

 		} else {

-			$client_name = trim( $user_data->user_login );

+			$client_name = trim($user_data->user_login);

 		}

 	}

 

@@ -4603,17 +4603,17 @@ 
 }

 

 

-add_filter( 'wpseo_replacements', 'geodir_wpseo_replacements', 10, 1 );

+add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);

 /*

  * Add location variables to wpseo replacements.

  *

  * @since 1.5.4

  */

-function geodir_wpseo_replacements( $vars ) {

+function geodir_wpseo_replacements($vars) {

 

 	// location variables

 	$gd_post_type   = geodir_get_current_posttype();

-	$location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type );

+	$location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);

 	/**

 	 * Filter the title variables location variables array

 	 *

@@ -4623,7 +4623,7 @@ 
 	 * @param array $location_array The array of location variables.

 	 * @param array $vars           The page title variables.

 	 */

-	$location_array  = apply_filters( 'geodir_filter_title_variables_location_arr_seo', $location_array, $vars );

+	$location_array = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);

 

 

 	$location_replace_vars = geodir_location_replace_vars($location_array, NULL, '');

@@ -4638,13 +4638,13 @@ 
 	 * @param string $vars          The title with variables.

 	 * @param array $location_array The array of location variables.

 	 */

-	return apply_filters( 'geodir_wpseo_replacements_vars', $vars, $location_array );

+	return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);

 }

 

 

-add_filter( 'geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3 );

-add_filter( 'geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2 );

-add_filter( 'geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3 );

+add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);

+add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);

+add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);

 

 /**

  * Filter the title variables.

@@ -4686,14 +4686,14 @@ 
  *

  * @return string Title after filtered variables.

  */

-function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {

+function geodir_filter_title_variables($title, $gd_page, $sep = '') {

 	global $wp, $post;

 

-	if ( ! $gd_page || ! $title ) {

+	if (!$gd_page || !$title) {

 		return $title; // if no a GD page then bail.

 	}

 

-	if ( $sep == '' ) {

+	if ($sep == '') {

 		/**

 		 * Filter the page title separator.

 		 *

@@ -4702,100 +4702,100 @@ 
 		 *

 		 * @param string $sep The separator, default: `|`.

 		 */

-		$sep = apply_filters( 'geodir_page_title_separator', '|' );

+		$sep = apply_filters('geodir_page_title_separator', '|');

 	}

 

-	if ( strpos( $title, '%%title%%' ) !== false ) {

-		$title = str_replace( "%%title%%", $post->post_title, $title );

+	if (strpos($title, '%%title%%') !== false) {

+		$title = str_replace("%%title%%", $post->post_title, $title);

 	}

 

-	if ( strpos( $title, '%%sitename%%' ) !== false ) {

-		$title = str_replace( "%%sitename%%", get_bloginfo( 'name' ), $title );

+	if (strpos($title, '%%sitename%%') !== false) {

+		$title = str_replace("%%sitename%%", get_bloginfo('name'), $title);

 	}

 

-	if ( strpos( $title, '%%sitedesc%%' ) !== false ) {

-		$title = str_replace( "%%sitedesc%%", get_bloginfo( 'description' ), $title );

+	if (strpos($title, '%%sitedesc%%') !== false) {

+		$title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);

 	}

 

-	if ( strpos( $title, '%%excerpt%%' ) !== false ) {

-		$title = str_replace( "%%excerpt%%", strip_tags( get_the_excerpt() ), $title );

+	if (strpos($title, '%%excerpt%%') !== false) {

+		$title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);

 	}

 

-	if ( $gd_page == 'search' || $gd_page == 'author' ) {

-		$post_type = isset( $_REQUEST['stype'] ) ? sanitize_text_field( $_REQUEST['stype'] ) : '';

-	} else if ( $gd_page == 'add-listing' ) {

-		$post_type = ( isset( $_REQUEST['listing_type'] ) ) ? sanitize_text_field( $_REQUEST['listing_type'] ) : '';

-		$post_type = ! $post_type && ! empty( $_REQUEST['pid'] ) ? get_post_type( (int) $_REQUEST['pid'] ) : $post_type;

-	} else if ( isset( $post->post_type ) && $post->post_type && in_array( $post->post_type, geodir_get_posttypes() ) ) {

+	if ($gd_page == 'search' || $gd_page == 'author') {

+		$post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : '';

+	} else if ($gd_page == 'add-listing') {

+		$post_type = (isset($_REQUEST['listing_type'])) ? sanitize_text_field($_REQUEST['listing_type']) : '';

+		$post_type = !$post_type && !empty($_REQUEST['pid']) ? get_post_type((int) $_REQUEST['pid']) : $post_type;

+	} else if (isset($post->post_type) && $post->post_type && in_array($post->post_type, geodir_get_posttypes())) {

 		$post_type = $post->post_type;

 	} else {

-		$post_type = get_query_var( 'post_type' );

+		$post_type = get_query_var('post_type');

 	}

 

-	if ( strpos( $title, '%%pt_single%%' ) !== false ) {

+	if (strpos($title, '%%pt_single%%') !== false) {

 		$singular_name = '';

-		if ( $post_type && $singular_name = get_post_type_singular_label( $post_type ) ) {

-			$singular_name = __( $singular_name, 'geodirectory' );

+		if ($post_type && $singular_name = get_post_type_singular_label($post_type)) {

+			$singular_name = __($singular_name, 'geodirectory');

 		}

 

-		$title = str_replace( "%%pt_single%%", $singular_name, $title );

+		$title = str_replace("%%pt_single%%", $singular_name, $title);

 	}

 

-	if ( strpos( $title, '%%pt_plural%%' ) !== false ) {

+	if (strpos($title, '%%pt_plural%%') !== false) {

 		$plural_name = '';

-		if ( $post_type && $plural_name = get_post_type_plural_label( $post_type ) ) {

-			$plural_name = __( $plural_name, 'geodirectory' );

+		if ($post_type && $plural_name = get_post_type_plural_label($post_type)) {

+			$plural_name = __($plural_name, 'geodirectory');

 		}

 

-		$title = str_replace( "%%pt_plural%%", $plural_name, $title );

+		$title = str_replace("%%pt_plural%%", $plural_name, $title);

 	}

 

-	if ( strpos( $title, '%%category%%' ) !== false ) {

+	if (strpos($title, '%%category%%') !== false) {

 		$cat_name = '';

 

-		if ( $gd_page == 'detail' ) {

-			if ( $post->default_category ) {

-				$cat      = get_term( $post->default_category, $post->post_type . 'category' );

-				$cat_name = ( isset( $cat->name ) ) ? $cat->name : '';

+		if ($gd_page == 'detail') {

+			if ($post->default_category) {

+				$cat      = get_term($post->default_category, $post->post_type.'category');

+				$cat_name = (isset($cat->name)) ? $cat->name : '';

 			}

-		} else if ( $gd_page == 'listing' ) {

+		} else if ($gd_page == 'listing') {

 			$queried_object = get_queried_object();

-			if ( isset( $queried_object->name ) ) {

+			if (isset($queried_object->name)) {

 				$cat_name = $queried_object->name;

 			}

 		}

-		$title = str_replace( "%%category%%", $cat_name, $title );

+		$title = str_replace("%%category%%", $cat_name, $title);

 	}

 

-	if ( strpos( $title, '%%tag%%' ) !== false ) {

+	if (strpos($title, '%%tag%%') !== false) {

 		$cat_name = '';

 

-		if ( $gd_page == 'detail' ) {

-			if ( $post->default_category ) {

-				$cat      = get_term( $post->default_category, $post->post_type . 'category' );

-				$cat_name = ( isset( $cat->name ) ) ? $cat->name : '';

+		if ($gd_page == 'detail') {

+			if ($post->default_category) {

+				$cat      = get_term($post->default_category, $post->post_type.'category');

+				$cat_name = (isset($cat->name)) ? $cat->name : '';

 			}

-		} else if ( $gd_page == 'listing' ) {

+		} else if ($gd_page == 'listing') {

 			$queried_object = get_queried_object();

-			if ( isset( $queried_object->name ) ) {

+			if (isset($queried_object->name)) {

 				$cat_name = $queried_object->name;

 			}

 		}

-		$title = str_replace( "%%tag%%", $cat_name, $title );

+		$title = str_replace("%%tag%%", $cat_name, $title);

 	}

 

-	if ( strpos( $title, '%%id%%' ) !== false ) {

-		$ID    = ( isset( $post->ID ) ) ? $post->ID : '';

-		$title = str_replace( "%%id%%", $ID, $title );

+	if (strpos($title, '%%id%%') !== false) {

+		$ID    = (isset($post->ID)) ? $post->ID : '';

+		$title = str_replace("%%id%%", $ID, $title);

 	}

 

-	if ( strpos( $title, '%%sep%%' ) !== false ) {

-		$title = str_replace( "%%sep%%", $sep, $title );

+	if (strpos($title, '%%sep%%') !== false) {

+		$title = str_replace("%%sep%%", $sep, $title);

 	}

 

 	// location variables

 	$gd_post_type   = geodir_get_current_posttype();

-	$location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type );

+	$location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);

 	

 	/**

 	 * Filter the title variables location variables array

@@ -4808,20 +4808,20 @@ 
 	 * @param string $gd_page       The page being filtered.

 	 * @param string $sep           The separator, default: `|`.

 	 */

-	$location_array  = apply_filters( 'geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep );

+	$location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);

 	

-	if ( $gd_page == 'location' && get_query_var( 'gd_country_full' ) ) {

-		if ( get_query_var( 'gd_country_full' ) ) {

-			$location_array['gd_country'] = get_query_var( 'gd_country_full' );

+	if ($gd_page == 'location' && get_query_var('gd_country_full')) {

+		if (get_query_var('gd_country_full')) {

+			$location_array['gd_country'] = get_query_var('gd_country_full');

 		}

-		if ( get_query_var( 'gd_region_full' ) ) {

-			$location_array['gd_region'] = get_query_var( 'gd_region_full' );

+		if (get_query_var('gd_region_full')) {

+			$location_array['gd_region'] = get_query_var('gd_region_full');

 		}

-		if ( get_query_var( 'gd_city_full' ) ) {

-			$location_array['gd_city'] = get_query_var( 'gd_city_full' );

+		if (get_query_var('gd_city_full')) {

+			$location_array['gd_city'] = get_query_var('gd_city_full');

 		}

-		if ( get_query_var( 'gd_neighbourhood_full' ) ) {

-			$location_array['gd_neighbourhood'] = get_query_var( 'gd_neighbourhood_full' );

+		if (get_query_var('gd_neighbourhood_full')) {

+			$location_array['gd_neighbourhood'] = get_query_var('gd_neighbourhood_full');

 		}

 	}

 	

@@ -4836,57 +4836,57 @@ 
 	 * @param string $gd_page       The page being filtered.

 	 * @param string $sep           The separator, default: `|`.

 	 */

-	$title = apply_filters( 'geodir_replace_location_variables', $title, $location_array, $gd_page, $sep );

+	$title = apply_filters('geodir_replace_location_variables', $title, $location_array, $gd_page, $sep);

 	

-	if ( strpos( $title, '%%search_term%%' ) !== false ) {

+	if (strpos($title, '%%search_term%%') !== false) {

 		$search_term = '';

-		if ( isset( $_REQUEST['s'] ) ) {

-			$search_term = esc_attr( $_REQUEST['s'] );

+		if (isset($_REQUEST['s'])) {

+			$search_term = esc_attr($_REQUEST['s']);

 		}

-		$title = str_replace( "%%search_term%%", $search_term, $title );

+		$title = str_replace("%%search_term%%", $search_term, $title);

 	}

 

-	if ( strpos( $title, '%%search_near%%' ) !== false ) {

+	if (strpos($title, '%%search_near%%') !== false) {

 		$search_term = '';

-		if ( isset( $_REQUEST['snear'] ) ) {

-			$search_term = esc_attr( $_REQUEST['snear'] );

+		if (isset($_REQUEST['snear'])) {

+			$search_term = esc_attr($_REQUEST['snear']);

 		}

-		$title = str_replace( "%%search_near%%", $search_term, $title );

+		$title = str_replace("%%search_near%%", $search_term, $title);

 	}

 

-	if ( strpos( $title, '%%name%%' ) !== false ) {

-		if ( is_author() ) {

-			$curauth     = ( get_query_var( 'author_name' ) ) ? get_user_by( 'slug', get_query_var( 'author_name' ) ) : get_userdata( get_query_var( 'author' ) );

+	if (strpos($title, '%%name%%') !== false) {

+		if (is_author()) {

+			$curauth     = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

 			$author_name = $curauth->display_name;

 		} else {

 			$author_name = get_the_author();

 		}

-		if ( ! $author_name || $author_name === '' ) {

+		if (!$author_name || $author_name === '') {

 			$queried_object = get_queried_object();

 

-			if ( isset( $queried_object->data->user_nicename ) ) {

+			if (isset($queried_object->data->user_nicename)) {

 				$author_name = $queried_object->data->display_name;

 			}

 		}

-		$title = str_replace( "%%name%%", $author_name, $title );

+		$title = str_replace("%%name%%", $author_name, $title);

 	}

 

-	if ( strpos( $title, '%%page%%' ) !== false ) {

-		$page  = geodir_title_meta_page( $sep );

-		$title = str_replace( "%%page%%", $page, $title );

+	if (strpos($title, '%%page%%') !== false) {

+		$page  = geodir_title_meta_page($sep);

+		$title = str_replace("%%page%%", $page, $title);

 	}

-	if ( strpos( $title, '%%pagenumber%%' ) !== false ) {

+	if (strpos($title, '%%pagenumber%%') !== false) {

 		$pagenumber = geodir_title_meta_pagenumber();

-		$title      = str_replace( "%%pagenumber%%", $pagenumber, $title );

+		$title      = str_replace("%%pagenumber%%", $pagenumber, $title);

 	}

-	if ( strpos( $title, '%%pagetotal%%' ) !== false ) {

+	if (strpos($title, '%%pagetotal%%') !== false) {

 		$pagetotal = geodir_title_meta_pagetotal();

-		$title     = str_replace( "%%pagetotal%%", $pagetotal, $title );

+		$title     = str_replace("%%pagetotal%%", $pagetotal, $title);

 	}

 

-	$title = wptexturize( $title );

-	$title = convert_chars( $title );

-	$title = esc_html( $title );

+	$title = wptexturize($title);

+	$title = convert_chars($title);

+	$title = esc_html($title);

 

 	/**

 	 * Filter the title variables after standard ones have been filtered.

@@ -4900,7 +4900,7 @@ 
 	 * @param string $sep           The separator, default: `|`.

 	 */

 

-	return apply_filters( 'geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep );

+	return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);

 }

 

 /**

@@ -4913,82 +4913,82 @@ 
  *

  * @return array Translation texts.

  */

-function geodir_load_cpt_text_translation( $translation_texts = array() ) {

-	$gd_post_types = geodir_get_posttypes( 'array' );

+function geodir_load_cpt_text_translation($translation_texts = array()) {

+	$gd_post_types = geodir_get_posttypes('array');

 

-	if ( ! empty( $gd_post_types ) ) {

-		foreach ( $gd_post_types as $post_type => $cpt_info ) {

-			$labels      = isset( $cpt_info['labels'] ) ? $cpt_info['labels'] : '';

-			$description = isset( $cpt_info['description'] ) ? $cpt_info['description'] : '';

-			$seo         = isset( $cpt_info['seo'] ) ? $cpt_info['seo'] : '';

+	if (!empty($gd_post_types)) {

+		foreach ($gd_post_types as $post_type => $cpt_info) {

+			$labels      = isset($cpt_info['labels']) ? $cpt_info['labels'] : '';

+			$description = isset($cpt_info['description']) ? $cpt_info['description'] : '';

+			$seo         = isset($cpt_info['seo']) ? $cpt_info['seo'] : '';

 

-			if ( ! empty( $labels ) ) {

-				if ( $labels['name'] != '' && ! in_array( $labels['name'], $translation_texts ) ) {

+			if (!empty($labels)) {

+				if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {

 					$translation_texts[] = $labels['name'];

 				}

-				if ( $labels['singular_name'] != '' && ! in_array( $labels['singular_name'], $translation_texts ) ) {

+				if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {

 					$translation_texts[] = $labels['singular_name'];

 				}

-				if ( $labels['add_new'] != '' && ! in_array( $labels['add_new'], $translation_texts ) ) {

+				if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {

 					$translation_texts[] = $labels['add_new'];

 				}

-				if ( $labels['add_new_item'] != '' && ! in_array( $labels['add_new_item'], $translation_texts ) ) {

+				if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {

 					$translation_texts[] = $labels['add_new_item'];

 				}

-				if ( $labels['edit_item'] != '' && ! in_array( $labels['edit_item'], $translation_texts ) ) {

+				if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {

 					$translation_texts[] = $labels['edit_item'];

 				}

-				if ( $labels['new_item'] != '' && ! in_array( $labels['new_item'], $translation_texts ) ) {

+				if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {

 					$translation_texts[] = $labels['new_item'];

 				}

-				if ( $labels['view_item'] != '' && ! in_array( $labels['view_item'], $translation_texts ) ) {

+				if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {

 					$translation_texts[] = $labels['view_item'];

 				}

-				if ( $labels['search_items'] != '' && ! in_array( $labels['search_items'], $translation_texts ) ) {

+				if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {

 					$translation_texts[] = $labels['search_items'];

 				}

-				if ( $labels['not_found'] != '' && ! in_array( $labels['not_found'], $translation_texts ) ) {

+				if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {

 					$translation_texts[] = $labels['not_found'];

 				}

-				if ( $labels['not_found_in_trash'] != '' && ! in_array( $labels['not_found_in_trash'], $translation_texts ) ) {

+				if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {

 					$translation_texts[] = $labels['not_found_in_trash'];

 				}

-				if ( isset( $labels['label_post_profile'] ) && $labels['label_post_profile'] != '' && ! in_array( $labels['label_post_profile'], $translation_texts ) ) {

+				if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {

 					$translation_texts[] = $labels['label_post_profile'];

 				}

-				if ( isset( $labels['label_post_info'] ) && $labels['label_post_info'] != '' && ! in_array( $labels['label_post_info'], $translation_texts ) ) {

+				if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {

 					$translation_texts[] = $labels['label_post_info'];

 				}

-				if ( isset( $labels['label_post_images'] ) && $labels['label_post_images'] != '' && ! in_array( $labels['label_post_images'], $translation_texts ) ) {

+				if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {

 					$translation_texts[] = $labels['label_post_images'];

 				}

-				if ( isset( $labels['label_post_map'] ) && $labels['label_post_map'] != '' && ! in_array( $labels['label_post_map'], $translation_texts ) ) {

+				if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {

 					$translation_texts[] = $labels['label_post_map'];

 				}

-				if ( isset( $labels['label_reviews'] ) && $labels['label_reviews'] != '' && ! in_array( $labels['label_reviews'], $translation_texts ) ) {

+				if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {

 					$translation_texts[] = $labels['label_reviews'];

 				}

-				if ( isset( $labels['label_related_listing'] ) && $labels['label_related_listing'] != '' && ! in_array( $labels['label_related_listing'], $translation_texts ) ) {

+				if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {

 					$translation_texts[] = $labels['label_related_listing'];

 				}

 			}

 

-			if ( $description != '' && ! in_array( $description, $translation_texts ) ) {

-				$translation_texts[] = normalize_whitespace( $description );

+			if ($description != '' && !in_array($description, $translation_texts)) {

+				$translation_texts[] = normalize_whitespace($description);

 			}

 

-			if ( ! empty( $seo ) ) {

-				if ( isset( $seo['meta_keyword'] ) && $seo['meta_keyword'] != '' && ! in_array( $seo['meta_keyword'], $translation_texts ) ) {

-					$translation_texts[] = normalize_whitespace( $seo['meta_keyword'] );

+			if (!empty($seo)) {

+				if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {

+					$translation_texts[] = normalize_whitespace($seo['meta_keyword']);

 				}

 

-				if ( isset( $seo['meta_description'] ) && $seo['meta_description'] != '' && ! in_array( $seo['meta_description'], $translation_texts ) ) {

-					$translation_texts[] = normalize_whitespace( $seo['meta_description'] );

+				if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {

+					$translation_texts[] = normalize_whitespace($seo['meta_description']);

 				}

 			}

 		}

 	}

-	$translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts;

+	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

 	return $translation_texts;

 }

@@ -5003,27 +5003,27 @@ 
  *

  * @return array Location terms.

  */

-function geodir_remove_location_terms( $location_terms = array() ) {

-	$location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false;

+function geodir_remove_location_terms($location_terms = array()) {

+	$location_manager = defined('POST_LOCATION_TABLE') ? true : false;

 

-	if ( ! empty( $location_terms ) && $location_manager ) {

-		$hide_country_part = get_option( 'geodir_location_hide_country_part' );

-		$hide_region_part  = get_option( 'geodir_location_hide_region_part' );

+	if (!empty($location_terms) && $location_manager) {

+		$hide_country_part = get_option('geodir_location_hide_country_part');

+		$hide_region_part  = get_option('geodir_location_hide_region_part');

 

-		if ( $hide_region_part && $hide_country_part ) {

-			if ( isset( $location_terms['gd_country'] ) ) {

-				unset( $location_terms['gd_country'] );

+		if ($hide_region_part && $hide_country_part) {

+			if (isset($location_terms['gd_country'])) {

+				unset($location_terms['gd_country']);

 			}

-			if ( isset( $location_terms['gd_region'] ) ) {

-				unset( $location_terms['gd_region'] );

+			if (isset($location_terms['gd_region'])) {

+				unset($location_terms['gd_region']);

 			}

-		} else if ( $hide_region_part && ! $hide_country_part ) {

-			if ( isset( $location_terms['gd_region'] ) ) {

-				unset( $location_terms['gd_region'] );

+		} else if ($hide_region_part && !$hide_country_part) {

+			if (isset($location_terms['gd_region'])) {

+				unset($location_terms['gd_region']);

 			}

-		} else if ( ! $hide_region_part && $hide_country_part ) {

-			if ( isset( $location_terms['gd_country'] ) ) {

-				unset( $location_terms['gd_country'] );

+		} else if (!$hide_region_part && $hide_country_part) {

+			if (isset($location_terms['gd_country'])) {

+				unset($location_terms['gd_country']);

 			}

 		}

 	}

@@ -5034,7 +5034,7 @@ 
 	 * @since 1.6.22

 	 * @param array $location_terms The array of location terms.

 	 */

-	return apply_filters('geodir_remove_location_terms',$location_terms);

+	return apply_filters('geodir_remove_location_terms', $location_terms);

 }

 

 /**

@@ -5051,32 +5051,32 @@ 
  * @param WP_Post $post Post object.

  * @param bool $update  Whether this is an existing listing being updated or not.

  */

-function geodir_on_wp_insert_post( $post_ID, $post, $update ) {

+function geodir_on_wp_insert_post($post_ID, $post, $update) {

 	global $gd_set_listing_edited;

 	

-	if ( ! $update ) {

+	if (!$update) {

 		return;

 	}

 

-	$action      = isset( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : '';

-	$is_admin    = is_admin() && ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) ) ? true : false;

+	$action      = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';

+	$is_admin    = is_admin() && (!defined('DOING_AJAX') || (defined('DOING_AJAX') && !DOING_AJAX)) ? true : false;

 	$inline_save = $action == 'inline-save' ? true : false;

 

-	if ( empty( $post->post_type ) || $is_admin || $inline_save || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {

+	if (empty($post->post_type) || $is_admin || $inline_save || (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)) {

 		return;

 	}

 

-	if ( $action != '' && in_array( $action, array( 'geodir_import_export' ) ) ) {

+	if ($action != '' && in_array($action, array('geodir_import_export'))) {

 		return;

 	}

 

 	$user_id = (int) get_current_user_id();

 

-	if ( $user_id > 0 && get_option( 'geodir_notify_post_edited' ) && ! wp_is_post_revision( $post_ID ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

-		$author_id = ! empty( $post->post_author ) ? $post->post_author : 0;

+	if ($user_id > 0 && get_option('geodir_notify_post_edited') && !wp_is_post_revision($post_ID) && in_array($post->post_type, geodir_get_posttypes())) {

+		$author_id = !empty($post->post_author) ? $post->post_author : 0;

 

-		if ( $user_id == $author_id && ! is_super_admin() && empty( $gd_set_listing_edited[$post_ID] ) ) {

-			if ( !empty( $gd_set_listing_edited ) ) {

+		if ($user_id == $author_id && !is_super_admin() && empty($gd_set_listing_edited[$post_ID])) {

+			if (!empty($gd_set_listing_edited)) {

 				$gd_set_listing_edited = array();

 			}

 			$gd_set_listing_edited[$post_ID] = true;

@@ -5094,14 +5094,14 @@ 
  *

  * @return string|null The current page start & end numbering.

  */

-function geodir_title_meta_page( $sep ) {

+function geodir_title_meta_page($sep) {

 	$replacement = null;

 

-	$max = geodir_title_meta_pagenumbering( 'max' );

-	$nr  = geodir_title_meta_pagenumbering( 'nr' );

+	$max = geodir_title_meta_pagenumbering('max');

+	$nr  = geodir_title_meta_pagenumbering('nr');

 

-	if ( $max > 1 && $nr > 1 ) {

-		$replacement = sprintf( $sep . ' ' . __( 'Page %1$d of %2$d', 'geodirectory' ), $nr, $max );

+	if ($max > 1 && $nr > 1) {

+		$replacement = sprintf($sep.' '.__('Page %1$d of %2$d', 'geodirectory'), $nr, $max);

 	}

 

 	return $replacement;

@@ -5118,8 +5118,8 @@ 
 function geodir_title_meta_pagenumber() {

 	$replacement = null;

 

-	$nr = geodir_title_meta_pagenumbering( 'nr' );

-	if ( isset( $nr ) && $nr > 0 ) {

+	$nr = geodir_title_meta_pagenumbering('nr');

+	if (isset($nr) && $nr > 0) {

 		$replacement = (string) $nr;

 	}

 

@@ -5137,8 +5137,8 @@ 
 function geodir_title_meta_pagetotal() {

 	$replacement = null;

 

-	$max = geodir_title_meta_pagenumbering( 'max' );

-	if ( isset( $max ) && $max > 0 ) {

+	$max = geodir_title_meta_pagenumbering('max');

+	if (isset($max) && $max > 0) {

 		$replacement = (string) $max;

 	}

 

@@ -5158,36 +5158,36 @@ 
  *

  * @return int|null The current page numbering.

  */

-function geodir_title_meta_pagenumbering( $request = 'nr' ) {

+function geodir_title_meta_pagenumbering($request = 'nr') {

 	global $wp_query, $post;

 	$max_num_pages = null;

 	$page_number   = null;

 

 	$max_num_pages = 1;

 

-	if ( ! is_singular() ) {

-		$page_number = get_query_var( 'paged' );

-		if ( $page_number === 0 || $page_number === '' ) {

+	if (!is_singular()) {

+		$page_number = get_query_var('paged');

+		if ($page_number === 0 || $page_number === '') {

 			$page_number = 1;

 		}

 

-		if ( isset( $wp_query->max_num_pages ) && ( $wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0 ) ) {

+		if (isset($wp_query->max_num_pages) && ($wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0)) {

 			$max_num_pages = $wp_query->max_num_pages;

 		}

 	} else {

-		$page_number = get_query_var( 'page' );

-		if ( $page_number === 0 || $page_number === '' ) {

+		$page_number = get_query_var('page');

+		if ($page_number === 0 || $page_number === '') {

 			$page_number = 1;

 		}

 

-		if ( isset( $post->post_content ) ) {

-			$max_num_pages = ( substr_count( $post->post_content, '<!--nextpage-->' ) + 1 );

+		if (isset($post->post_content)) {

+			$max_num_pages = (substr_count($post->post_content, '<!--nextpage-->') + 1);

 		}

 	}

 

 	$return = null;

 

-	switch ( $request ) {

+	switch ($request) {

 		case 'nr':

 			$return = $page_number;

 			break;

@@ -5208,14 +5208,14 @@ 
  *

  * @return array Terms.

  */

-function geodir_filter_empty_terms( $terms ) {

-	if ( empty( $terms ) ) {

+function geodir_filter_empty_terms($terms) {

+	if (empty($terms)) {

 		return $terms;

 	}

 

 	$return = array();

-	foreach ( $terms as $term ) {

-		if ( isset( $term->count ) && $term->count > 0 ) {

+	foreach ($terms as $term) {

+		if (isset($term->count) && $term->count > 0) {

 			$return[] = $term;

 		} else {

 			/**

@@ -5226,7 +5226,7 @@ 
 			 * @param array $return The array of terms to return.

 			 * @param object $term  The term object.

 			 */

-			$return = apply_filters( 'geodir_filter_empty_terms_filter', $return, $term );

+			$return = apply_filters('geodir_filter_empty_terms_filter', $return, $term);

 		}

 	}

 

@@ -5243,15 +5243,15 @@ 
  *

  * @return array

  */

-function geodir_remove_hentry( $class ) {

-	if ( geodir_is_page( 'detail' ) ) {

-		$class = array_diff( $class, array( 'hentry' ) );

+function geodir_remove_hentry($class) {

+	if (geodir_is_page('detail')) {

+		$class = array_diff($class, array('hentry'));

 	}

 

 	return $class;

 }

 

-add_filter( 'post_class', 'geodir_remove_hentry' );

+add_filter('post_class', 'geodir_remove_hentry');

 

 /**

  * Registers a individual text string for WPML translation.

@@ -5263,8 +5263,8 @@ 
  * @param string $domain The plugin domain. Default geodirectory.

  * @param string $name The name of the string which helps to know what's being translated.

  */

-function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {

-    do_action( 'wpml_register_single_string', $domain, $name, $string );

+function geodir_wpml_register_string($string, $domain = 'geodirectory', $name = '') {

+    do_action('wpml_register_single_string', $domain, $name, $string);

 }

 

 /**

@@ -5279,8 +5279,8 @@ 
  * @param string $language_code Return the translation in this language. Default is NULL which returns the current language.

  * @return string The translated string.

  */

-function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {

-    return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code );

+function geodir_wpml_translate_string($string, $domain = 'geodirectory', $name = '', $language_code = NULL) {

+    return apply_filters('wpml_translate_single_string', $string, $domain, $name, $language_code);

 }

 

 /**

@@ -5295,19 +5295,19 @@ 
  * @param int $post_ID  Post ID.

  * @param array $data Post data.

  */

-function geodir_send_listing_edited_notification( $post_ID, $data ) {

+function geodir_send_listing_edited_notification($post_ID, $data) {

     global $gd_notified_edited, $gd_set_listing_edited;

     

-    if ( !empty( $gd_set_listing_edited[ $post_ID ] ) && empty( $gd_notified_edited[ $post_ID ] ) ) {

-        if ( !empty( $gd_notified_edited ) ) {

+    if (!empty($gd_set_listing_edited[$post_ID]) && empty($gd_notified_edited[$post_ID])) {

+        if (!empty($gd_notified_edited)) {

             $gd_notified_edited = array();

         }

-        $gd_notified_edited[ $post_ID ] = true;

+        $gd_notified_edited[$post_ID] = true;

         

-        $from_email   = get_option( 'site_email' );

+        $from_email   = get_option('site_email');

         $from_name    = get_site_emailName();

-        $to_email     = get_option( 'admin_email' );

-        $to_name      = get_option( 'name' );

+        $to_email     = get_option('admin_email');

+        $to_name      = get_option('name');

         $message_type = 'listing_edited';

 

         $notify_edited = true;

@@ -5319,11 +5319,11 @@ 
          * @param bool $notify_edited Notify on listing edited by author?

          * @param object $post        The current post object.

          */

-        $notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post_ID );

+        $notify_edited = apply_filters('geodir_notify_on_listing_edited', $notify_edited, $post_ID);

 

-        if ( $notify_edited ) {

-            geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID );

+        if ($notify_edited) {

+            geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);

         }

     }

 }

-add_action( 'geodir_after_save_listing', 'geodir_send_listing_edited_notification', 1000, 2 );
\ No newline at end of file
+add_action('geodir_after_save_listing', 'geodir_send_listing_edited_notification', 1000, 2);
\ No newline at end of file

upgrade.php

Braces +1 added lines, -1 removed lines

@@ -324,7 +324,7 @@
 

             if(!empty($show_in_arr )){

                 $show_in_arr = implode(',',$show_in_arr);

-            }else{

+            } else{

                 $show_in_arr = '';

             }

 

Indentation +661 added lines, -661 removed lines

@@ -10,53 +10,53 @@ 
 global $wpdb;

 

 if (get_option('geodirectory' . '_db_version') != GEODIRECTORY_VERSION) {

-    /**

-     * Include custom database table related functions.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once('geodirectory-admin/admin_db_install.php');

-    add_action('plugins_loaded', 'geodirectory_upgrade_all', 10);

-    if (GEODIRECTORY_VERSION <= '1.3.6') {

-        add_action('plugins_loaded', 'geodir_upgrade_136', 11);

-    }

-

-    if (GEODIRECTORY_VERSION <= '1.4.6') {

-        add_action('init', 'geodir_upgrade_146', 11);

-    }

-

-    if (GEODIRECTORY_VERSION <= '1.4.8') {

-        add_action('init', 'geodir_upgrade_148', 11);

-    }

-

-    if (GEODIRECTORY_VERSION <= '1.5.0') {

-        add_action('init', 'geodir_upgrade_150', 11);

-    }

-

-    if (GEODIRECTORY_VERSION <= '1.5.2') {

-        add_action('init', 'geodir_upgrade_152', 11);

-    }

-

-    if (GEODIRECTORY_VERSION <= '1.5.3') {

-        add_action('init', 'geodir_upgrade_153', 11);

-    }

-

-    if (GEODIRECTORY_VERSION <= '1.5.4') {

-        add_action('init', 'geodir_upgrade_154', 11);

-    }

+	/**

+	 * Include custom database table related functions.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once('geodirectory-admin/admin_db_install.php');

+	add_action('plugins_loaded', 'geodirectory_upgrade_all', 10);

+	if (GEODIRECTORY_VERSION <= '1.3.6') {

+		add_action('plugins_loaded', 'geodir_upgrade_136', 11);

+	}

+

+	if (GEODIRECTORY_VERSION <= '1.4.6') {

+		add_action('init', 'geodir_upgrade_146', 11);

+	}

+

+	if (GEODIRECTORY_VERSION <= '1.4.8') {

+		add_action('init', 'geodir_upgrade_148', 11);

+	}

+

+	if (GEODIRECTORY_VERSION <= '1.5.0') {

+		add_action('init', 'geodir_upgrade_150', 11);

+	}

+

+	if (GEODIRECTORY_VERSION <= '1.5.2') {

+		add_action('init', 'geodir_upgrade_152', 11);

+	}

+

+	if (GEODIRECTORY_VERSION <= '1.5.3') {

+		add_action('init', 'geodir_upgrade_153', 11);

+	}

+

+	if (GEODIRECTORY_VERSION <= '1.5.4') {

+		add_action('init', 'geodir_upgrade_154', 11);

+	}

     

-    if (GEODIRECTORY_VERSION <= '1.6.18') {

-        add_action('init', 'geodir_upgrade_1618', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.6.18') {

+		add_action('init', 'geodir_upgrade_1618', 11);

+	}

     

-    if (GEODIRECTORY_VERSION <= '1.6.22') {

-        add_action('init', 'geodir_upgrade_1622', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.6.22') {

+		add_action('init', 'geodir_upgrade_1622', 11);

+	}

 

-    add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

+	add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

 

-    update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

+	update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

 

 }

 

@@ -69,10 +69,10 @@ 
  */

 function geodirectory_upgrade_all()

 {

-    geodir_create_tables();

-    geodir_update_review_db();

-    gd_install_theme_compat();

-    gd_convert_custom_field_display();

+	geodir_create_tables();

+	geodir_update_review_db();

+	gd_install_theme_compat();

+	gd_convert_custom_field_display();

 }

 

 /**

@@ -83,7 +83,7 @@ 
  */

 function geodir_upgrade_136()

 {

-    geodir_fix_review_overall_rating();

+	geodir_fix_review_overall_rating();

 }

 

 /**

@@ -93,7 +93,7 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_146(){

-    gd_convert_virtual_pages();

+	gd_convert_virtual_pages();

 }

 

 /**

@@ -103,7 +103,7 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_150(){

-    gd_fix_cpt_rewrite_slug();

+	gd_fix_cpt_rewrite_slug();

 }

 

 

@@ -115,11 +115,11 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_148(){

-    /*

+	/*

      * Blank the users google password if present as we now use oAuth 2.0

      */

-    update_option('geodir_ga_pass','');

-    update_option('geodir_ga_user','');

+	update_option('geodir_ga_pass','');

+	update_option('geodir_ga_user','');

 

 }

 

@@ -131,8 +131,8 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_153(){

-    geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 }

 

 /**

@@ -142,7 +142,7 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_154(){

-    geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

 }

 

 /**

@@ -152,7 +152,7 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_152(){

-    gd_fix_address_detail_table_limit();

+	gd_fix_address_detail_table_limit();

 }

 

 

@@ -168,12 +168,12 @@ 
  */

 function geodir_update_review_db()

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    geodir_fix_review_date();

-    geodir_fix_review_post_status();

-    geodir_fix_review_content();

-    geodir_fix_review_location();

+	geodir_fix_review_date();

+	geodir_fix_review_post_status();

+	geodir_fix_review_content();

+	geodir_fix_review_location();

 

 }

 

@@ -186,8 +186,8 @@ 
  */

 function geodir_fix_review_date()

 {

-    global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

+	global $wpdb;

+	$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

 }

 

 /**

@@ -199,8 +199,8 @@ 
  */

 function geodir_fix_review_post_status()

 {

-    global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

+	global $wpdb;

+	$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

 }

 

 /**

@@ -213,12 +213,12 @@ 
  */

 function geodir_fix_review_content()

 {

-    global $wpdb;

-    if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

-        return true;

-    } else {

-        return false;

-    }

+	global $wpdb;

+	if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

+		return true;

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -231,20 +231,20 @@ 
  */

 function geodir_fix_review_location()

 {

-    global $wpdb;

+	global $wpdb;

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

 

-            $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

+			$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

 

-        }

-        return true;

-    }

-    return false;

+		}

+		return true;

+	}

+	return false;

 }

 

 /**

@@ -256,82 +256,82 @@ 
  */

 function geodir_fix_review_overall_rating()

 {

-    global $wpdb;

+	global $wpdb;

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            $reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			$reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

 

-            if (!empty($reviews)) {

-                foreach ($reviews as $post_id) {

-                    geodir_update_postrating($post_id->post_id, $key);

-                }

+			if (!empty($reviews)) {

+				foreach ($reviews as $post_id) {

+					geodir_update_postrating($post_id->post_id, $key);

+				}

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 }

 

 

 function gd_convert_custom_field_display(){

-    global $wpdb;

+	global $wpdb;

 

-    $field_info = $wpdb->get_results("select * from " . GEODIR_CUSTOM_FIELDS_TABLE);

+	$field_info = $wpdb->get_results("select * from " . GEODIR_CUSTOM_FIELDS_TABLE);

 

-    $has_run = get_option('gd_convert_custom_field_display');

-    if($has_run){return;}

+	$has_run = get_option('gd_convert_custom_field_display');

+	if($has_run){return;}

 

-    // set the field_type_key for standard fields

-    $wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET field_type_key = field_type");

+	// set the field_type_key for standard fields

+	$wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET field_type_key = field_type");

 

 

-    if(is_array( $field_info)){

+	if(is_array( $field_info)){

 

-        foreach( $field_info as $cf){

+		foreach( $field_info as $cf){

 

-            $id = $cf->id;

+			$id = $cf->id;

 

-            if(!property_exists($cf,'show_in') || !$id){return;}

+			if(!property_exists($cf,'show_in') || !$id){return;}

 

-            $show_in_arr = array();

+			$show_in_arr = array();

 

-            if($cf->is_default){

-                $show_in_arr[] = "[detail]";

-            }

+			if($cf->is_default){

+				$show_in_arr[] = "[detail]";

+			}

 

-            if($cf->show_on_detail){

-                $show_in_arr[] = "[moreinfo]";

-            }

+			if($cf->show_on_detail){

+				$show_in_arr[] = "[moreinfo]";

+			}

 

-            if($cf->show_on_listing){

-                $show_in_arr[] = "[listing]";

-            }

+			if($cf->show_on_listing){

+				$show_in_arr[] = "[listing]";

+			}

 

-            if($cf->show_as_tab || $cf->htmlvar_name=='geodir_video' || $cf->htmlvar_name=='geodir_special_offers'){

-                $show_in_arr[] = "[owntab]";

-            }

+			if($cf->show_as_tab || $cf->htmlvar_name=='geodir_video' || $cf->htmlvar_name=='geodir_special_offers'){

+				$show_in_arr[] = "[owntab]";

+			}

 

-            if($cf->htmlvar_name=='post' || $cf->htmlvar_name=='geodir_contact' || $cf->htmlvar_name=='geodir_timing'){

-                $show_in_arr[] = "[mapbubble]";

-            }

+			if($cf->htmlvar_name=='post' || $cf->htmlvar_name=='geodir_contact' || $cf->htmlvar_name=='geodir_timing'){

+				$show_in_arr[] = "[mapbubble]";

+			}

 

-            if(!empty($show_in_arr )){

-                $show_in_arr = implode(',',$show_in_arr);

-            }else{

-                $show_in_arr = '';

-            }

+			if(!empty($show_in_arr )){

+				$show_in_arr = implode(',',$show_in_arr);

+			}else{

+				$show_in_arr = '';

+			}

 

-            $wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET show_in='$show_in_arr' WHERE id=$id");

+			$wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET show_in='$show_in_arr' WHERE id=$id");

 

-        }

+		}

 

-        update_option('gd_convert_custom_field_display',1);

-    }

+		update_option('gd_convert_custom_field_display',1);

+	}

 }

 

 ############################################

@@ -347,422 +347,422 @@ 
  */

 function gd_install_theme_compat()

 {

-    global $wpdb;

+	global $wpdb;

 

-    $theme_compat = array();

-    $theme_compat = get_option('gd_theme_compats');

+	$theme_compat = array();

+	$theme_compat = get_option('gd_theme_compats');

 //GDF

-    $theme_compat['GeoDirectory_Framework'] = array(

-        'geodir_wrapper_open_id' => 'geodir_wrapper',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

-        'geodir_wrapper_content_open_id' => 'geodir_content',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<!-- removed -->',

-        'geodir_main_content_close_replace' => '<!-- removed -->',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => '',

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => ''

-    );

+	$theme_compat['GeoDirectory_Framework'] = array(

+		'geodir_wrapper_open_id' => 'geodir_wrapper',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

+		'geodir_wrapper_content_open_id' => 'geodir_content',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<!-- removed -->',

+		'geodir_main_content_close_replace' => '<!-- removed -->',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => '',

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => ''

+	);

 

 //Directory Theme

-    $theme_compat['Directory_Starter'] = array(

-        'geodir_wrapper_open_id' => 'geodir_wrapper',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

-        'geodir_wrapper_content_open_id' => 'geodir_content',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<!-- removed -->',

-        'geodir_main_content_close_replace' => '<!-- removed -->',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => '',

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => ''

-    );

+	$theme_compat['Directory_Starter'] = array(

+		'geodir_wrapper_open_id' => 'geodir_wrapper',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

+		'geodir_wrapper_content_open_id' => 'geodir_content',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<!-- removed -->',

+		'geodir_main_content_close_replace' => '<!-- removed -->',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => '',

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => ''

+	);

 

 //Jobby

-    $theme_compat['Jobby'] = $theme_compat['Directory_Starter'];

+	$theme_compat['Jobby'] = $theme_compat['Directory_Starter'];

 

 //GeoProperty

-    $theme_compat['GeoProperty'] = $theme_compat['Directory_Starter'];

+	$theme_compat['GeoProperty'] = $theme_compat['Directory_Starter'];

 

 //Avada

-    $theme_compat['Avada'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '<!-- removed -->',

-        'geodir_wrapper_close_replace' => '<!-- removed -->',

-        'geodir_wrapper_content_open_id' => 'content',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_right_close_replace' => '</div><!-- end sidebar -->',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_left_close_replace' => '</div><!-- end sidebar -->',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<!-- removed -->',

-        'geodir_main_content_close_replace' => '<!-- removed -->',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.geodir-sidebar-left{float:left}select,textarea{border-style:solid;border-width:1px}.top-menu li > div{visibility:visible}.geodir-chosen-container-single .chosen-single{height:auto}ul li#menu-item-gd-location-switcher ul{width:222px}ul li#menu-item-gd-location-switcher ul li{padding-right:0!important}#mobile-nav li#mobile-menu-item-gd-location-switcher li a{padding-left:10px;padding-right:10px}#menu-item-gd-location-switcher dd,#mobile-menu-item-gd-location-switcher{margin-left:0}#menu-item-gd-location-switcher dd a{display:block}.geodir-chosen-container .chosen-results li.highlighted{background-color:#eee;background-image:none;color:#444}#mobile-nav li.mobile-nav-item li a:before{content:\'\';margin:0}#mobile-nav li.mobile-nav-item li a{padding:10px;width:auto}.geodir-listing-search{text-align:center}.geodir-search{float:none;margin:0}.geodir-search select,.geodir-search .search_by_post,.geodir-search input[type="text"],.geodir-search button[type="button"], .geodir-search input[type="button"],.geodir-search input[type="submit"]{display:inline-block;float:none}.geodir-cat-list ul li,.map_category ul li{list-style-type:none}.wpgeo-avada .page-title ul li:after{content:\'\'}.top_banner_section{margin-bottom:0}.geodir-category-list-in{margin:0;padding:15px}.geodir_full_page .geodir-cat-list .widget-title{margin-top:0}.geodir_full_page .geodir-cat-list ul li{padding-left:0}.geodir-loc-bar{border:none;margin:0;padding:0}.geodir-loc-bar-in{padding:15px 0}.geodir_full_page section.widget{margin-bottom:20px}.sidebar .geodir-loginbox-list li{margin-bottom:10px;padding-bottom:10px}.sidebar .geodir-loginbox-list li a{display:block}.sidebar .geodir-chosen-container .chosen-results li{margin:0;padding:5px 6px}.sidebar .geodir-chosen-container .chosen-results li.highlighted{background:#eee;background-image:none;color:#000}.sidebar .geodir_category_list_view li.geodir-gridview{display:inline-block;margin-bottom:15px}.wpgeo-avada.double-sidebars #main #sidebar{margin-left:3%}.wpgeo-avada.double-sidebars #main #sidebar-2{margin-left:-100%}.wpgeo-avada.double-sidebars #content{float:left;margin-left:0}.geodir_full_page section.widget{margin-bottom: 0px;} .sidebar .widget .geodir-hide {display: none;}li.fusion-mobile-nav-item .geodir_location_tab_container a:before{content: "" !important; margin-right: auto !important;}li.fusion-mobile-nav-item .geodir_location_tab_container a{padding-left:5px !important;}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Avada'

-    );

+	$theme_compat['Avada'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '<!-- removed -->',

+		'geodir_wrapper_close_replace' => '<!-- removed -->',

+		'geodir_wrapper_content_open_id' => 'content',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_right_close_replace' => '</div><!-- end sidebar -->',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_left_close_replace' => '</div><!-- end sidebar -->',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<!-- removed -->',

+		'geodir_main_content_close_replace' => '<!-- removed -->',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.geodir-sidebar-left{float:left}select,textarea{border-style:solid;border-width:1px}.top-menu li > div{visibility:visible}.geodir-chosen-container-single .chosen-single{height:auto}ul li#menu-item-gd-location-switcher ul{width:222px}ul li#menu-item-gd-location-switcher ul li{padding-right:0!important}#mobile-nav li#mobile-menu-item-gd-location-switcher li a{padding-left:10px;padding-right:10px}#menu-item-gd-location-switcher dd,#mobile-menu-item-gd-location-switcher{margin-left:0}#menu-item-gd-location-switcher dd a{display:block}.geodir-chosen-container .chosen-results li.highlighted{background-color:#eee;background-image:none;color:#444}#mobile-nav li.mobile-nav-item li a:before{content:\'\';margin:0}#mobile-nav li.mobile-nav-item li a{padding:10px;width:auto}.geodir-listing-search{text-align:center}.geodir-search{float:none;margin:0}.geodir-search select,.geodir-search .search_by_post,.geodir-search input[type="text"],.geodir-search button[type="button"], .geodir-search input[type="button"],.geodir-search input[type="submit"]{display:inline-block;float:none}.geodir-cat-list ul li,.map_category ul li{list-style-type:none}.wpgeo-avada .page-title ul li:after{content:\'\'}.top_banner_section{margin-bottom:0}.geodir-category-list-in{margin:0;padding:15px}.geodir_full_page .geodir-cat-list .widget-title{margin-top:0}.geodir_full_page .geodir-cat-list ul li{padding-left:0}.geodir-loc-bar{border:none;margin:0;padding:0}.geodir-loc-bar-in{padding:15px 0}.geodir_full_page section.widget{margin-bottom:20px}.sidebar .geodir-loginbox-list li{margin-bottom:10px;padding-bottom:10px}.sidebar .geodir-loginbox-list li a{display:block}.sidebar .geodir-chosen-container .chosen-results li{margin:0;padding:5px 6px}.sidebar .geodir-chosen-container .chosen-results li.highlighted{background:#eee;background-image:none;color:#000}.sidebar .geodir_category_list_view li.geodir-gridview{display:inline-block;margin-bottom:15px}.wpgeo-avada.double-sidebars #main #sidebar{margin-left:3%}.wpgeo-avada.double-sidebars #main #sidebar-2{margin-left:-100%}.wpgeo-avada.double-sidebars #content{float:left;margin-left:0}.geodir_full_page section.widget{margin-bottom: 0px;} .sidebar .widget .geodir-hide {display: none;}li.fusion-mobile-nav-item .geodir_location_tab_container a:before{content: "" !important; margin-right: auto !important;}li.fusion-mobile-nav-item .geodir_location_tab_container a{padding-left:5px !important;}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Avada'

+	);

 

 //Enfold

-    $theme_compat['Enfold'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '</div></main>',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '',

-        'geodir_sidebar_right_close_replace' => '</div></aside><!-- sidebar ends here-->',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '',

-        'geodir_sidebar_left_close_replace' => '</div></aside><!-- sidebar ends here-->',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.geodir_full_page .top_banner_section{margin-bottom:0}.widget .geodir-cat-list ul li{clear:none}.wpgeo-enfold .av-main-nav ul{width:222px}.geodir-listing-search .geodir-loc-bar{border-top:none;padding:0}#main .geodir-listing-search,.geodir-listing-search .geodir-loc-bar{margin-bottom:0}#main .geodir-loc-bar-in,#main .geodir-category-list-in{background-color:#fcfcfc;margin:20px 0;padding:20px}#main .geodir_full_page .geodir-loc-bar-in,#main .geodir_full_page .geodir-loc-bar,#main .geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}#main .geodir-loc-bar-in{padding:20px}#main .geodir-search{margin:0;width:100%}#main .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#main .geodir-search input[type="text"]{margin:0 3% 0 0;padding:10px;width:32.4%}#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"]{font-size:inherit;line-height:2.25;margin:0;padding:7px;width:13%}.enfold-home-top section.widget{margin:0;padding:0}.enfold-home-top .top_banner_section{margin-bottom:0}.enfold-home-top .geodir-loc-bar{background:#fcfcfc;border:none;margin:0;padding:0}#main .enfold-home-top .geodir-loc-bar-in{background:none;border:none;margin:0 auto;padding:20px 0}#main .geodir-breadcrumb{border-bottom-style:solid;border-bottom-width:1px}#gd-tabs dt{clear:none}#geodir_slider ul li{list-style-type:none;margin:0;padding:0}#respond{clear:both}#comments .comments-title span{display:inline;font-size:inherit;font-weight:700}#reviewsTab .comments-area .bypostauthor cite span{display:inline}#top #comments .commentlist .comment,#top #comments .commentlist .comment > div{min-height:0}.commentlist .commenttext{padding-top:15px}#comment_imagesdropbox{margin-bottom:20px}.wpgeo-enfold .geodir_category_list_view li{margin-left:0;padding:0}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_category_list_view li .geodir-post-img{display:block}.wpgeo-enfold .geodir_event_listing_calendar tr.title{background:#ccc}@media only screen and (max-width:480px){.geodir_category_list_view li .geodir-content,.geodir_category_list_view li .geodir-post-img,.geodir_category_list_view li .geodir-addinfo{float:none;width:100%;margin:10px 0}#main .geodir-search input[type="text"],#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"],#main .geodir-search select{margin:10px 0;width:100%}}#main .geodir_full_page section:last-child .geodir-loc-bar{margin-bottom: -1px;border-bottom: none;}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Enfold'

-    );

+	$theme_compat['Enfold'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '</div></main>',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '',

+		'geodir_sidebar_right_close_replace' => '</div></aside><!-- sidebar ends here-->',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '',

+		'geodir_sidebar_left_close_replace' => '</div></aside><!-- sidebar ends here-->',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.geodir_full_page .top_banner_section{margin-bottom:0}.widget .geodir-cat-list ul li{clear:none}.wpgeo-enfold .av-main-nav ul{width:222px}.geodir-listing-search .geodir-loc-bar{border-top:none;padding:0}#main .geodir-listing-search,.geodir-listing-search .geodir-loc-bar{margin-bottom:0}#main .geodir-loc-bar-in,#main .geodir-category-list-in{background-color:#fcfcfc;margin:20px 0;padding:20px}#main .geodir_full_page .geodir-loc-bar-in,#main .geodir_full_page .geodir-loc-bar,#main .geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}#main .geodir-loc-bar-in{padding:20px}#main .geodir-search{margin:0;width:100%}#main .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#main .geodir-search input[type="text"]{margin:0 3% 0 0;padding:10px;width:32.4%}#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"]{font-size:inherit;line-height:2.25;margin:0;padding:7px;width:13%}.enfold-home-top section.widget{margin:0;padding:0}.enfold-home-top .top_banner_section{margin-bottom:0}.enfold-home-top .geodir-loc-bar{background:#fcfcfc;border:none;margin:0;padding:0}#main .enfold-home-top .geodir-loc-bar-in{background:none;border:none;margin:0 auto;padding:20px 0}#main .geodir-breadcrumb{border-bottom-style:solid;border-bottom-width:1px}#gd-tabs dt{clear:none}#geodir_slider ul li{list-style-type:none;margin:0;padding:0}#respond{clear:both}#comments .comments-title span{display:inline;font-size:inherit;font-weight:700}#reviewsTab .comments-area .bypostauthor cite span{display:inline}#top #comments .commentlist .comment,#top #comments .commentlist .comment > div{min-height:0}.commentlist .commenttext{padding-top:15px}#comment_imagesdropbox{margin-bottom:20px}.wpgeo-enfold .geodir_category_list_view li{margin-left:0;padding:0}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_category_list_view li .geodir-post-img{display:block}.wpgeo-enfold .geodir_event_listing_calendar tr.title{background:#ccc}@media only screen and (max-width:480px){.geodir_category_list_view li .geodir-content,.geodir_category_list_view li .geodir-post-img,.geodir_category_list_view li .geodir-addinfo{float:none;width:100%;margin:10px 0}#main .geodir-search input[type="text"],#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"],#main .geodir-search select{margin:10px 0;width:100%}}#main .geodir_full_page section:last-child .geodir-loc-bar{margin-bottom: -1px;border-bottom: none;}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Enfold'

+	);

 

 // X

-    $theme_compat['X'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.x-colophon.bottom{clear:both}#geodir-main-content,.geodir_flex-container{margin-top:16px}.geodir-x ul{list-style:none}.widget ul.geodir_category_list_view{border:none}.geodir_category_list_view li.geodir-gridview:last-child{border-bottom:1px solid #e1e1e1}.home .x-header-landmark{display:none}.geodir-x .x-main .geodir_advance_search_widget{margin:0}.geodir-x .top_banner_section{margin-bottom:0}.geodir-loc-bar{background:rgba(0,0,0,0.05);margin:0;padding:0}.geodir-loc-bar-in{background:none;border:none;padding:10px}.geodir-search{margin:0;width:100%}.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{border:1px solid #ccc;box-shadow:none;height:auto;line-height:21px;margin:0 1% 0 0;padding:5px 10px}.widget .geodir-search select,.geodir-search input[type="text"]{width:28%}.geodir-search input[type="submit"],.geodir-search input[type="button"]{line-height:19px;margin-right:0;width:11%}.geodir-search input:hover[type="submit"],.geodir-search input:hover[type="button"]{background:#333;color:#fff}.geodir-cat-list .widget-title{margin-top:0}.geodir-x .geodir-category-list-in{background:rgba(0,0,0,0.05);border:none}.widget .geodir-cat-list ul.geodir-popular-cat-list{border:none;border-radius:0;box-shadow:none}.geodir_full_page .geodir-cat-list ul li{border:none}.geodir_full_page .geodir-cat-list ul li a{border:none}.post-type-archive .geodir-loc-bar{border:none;margin-top:20px}#menu-item-gd-location-switcher dd{margin-left:0}.geodir-chosen-container-single .chosen-single{height:auto}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_full_page section.widget{clear:both}.x-ethos .entry-title{margin-bottom:20px}.x-ethos .geodir-chosen-container-single .chosen-single{padding:0 0 0 8px}.x-ethos .widget ul li a,.x-ethos .geodir_category_list_view li{color:#333}@media only screen and (max-width:767px){.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{margin:0 0 10px;width:100%}}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-loc-bar,.geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-category-list-in{border-bottom:1px solid rgba(0,0,0,0.1)}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'X'

-    );

+	$theme_compat['X'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.x-colophon.bottom{clear:both}#geodir-main-content,.geodir_flex-container{margin-top:16px}.geodir-x ul{list-style:none}.widget ul.geodir_category_list_view{border:none}.geodir_category_list_view li.geodir-gridview:last-child{border-bottom:1px solid #e1e1e1}.home .x-header-landmark{display:none}.geodir-x .x-main .geodir_advance_search_widget{margin:0}.geodir-x .top_banner_section{margin-bottom:0}.geodir-loc-bar{background:rgba(0,0,0,0.05);margin:0;padding:0}.geodir-loc-bar-in{background:none;border:none;padding:10px}.geodir-search{margin:0;width:100%}.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{border:1px solid #ccc;box-shadow:none;height:auto;line-height:21px;margin:0 1% 0 0;padding:5px 10px}.widget .geodir-search select,.geodir-search input[type="text"]{width:28%}.geodir-search input[type="submit"],.geodir-search input[type="button"]{line-height:19px;margin-right:0;width:11%}.geodir-search input:hover[type="submit"],.geodir-search input:hover[type="button"]{background:#333;color:#fff}.geodir-cat-list .widget-title{margin-top:0}.geodir-x .geodir-category-list-in{background:rgba(0,0,0,0.05);border:none}.widget .geodir-cat-list ul.geodir-popular-cat-list{border:none;border-radius:0;box-shadow:none}.geodir_full_page .geodir-cat-list ul li{border:none}.geodir_full_page .geodir-cat-list ul li a{border:none}.post-type-archive .geodir-loc-bar{border:none;margin-top:20px}#menu-item-gd-location-switcher dd{margin-left:0}.geodir-chosen-container-single .chosen-single{height:auto}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_full_page section.widget{clear:both}.x-ethos .entry-title{margin-bottom:20px}.x-ethos .geodir-chosen-container-single .chosen-single{padding:0 0 0 8px}.x-ethos .widget ul li a,.x-ethos .geodir_category_list_view li{color:#333}@media only screen and (max-width:767px){.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{margin:0 0 10px;width:100%}}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-loc-bar,.geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-category-list-in{border-bottom:1px solid rgba(0,0,0,0.1)}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'X'

+	);

 

 // Divi

-    $theme_compat['Divi'] = array(

-        'geodir_wrapper_open_id' => 'main-content',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => 'left-area',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '<div class="container"><div id="content-area" class="clearfix"><div id="[id]" class="[class]" role="main" >',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => 'sidebar',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_right_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

-        'geodir_sidebar_left_open_id' => 'sidebar',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_left_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('#left-area ul.geodir-direction-nav{list-style-type:none}#sidebar .geodir-company_info{margin-left:30px}#sidebar .geodir-widget{float:none;margin:0 0 30px 30px}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.archive .entry-header,.geodir-breadcrumb{border-bottom:1px solid #e2e2e2}.archive .entry-header h1,ul#breadcrumbs{padding:0 15px;width:100%}#left-area ul.geodir_category_list_view{padding:10px 0}.nav li#menu-item-gd-location-switcher ul{width:222px}#menu-item-gd-location-switcher li.gd-location-switcher-menu-item{padding-right:0}#menu-item-gd-location-switcher dd{margin-left:0}#menu-item-gd-location-switcher .geodir_location_tab_container dd a{padding:5px;width:auto}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type=button],.geodir_full_page .geodir-search input[type=submit],.geodir_full_page .geodir-search input[type=text],.geodir_full_page .geodir-search select{display:inline-block;float:none}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Divi'

-    );

+	$theme_compat['Divi'] = array(

+		'geodir_wrapper_open_id' => 'main-content',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => 'left-area',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '<div class="container"><div id="content-area" class="clearfix"><div id="[id]" class="[class]" role="main" >',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => 'sidebar',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_right_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

+		'geodir_sidebar_left_open_id' => 'sidebar',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_left_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('#left-area ul.geodir-direction-nav{list-style-type:none}#sidebar .geodir-company_info{margin-left:30px}#sidebar .geodir-widget{float:none;margin:0 0 30px 30px}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.archive .entry-header,.geodir-breadcrumb{border-bottom:1px solid #e2e2e2}.archive .entry-header h1,ul#breadcrumbs{padding:0 15px;width:100%}#left-area ul.geodir_category_list_view{padding:10px 0}.nav li#menu-item-gd-location-switcher ul{width:222px}#menu-item-gd-location-switcher li.gd-location-switcher-menu-item{padding-right:0}#menu-item-gd-location-switcher dd{margin-left:0}#menu-item-gd-location-switcher .geodir_location_tab_container dd a{padding:5px;width:auto}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type=button],.geodir_full_page .geodir-search input[type=submit],.geodir_full_page .geodir-search input[type=text],.geodir_full_page .geodir-search select{display:inline-block;float:none}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Divi'

+	);

 

 // Genesis

-    $theme_compat['Genesis'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => 'content-sidebar-wrap',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => 'content',

-        'geodir_wrapper_content_open_replace' => '<div class="[class]" role="main" >',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => 'sidebar sidebar-primary widget-area',

-        'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => 'sidebar sidebar-secondary widget-area',

-        'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<main  id="[id]" class="entry [class]"  role="main">',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-gd-location-switcher menu-item-has-children gd-location-switcher',

-        'geodir_theme_compat_css' => stripslashes('.full-width-content #geodir-wrapper-content{width:100%}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}.content{float:left}.sidebar-content .content,.sidebar-content #geodir-wrapper-content{float:right}.sidebar .geodir-company_info{background-color:#fff;border:none}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.geodir-breadcrumb-bar{margin-bottom:-35px} .search-page .entry-title,.listings-page .entry-title{font-size: 20px;}.site-inner .geodir-breadcrumb-bar{margin-bottom:0px}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Genesis'

-    );

+	$theme_compat['Genesis'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => 'content-sidebar-wrap',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => 'content',

+		'geodir_wrapper_content_open_replace' => '<div class="[class]" role="main" >',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => 'sidebar sidebar-primary widget-area',

+		'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => 'sidebar sidebar-secondary widget-area',

+		'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<main  id="[id]" class="entry [class]"  role="main">',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-gd-location-switcher menu-item-has-children gd-location-switcher',

+		'geodir_theme_compat_css' => stripslashes('.full-width-content #geodir-wrapper-content{width:100%}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}.content{float:left}.sidebar-content .content,.sidebar-content #geodir-wrapper-content{float:right}.sidebar .geodir-company_info{background-color:#fff;border:none}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.geodir-breadcrumb-bar{margin-bottom:-35px} .search-page .entry-title,.listings-page .entry-title{font-size: 20px;}.site-inner .geodir-breadcrumb-bar{margin-bottom:0px}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Genesis'

+	);

 

 // Jupiter

-    $theme_compat['Jupiter'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '<div id="theme-page"><div class="mk-main-wrapper-holder"><div  class="theme-page-wrapper mk-main-wrapper  mk-grid vc_row-fluid">',

-        'geodir_wrapper_close_replace' => '</div></div></div>',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => 'mk-sidebar',

-        'geodir_sidebar_right_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

-        'geodir_sidebar_right_open_replace' => '',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => 'mk-sidebar',

-        'geodir_sidebar_left_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

-        'geodir_sidebar_left_open_replace' => '',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_before_title_filter' => '<h3 class="widgettitle geodir-widget-title">',

-        'geodir_after_title_filter' => '',

-        'geodir_menu_li_class_filter' => 'menu-item menu-item-has-children no-mega-menu',

-        'geodir_sub_menu_ul_class_filter' => '',

-        'geodir_sub_menu_li_class_filter' => '',

-        'geodir_menu_a_class_filter' => 'menu-item-link',

-        'geodir_sub_menu_a_class_filter' => 'menu-item-link one-page-nav-item',

-        'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher menu-item-has-children no-mega-menu',

-        'geodir_location_switcher_menu_a_class_filter' => 'menu-item-link',

-        'geodir_location_switcher_menu_sub_ul_class_filter' => '',

-        'geodir_location_switcher_menu_sub_li_class_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.geodir-widget li,.geodir_category_list_view li{margin:0}#theme-page h3.geodir-entry-title{font-size:14px}#menu-item-gd-location-switcher dd{line-height:44px}#menu-item-gd-location-switcher .geodir_location_sugestion{line-height:20px}.geodir_loginbox{overflow:visible}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Jupiter'

-    );

+	$theme_compat['Jupiter'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '<div id="theme-page"><div class="mk-main-wrapper-holder"><div  class="theme-page-wrapper mk-main-wrapper  mk-grid vc_row-fluid">',

+		'geodir_wrapper_close_replace' => '</div></div></div>',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => 'mk-sidebar',

+		'geodir_sidebar_right_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

+		'geodir_sidebar_right_open_replace' => '',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => 'mk-sidebar',

+		'geodir_sidebar_left_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

+		'geodir_sidebar_left_open_replace' => '',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_before_title_filter' => '<h3 class="widgettitle geodir-widget-title">',

+		'geodir_after_title_filter' => '',

+		'geodir_menu_li_class_filter' => 'menu-item menu-item-has-children no-mega-menu',

+		'geodir_sub_menu_ul_class_filter' => '',

+		'geodir_sub_menu_li_class_filter' => '',

+		'geodir_menu_a_class_filter' => 'menu-item-link',

+		'geodir_sub_menu_a_class_filter' => 'menu-item-link one-page-nav-item',

+		'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher menu-item-has-children no-mega-menu',

+		'geodir_location_switcher_menu_a_class_filter' => 'menu-item-link',

+		'geodir_location_switcher_menu_sub_ul_class_filter' => '',

+		'geodir_location_switcher_menu_sub_li_class_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.geodir-widget li,.geodir_category_list_view li{margin:0}#theme-page h3.geodir-entry-title{font-size:14px}#menu-item-gd-location-switcher dd{line-height:44px}#menu-item-gd-location-switcher .geodir_location_sugestion{line-height:20px}.geodir_loginbox{overflow:visible}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Jupiter'

+	);

 

 // Multi News

-    $theme_compat['Multi_News'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => 'main-container clearfix',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '<div class="main-left" ><div class="main-content  "><div class="site-content page-wrap">',

-        'geodir_wrapper_content_close_replace' => '</div></div></div>',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside  class="sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  class="secondary-sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<div class="site-content page-wrap">',

-        'geodir_main_content_close_replace' => '</div>',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_full_page_class_filter' => 'section full-width-section',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_before_title_filter' => '<div class="widget-title"><h2>',

-        'geodir_after_title_filter' => '</h2></div>',

-        'geodir_menu_li_class_filter' => '',

-        'geodir_sub_menu_ul_class_filter' => '',

-        'geodir_sub_menu_li_class_filter' => '',

-        'geodir_menu_a_class_filter' => '',

-        'geodir_sub_menu_a_class_filter' => '',

-        'geodir_location_switcher_menu_li_class_filter' => '',

-        'geodir_location_switcher_menu_a_class_filter' => '',

-        'geodir_location_switcher_menu_sub_ul_class_filter' => '',

-        'geodir_location_switcher_menu_sub_li_class_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.full-width-section .geodir-search{margin:0;width:100%}.geodir_full_page .geodir-search{margin:0 auto;float:none}.geodir-search input[type=button],.geodir-search input[type=submit]{width:13%}.geodir-search input[type=text]{border:1px solid #ddd;border-radius:0;padding:0 8px}.geodir-category-list-in,.geodir-loc-bar-in{background:#f2f2f2;border-color:#dbdbdb}.geodir-category-list-in{margin-top:0}.geodir-cat-list .widget-title h2{margin:-13px -13px 13px}.widget .geodir-cat-list ul li.geodir-pcat-show a:before{display:none!important}.widget .geodir-cat-list ul li.geodir-pcat-show i{margin-right:5px}.container .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#geodir_carousel,#geodir_slider{border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;margin-bottom:20px!important;border:1px solid #e1e1e1;box-shadow:none}#geodir_carousel{padding:10px}.geodir-tabs-content ol.commentlist{margin:40px 0;padding:0}li#post_mapTab{min-height:400px}#reviewsTab ol.commentlist li{border-bottom:none}#reviewsTab ol.commentlist li article.comment{border-bottom:1px solid #e1e1e1;padding-bottom:10px}.comment-content .rating{display:none}.comment-respond .gd_rating{margin-bottom:20px}div.geodir-rating{width:85px!important}.comment-respond .comment-notes{margin-bottom:10px}.average-review span,.comment-form label,.dtreviewed,.geodir-details-sidebar-user-links a,.geodir-viewall,.geodir_more_info span,.reviewer,dl.geodir-tab-head dd a{font-family:"Archivo Narrow",sans-serif}section.comment-content{margin:0 0 0 12%}#reviewsTab .comments-area .comment-content{width:auto}section.comment-content .description,section.comment-content p{margin:15px 0}dl.geodir-tab-head dd a{background:#f3f3f3;margin-top:-1px;font-size:14px;padding:0 15px}dl.geodir-tab-head dd.geodir-tab-active a{padding-bottom:1px}.geodir-widget .geodir_list_heading,.geodir-widget h3.widget-title{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px;color:#2d2d2d}.geodir-widget .geodir_list_heading h3{background:0 0;border:none}.geodir-widget .geodir_list_heading{margin:-13px -14px 13px}.geodir-map-listing-page{border-width:1px 0 0;border-style:solid;border-color:#dbdbdb}.geodir-sidebar-wrap .geodir-company_info{margin:15px}.geodir-details-sidebar-social-sharing iframe{float:left}.geodir-details-sidebar-rating{overflow:hidden}.geodir-details-sidebar-rating .gd_rating_show,.geodir-details-sidebar-rating .geodir-rating{float:left;margin-right:15px}.geodir-details-sidebar-rating span.item{float:left;margin-top:5px}.geodir-details-sidebar-rating .average-review{top:-4px;position:relative}.geodir-details-sidebar-rating span.item img{margin-top:5px}.geodir_full_page{background:#fff;border:1px solid #e1e1e1;-webkit-box-shadow:0 1px 0 #e5e5e5;box-shadow:0 1px 0 #e5e5e5;padding:15px;margin-bottom:20px;clear:both}.geodir_map_container .main_list img{margin:0 5px}.geodir_category_list_view li.geodir-gridview .geodir-post-img .geodir_thumbnail{margin-bottom:10px}.geodir-addinfo .geodir-pinpoint,.geodir-addinfo a i{margin-right:5px}.geodir_category_list_view li.geodir-gridview h3{font-size:18px;margin-bottom:10px}#related_listingTab ul.geodir_category_list_view{padding:0!important}#reviewsTab #comments .gd_rating{margin-top:5px}.widget .geodir_category_list_view li .geodir-entry-content,.widget .geodir_category_list_view li a:before{display:none!important}.geodir_category_list_view li .geodir-entry-title{margin-bottom:10px}.widget ul.geodir_category_list_view{padding:15px}.sidebar .widget .geodir_category_list_view li{width:calc(100% - 25px)}.widget .geodir-loginbox-list li{overflow:visible!important}.widget ul.chosen-results{margin:0!important}.main_list_selecter{margin-right:5px}.geodir-viewall{float:right;width:auto!important}.widget-title h2{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px}.widget:first-child .geodir_list_heading .widget-title{margin-top:0}.geodir_list_heading .widget-title{float:left;width:80%;margin-top:0}.geodir_list_heading .widget-title h2{padding:0 px;background:0 0;border:none;height:auto;line-height:auto}.chosen-default:before{content:none;display:none;position:absolute;margin-left:-1000000px;float:left}#geodir-wrapper .entry-crumbs{margin-bottom:20px}.geodir-search .mom-select{float:left;width:150px;margin:5px;border:1px solid #ddd;height:40px}.iprelative .gm-style .gm-style-iw{width:100%!important}'),

-        'geodir_theme_compat_js' => 'jQuery(document).ready(function(e){e(".geodir_full_page").length&&""===e.trim(e(".geodir_full_page").html())&&e(".geodir_full_page").css({display:"none"})});',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Multi_News'

-    );

-

-    // Kelo

-    $theme_compat['Kleo'] = array(

-        'geodir_theme_compat_code' => 'Kleo'

-    );

-

-

-    // Twenty Seventeen

-    $theme_compat['Twenty_Seventeen'] = array(

-        'geodir_wrapper_open_replace' => '<div class="wrap">',

-        'geodir_wrapper_content_open_replace' => '<div id="primary" class="content-area" >',

-        'geodir_sidebar_right_open_replace' => '<aside id="secondary"  class="widget-area" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_left_open_replace' => '<aside id="secondary"  class="widget-area" itemscope itemtype="[itemtype]" >',

-        'geodir_theme_compat_css' => stripslashes('body.geodir-page #primary header.entry-header {margin-left:0;float:none !important;} .gxeodir_flex-container{float:left;} .geodir-tabs-content.entry-content{width:100% !important;} dl.geodir-tab-head, .geodir_map_container {z-index:2;} .geodir-cat-list ul.geodir-popular-cat-list  li + li {    margin-top: 0;} .geodir-cat-list .geodir-popular-cat-list a img, .entry-content .gm-style a img, .widget .gm-style a img {    box-sizing: none; -webkit-box-shadow: none; -moz-box-shadow: none;}'),

-        'geodir_theme_compat_code' => 'Twenty_Seventeen'

-    );

-

-    // buddyBoss

-    $theme_compat['Boss.'] = array(

-        'geodir_wrapper_open_replace' => '<div class="page-right-sidebar">',

-        'geodir_wrapper_content_open_replace' => '<div id="primary" class="site-content">',

-        'geodir_article_open_replace' => '<div  id="[id]" class="[class]" itemscope itemtype="[itemtype]">',

-        'geodir_article_close_replace' => '</div>',

-        'geodir_sidebar_right_open_replace' => '<div id="secondary" class="widget-area" >',

-        'geodir_sidebar_right_close_replace' => '</div>',

-        'geodir_sidebar_left_open_replace' => '<div id="secondary" class="widget-area" >',

-        'geodir_sidebar_left_close_replace' => '</div>',

-        'geodir_theme_compat_css' => stripslashes('.geodir-breadcrumb{padding-top:20px;border-bottom:1px solid #ddd;padding-bottom:0} article.geodir-category-listing{padding: 0 !important;}'),

-        'geodir_theme_compat_code' => 'BuddyBoss'

-

-

-    );

-

-    // Flatsome

-    $theme_compat['Flatsome'] = array(

-        'geodir_wrapper_open_replace' => '<div class="page-wrapper page-right-sidebar"><div class="row">',

-        'geodir_wrapper_close_replace' => '</div></div>',

-        'geodir_wrapper_content_open_replace' => '<div id="content" class="large-9 left col col-divided" role="main"><div class="page-inner">',

-        'geodir_wrapper_content_close_replace' => '</div></div>',

-        'geodir_sidebar_right_open_replace' => '<div class="large-3 col"><div id="secondary" class="widget-area " role="complementary">',

-        'geodir_sidebar_right_close_replace' => '</div></div>',

-        'geodir_sidebar_left_open_replace' => '<div class="large-3 col"><div id="secondary" class="widget-area " role="complementary">',

-        'geodir_sidebar_left_close_replace' => '</div></div>',

-        'geodir_menu_li_class_filter' => 'menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children  has-dropdown',

-        'geodir_sub_menu_ul_class_filter' => 'nav-dropdown nav-dropdown-default gd-nav-dropdown',

-        'geodir_sub_menu_li_class_filter' => 'menu-item menu-item-type-custom menu-item-object-custom',

-        'geodir_menu_a_class_filter' => 'nav-top-link gd-nav-top-link',

-        'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher has-dropdown',

-        'geodir_location_switcher_menu_sub_ul_class_filter' => 'nav-dropdown nav-dropdown-default',

-        'geodir_theme_compat_css' => stripslashes('dl.geodir_location_tabs_head dt{margin:0;}.header{z-index:90;}'),

-        'geodir_theme_compat_js' => stripslashes('jQuery(function(){jQuery("#masthead .gd-nav-top-link").append(\'<i class="icon-angle-down"></i>\'),jQuery("#menu-item-gd-location-switcher >  a").append(\'<i class="icon-angle-down"></i>\'),jQuery(".mobile-sidebar .gd-nav-dropdown").addClass("children"),jQuery(".mobile-sidebar .gd-nav-dropdown").removeClass("nav-dropdown nav-dropdown-default"),jQuery(".mobile-sidebar #menu-item-gd-location-switcher ul").removeClass("nav-dropdown nav-dropdown-default"),setTimeout(function(){},5e3)});'),

-

-

-    );

-

-

-    update_option('gd_theme_compats', $theme_compat);

-

-    gd_set_theme_compat();// set the compat pack if avail

+	$theme_compat['Multi_News'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => 'main-container clearfix',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '<div class="main-left" ><div class="main-content  "><div class="site-content page-wrap">',

+		'geodir_wrapper_content_close_replace' => '</div></div></div>',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside  class="sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  class="secondary-sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<div class="site-content page-wrap">',

+		'geodir_main_content_close_replace' => '</div>',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_full_page_class_filter' => 'section full-width-section',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_before_title_filter' => '<div class="widget-title"><h2>',

+		'geodir_after_title_filter' => '</h2></div>',

+		'geodir_menu_li_class_filter' => '',

+		'geodir_sub_menu_ul_class_filter' => '',

+		'geodir_sub_menu_li_class_filter' => '',

+		'geodir_menu_a_class_filter' => '',

+		'geodir_sub_menu_a_class_filter' => '',

+		'geodir_location_switcher_menu_li_class_filter' => '',

+		'geodir_location_switcher_menu_a_class_filter' => '',

+		'geodir_location_switcher_menu_sub_ul_class_filter' => '',

+		'geodir_location_switcher_menu_sub_li_class_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.full-width-section .geodir-search{margin:0;width:100%}.geodir_full_page .geodir-search{margin:0 auto;float:none}.geodir-search input[type=button],.geodir-search input[type=submit]{width:13%}.geodir-search input[type=text]{border:1px solid #ddd;border-radius:0;padding:0 8px}.geodir-category-list-in,.geodir-loc-bar-in{background:#f2f2f2;border-color:#dbdbdb}.geodir-category-list-in{margin-top:0}.geodir-cat-list .widget-title h2{margin:-13px -13px 13px}.widget .geodir-cat-list ul li.geodir-pcat-show a:before{display:none!important}.widget .geodir-cat-list ul li.geodir-pcat-show i{margin-right:5px}.container .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#geodir_carousel,#geodir_slider{border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;margin-bottom:20px!important;border:1px solid #e1e1e1;box-shadow:none}#geodir_carousel{padding:10px}.geodir-tabs-content ol.commentlist{margin:40px 0;padding:0}li#post_mapTab{min-height:400px}#reviewsTab ol.commentlist li{border-bottom:none}#reviewsTab ol.commentlist li article.comment{border-bottom:1px solid #e1e1e1;padding-bottom:10px}.comment-content .rating{display:none}.comment-respond .gd_rating{margin-bottom:20px}div.geodir-rating{width:85px!important}.comment-respond .comment-notes{margin-bottom:10px}.average-review span,.comment-form label,.dtreviewed,.geodir-details-sidebar-user-links a,.geodir-viewall,.geodir_more_info span,.reviewer,dl.geodir-tab-head dd a{font-family:"Archivo Narrow",sans-serif}section.comment-content{margin:0 0 0 12%}#reviewsTab .comments-area .comment-content{width:auto}section.comment-content .description,section.comment-content p{margin:15px 0}dl.geodir-tab-head dd a{background:#f3f3f3;margin-top:-1px;font-size:14px;padding:0 15px}dl.geodir-tab-head dd.geodir-tab-active a{padding-bottom:1px}.geodir-widget .geodir_list_heading,.geodir-widget h3.widget-title{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px;color:#2d2d2d}.geodir-widget .geodir_list_heading h3{background:0 0;border:none}.geodir-widget .geodir_list_heading{margin:-13px -14px 13px}.geodir-map-listing-page{border-width:1px 0 0;border-style:solid;border-color:#dbdbdb}.geodir-sidebar-wrap .geodir-company_info{margin:15px}.geodir-details-sidebar-social-sharing iframe{float:left}.geodir-details-sidebar-rating{overflow:hidden}.geodir-details-sidebar-rating .gd_rating_show,.geodir-details-sidebar-rating .geodir-rating{float:left;margin-right:15px}.geodir-details-sidebar-rating span.item{float:left;margin-top:5px}.geodir-details-sidebar-rating .average-review{top:-4px;position:relative}.geodir-details-sidebar-rating span.item img{margin-top:5px}.geodir_full_page{background:#fff;border:1px solid #e1e1e1;-webkit-box-shadow:0 1px 0 #e5e5e5;box-shadow:0 1px 0 #e5e5e5;padding:15px;margin-bottom:20px;clear:both}.geodir_map_container .main_list img{margin:0 5px}.geodir_category_list_view li.geodir-gridview .geodir-post-img .geodir_thumbnail{margin-bottom:10px}.geodir-addinfo .geodir-pinpoint,.geodir-addinfo a i{margin-right:5px}.geodir_category_list_view li.geodir-gridview h3{font-size:18px;margin-bottom:10px}#related_listingTab ul.geodir_category_list_view{padding:0!important}#reviewsTab #comments .gd_rating{margin-top:5px}.widget .geodir_category_list_view li .geodir-entry-content,.widget .geodir_category_list_view li a:before{display:none!important}.geodir_category_list_view li .geodir-entry-title{margin-bottom:10px}.widget ul.geodir_category_list_view{padding:15px}.sidebar .widget .geodir_category_list_view li{width:calc(100% - 25px)}.widget .geodir-loginbox-list li{overflow:visible!important}.widget ul.chosen-results{margin:0!important}.main_list_selecter{margin-right:5px}.geodir-viewall{float:right;width:auto!important}.widget-title h2{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px}.widget:first-child .geodir_list_heading .widget-title{margin-top:0}.geodir_list_heading .widget-title{float:left;width:80%;margin-top:0}.geodir_list_heading .widget-title h2{padding:0 px;background:0 0;border:none;height:auto;line-height:auto}.chosen-default:before{content:none;display:none;position:absolute;margin-left:-1000000px;float:left}#geodir-wrapper .entry-crumbs{margin-bottom:20px}.geodir-search .mom-select{float:left;width:150px;margin:5px;border:1px solid #ddd;height:40px}.iprelative .gm-style .gm-style-iw{width:100%!important}'),

+		'geodir_theme_compat_js' => 'jQuery(document).ready(function(e){e(".geodir_full_page").length&&""===e.trim(e(".geodir_full_page").html())&&e(".geodir_full_page").css({display:"none"})});',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Multi_News'

+	);

+

+	// Kelo

+	$theme_compat['Kleo'] = array(

+		'geodir_theme_compat_code' => 'Kleo'

+	);

+

+

+	// Twenty Seventeen

+	$theme_compat['Twenty_Seventeen'] = array(

+		'geodir_wrapper_open_replace' => '<div class="wrap">',

+		'geodir_wrapper_content_open_replace' => '<div id="primary" class="content-area" >',

+		'geodir_sidebar_right_open_replace' => '<aside id="secondary"  class="widget-area" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_left_open_replace' => '<aside id="secondary"  class="widget-area" itemscope itemtype="[itemtype]" >',

+		'geodir_theme_compat_css' => stripslashes('body.geodir-page #primary header.entry-header {margin-left:0;float:none !important;} .gxeodir_flex-container{float:left;} .geodir-tabs-content.entry-content{width:100% !important;} dl.geodir-tab-head, .geodir_map_container {z-index:2;} .geodir-cat-list ul.geodir-popular-cat-list  li + li {    margin-top: 0;} .geodir-cat-list .geodir-popular-cat-list a img, .entry-content .gm-style a img, .widget .gm-style a img {    box-sizing: none; -webkit-box-shadow: none; -moz-box-shadow: none;}'),

+		'geodir_theme_compat_code' => 'Twenty_Seventeen'

+	);

+

+	// buddyBoss

+	$theme_compat['Boss.'] = array(

+		'geodir_wrapper_open_replace' => '<div class="page-right-sidebar">',

+		'geodir_wrapper_content_open_replace' => '<div id="primary" class="site-content">',

+		'geodir_article_open_replace' => '<div  id="[id]" class="[class]" itemscope itemtype="[itemtype]">',

+		'geodir_article_close_replace' => '</div>',

+		'geodir_sidebar_right_open_replace' => '<div id="secondary" class="widget-area" >',

+		'geodir_sidebar_right_close_replace' => '</div>',

+		'geodir_sidebar_left_open_replace' => '<div id="secondary" class="widget-area" >',

+		'geodir_sidebar_left_close_replace' => '</div>',

+		'geodir_theme_compat_css' => stripslashes('.geodir-breadcrumb{padding-top:20px;border-bottom:1px solid #ddd;padding-bottom:0} article.geodir-category-listing{padding: 0 !important;}'),

+		'geodir_theme_compat_code' => 'BuddyBoss'

+

+

+	);

+

+	// Flatsome

+	$theme_compat['Flatsome'] = array(

+		'geodir_wrapper_open_replace' => '<div class="page-wrapper page-right-sidebar"><div class="row">',

+		'geodir_wrapper_close_replace' => '</div></div>',

+		'geodir_wrapper_content_open_replace' => '<div id="content" class="large-9 left col col-divided" role="main"><div class="page-inner">',

+		'geodir_wrapper_content_close_replace' => '</div></div>',

+		'geodir_sidebar_right_open_replace' => '<div class="large-3 col"><div id="secondary" class="widget-area " role="complementary">',

+		'geodir_sidebar_right_close_replace' => '</div></div>',

+		'geodir_sidebar_left_open_replace' => '<div class="large-3 col"><div id="secondary" class="widget-area " role="complementary">',

+		'geodir_sidebar_left_close_replace' => '</div></div>',

+		'geodir_menu_li_class_filter' => 'menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children  has-dropdown',

+		'geodir_sub_menu_ul_class_filter' => 'nav-dropdown nav-dropdown-default gd-nav-dropdown',

+		'geodir_sub_menu_li_class_filter' => 'menu-item menu-item-type-custom menu-item-object-custom',

+		'geodir_menu_a_class_filter' => 'nav-top-link gd-nav-top-link',

+		'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher has-dropdown',

+		'geodir_location_switcher_menu_sub_ul_class_filter' => 'nav-dropdown nav-dropdown-default',

+		'geodir_theme_compat_css' => stripslashes('dl.geodir_location_tabs_head dt{margin:0;}.header{z-index:90;}'),

+		'geodir_theme_compat_js' => stripslashes('jQuery(function(){jQuery("#masthead .gd-nav-top-link").append(\'<i class="icon-angle-down"></i>\'),jQuery("#menu-item-gd-location-switcher >  a").append(\'<i class="icon-angle-down"></i>\'),jQuery(".mobile-sidebar .gd-nav-dropdown").addClass("children"),jQuery(".mobile-sidebar .gd-nav-dropdown").removeClass("nav-dropdown nav-dropdown-default"),jQuery(".mobile-sidebar #menu-item-gd-location-switcher ul").removeClass("nav-dropdown nav-dropdown-default"),setTimeout(function(){},5e3)});'),

+

+

+	);

+

+

+	update_option('gd_theme_compats', $theme_compat);

+

+	gd_set_theme_compat();// set the compat pack if avail

 }

 

 

@@ -774,61 +774,61 @@ 
  * @global object $wpdb WordPress Database object.

  */

 function gd_convert_virtual_pages(){

-    global $wpdb;

-

-    // Update the add listing page settings

-    $add_listing_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('add-listing')

-        )

-    );

-

-    if($add_listing_page){

-        wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

-        update_option( 'geodir_add_listing_page', $add_listing_page);

-    }

-

-    // Update the listing preview page settings

-    $listing_preview_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('listing-preview')

-        )

-    );

-

-    if($listing_preview_page){

-        wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

-        update_option( 'geodir_preview_page', $listing_preview_page);

-    }

-

-    // Update the listing success page settings

-    $listing_success_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('listing-success')

-        )

-    );

-

-    if($listing_success_page){

-        wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

-        update_option( 'geodir_success_page', $listing_success_page);

-    }

-

-    // Update the listing success page settings

-    $location_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('location')

-        )

-    );

-

-    if($location_page){

-        $location_slug = get_option('geodir_location_prefix');

-        if(!$location_slug ){$location_slug  = 'location';}

-        wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

-        update_option( 'geodir_location_page', $location_page);

-    }

+	global $wpdb;

+

+	// Update the add listing page settings

+	$add_listing_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('add-listing')

+		)

+	);

+

+	if($add_listing_page){

+		wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

+		update_option( 'geodir_add_listing_page', $add_listing_page);

+	}

+

+	// Update the listing preview page settings

+	$listing_preview_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('listing-preview')

+		)

+	);

+

+	if($listing_preview_page){

+		wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

+		update_option( 'geodir_preview_page', $listing_preview_page);

+	}

+

+	// Update the listing success page settings

+	$listing_success_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('listing-success')

+		)

+	);

+

+	if($listing_success_page){

+		wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

+		update_option( 'geodir_success_page', $listing_success_page);

+	}

+

+	// Update the listing success page settings

+	$location_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('location')

+		)

+	);

+

+	if($location_page){

+		$location_slug = get_option('geodir_location_prefix');

+		if(!$location_slug ){$location_slug  = 'location';}

+		wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

+		update_option( 'geodir_location_page', $location_page);

+	}

 

 }

 

@@ -842,31 +842,31 @@ 
 function gd_fix_cpt_rewrite_slug()

 {

 

-    $alt_post_types = array();

-    $post_types = get_option('geodir_post_types');

+	$alt_post_types = array();

+	$post_types = get_option('geodir_post_types');

 

 

-    if (is_array($post_types)){

+	if (is_array($post_types)){

 

-        foreach ($post_types as $post_type => $args) {

+		foreach ($post_types as $post_type => $args) {

 

 

-            if(isset($args['rewrite']['slug'])){

-                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

-            }

+			if(isset($args['rewrite']['slug'])){

+				$args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

+			}

 

-                $alt_post_types[$post_type] = $args;

+				$alt_post_types[$post_type] = $args;

 

-        }

-    }

+		}

+	}

 

-    if(!empty($alt_post_types)) {

-        update_option('geodir_post_types',$alt_post_types);

-        }

+	if(!empty($alt_post_types)) {

+		update_option('geodir_post_types',$alt_post_types);

+		}

 

 

-    // flush the rewrite rules

-    flush_rewrite_rules();

+	// flush the rewrite rules

+	flush_rewrite_rules();

 }

 

 

@@ -879,20 +879,20 @@ 
  */

 function gd_fix_address_detail_table_limit()

 {

-    global $wpdb;

-

-    $all_postypes = geodir_get_posttypes();

-

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            try {

-                $wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

-            } catch(Exception $e) {

-                error_log( 'Error: ' . $e->getMessage() );

-            }

-        }

-    }

+	global $wpdb;

+

+	$all_postypes = geodir_get_posttypes();

+

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			try {

+				$wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

+			} catch(Exception $e) {

+				error_log( 'Error: ' . $e->getMessage() );

+			}

+		}

+	}

 }

 

 /**

@@ -904,63 +904,63 @@ 
  * @return bool

  */

 function geodir_upgrade_1618() {

-    global $wpdb;

+	global $wpdb;

 

-    $gd_posttypes = geodir_get_posttypes();

-    $default_location = geodir_get_default_location();

+	$gd_posttypes = geodir_get_posttypes();

+	$default_location = geodir_get_default_location();

     

-    $old_country = 'Czech Republic';

-    $old_slug = 'czech-republic';

-    $new_country = 'Czechia';

-    $new_slug = 'czechia';

-    $flush_rewrite_rules = false;

-

-    if (!empty($gd_posttypes) && defined('POST_LOCATION_TABLE')) {        

-        // Update locations

-        if ($wpdb->query($wpdb->prepare("UPDATE `" . POST_LOCATION_TABLE . "` SET `country` = %s, country_slug = %s WHERE `country` LIKE %s OR country_slug LIKE %s", array($new_country, $new_slug, $old_country, $old_slug)))) {

-            $flush_rewrite_rules = true;

-        }

+	$old_country = 'Czech Republic';

+	$old_slug = 'czech-republic';

+	$new_country = 'Czechia';

+	$new_slug = 'czechia';

+	$flush_rewrite_rules = false;

+

+	if (!empty($gd_posttypes) && defined('POST_LOCATION_TABLE')) {        

+		// Update locations

+		if ($wpdb->query($wpdb->prepare("UPDATE `" . POST_LOCATION_TABLE . "` SET `country` = %s, country_slug = %s WHERE `country` LIKE %s OR country_slug LIKE %s", array($new_country, $new_slug, $old_country, $old_slug)))) {

+			$flush_rewrite_rules = true;

+		}

         

-        // Update locations seo

-        if ($wpdb->query($wpdb->prepare("UPDATE `" . LOCATION_SEO_TABLE . "` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {

-            $flush_rewrite_rules = true;

-        }

-

-        // Update term meta

-        if ($wpdb->query($wpdb->prepare("UPDATE `" . GEODIR_TERM_META . "` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {

-            $flush_rewrite_rules = true;

-        }

-

-        if ($wpdb->query($wpdb->prepare("UPDATE `" . GEODIR_TERM_META . "` SET `location_name` = %s WHERE location_type LIKE 'gd_country' AND location_name LIKE %s", array($new_slug, $old_slug)))) {

-            $flush_rewrite_rules = true;

-        }

-

-        // Update detail table

-        foreach ($gd_posttypes as $pos_type) {

-            try {

-                if ($wpdb->query("UPDATE `" . $wpdb->prefix . "geodir_" . $pos_type . "_detail` SET post_country = '" . $new_country . "', post_locations = REPLACE ( post_locations, ',[" . $old_slug . "]', ',[" . $new_slug . "]' ) WHERE post_locations LIKE '%[" . $old_slug . "]' OR post_country LIKE '" . $old_country . "'")) {

-                    $flush_rewrite_rules = true;

-                }

-            } catch(Exception $e) {

-                error_log( 'Error: ' . $e->getMessage() );

-            }

-        }

-    }

+		// Update locations seo

+		if ($wpdb->query($wpdb->prepare("UPDATE `" . LOCATION_SEO_TABLE . "` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {

+			$flush_rewrite_rules = true;

+		}

+

+		// Update term meta

+		if ($wpdb->query($wpdb->prepare("UPDATE `" . GEODIR_TERM_META . "` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {

+			$flush_rewrite_rules = true;

+		}

+

+		if ($wpdb->query($wpdb->prepare("UPDATE `" . GEODIR_TERM_META . "` SET `location_name` = %s WHERE location_type LIKE 'gd_country' AND location_name LIKE %s", array($new_slug, $old_slug)))) {

+			$flush_rewrite_rules = true;

+		}

+

+		// Update detail table

+		foreach ($gd_posttypes as $pos_type) {

+			try {

+				if ($wpdb->query("UPDATE `" . $wpdb->prefix . "geodir_" . $pos_type . "_detail` SET post_country = '" . $new_country . "', post_locations = REPLACE ( post_locations, ',[" . $old_slug . "]', ',[" . $new_slug . "]' ) WHERE post_locations LIKE '%[" . $old_slug . "]' OR post_country LIKE '" . $old_country . "'")) {

+					$flush_rewrite_rules = true;

+				}

+			} catch(Exception $e) {

+				error_log( 'Error: ' . $e->getMessage() );

+			}

+		}

+	}

     

-    if (!empty($default_location) && ((isset($default_location->country) && $default_location->country == $old_country) || (isset($default_location->country_slug) && $default_location->country_slug == $old_slug))) {

-        $default_location->country = $new_country;

-        $default_location->country_slug = $new_slug;

+	if (!empty($default_location) && ((isset($default_location->country) && $default_location->country == $old_country) || (isset($default_location->country_slug) && $default_location->country_slug == $old_slug))) {

+		$default_location->country = $new_country;

+		$default_location->country_slug = $new_slug;

         

-        update_option('geodir_default_location', $default_location);

+		update_option('geodir_default_location', $default_location);

         

-        $flush_rewrite_rules = true;

-    }

+		$flush_rewrite_rules = true;

+	}

     

-    if ($flush_rewrite_rules) {

-        flush_rewrite_rules();

-    }

+	if ($flush_rewrite_rules) {

+		flush_rewrite_rules();

+	}

     

-    return true;

+	return true;

 }

 

 /**

@@ -971,9 +971,9 @@ 
  * @return bool

  */

 function geodir_upgrade_1622() {

-    if ( get_option( 'geodir_notify_post_submit', '-1' ) == '-1' ) {

-        update_option( 'geodir_notify_post_submit', '1' );

-    }

+	if ( get_option( 'geodir_notify_post_submit', '-1' ) == '-1' ) {

+		update_option( 'geodir_notify_post_submit', '1' );

+	}

     

-    return true;

+	return true;

 }
\ No newline at end of file

Spacing +67 added lines, -67 removed lines

@@ -9,7 +9,7 @@ 
 

 global $wpdb;

 

-if (get_option('geodirectory' . '_db_version') != GEODIRECTORY_VERSION) {

+if (get_option('geodirectory'.'_db_version') != GEODIRECTORY_VERSION) {

     /**

      * Include custom database table related functions.

      *

@@ -54,9 +54,9 @@ 
         add_action('init', 'geodir_upgrade_1622', 11);

     }

 

-    add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

+    add_action('init', 'gd_fix_cpt_rewrite_slug', 11); // this needs to be kept for a few versions

 

-    update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

+    update_option('geodirectory'.'_db_version', GEODIRECTORY_VERSION);

 

 }

 

@@ -92,7 +92,7 @@ 
  * @since 1.0.0

  * @package GeoDirectory

  */

-function geodir_upgrade_146(){

+function geodir_upgrade_146() {

     gd_convert_virtual_pages();

 }

 

@@ -102,7 +102,7 @@ 
  * @since 1.5.0

  * @package GeoDirectory

  */

-function geodir_upgrade_150(){

+function geodir_upgrade_150() {

     gd_fix_cpt_rewrite_slug();

 }

 

@@ -114,12 +114,12 @@ 
  * @since 1.4.8

  * @package GeoDirectory

  */

-function geodir_upgrade_148(){

+function geodir_upgrade_148() {

     /*

      * Blank the users google password if present as we now use oAuth 2.0

      */

-    update_option('geodir_ga_pass','');

-    update_option('geodir_ga_user','');

+    update_option('geodir_ga_pass', '');

+    update_option('geodir_ga_user', '');

 

 }

 

@@ -130,7 +130,7 @@ 
  * @since 1.5.3

  * @package GeoDirectory

  */

-function geodir_upgrade_153(){

+function geodir_upgrade_153() {

     geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

     geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 }

@@ -141,7 +141,7 @@ 
  * @since 1.5.3

  * @package GeoDirectory

  */

-function geodir_upgrade_154(){

+function geodir_upgrade_154() {

     geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

 }

 

@@ -151,7 +151,7 @@ 
  * @since 1.5.2

  * @package GeoDirectory

  */

-function geodir_upgrade_152(){

+function geodir_upgrade_152() {

     gd_fix_address_detail_table_limit();

 }

 

@@ -187,7 +187,7 @@ 
 function geodir_fix_review_date()

 {

     global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

+    $wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

 }

 

 /**

@@ -200,7 +200,7 @@ 
 function geodir_fix_review_post_status()

 {

     global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

+    $wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

 }

 

 /**

@@ -214,7 +214,7 @@ 
 function geodir_fix_review_content()

 {

     global $wpdb;

-    if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

+    if ($wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

         return true;

     } else {

         return false;

@@ -239,7 +239,7 @@ 
         foreach ($all_postypes as $key) {

             // update each GD CTP

 

-            $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

+            $wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN ".$wpdb->prefix."geodir_".$key."_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

 

         }

         return true;

@@ -263,7 +263,7 @@ 
     if (!empty($all_postypes)) {

         foreach ($all_postypes as $key) {

             // update each GD CTP

-            $reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

+            $reviews = $wpdb->get_results("SELECT post_id FROM ".$wpdb->prefix."geodir_".$key."_detail d");

 

             if (!empty($reviews)) {

                 foreach ($reviews as $post_id) {

@@ -278,51 +278,51 @@ 
 }

 

 

-function gd_convert_custom_field_display(){

+function gd_convert_custom_field_display() {

     global $wpdb;

 

-    $field_info = $wpdb->get_results("select * from " . GEODIR_CUSTOM_FIELDS_TABLE);

+    $field_info = $wpdb->get_results("select * from ".GEODIR_CUSTOM_FIELDS_TABLE);

 

     $has_run = get_option('gd_convert_custom_field_display');

-    if($has_run){return;}

+    if ($has_run) {return; }

 

     // set the field_type_key for standard fields

     $wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET field_type_key = field_type");

 

 

-    if(is_array( $field_info)){

+    if (is_array($field_info)) {

 

-        foreach( $field_info as $cf){

+        foreach ($field_info as $cf) {

 

             $id = $cf->id;

 

-            if(!property_exists($cf,'show_in') || !$id){return;}

+            if (!property_exists($cf, 'show_in') || !$id) {return; }

 

             $show_in_arr = array();

 

-            if($cf->is_default){

+            if ($cf->is_default) {

                 $show_in_arr[] = "[detail]";

             }

 

-            if($cf->show_on_detail){

+            if ($cf->show_on_detail) {

                 $show_in_arr[] = "[moreinfo]";

             }

 

-            if($cf->show_on_listing){

+            if ($cf->show_on_listing) {

                 $show_in_arr[] = "[listing]";

             }

 

-            if($cf->show_as_tab || $cf->htmlvar_name=='geodir_video' || $cf->htmlvar_name=='geodir_special_offers'){

+            if ($cf->show_as_tab || $cf->htmlvar_name == 'geodir_video' || $cf->htmlvar_name == 'geodir_special_offers') {

                 $show_in_arr[] = "[owntab]";

             }

 

-            if($cf->htmlvar_name=='post' || $cf->htmlvar_name=='geodir_contact' || $cf->htmlvar_name=='geodir_timing'){

+            if ($cf->htmlvar_name == 'post' || $cf->htmlvar_name == 'geodir_contact' || $cf->htmlvar_name == 'geodir_timing') {

                 $show_in_arr[] = "[mapbubble]";

             }

 

-            if(!empty($show_in_arr )){

-                $show_in_arr = implode(',',$show_in_arr);

-            }else{

+            if (!empty($show_in_arr)) {

+                $show_in_arr = implode(',', $show_in_arr);

+            } else {

                 $show_in_arr = '';

             }

 

@@ -330,7 +330,7 @@ 
 

         }

 

-        update_option('gd_convert_custom_field_display',1);

+        update_option('gd_convert_custom_field_display', 1);

     }

 }

 

@@ -762,7 +762,7 @@ 
 

     update_option('gd_theme_compats', $theme_compat);

 

-    gd_set_theme_compat();// set the compat pack if avail

+    gd_set_theme_compat(); // set the compat pack if avail

 }

 

 

@@ -773,61 +773,61 @@ 
  * @package GeoDirectory

  * @global object $wpdb WordPress Database object.

  */

-function gd_convert_virtual_pages(){

+function gd_convert_virtual_pages() {

     global $wpdb;

 

     // Update the add listing page settings

     $add_listing_page = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

             array('add-listing')

         )

     );

 

-    if($add_listing_page){

-        wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

-        update_option( 'geodir_add_listing_page', $add_listing_page);

+    if ($add_listing_page) {

+        wp_update_post(array('ID' => $add_listing_page, 'post_status' => 'publish'));

+        update_option('geodir_add_listing_page', $add_listing_page);

     }

 

     // Update the listing preview page settings

     $listing_preview_page = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

             array('listing-preview')

         )

     );

 

-    if($listing_preview_page){

-        wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

-        update_option( 'geodir_preview_page', $listing_preview_page);

+    if ($listing_preview_page) {

+        wp_update_post(array('ID' => $listing_preview_page, 'post_status' => 'publish'));

+        update_option('geodir_preview_page', $listing_preview_page);

     }

 

     // Update the listing success page settings

     $listing_success_page = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

             array('listing-success')

         )

     );

 

-    if($listing_success_page){

-        wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

-        update_option( 'geodir_success_page', $listing_success_page);

+    if ($listing_success_page) {

+        wp_update_post(array('ID' => $listing_success_page, 'post_status' => 'publish'));

+        update_option('geodir_success_page', $listing_success_page);

     }

 

     // Update the listing success page settings

     $location_page = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

             array('location')

         )

     );

 

-    if($location_page){

+    if ($location_page) {

         $location_slug = get_option('geodir_location_prefix');

-        if(!$location_slug ){$location_slug  = 'location';}

-        wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

-        update_option( 'geodir_location_page', $location_page);

+        if (!$location_slug) {$location_slug = 'location'; }

+        wp_update_post(array('ID' => $location_page, 'post_status' => 'publish', 'post_name' => $location_slug));

+        update_option('geodir_location_page', $location_page);

     }

 

 }

@@ -846,13 +846,13 @@ 
     $post_types = get_option('geodir_post_types');

 

 

-    if (is_array($post_types)){

+    if (is_array($post_types)) {

 

         foreach ($post_types as $post_type => $args) {

 

 

-            if(isset($args['rewrite']['slug'])){

-                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

+            if (isset($args['rewrite']['slug'])) {

+                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%", "", $args['rewrite']['slug']);

             }

 

                 $alt_post_types[$post_type] = $args;

@@ -860,8 +860,8 @@ 
         }

     }

 

-    if(!empty($alt_post_types)) {

-        update_option('geodir_post_types',$alt_post_types);

+    if (!empty($alt_post_types)) {

+        update_option('geodir_post_types', $alt_post_types);

         }

 

 

@@ -887,9 +887,9 @@ 
         foreach ($all_postypes as $key) {

             // update each GD CTP

             try {

-                $wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

-            } catch(Exception $e) {

-                error_log( 'Error: ' . $e->getMessage() );

+                $wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_".$key."_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

+            } catch (Exception $e) {

+                error_log('Error: '.$e->getMessage());

             }

         }

     }

@@ -917,32 +917,32 @@ 
 

     if (!empty($gd_posttypes) && defined('POST_LOCATION_TABLE')) {        

         // Update locations

-        if ($wpdb->query($wpdb->prepare("UPDATE `" . POST_LOCATION_TABLE . "` SET `country` = %s, country_slug = %s WHERE `country` LIKE %s OR country_slug LIKE %s", array($new_country, $new_slug, $old_country, $old_slug)))) {

+        if ($wpdb->query($wpdb->prepare("UPDATE `".POST_LOCATION_TABLE."` SET `country` = %s, country_slug = %s WHERE `country` LIKE %s OR country_slug LIKE %s", array($new_country, $new_slug, $old_country, $old_slug)))) {

             $flush_rewrite_rules = true;

         }

         

         // Update locations seo

-        if ($wpdb->query($wpdb->prepare("UPDATE `" . LOCATION_SEO_TABLE . "` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {

+        if ($wpdb->query($wpdb->prepare("UPDATE `".LOCATION_SEO_TABLE."` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {

             $flush_rewrite_rules = true;

         }

 

         // Update term meta

-        if ($wpdb->query($wpdb->prepare("UPDATE `" . GEODIR_TERM_META . "` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {

+        if ($wpdb->query($wpdb->prepare("UPDATE `".GEODIR_TERM_META."` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {

             $flush_rewrite_rules = true;

         }

 

-        if ($wpdb->query($wpdb->prepare("UPDATE `" . GEODIR_TERM_META . "` SET `location_name` = %s WHERE location_type LIKE 'gd_country' AND location_name LIKE %s", array($new_slug, $old_slug)))) {

+        if ($wpdb->query($wpdb->prepare("UPDATE `".GEODIR_TERM_META."` SET `location_name` = %s WHERE location_type LIKE 'gd_country' AND location_name LIKE %s", array($new_slug, $old_slug)))) {

             $flush_rewrite_rules = true;

         }

 

         // Update detail table

         foreach ($gd_posttypes as $pos_type) {

             try {

-                if ($wpdb->query("UPDATE `" . $wpdb->prefix . "geodir_" . $pos_type . "_detail` SET post_country = '" . $new_country . "', post_locations = REPLACE ( post_locations, ',[" . $old_slug . "]', ',[" . $new_slug . "]' ) WHERE post_locations LIKE '%[" . $old_slug . "]' OR post_country LIKE '" . $old_country . "'")) {

+                if ($wpdb->query("UPDATE `".$wpdb->prefix."geodir_".$pos_type."_detail` SET post_country = '".$new_country."', post_locations = REPLACE ( post_locations, ',[".$old_slug."]', ',[".$new_slug."]' ) WHERE post_locations LIKE '%[".$old_slug."]' OR post_country LIKE '".$old_country."'")) {

                     $flush_rewrite_rules = true;

                 }

-            } catch(Exception $e) {

-                error_log( 'Error: ' . $e->getMessage() );

+            } catch (Exception $e) {

+                error_log('Error: '.$e->getMessage());

             }

         }

     }

@@ -971,8 +971,8 @@ 
  * @return bool

  */

 function geodir_upgrade_1622() {

-    if ( get_option( 'geodir_notify_post_submit', '-1' ) == '-1' ) {

-        update_option( 'geodir_notify_post_submit', '1' );

+    if (get_option('geodir_notify_post_submit', '-1') == '-1') {

+        update_option('geodir_notify_post_submit', '1');

     }

     

     return true;

geodirectory-functions/custom_fields_functions.php

Doc Comments +6 added lines, -4 removed lines

@@ -1345,6 +1345,9 @@ 
 }

 

 

+/**
+ * @return string
+ */
 function geodir_field_icon_proccess($cf){

 

 

@@ -1738,7 +1741,7 @@ 
  * @global object $wpdb WordPress Database object.

  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @param int $post_id The post ID.

- * @return mixed Returns video.

+ * @return string Returns video.

  */

 function geodir_get_video($post_id)

 {

@@ -1764,7 +1767,7 @@ 
  * @global object $wpdb WordPress Database object.

  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @param int $post_id The post ID.

- * @return mixed Returns special offers.

+ * @return string Returns special offers.

  */

 function geodir_get_special_offers($post_id)

 {

@@ -1788,7 +1791,7 @@ 
      *

      * @since 1.0.0

      * @package GeoDirectory

-     * @return mixed|void Returns max upload file size.

+     * @return string|null Returns max upload file size.

      */

     function geodir_max_upload_size()

     {

@@ -2157,7 +2160,6 @@ 
      * @param string $field_type The form field type.

      * @param object|int $result_str The custom field results object or row id.

      * @param string $field_ins_upd When set to "submit" displays form.

-     * @param bool $default when set to true field will be for admin use only.

      */

     function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')

     {

Braces +133 added lines, -92 removed lines

@@ -51,8 +51,9 @@ 
         global $wpdb;

         $result = 0;// no rows affected

         if (!geodir_column_exist($db, $column)) {

-            if (!empty($db) && !empty($column))

-                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

+            if (!empty($db) && !empty($column)) {
+                            $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
+            }
         }

         return $result;

     }

@@ -82,10 +83,11 @@ 
 

     $default_query = '';

 

-    if ($default == 'default')

-        $default_query .= " and is_admin IN ('1') ";

-    elseif ($default == 'custom')

-        $default_query .= " and is_admin = '0' ";

+    if ($default == 'default') {
+            $default_query .= " and is_admin IN ('1') ";
+    } elseif ($default == 'custom') {
+            $default_query .= " and is_admin = '0' ";
+    }
 

     if ($fields_location == 'none') {

     } else{

@@ -239,10 +241,12 @@ 
                 }

 

                 return $field_id;

-            } else

-                return 0;

-        } else

-            return 0;

+            } else {
+                            return 0;
+            }
+        } else {
+                    return 0;
+        }
     }

 }

 

@@ -350,7 +354,9 @@ 
 

 

 

-            if ($post_type == '') $post_type = 'gd_place';

+            if ($post_type == '') {
+            	$post_type = 'gd_place';
+            }
 

 

             $detail_table = $plugin_prefix . $post_type . '_detail';

@@ -390,16 +396,17 @@ 
             }

 

             $option_values = '';

-            if (isset($request_field['option_values']))

-                $option_values = $request_field['option_values'];

+            if (isset($request_field['option_values'])) {
+                            $option_values = $request_field['option_values'];
+            }
 

             $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0';

 

             $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0';

 

-            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))

-                $price_pkg = implode(",", $request_field['show_on_pkg']);

-            else {

+            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) {
+                            $price_pkg = implode(",", $request_field['show_on_pkg']);
+            } else {

                 $package_info = array();

 

                 $package_info = geodir_post_package_info($package_info, '', $post_type);

@@ -407,22 +414,29 @@ 
             }

 

 

-            if (isset($request_field['extra']) && !empty($request_field['extra']))

-                $extra_fields = $request_field['extra'];

+            if (isset($request_field['extra']) && !empty($request_field['extra'])) {
+                            $extra_fields = $request_field['extra'];
+            }
 

-            if (isset($request_field['is_default']) && $request_field['is_default'] != '')

-                $is_default = $request_field['is_default'];

-            else

-                $is_default = '0';

+            if (isset($request_field['is_default']) && $request_field['is_default'] != '') {
+                            $is_default = $request_field['is_default'];
+            } else {
+                            $is_default = '0';
+            }
 

-            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')

-                $is_admin = $request_field['is_admin'];

-            else

-                $is_admin = '0';

+            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') {
+                            $is_admin = $request_field['is_admin'];
+            } else {
+                            $is_admin = '0';
+            }
 

 

-            if ($is_active == '') $is_active = 1;

-            if ($is_required == '') $is_required = 0;

+            if ($is_active == '') {
+            	$is_active = 1;
+            }
+            if ($is_required == '') {
+            	$is_required = 0;
+            }
 

 

             if ($sort_order == '') {

@@ -691,7 +705,7 @@ 
                                 }

                                 if($op_max){$op_size =$op_max; }

                             }

-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

+                        } elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

                             if(strlen($option_values)){

                                 $op_size =  strlen($option_values);

                             }

@@ -708,11 +722,13 @@ 
                             return __('Column change failed, you may have too many columns.','geodirectory');

                         }

 

-                        if (isset($request_field['cat_display_type']))

-                            $extra_fields = $request_field['cat_display_type'];

+                        if (isset($request_field['cat_display_type'])) {
+                                                    $extra_fields = $request_field['cat_display_type'];
+                        }
 

-                        if (isset($request_field['multi_display_type']))

-                            $extra_fields = $request_field['multi_display_type'];

+                        if (isset($request_field['multi_display_type'])) {
+                                                    $extra_fields = $request_field['multi_display_type'];
+                        }
 

 

                         break;

@@ -726,8 +742,9 @@ 
                         if($alter_result===false){

                             return __('Column change failed, you may have too many columns.','geodirectory');

                         }

-                        if (isset($request_field['advanced_editor']))

-                            $extra_fields = $request_field['advanced_editor'];

+                        if (isset($request_field['advanced_editor'])) {
+                                                    $extra_fields = $request_field['advanced_editor'];
+                        }
 

                         break;

 

@@ -823,8 +840,9 @@ 
                 );

 

 

-                if ($cat_sort == '')

-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

+                if ($cat_sort == '') {
+                                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
+                }
 

 

                 /**

@@ -1194,8 +1212,10 @@ 
         }

 

         return $post_meta_info;

-    else:

-        return false;

+    else {
+    	:

+        return false;
+    }
     endif;

 }

 

@@ -1272,8 +1292,9 @@ 
         if (is_admin()) {

             global $post;

 

-            if (isset($_REQUEST['post']))

-                $_REQUEST['pid'] = $_REQUEST['post'];

+            if (isset($_REQUEST['post'])) {
+                            $_REQUEST['pid'] = $_REQUEST['post'];
+            }
         }

 

         

@@ -1365,7 +1386,7 @@ 
         $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

     } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {

         $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';

-    }else{

+    } else{

         $field_icon = $cf['field_icon'];

     }

 

@@ -1437,8 +1458,9 @@ 
                     $variables_array['post_id'] = !empty($post->ID) ? $post->ID : (!empty($post->pid) ? $post->pid : NULL);

                     $variables_array['label'] = __($type['site_title'], 'geodirectory');

                     $variables_array['value'] = '';

-                    if (isset($post->{$type['htmlvar_name']}))

-                        $variables_array['value'] = $post->{$type['htmlvar_name']};

+                    if (isset($post->{$type['htmlvar_name']})) {
+                                            $variables_array['value'] = $post->{$type['htmlvar_name']};
+                    }
                 endif;

 

 

@@ -1460,7 +1482,9 @@ 
                      * @param string $html Custom field unfiltered HTML.

                      * @param array $variables_array Custom field variables array.

                      */

-                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);

+                    if ($html) {
+                    	echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
+                    }
 

                     /**

                      * Called after a custom fields is output on the frontend.

@@ -1503,10 +1527,11 @@ 
      */

     function geodir_default_date_format()

     {

-        if ($format = get_option('date_format'))

-            return $format;

-        else

-            return 'dd-mm-yy';

+        if ($format = get_option('date_format')) {
+                    return $format;
+        } else {
+                    return 'dd-mm-yy';
+        }
     }

 }

 

@@ -1613,11 +1638,13 @@ 
                     // Set an array containing a list of acceptable formats

                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

-                    if (!function_exists('wp_handle_upload'))

-                        require_once(ABSPATH . 'wp-admin/includes/file.php');

+                    if (!function_exists('wp_handle_upload')) {
+                                            require_once(ABSPATH . 'wp-admin/includes/file.php');
+                    }
 

-                    if (!is_dir($geodir_uploadpath))

-                        mkdir($geodir_uploadpath);

+                    if (!is_dir($geodir_uploadpath)) {
+                                            mkdir($geodir_uploadpath);
+                    }
 

                     $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

                     $explode_sub_dir = explode("/", $sub_dir);

@@ -1630,16 +1657,19 @@ 
                     }

 

                     $uploaded_file = '';

-                    if (file_exists($img_path))

-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+                    if (file_exists($img_path)) {
+                                            $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
+                    }
 

                     if ($curr_img_dir != $geodir_uploaddir) {

-                        if (file_exists($img_path))

-                            unlink($img_path);

+                        if (file_exists($img_path)) {
+                                                    unlink($img_path);
+                        }
                     }

 

-                    if (!empty($uploaded_file))

-                        $file_urls = $geodir_uploadurl . '/' . $new_name;

+                    if (!empty($uploaded_file)) {
+                                            $file_urls = $geodir_uploadurl . '/' . $new_name;
+                    }
 

                 } else {

                     $file_urls = $post_image[$m];

@@ -1660,8 +1690,9 @@ 
 

         geodir_save_post_meta($post_id, $field_id, $file_urls);

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

+        if (!empty($invalid_files)) {
+                    geodir_remove_attachments($invalid_files);
+        }
 

     }

 }

@@ -1887,8 +1918,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

-        if (!in_array($post_type, $all_postypes))

-            return false;

+        if (!in_array($post_type, $all_postypes)) {
+                    return false;
+        }
 

         $fields = array();

 

@@ -1986,8 +2018,10 @@ 
         }

 

         return $field_ids;

-    else:

-        return false;

+    else {
+    	:

+        return false;
+    }
     endif;

 }

 

@@ -2160,8 +2194,9 @@ 
 

             return $field_id;

 

-        } else

-            return 0;

+        } else {
+                    return 0;
+        }
 

     }

 }

@@ -2202,8 +2237,9 @@ 
         $htmlvar_name = isset($field_type_key) ? $field_type_key : '';

 

         $site_title = '';

-        if ($site_title == '')

-            $site_title = isset($field_info->site_title) ? $field_info->site_title : '';

+        if ($site_title == '') {
+                    $site_title = isset($field_info->site_title) ? $field_info->site_title : '';
+        }
 

         if ($site_title == '') {

             $fields = geodir_get_custom_sort_options($post_type);

@@ -2217,8 +2253,9 @@ 
             }

         }

 

-        if ($htmlvar_name == '')

-            $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

+        if ($htmlvar_name == '') {
+                    $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
+        }
 

         $nonce = wp_create_nonce('custom_fields_' . $result_str);

 

@@ -2231,7 +2268,7 @@ 
 

                 if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {

                     $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';

-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){

+                } elseif(isset($cso['field_icon']) && $cso['field_icon']){

                     $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';

                 }

 

@@ -2667,7 +2704,7 @@ 
     $dt_value = '';

     if (isset($field_info->data_type)) {

         $dt_value  = esc_attr($field_info->data_type);

-    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

+    } elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

         $dt_value  = $cf['defaults']['data_type'];

     }

     ?>

@@ -2699,7 +2736,7 @@ 
     $value = '';

     if (isset($field_info->decimal_point)) {

         $value = esc_attr($field_info->decimal_point);

-    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){

+    } elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){

         $value = $cf['defaults']['decimal_point'];

     }

     ?>

@@ -2771,11 +2808,13 @@ 
 

             <?php

             $selected = '';

-            if (isset($field_info->extra_fields))

-                $advanced_editor = unserialize($field_info->extra_fields);

+            if (isset($field_info->extra_fields)) {
+                            $advanced_editor = unserialize($field_info->extra_fields);
+            }
 

-            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))

-                $selected = 'checked="checked"';

+            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor)) {
+                            $selected = 'checked="checked"';
+            }
             ?>

 

             <input type="checkbox" name="advanced_editor[]" id="advanced_editor"

@@ -2797,7 +2836,7 @@ 
     $value = '';

     if (isset($field_info->validation_pattern)) {

         $value = esc_attr($field_info->validation_pattern);

-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){

+    } elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){

         $value = esc_attr($cf['defaults']['validation_pattern']);

     }

     ?>

@@ -2817,7 +2856,7 @@ 
     $value = '';

     if (isset($field_info->validation_msg)) {

         $value = esc_attr($field_info->validation_msg);

-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){

+    } elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){

         $value = esc_attr($cf['defaults']['validation_msg']);

     }

     ?>

@@ -2847,8 +2886,9 @@ 
 

     if (!isset($field_info->post_type)) {

         $post_type = sanitize_text_field($_REQUEST['listing_type']);

-    } else

-        $post_type = $field_info->post_type;

+    } else {
+            $post_type = $field_info->post_type;
+    }
     ?>

     <li style="display: none;">

         <label for="htmlvar_name" class="gd-cf-tooltip-wrap">

@@ -3122,7 +3162,7 @@ 
     $value = '';

     if (isset($field_info->option_values)) {

         $value = esc_attr($field_info->option_values);

-    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){

+    } elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){

         $value = esc_attr($cf['defaults']['option_values']);

     }

 

@@ -3265,7 +3305,7 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['is_price'])) {

     $value = esc_attr($extra_fields['is_price']);

-    }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){

+    } elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){

     $value = esc_attr($cf['defaults']['extra_fields']['is_price']);

     }

 

@@ -3302,7 +3342,7 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['thousand_separator'])) {

         $value = esc_attr($extra_fields['thousand_separator']);

-    }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){

+    } elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){

         $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']);

     }

     ?>

@@ -3329,7 +3369,7 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['decimal_separator'])) {

         $value = esc_attr($extra_fields['decimal_separator']);

-    }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){

+    } elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){

         $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']);

     }

     ?>

@@ -3352,7 +3392,7 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['decimal_display'])) {

         $value = esc_attr($extra_fields['decimal_display']);

-    }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){

+    } elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){

         $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']);

     }

     ?>

@@ -3375,7 +3415,7 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['currency_symbol'])) {

         $value = esc_attr($extra_fields['currency_symbol']);

-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){

+    } elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){

         $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']);

     }

     ?>

@@ -3396,7 +3436,7 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {

         $value = esc_attr($extra_fields['currency_symbol_placement']);

-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){

+    } elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){

         $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']);

     }

     ?>

@@ -3623,8 +3663,9 @@ 
     $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';

 

     if($decimals>0 && $decimal_display=='if'){

-        if(is_int($number) || floor( $number ) == $number)

-            $decimals = 0;

+        if(is_int($number) || floor( $number ) == $number) {
+                    $decimals = 0;
+        }
     }

 

     $number = number_format($number,$decimals,$decimalpoint,$separator);

@@ -3633,7 +3674,7 @@ 
 

     if($currency_symbol_placement=='left'){

         $number = $symbol . $number;

-    }else{

+    } else{

         $number = $number . $symbol;

     }

 

Spacing +412 added lines, -412 removed lines

@@ -49,7 +49,7 @@ 
     function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

     {

         global $wpdb;

-        $result = 0;// no rows affected

+        $result = 0; // no rows affected

         if (!geodir_column_exist($db, $column)) {

             if (!empty($db) && !empty($column))

                 $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

@@ -74,7 +74,7 @@ 
 {

     global $wpdb, $geodir_post_custom_fields_cache;

 

-    $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;

+    $cache_stored = $post_type.'_'.$package_id.'_'.$default.'_'.$fields_location;

 

     if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {

         return $geodir_post_custom_fields_cache[$cache_stored];

@@ -88,14 +88,14 @@ 
         $default_query .= " and is_admin = '0' ";

 

     if ($fields_location == 'none') {

-    } else{

-        $fields_location = esc_sql( $fields_location );

+    } else {

+        $fields_location = esc_sql($fields_location);

         $default_query .= " and show_in LIKE '%%[$fields_location]%%' ";

     }

 

     $post_meta_info = $wpdb->get_results(

         $wpdb->prepare(

-            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

+            "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

             array($post_type)

         )

     );

@@ -162,13 +162,13 @@ 
      * @param string $field_ins_upd When set to "submit" displays form.

      * @param string $field_type_key The key of the custom field.

      */

-    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')

+    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '')

     {

         global $wpdb;

         $cf = $result_str;

         if (!is_object($cf)) {

 

-            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));

+            $field_info = $wpdb->get_row($wpdb->prepare("select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)));

 

         } else {

             $field_info = $cf;

@@ -202,14 +202,14 @@ 
         if ($field_id != '') {

             $cf = trim($field_id, '_');

 

-            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

-                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

+            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)))) {

+                $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d ", array($cf)));

 

                 $post_type = $field->post_type;

                 $htmlvar_name = $field->htmlvar_name;

 

                 if ($post_type != '' && $htmlvar_name != '') {

-                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

+                    $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

                 }

 

                 /**

@@ -223,18 +223,18 @@ 
                 do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);

 

                 if ($field->field_type == 'address') {

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_address`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_city`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_region`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_country`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_zip`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_latitude`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_longitude`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapview`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapzoom`");

                 } else {

                     if ($field->field_type != 'fieldset') {

-                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");

+                        $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."`");

                     }

                 }

 

@@ -305,7 +305,7 @@ 
         $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

 

         // some servers fail if a POST value is VARCHAR so we change it.

-        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){

+        if (isset($request_field['data_type']) && $request_field['data_type'] == 'XVARCHAR') {

             $request_field['data_type'] = 'VARCHAR';

         }

 

@@ -318,12 +318,12 @@ 
         $post_type = $request_field['listing_type'];

 

         if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {

-            $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;

+            $cehhtmlvar_name = 'geodir_'.$cehhtmlvar_name;

         }

 

         $check_html_variable = $wpdb->get_var(

             $wpdb->prepare(

-                "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",

+                "select htmlvar_name from ".GEODIR_CUSTOM_FIELDS_TABLE." where id <> %d and htmlvar_name = %s and post_type = %s ",

                 array($cf, $cehhtmlvar_name, $post_type)

             )

         );

@@ -335,7 +335,7 @@ 
 

                 $post_meta_info = $wpdb->get_row(

                     $wpdb->prepare(

-                        "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",

+                        "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id = %d",

                         array($cf)

                     )

                 );

@@ -353,7 +353,7 @@ 
             if ($post_type == '') $post_type = 'gd_place';

 

 

-            $detail_table = $plugin_prefix . $post_type . '_detail';

+            $detail_table = $plugin_prefix.$post_type.'_detail';

 

             $admin_title = $request_field['admin_title'];

             $site_title = $request_field['site_title'];

@@ -381,12 +381,12 @@ 
             $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';

 

             

-            if(is_array($show_in)){

+            if (is_array($show_in)) {

                 $show_in = implode(",", $request_field['show_in']);

             }

             

             if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {

-                $htmlvar_name = 'geodir_' . $htmlvar_name;

+                $htmlvar_name = 'geodir_'.$htmlvar_name;

             }

 

             $option_values = '';

@@ -427,9 +427,9 @@ 
 

             if ($sort_order == '') {

 

-                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);

+                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM ".GEODIR_CUSTOM_FIELDS_TABLE);

 

-                $sort_order = (int)$last_order + 1;

+                $sort_order = (int) $last_order + 1;

             }

 

             $default_value_add = '';

@@ -441,15 +441,15 @@ 
                     case 'address':

 

                         if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

+                            $prefix = $htmlvar_name.'_';

                         }

-                        $old_prefix = $old_html_variable . '_';

+                        $old_prefix = $old_html_variable.'_';

 

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";

+                        $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."address` `".$prefix."address` VARCHAR( 254 ) NULL";

 

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

                         $wpdb->query($meta_field_add);

@@ -458,12 +458,12 @@ 
 

                             if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."city'");

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."city` `".$prefix."city` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

@@ -471,9 +471,9 @@ 
 

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add);

 

                                 }

 

@@ -483,36 +483,36 @@ 
 

                             if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."region'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."region` `".$prefix."region` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add);

                                 }

 

                             }

                             if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."country'");

 

                                 if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."country` `".$prefix."country` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

@@ -520,24 +520,24 @@ 
 

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add);

 

                                 }

 

                             }

                             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."zip'");

 

                                 if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."zip` `".$prefix."zip` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

@@ -545,128 +545,128 @@ 
 

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add);

 

                                 }

 

                             }

                             if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latitude'");

                                 if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latitude` `".$prefix."latitude` VARCHAR( 20 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL";

                                     $meta_field_add = "VARCHAR( 20 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add);

 

                                 }

 

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."longitude'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."longitude` `".$prefix."longitude` VARCHAR( 20 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL";

                                     $meta_field_add = "VARCHAR( 20 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add);

                                 }

 

                             }

                             if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapview'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapview` `".$prefix."mapview` VARCHAR( 15 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL";

 

                                     $meta_field_add = "VARCHAR( 15 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add);

                                 }

 

 

                             }

                             if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapzoom'");

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapzoom` `".$prefix."mapzoom` VARCHAR( 3 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

 

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL";

 

                                     $meta_field_add = "VARCHAR( 3 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add);

                                 }

 

                             }

                             // show lat lng

                             if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latlng'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latlng` `".$prefix."latlng` VARCHAR( 3 ) NULL";

                                     $meta_field_add .= " DEFAULT '1'";

 

                                     $wpdb->query($meta_field_add);

                                 } else {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL";

 

                                     $meta_field_add = "VARCHAR( 3 ) NULL";

                                     $meta_field_add .= " DEFAULT '1'";

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add);

                                 }

 

                             }

@@ -682,30 +682,30 @@ 
                         $op_size = '500';

 

                         // only make the field as big as it needs to be.

-                        if(isset($option_values) && $option_values && $field_type=='select'){

-                            $option_values_arr = explode(',',$option_values);

-                            if(is_array($option_values_arr)){

+                        if (isset($option_values) && $option_values && $field_type == 'select') {

+                            $option_values_arr = explode(',', $option_values);

+                            if (is_array($option_values_arr)) {

                                 $op_max = 0;

-                                foreach($option_values_arr as $op_val){

-                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}

+                                foreach ($option_values_arr as $op_val) {

+                                    if (strlen($op_val) && strlen($op_val) > $op_max) {$op_max = strlen($op_val); }

                                 }

-                                if($op_max){$op_size =$op_max; }

+                                if ($op_max) {$op_size = $op_max; }

                             }

-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

-                            if(strlen($option_values)){

-                                $op_size =  strlen($option_values);

+                        }elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

+                            if (strlen($option_values)) {

+                                $op_size = strlen($option_values);

                             }

                         }

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";

+                        $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."`VARCHAR( $op_size ) NULL";

 

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

                         $alter_result = $wpdb->query($meta_field_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

 

                         if (isset($request_field['cat_display_type']))

@@ -722,9 +722,9 @@ 
                     case 'url':

                     case 'file':

 

-                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        $alter_result = $wpdb->query("ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` TEXT NULL");

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

                         if (isset($request_field['advanced_editor']))

                             $extra_fields = $request_field['advanced_editor'];

@@ -738,24 +738,24 @@ 
                     default:

                         if ($data_type != 'VARCHAR' && $data_type != '') {

                             if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";

+                                $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` DECIMAL(11, ".(int) $decimal_point.") NULL";

                             } else {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";

+                                $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` ".$data_type." NULL";

                             }

 

                             if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

                             }

                         } else {

-                            $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";

+                            $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` VARCHAR( 254 ) NULL";

                             if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

                             }

                         }

 

                         $alter_result = $wpdb->query($default_value_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

                         break;

                 endswitch;

@@ -771,7 +771,7 @@ 
 

                     $wpdb->prepare(

 

-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                        "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -805,7 +805,7 @@ 
 					for_admin_use = %s

 					where id = %d",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)

+                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use, $cf)

                     )

 

                 );

@@ -815,7 +815,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                        "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 					 	site_title=%s

 					where post_type = %s and htmlvar_name = %s",

                         array($site_title, $post_type, $htmlvar_name)

@@ -824,7 +824,7 @@ 
 

 

                 if ($cat_sort == '')

-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

+                    $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

 

 

                 /**

@@ -844,7 +844,7 @@ 
                         $data_type = '';

 

                         if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

+                            $prefix = $htmlvar_name.'_';

                         }

                         $old_prefix = $old_html_variable;

 

@@ -852,109 +852,109 @@ 
 

                         $meta_field_add = "VARCHAR( 254 ) NULL";

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

-                        geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);

+                        geodir_add_column_if_not_exist($detail_table, $prefix."address", $meta_field_add);

                         //$wpdb->query($meta_field_add);

 

 

                         if (!empty($extra_fields)) {

 

                             if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."city` VARCHAR( 30 ) NULL";

                                 $meta_field_add = "VARCHAR( 50 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."region` VARCHAR( 30 ) NULL";

                                 $meta_field_add = "VARCHAR( 50 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."country` VARCHAR( 30 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 30 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."zip` VARCHAR( 15 ) NULL";

                                 $meta_field_add = "VARCHAR( 15 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL";

                                 $meta_field_add = "VARCHAR( 20 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

 

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 20 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add);

 

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 15 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add);

 

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 3 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add);

 

                                 //$wpdb->query($meta_field_add);

                             }

                             // show lat lng

                             if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 3 ) NULL";

                                 $meta_field_add .= " DEFAULT '1'";

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                         }

@@ -964,8 +964,8 @@ 
                     case 'checkbox':

                         $data_type = 'TINYINT';

 

-                        $meta_field_add = $data_type . "( 1 ) NOT NULL ";

-                        if ((int)$default_value === 1) {

+                        $meta_field_add = $data_type."( 1 ) NOT NULL ";

+                        if ((int) $default_value === 1) {

                             $meta_field_add .= " DEFAULT '1'";

                         }

 

@@ -998,7 +998,7 @@ 
                             }

                         } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

                             if (strlen($option_values)) {

-                                $op_size =  strlen($option_values);

+                                $op_size = strlen($option_values);

                             }

 

                             if (isset($request_field['multi_display_type'])) {

@@ -1006,9 +1006,9 @@ 
                             }

                         }

 

-                        $meta_field_add = $data_type . "( $op_size ) NULL ";

+                        $meta_field_add = $data_type."( $op_size ) NULL ";

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

@@ -1023,9 +1023,9 @@ 
 

                         $data_type = 'TEXT';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+                        $meta_field_add = $data_type." NULL ";

                         /*if($default_value != '')

 					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/

 

@@ -1040,9 +1040,9 @@ 
 

                         $data_type = 'DATE';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+                        $meta_field_add = $data_type." NULL ";

 

                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

                         if ($add_result === false) {

@@ -1055,9 +1055,9 @@ 
 

                         $data_type = 'TIME';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+                        $meta_field_add = $data_type." NULL ";

 

                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

                         if ($add_result === false) {

@@ -1069,22 +1069,22 @@ 
                     default:

 

                         if ($data_type != 'VARCHAR' && $data_type != '') {

-                            $meta_field_add = $data_type . " NULL ";

+                            $meta_field_add = $data_type." NULL ";

 

                             if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";

+                                $meta_field_add = "DECIMAL(11, ".(int) $decimal_point.") NULL ";

                             }

 

                             if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

+                                $meta_field_add .= " DEFAULT '".$default_value."'";

                             }

                         } else {

                             $meta_field_add = " VARCHAR( 254 ) NULL ";

 

                             if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

+                                $meta_field_add .= " DEFAULT '".$default_value."'";

                             }

                         }

 

@@ -1106,7 +1106,7 @@ 
 

                     $wpdb->prepare(

 

-                        "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                        "insert into ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -1139,7 +1139,7 @@ 
 					validation_msg = %s,

 					for_admin_use = %s ",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)

+                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use)

 

                     )

 

@@ -1151,7 +1151,7 @@ 
 

             }

 

-            return (int)$lastid;

+            return (int) $lastid;

 

 

         } else {

@@ -1184,7 +1184,7 @@ 
 

             $post_meta_info = $wpdb->query(

                 $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                    "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 															sort_order=%d 

 															where id= %d",

                     array($count, $cf)

@@ -1206,7 +1206,7 @@ 
         global $post;

 

         if (isset($_REQUEST['post'])) {

-            $_REQUEST['pid'] = (int)$_REQUEST['post'];

+            $_REQUEST['pid'] = (int) $_REQUEST['post'];

         }

     }

 

@@ -1229,7 +1229,7 @@ 
      * @param mixed $value Custom field value.

      * @param array $cf Custom field info.

      */

-    return apply_filters( 'geodir_get_cf_value', $value, $cf );

+    return apply_filters('geodir_get_cf_value', $value, $cf);

 }

 

 /**

@@ -1255,16 +1255,16 @@ 
     $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);

 

     foreach ($custom_fields as $key => $val) {

-        if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}

+        if (isset($val['extra_fields'])) {$extra_fields = $val['extra_fields']; }

         $val = stripslashes_deep($val); // strip slashes from labels

-        if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}

+        if (isset($val['extra_fields'])) {$val['extra_fields'] = $extra_fields; }

 

         $name = $val['name'];

         $type = $val['type'];

         $is_default = $val['is_default'];

 

         /* field available to site admin only for edit */

-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;

+        $for_admin_use = isset($val['for_admin_use']) && (int) $val['for_admin_use'] == 1 ? true : false;

         if ($for_admin_use && !is_super_admin()) {

             continue;

         }

@@ -1289,11 +1289,11 @@ 
          * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

          * @see 'geodir_after_custom_form_field_$name'

          */

-        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);

+        do_action('geodir_before_custom_form_field_'.$name, $listing_type, $package_id, $val);

 

 

         $custom_field = $val;

-        $html ='';

+        $html = '';

         /**

          * Filter the output for custom fields.

          *

@@ -1302,7 +1302,7 @@ 
          * @param string $html The html to be filtered (blank).

          * @param array $custom_field The custom field array values.

          */

-        echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);

+        echo apply_filters("geodir_custom_field_input_{$type}", $html, $custom_field);

 

 

 

@@ -1317,7 +1317,7 @@ 
          * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

          * @see 'geodir_before_custom_form_field_$name'

          */

-        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);

+        do_action('geodir_after_custom_form_field_'.$name, $listing_type, $package_id, $val);

 

     }

 

@@ -1343,7 +1343,7 @@ 
 

         $filter = $wpdb->get_row(

             $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",

+                "SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND ".$key."='".$value."'",

                 array($geodir_post_type)

             )

         );

@@ -1358,14 +1358,14 @@ 
 }

 

 

-function geodir_field_icon_proccess($cf){

+function geodir_field_icon_proccess($cf) {

 

 

     if (strpos($cf['field_icon'], 'http') !== false) {

-        $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

+        $field_icon = ' background: url('.$cf['field_icon'].') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

     } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {

-        $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';

-    }else{

+        $field_icon = '<i class="'.$cf['field_icon'].'"></i>';

+    } else {

         $field_icon = $cf['field_icon'];

     }

 

@@ -1410,14 +1410,14 @@ 
 

 

             foreach ($fields_info as $type) {

-                if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}

+                if (isset($type['extra_fields'])) {$extra_fields = $type['extra_fields']; }

                 $type = stripslashes_deep($type); // strip slashes

-                if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}

+                if (isset($type['extra_fields'])) {$type['extra_fields'] = $extra_fields; }

                 $html = '';

                 $field_icon = geodir_field_icon_proccess($type);

                 $filed_type = $type['type'];

                 $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';

-                if($html_var=='post'){$html_var='post_address';}

+                if ($html_var == 'post') {$html_var = 'post_address'; }

 

                 /**

                  * Filter the output for custom fields.

@@ -1428,7 +1428,7 @@ 
                  * @param string $fields_location The location the field is to be show.

                  * @param array $type The array of field values.

                  */

-                $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);

+                $html = apply_filters("geodir_custom_field_output_{$filed_type}", $html, $fields_location, $type);

 

                 $variables_array = array();

 

@@ -1488,7 +1488,7 @@ 
          * @param string $fields_location The location the fields are being output.

          * @since 1.6.9

          */

-        return apply_filters('geodir_show_listing_info',$html,$fields_location);

+        return apply_filters('geodir_show_listing_info', $html, $fields_location);

 

     }

 }

@@ -1563,7 +1563,7 @@ 
 

         $post_type = get_post_type($post_id);

         //echo $field_id; exit;

-        $table = $plugin_prefix . $post_type . '_detail';

+        $table = $plugin_prefix.$post_type.'_detail';

 

         $postcurr_images = array();

         $postcurr_images = geodir_get_post_meta($post_id, $field_id, true);

@@ -1582,13 +1582,13 @@ 
             $geodir_uploadurl = $uploads['url'];

             $sub_dir = $uploads['subdir'];

 

-            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';

 

             for ($m = 0; $m < count($post_image); $m++) {

 

                 /* --------- start ------- */

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

+                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM ".$table." WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

 

 

                     $curr_img_url = $post_image[$m];

@@ -1614,24 +1614,24 @@ 
                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

                     if (!function_exists('wp_handle_upload'))

-                        require_once(ABSPATH . 'wp-admin/includes/file.php');

+                        require_once(ABSPATH.'wp-admin/includes/file.php');

 

                     if (!is_dir($geodir_uploadpath))

                         mkdir($geodir_uploadpath);

 

-                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

+                    $new_name = $post_id.'_'.$field_id.'_'.$img_name_arr[0].'.'.$img_name_arr[1];

                     $explode_sub_dir = explode("/", $sub_dir);

                     if ($curr_img_dir == end($explode_sub_dir)) {

-                        $img_path = $geodir_uploadpath . '/' . $filename;

-                        $img_url = $geodir_uploadurl . '/' . $filename;

+                        $img_path = $geodir_uploadpath.'/'.$filename;

+                        $img_url = $geodir_uploadurl.'/'.$filename;

                     } else {

-                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+                        $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;

+                        $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename;

                     }

 

                     $uploaded_file = '';

                     if (file_exists($img_path))

-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+                        $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name);

 

                     if ($curr_img_dir != $geodir_uploaddir) {

                         if (file_exists($img_path))

@@ -1639,7 +1639,7 @@ 
                     }

 

                     if (!empty($uploaded_file))

-                        $file_urls = $geodir_uploadurl . '/' . $new_name;

+                        $file_urls = $geodir_uploadurl.'/'.$new_name;

 

                 } else {

                     $file_urls = $post_image[$m];

@@ -1653,8 +1653,8 @@ 
         if (!empty($postcurr_images)) {

 

             if ($file_urls != $postcurr_images) {

-                $invalid_files[] = (object)array('src' => $postcurr_images);

-                $invalid_files = (object)$invalid_files;

+                $invalid_files[] = (object) array('src' => $postcurr_images);

+                $invalid_files = (object) $invalid_files;

             }

         }

 

@@ -1706,9 +1706,9 @@ 
     function geodir_upload_dir($upload)

     {

         global $current_user;

-        $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

-        $upload['path'] = $upload['basedir'] . $upload['subdir'];

-        $upload['url'] = $upload['baseurl'] . $upload['subdir'];

+        $upload['subdir'] = $upload['subdir'].'/temp_'.$current_user->data->ID;

+        $upload['path'] = $upload['basedir'].$upload['subdir'];

+        $upload['url'] = $upload['baseurl'].$upload['subdir'];

         return $upload;

     }

 

@@ -1723,20 +1723,20 @@ 
         // check ajax nonce

         $imgid = $_POST["imgid"];

 

-        check_ajax_referer($imgid . 'pluploadan');

+        check_ajax_referer($imgid.'pluploadan');

 

         // handle custom file uploaddir

         add_filter('upload_dir', 'geodir_upload_dir');

 

         // change file orientation if needed

-        $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);

+        $fixed_file = geodir_exif($_FILES[$imgid.'async-upload']);

 

         // handle file upload

         $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));

         // remove handle custom file uploaddir

         remove_filter('upload_dir', 'geodir_upload_dir');

 

-        if(!isset($status['url']) && isset($status['error'])){

+        if (!isset($status['url']) && isset($status['error'])) {

             print_r($status);

         }

 

@@ -1766,9 +1766,9 @@ 
 

     $post_type = get_post_type($post_id);

 

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));

+    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM ".$table." WHERE post_id=%d", array($post_id)));

 

     if ($results) {

         return $results[0]->geodir_video;

@@ -1792,9 +1792,9 @@ 
 

     $post_type = get_post_type($post_id);

 

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));

+    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM ".$table." WHERE post_id=%d", array($post_id)));

 

     if ($results) {

         return $results[0]->geodir_special_offers;

@@ -1812,12 +1812,12 @@ 
      */

     function geodir_max_upload_size()

     {

-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

+        $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);

 

         if ($max_filesize > 0 && $max_filesize < 1) {

-            $max_filesize = (int)($max_filesize * 1024) . 'kb';

+            $max_filesize = (int) ($max_filesize * 1024).'kb';

         } else {

-            $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

+            $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb';

         }

         /** Filter documented in geodirectory-functions/general_functions.php **/

         return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

@@ -1849,7 +1849,7 @@ 
 

             $custom_fields = $wpdb->get_results(

                 $wpdb->prepare(

-                    "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

+                    "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from ".GEODIR_CUSTOM_FIELDS_TABLE." where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

                     array($post_type)

                 ), 'ARRAY_A'

             );

@@ -1976,7 +1976,7 @@ 
 

             $post_meta_info = $wpdb->query(

                 $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                    "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 															sort_order=%d 

 															where id= %d",

                     array($count, $cf)

@@ -2058,14 +2058,14 @@ 
 

         $check_html_variable = $wpdb->get_var(

             $wpdb->prepare(

-                "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",

+                "select htmlvar_name from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s and field_type=%s ",

                 array($cehhtmlvar_name, $post_type, $field_type)

             )

         );

 

         if ($is_default == 1) {

 

-            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));

+            $wpdb->query($wpdb->prepare("update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set is_default='0', default_order='' where post_type = %s", array($post_type)));

 

         }

 

@@ -2076,7 +2076,7 @@ 
 

                 $wpdb->prepare(

 

-                    "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                    "insert into ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -2107,7 +2107,7 @@ 
 

                 $wpdb->prepare(

 

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                    "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -2133,7 +2133,7 @@ 
         }

 

 

-        return (int)$lastid;

+        return (int) $lastid;

 

     }

 }

@@ -2156,7 +2156,7 @@ 
         if ($field_id != '') {

             $cf = trim($field_id, '_');

 

-            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));

+            $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where id= %d ", array($cf)));

 

             return $field_id;

 

@@ -2179,12 +2179,12 @@ 
      * @param string $field_ins_upd When set to "submit" displays form.

      * @param bool $default when set to true field will be for admin use only.

      */

-    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')

+    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '')

     {

         global $wpdb;

         $cf = $result_str;

         if (!is_object($cf)) {

-            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));

+            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE id = %d", array($cf)));

         } else {

             $field_info = $cf;

             $result_str = $cf->id;

@@ -2220,18 +2220,18 @@ 
         if ($htmlvar_name == '')

             $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

 

-        $nonce = wp_create_nonce('custom_fields_' . $result_str);

+        $nonce = wp_create_nonce('custom_fields_'.$result_str);

 

         $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

         $cso_arr = geodir_get_custom_sort_options($post_type);

 

         $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);

-        foreach($cso_arr as $cso){

-            if($cur_field_type==$cso['field_type']){

+        foreach ($cso_arr as $cso) {

+            if ($cur_field_type == $cso['field_type']) {

 

                 if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {

                     $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';

-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){

+                }elseif (isset($cso['field_icon']) && $cso['field_icon']) {

                     $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';

                 }

 

@@ -2241,40 +2241,40 @@ 
         $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);

         ?>

 

-        <li class="text" id="licontainer_<?php echo $result_str;?>">

+        <li class="text" id="licontainer_<?php echo $result_str; ?>">

             <form><!-- we need to wrap in a form so we can use radio buttons with same name -->

-            <div class="title title<?php echo $result_str;?> gt-fieldset"

-                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory');?>"

-                 ondblclick="show_hide('field_frm<?php echo $result_str;?>')">

+            <div class="title title<?php echo $result_str; ?> gt-fieldset"

+                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory'); ?>"

+                 ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">

                 <?php

 

                 ?>

 

-                <div title="<?php _e('Click to remove field', 'geodirectory');?>"

-                     onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

+                <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"

+                     onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                      class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div>

 

 

-                <?php echo $field_icon;?>

+                <?php echo $field_icon; ?>

                 <b style="cursor:pointer;"

-                   onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' (' . $site_title . ')');?></b>

+                   onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory').' ('.$site_title.')'); ?></b>

 

             </div>

 

-            <div id="field_frm<?php echo $result_str;?>" class="field_frm"

+            <div id="field_frm<?php echo $result_str; ?>" class="field_frm"

                  style="display:<?php if ($field_ins_upd == 'submit') {

                      echo 'block;';

                  } else {

                      echo 'none;';

                  } ?>">

                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>

-                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>

-                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>

-                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/>

+                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/>

+                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/>

+                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str; ?>"/>

                 <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {

                     echo $field_info->data_type;

                 }?>"/>

-                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/>

+                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name; ?>"/>

 

 

                 <ul class="widefat post fixed" border="0" style="width:100%;">

@@ -2284,7 +2284,7 @@ 
                         <input type="hidden" name="site_title" id="site_title" value="<?php echo esc_attr($site_title); ?>"/>

 

                         <li>

-                            <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0;?>

+                            <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0; ?>

 

                             <label for="asc" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Ascending Sort (low to high)', 'geodirectory'); ?>

@@ -2294,24 +2294,24 @@ 
                             </label>

                             <div class="gd-cf-input-wrap gd-switch">

 

-                                <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled"  value="1"

+                                <input type="radio" id="asc_yes<?php echo $radio_id; ?>" name="asc" class="gdri-enabled"  value="1"

                                     <?php if ($value == '1') {

                                         echo 'checked';

                                     } ?>/>

-                                <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                                <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                                <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0"

+                                <input type="radio" id="asc_no<?php echo $radio_id; ?>" name="asc" class="gdri-disabled" value="0"

                                     <?php if ($value == '0' || !$value) {

                                         echo 'checked';

                                     } ?>/>

-                                <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                                <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                             </div>

 

                         </li>

 

-                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>

-                            <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : '';?>

+                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>

+                            <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : ''; ?>

 

                             <label for="asc_title" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Ascending title', 'geodirectory'); ?>

@@ -2321,14 +2321,14 @@ 
                             </label>

                             <div class="gd-cf-input-wrap">

 

-                                <input type="text" name="asc_title" id="asc_title" value="<?php echo $value;?>" />

+                                <input type="text" name="asc_title" id="asc_title" value="<?php echo $value; ?>" />

                             </div>

 

 

                         </li>

 

 

-                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>

+                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>

 

                             <label for="is_default" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>

@@ -2339,7 +2339,7 @@ 
                             <div class="gd-cf-input-wrap">

 

                                 <input type="radio" name="is_default"

-                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {

+                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_asc') {

                                     echo 'checked="checked"';

                                 } ?>/>

                             </div>

@@ -2349,7 +2349,7 @@ 
 

 

                         <li>

-                            <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0;?>

+                            <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0; ?>

 

                             <label for="desc" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Descending Sort (high to low)', 'geodirectory'); ?>

@@ -2359,24 +2359,24 @@ 
                             </label>

                             <div class="gd-cf-input-wrap gd-switch">

 

-                                <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled"  value="1"

+                                <input type="radio" id="desc_yes<?php echo $radio_id; ?>" name="desc" class="gdri-enabled"  value="1"

                                     <?php if ($value == '1') {

                                         echo 'checked';

                                     } ?>/>

-                                <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                                <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                                <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0"

+                                <input type="radio" id="desc_no<?php echo $radio_id; ?>" name="desc" class="gdri-disabled" value="0"

                                     <?php if ($value == '0' || !$value) {

                                         echo 'checked';

                                     } ?>/>

-                                <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                                <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                             </div>

 

                         </li>

 

-                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>

-                            <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : '';?>

+                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>

+                            <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : ''; ?>

 

                             <label for="desc_title" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Descending title', 'geodirectory'); ?>

@@ -2386,13 +2386,13 @@ 
                             </label>

                             <div class="gd-cf-input-wrap">

 

-                                <input type="text" name="desc_title" id="desc_title" value="<?php echo $value;?>" />

+                                <input type="text" name="desc_title" id="desc_title" value="<?php echo $value; ?>" />

                             </div>

 

 

                         </li>

 

-                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>

+                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>

 

                             <label for="is_default" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>

@@ -2403,7 +2403,7 @@ 
                             <div class="gd-cf-input-wrap">

 

                                 <input type="radio" name="is_default"

-                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {

+                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_desc') {

                                     echo 'checked="checked"';

                                 } ?>/>

                             </div>

@@ -2428,14 +2428,14 @@ 
                             </label>

                             <div class="gd-cf-input-wrap">

 

-                                <input type="text" name="site_title" id="site_title" value="<?php echo $value;?>" />

+                                <input type="text" name="site_title" id="site_title" value="<?php echo $value; ?>" />

                             </div>

 

 

                         </li>

 

                         <li>

-                            <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : '';?>

+                            <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : ''; ?>

 

                             <label for="is_default" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>

@@ -2459,7 +2459,7 @@ 
 

 

                     <li>

-                        <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active: 0;?>

+                        <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active : 0; ?>

 

                         <label for="is_active" class="gd-cf-tooltip-wrap">

                             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is active', 'geodirectory'); ?>

@@ -2469,17 +2469,17 @@ 
                         </label>

                         <div class="gd-cf-input-wrap gd-switch">

 

-                            <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"

+                            <input type="radio" id="is_active_yes<?php echo $radio_id; ?>" name="is_active" class="gdri-enabled"  value="1"

                                 <?php if ($value == '1') {

                                     echo 'checked';

                                 } ?>/>

-                            <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                            <label for="is_active_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                            <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"

+                            <input type="radio" id="is_active_no<?php echo $radio_id; ?>" name="is_active" class="gdri-disabled" value="0"

                                 <?php if ($value == '0' || !$value) {

                                     echo 'checked';

                                 } ?>/>

-                            <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                            <label for="is_active_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                         </div>

 

@@ -2500,10 +2500,10 @@ 
                             <h3></h3>

                         </label>

                         <div class="gd-cf-input-wrap">

-                            <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"

+                            <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"

                                    onclick="save_sort_field('<?php echo esc_attr($result_str); ?>')"/>

-                                <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"

-                                                                    onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

+                                <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"

+                                                                    onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                                                                     class="button"/></a>

                         </div>

                     </li>

@@ -2538,7 +2538,7 @@ 
         if (!$package_id || !$field_name || !$post_type) {

             return true;

         }

-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));

+        $sql = $wpdb->prepare("SELECT id FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int) $package_id));

 

         if ($wpdb->get_var($sql)) {

             return true;

@@ -2661,13 +2661,13 @@ 
 }

 

 

-function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){

+function geodir_cfa_data_type_text($output, $result_str, $cf, $field_info) {

     ob_start();

 

     $dt_value = '';

     if (isset($field_info->data_type)) {

         $dt_value  = esc_attr($field_info->data_type);

-    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

+    }elseif (isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']) {

         $dt_value  = $cf['defaults']['data_type'];

     }

     ?>

@@ -2678,15 +2678,15 @@ 
             <select name="data_type" id="data_type"

                     onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');">

                 <option

-                    value="XVARCHAR" <?php if ($dt_value  == 'VARCHAR') {

+                    value="XVARCHAR" <?php if ($dt_value == 'VARCHAR') {

                     echo 'selected="selected"';

                 } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>

                 <option

-                    value="INT" <?php if ($dt_value   == 'INT') {

+                    value="INT" <?php if ($dt_value == 'INT') {

                     echo 'selected="selected"';

                 } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>

                 <option

-                    value="FLOAT" <?php if ($dt_value   == 'FLOAT') {

+                    value="FLOAT" <?php if ($dt_value == 'FLOAT') {

                     echo 'selected="selected"';

                 } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>

             </select>

@@ -2699,13 +2699,13 @@ 
     $value = '';

     if (isset($field_info->decimal_point)) {

         $value = esc_attr($field_info->decimal_point);

-    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){

+    }elseif (isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']) {

         $value = $cf['defaults']['decimal_point'];

     }

     ?>

 

     <li class="decimal-point-wrapper"

-        style="<?php echo ($dt_value  == 'FLOAT') ? '' : 'display:none' ?>">

+        style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>">

         <label for="decimal_point"><?php _e('Select decimal point :', 'geodirectory'); ?></label>

         <div class="gd-cf-input-wrap">

             <select name="decimal_point" id="decimal_point">

@@ -2723,41 +2723,41 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);

+add_filter('geodir_cfa_data_type_text', 'geodir_cfa_data_type_text', 10, 4);

 

 // htmlvar not needed for fieldset and taxonomy

-add_filter('geodir_cfa_htmlvar_name_fieldset','__return_empty_string',10,4);

-add_filter('geodir_cfa_htmlvar_name_taxonomy','__return_empty_string',10,4);

+add_filter('geodir_cfa_htmlvar_name_fieldset', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_htmlvar_name_taxonomy', '__return_empty_string', 10, 4);

 

 

 // default_value not needed for textarea, html, file, fieldset, taxonomy, address

-add_filter('geodir_cfa_default_value_file','__return_empty_string',10,4);

-add_filter('geodir_cfa_default_value_taxonomy','__return_empty_string',10,4);

-add_filter('geodir_cfa_default_value_address','__return_empty_string',10,4);

-add_filter('geodir_cfa_default_value_fieldset','__return_empty_string',10,4);

+add_filter('geodir_cfa_default_value_file', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_default_value_taxonomy', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_default_value_address', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_default_value_fieldset', '__return_empty_string', 10, 4);

 

 // is_required not needed for fieldset

-add_filter('geodir_cfa_is_required_fieldset','__return_empty_string',10,4);

-add_filter('geodir_cfa_required_msg_fieldset','__return_empty_string',10,4);

+add_filter('geodir_cfa_is_required_fieldset', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_required_msg_fieldset', '__return_empty_string', 10, 4);

 

 // field_icon not needed for fieldset

-add_filter('geodir_cfa_field_icon_fieldset','__return_empty_string',10,4);

-add_filter('geodir_cfa_css_class_fieldset','__return_empty_string',10,4);

+add_filter('geodir_cfa_field_icon_fieldset', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_css_class_fieldset', '__return_empty_string', 10, 4);

 

 // cat_sort not needed for some fields

-add_filter('geodir_cfa_cat_sort_html','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_file','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_url','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_fieldset','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_multiselect','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_textarea','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_taxonomy','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_address','__return_empty_string',10,4);

+add_filter('geodir_cfa_cat_sort_html', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_file', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_url', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_fieldset', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_multiselect', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_textarea', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_taxonomy', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_address', '__return_empty_string', 10, 4);

 

 

 

-function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){

-    if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}

+function geodir_cfa_advanced_editor_geodir_special_offers($output, $result_str, $cf, $field_info) {

+    if ($field_info->htmlvar_name != 'geodir_special_offers') {return ''; }

     ob_start();

     ?>

     <li>

@@ -2788,16 +2788,16 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);

+add_filter('geodir_cfa_advanced_editor_textarea', 'geodir_cfa_advanced_editor_geodir_special_offers', 10, 4);

 

 

-function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){

+function geodir_cfa_validation_pattern_text($output, $result_str, $cf, $field_info) {

     ob_start();

 

     $value = '';

     if (isset($field_info->validation_pattern)) {

         $value = esc_attr($field_info->validation_pattern);

-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){

+    }elseif (isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']) {

         $value = esc_attr($cf['defaults']['validation_pattern']);

     }

     ?>

@@ -2817,7 +2817,7 @@ 
     $value = '';

     if (isset($field_info->validation_msg)) {

         $value = esc_attr($field_info->validation_msg);

-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){

+    }elseif (isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']) {

         $value = esc_attr($cf['defaults']['validation_msg']);

     }

     ?>

@@ -2838,10 +2838,10 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);

+add_filter('geodir_cfa_validation_pattern_text', 'geodir_cfa_validation_pattern_text', 10, 4);

 

 

-function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){

+function geodir_cfa_htmlvar_name_taxonomy($output, $result_str, $cf, $field_info) {

     ob_start();

     global $post_type;

 

@@ -2866,7 +2866,7 @@ 
                     ?>

                     <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {

                         echo 'selected="selected"';

-                    }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php

+                    }?> id="<?php echo $gd_tax; ?>"><?php echo $gd_tax; ?></option><?php

                 }

                 ?>

             </select>

@@ -2877,7 +2877,7 @@ 
         <label for="cat_display_type" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Category display type :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory');?>

+                <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -2885,19 +2885,19 @@ 
             <select name="cat_display_type" id="cat_display_type">

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {

                     echo 'selected="selected"';

-                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>

+                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {

                     echo 'selected="selected"';

-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>

+                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {

                     echo 'selected="selected"';

-                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>

+                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {

                     echo 'selected="selected"';

-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

+                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {

                     echo 'selected="selected"';

-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

+                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>

             </select>

         </div>

     </li>

@@ -2906,10 +2906,10 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);

+add_filter('geodir_cfa_htmlvar_name_taxonomy', 'geodir_cfa_htmlvar_name_taxonomy', 10, 4);

 

 

-function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_address($output, $result_str, $cf, $field_info) {

 

     ob_start();

     if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

@@ -2932,32 +2932,32 @@ 
         <label for="show_zip" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display zip/post code :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory');?>

+                <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled"  value="1"

+            <input type="radio" id="show_zip_yes<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {

                     echo 'checked';

                 } ?>/>

-            <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0"

+            <input type="radio" id="show_zip_no<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {

                     echo 'checked';

                 } ?>/>

-            <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

 

         </div>

     </li>

 

-    <li class="cf-zip-lable"  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'";}?> >

+    <li class="cf-zip-lable"  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'"; }?> >

         <label for="zip_lable" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Zip/Post code label :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Enter zip/post code field label in address section.', 'geodirectory');?>

+                <?php _e('Enter zip/post code field label in address section.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -2975,7 +2975,7 @@ 
         <label for="map_lable" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map button label :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory');?>

+                <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -2990,22 +2990,22 @@ 
         <label for="show_mapzoom" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Use user zoom level:', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory');?>

+                <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"

+            <input type="radio" id="show_mapzoom_yes<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {

                     echo 'checked';

                 } ?>/>

-            <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label for="show_mapzoom_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"

+            <input type="radio" id="show_mapzoom_no<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {

                     echo 'checked';

                 } ?>/>

-            <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label for="show_mapzoom_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

@@ -3014,22 +3014,22 @@ 
         <label for="show_mapview" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display map view:', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory');?>

+                <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"

+            <input type="radio" id="show_mapview_yes<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {

                     echo 'checked';

                 } ?>/>

-            <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label for="show_mapview_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0"

+            <input type="radio" id="show_mapview_no<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {

                     echo 'checked';

                 } ?>/>

-            <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label for="show_mapview_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

@@ -3039,7 +3039,7 @@ 
         <label for="mapview_lable" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map view label:', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Enter mapview field label in address section.', 'geodirectory');?>

+                <?php _e('Enter mapview field label in address section.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -3053,22 +3053,22 @@ 
         <label for="show_latlng" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show latitude and longitude', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory');?>

+                <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"

+            <input type="radio" id="show_latlng_yes<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {

                     echo 'checked';

                 } ?>/>

-            <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label for="show_latlng_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0"

+            <input type="radio" id="show_latlng_no<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {

                     echo 'checked';

                 } ?>/>

-            <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label for="show_latlng_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

@@ -3077,17 +3077,17 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);

+add_filter('geodir_cfa_extra_fields_address', 'geodir_cfa_extra_fields_address', 10, 4);

 

 

-function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_multiselect($output, $result_str, $cf, $field_info) {

     ob_start();

     ?>

     <li>

         <label for="multi_display_type" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory');?>

+                <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -3095,13 +3095,13 @@ 
             <select name="multi_display_type" id="multi_display_type">

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {

                     echo 'selected="selected"';

-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>

+                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {

                     echo 'selected="selected"';

-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

+                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {

                     echo 'selected="selected"';

-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

+                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>

             </select>

 

             <br/>

@@ -3112,17 +3112,17 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);

+add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_multiselect', 10, 4);

 

 

-function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_smr($output, $result_str, $cf, $field_info) {

 

     ob_start();

 

     $value = '';

     if (isset($field_info->option_values)) {

         $value = esc_attr($field_info->option_values);

-    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){

+    }elseif (isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']) {

         $value = esc_attr($cf['defaults']['option_values']);

     }

 

@@ -3132,11 +3132,11 @@ 
         <label for="option_values" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <span><?php _e('Option Values should be separated by comma.', 'geodirectory');?></span>

+                <span><?php _e('Option Values should be separated by comma.', 'geodirectory'); ?></span>

                 <br/>

-                <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory');?></span>

+                <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory'); ?></span>

                     <br/>

-                    <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory');?></span>

+                    <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory'); ?></span>

                     <?php if ($field_type == 'multiselect' || $field_type == 'select') { ?>

                         <br/>

                         <span><?php _e('- If using OPTGROUP tag to grouping options, use "{optgroup}OPTGROUP-LABEL|OPTION-1,OPTION-2{/optgroup}"', 'geodirectory'); ?></span>

@@ -3147,7 +3147,7 @@ 
         </label>

         <div class="gd-cf-input-wrap">

             <input type="text" name="option_values" id="option_values"

-                   value="<?php echo $value;?>"/>

+                   value="<?php echo $value; ?>"/>

             <br/>

 

         </div>

@@ -3157,12 +3157,12 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);

-add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);

-add_filter('geodir_cfa_extra_fields_radio','geodir_cfa_extra_fields_smr',10,4);

+add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_smr', 10, 4);

+add_filter('geodir_cfa_extra_fields_select', 'geodir_cfa_extra_fields_smr', 10, 4);

+add_filter('geodir_cfa_extra_fields_radio', 'geodir_cfa_extra_fields_smr', 10, 4);

 

 

-function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_datepicker($output, $result_str, $cf, $field_info) {

     ob_start();

     $extra = array();

     if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

@@ -3173,7 +3173,7 @@ 
         <label for="date_format" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Select the date format.', 'geodirectory');?>

+                <?php _e('Select the date format.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap" style="overflow:inherit;">

@@ -3193,16 +3193,16 @@ 
              * @since 1.6.5

              * @param array $date_formats The PHP date format array.

              */

-            $date_formats = apply_filters('geodir_date_formats',$date_formats);

+            $date_formats = apply_filters('geodir_date_formats', $date_formats);

             ?>

             <select name="extra[date_format]" id="date_format">

                 <?php

-                foreach($date_formats as $format){

+                foreach ($date_formats as $format) {

                     $selected = '';

-                    if(!empty($extra) && esc_attr($extra['date_format'])==$format){

+                    if (!empty($extra) && esc_attr($extra['date_format']) == $format) {

                         $selected = "selected='selected'";

                     }

-                    echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";

+                    echo "<option $selected value='$format'>$format       (".date_i18n($format, time()).")</option>";

                 }

                 ?>

             </select>

@@ -3214,10 +3214,10 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);

+add_filter('geodir_cfa_extra_fields_datepicker', 'geodir_cfa_extra_fields_datepicker', 10, 4);

 

 

-function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_file($output, $result_str, $cf, $field_info) {

     ob_start();

     $allowed_file_types = geodir_allowed_mime_types();

 

@@ -3228,16 +3228,16 @@ 
         <label for="gd_file_types" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory');?>

+                <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

             <select name="extra[gd_file_types][]" id="gd_file_types" multiple="multiple" style="height:100px;width:90%;">

-                <option value="*" <?php selected(true, in_array('*', $gd_file_types));?>><?php _e('All types', 'geodirectory') ;?></option>

-                <?php foreach ( $allowed_file_types as $format => $types ) { ?>

-                    <optgroup label="<?php echo esc_attr( wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory') ) ) ;?>">

-                        <?php foreach ( $types as $ext => $type ) { ?>

-                            <option value="<?php echo esc_attr($ext) ;?>" <?php selected(true, in_array($ext, $gd_file_types));?>><?php echo '.' . $ext ;?></option>

+                <option value="*" <?php selected(true, in_array('*', $gd_file_types)); ?>><?php _e('All types', 'geodirectory'); ?></option>

+                <?php foreach ($allowed_file_types as $format => $types) { ?>

+                    <optgroup label="<?php echo esc_attr(wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory'))); ?>">

+                        <?php foreach ($types as $ext => $type) { ?>

+                            <option value="<?php echo esc_attr($ext); ?>" <?php selected(true, in_array($ext, $gd_file_types)); ?>><?php echo '.'.$ext; ?></option>

                         <?php } ?>

                     </optgroup>

                 <?php } ?>

@@ -3249,9 +3249,9 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);

+add_filter('geodir_cfa_extra_fields_file', 'geodir_cfa_extra_fields_file', 10, 4);

 

-function geodir_cfa_extra_fields_text($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_text($output, $result_str, $cf, $field_info) {

     ob_start();

 

     $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

@@ -3265,15 +3265,15 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['is_price'])) {

     $value = esc_attr($extra_fields['is_price']);

-    }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){

+    }elseif (isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']) {

     $value = esc_attr($cf['defaults']['extra_fields']['is_price']);

     }

 

-    $show_price_extra = ($value==1) ? 1 : 0;

+    $show_price_extra = ($value == 1) ? 1 : 0;

 

-    $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0;

+    $show_price = (isset($field_info->data_type) && ($field_info->data_type == 'INT' && $field_info->data_type == 'FLOAT')) ? 1 : 0;

     ?>

-    <li class="gdcf-price-extra-set" <?php if(!$show_price){ echo "style='display:none;'";}?>>

+    <li class="gdcf-price-extra-set" <?php if (!$show_price) { echo "style='display:none;'"; }?>>

         <label for="is_price" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display as price? :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

@@ -3282,17 +3282,17 @@ 
         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="is_price_yes<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-enabled"  value="1"

+            <input type="radio" id="is_price_yes<?php echo $radio_id; ?>" name="extra[is_price]" class="gdri-enabled"  value="1"

                 <?php if ($value == '1') {

                     echo 'checked';

                 } ?>/>

-            <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="is_price_no<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-disabled" value="0"

+            <input type="radio" id="is_price_no<?php echo $radio_id; ?>" name="extra[is_price]" class="gdri-disabled" value="0"

                 <?php if ($value == '0' || !$value) {

                     echo 'checked';

                 } ?>/>

-            <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

@@ -3302,23 +3302,23 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['thousand_separator'])) {

         $value = esc_attr($extra_fields['thousand_separator']);

-    }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){

+    }elseif (isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']) {

         $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']);

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select the thousand separator.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

                 <select name="extra[thousand_separator]" id="thousand_separator">

-                    <option value="comma" <?php selected(true, $value == 'comma');?>><?php _e(', (comma)', 'geodirectory'); ?></option>

-                    <option value="slash" <?php selected(true, $value == "slash");?>><?php _e('\ (slash)', 'geodirectory'); ?></option>

-                    <option value="period" <?php selected(true, $value == 'period');?>><?php _e('. (period)', 'geodirectory'); ?></option>

-                    <option value="space" <?php selected(true, $value == 'space');?>><?php _e(' (space)', 'geodirectory'); ?></option>

-                    <option value="none" <?php selected(true, $value == 'none');?>><?php _e('(none)', 'geodirectory'); ?></option>

+                    <option value="comma" <?php selected(true, $value == 'comma'); ?>><?php _e(', (comma)', 'geodirectory'); ?></option>

+                    <option value="slash" <?php selected(true, $value == "slash"); ?>><?php _e('\ (slash)', 'geodirectory'); ?></option>

+                    <option value="period" <?php selected(true, $value == 'period'); ?>><?php _e('. (period)', 'geodirectory'); ?></option>

+                    <option value="space" <?php selected(true, $value == 'space'); ?>><?php _e(' (space)', 'geodirectory'); ?></option>

+                    <option value="none" <?php selected(true, $value == 'none'); ?>><?php _e('(none)', 'geodirectory'); ?></option>

                 </select>

         </div>

     </li>

@@ -3329,20 +3329,20 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['decimal_separator'])) {

         $value = esc_attr($extra_fields['decimal_separator']);

-    }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){

+    }elseif (isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']) {

         $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']);

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select the decimal separator.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

             <select name="extra[decimal_separator]" id="decimal_separator">

-                <option value="period" <?php selected(true, $value == 'period');?>><?php _e('. (period)', 'geodirectory'); ?></option>

-                <option value="comma" <?php selected(true, $value == "comma");?>><?php _e(', (comma)', 'geodirectory'); ?></option>

+                <option value="period" <?php selected(true, $value == 'period'); ?>><?php _e('. (period)', 'geodirectory'); ?></option>

+                <option value="comma" <?php selected(true, $value == "comma"); ?>><?php _e(', (comma)', 'geodirectory'); ?></option>

             </select>

         </div>

     </li>

@@ -3352,20 +3352,20 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['decimal_display'])) {

         $value = esc_attr($extra_fields['decimal_display']);

-    }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){

+    }elseif (isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']) {

         $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']);

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select how the decimal is displayed', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

             <select name="extra[decimal_display]" id="decimal_display">

-                <option value="if" <?php selected(true, $value == 'if');?>><?php _e('If used (not .00)', 'geodirectory'); ?></option>

-                <option value="allways" <?php selected(true, $value == "allways");?>><?php _e('Always (.00)', 'geodirectory'); ?></option>

+                <option value="if" <?php selected(true, $value == 'if'); ?>><?php _e('If used (not .00)', 'geodirectory'); ?></option>

+                <option value="allways" <?php selected(true, $value == "allways"); ?>><?php _e('Always (.00)', 'geodirectory'); ?></option>

             </select>

         </div>

     </li>

@@ -3375,12 +3375,12 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['currency_symbol'])) {

         $value = esc_attr($extra_fields['currency_symbol']);

-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){

+    }elseif (isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']) {

         $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']);

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select the currency symbol.', 'geodirectory'); ?>

             </div>

@@ -3396,20 +3396,20 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {

         $value = esc_attr($extra_fields['currency_symbol_placement']);

-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){

+    }elseif (isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']) {

         $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']);

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select the currency symbol placement.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

             <select name="extra[currency_symbol_placement]" id="currency_symbol_placement">

-                <option value="left" <?php selected(true, $value == 'left');?>><?php _e('Left', 'geodirectory'); ?></option>

-                <option value="right" <?php selected(true, $value == "right");?>><?php _e('Right', 'geodirectory'); ?></option>

+                <option value="left" <?php selected(true, $value == 'left'); ?>><?php _e('Left', 'geodirectory'); ?></option>

+                <option value="right" <?php selected(true, $value == "right"); ?>><?php _e('Right', 'geodirectory'); ?></option>

             </select>

         </div>

     </li>

@@ -3420,11 +3420,11 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-add_filter('geodir_cfa_extra_fields_text','geodir_cfa_extra_fields_text',10,4);

+add_filter('geodir_cfa_extra_fields_text', 'geodir_cfa_extra_fields_text', 10, 4);

 

-function geodir_default_custom_fields($post_type='gd_place',$package_id=''){

+function geodir_default_custom_fields($post_type = 'gd_place', $package_id = '') {

     $fields = array();

-    $package = ($package_id=='') ? '' : array($package_id);

+    $package = ($package_id == '') ? '' : array($package_id);

 

     $fields[] = array('listing_type' => $post_type,

                       'data_type' => 'VARCHAR',

@@ -3597,7 +3597,7 @@ 
     return  $fields;

 }

 

-function geodir_currency_format_number($number='',$cf=''){

+function geodir_currency_format_number($number = '', $cf = '') {

 

     $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : '';

 

@@ -3606,35 +3606,35 @@ 
     $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if');

     $decimalpoint = '.';

 

-    if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){

+    if (isset($cs['decimal_separator']) && $cs['decimal_separator'] == 'comma') {

         $decimalpoint = ',';

     }

 

     $separator = ',';

 

-    if(isset($cs['thousand_separator'])){

-        if($cs['thousand_separator']=='comma'){$separator = ',';}

-        if($cs['thousand_separator']=='slash'){$separator = '\\';}

-        if($cs['thousand_separator']=='period'){$separator = '.';}

-        if($cs['thousand_separator']=='space'){$separator = ' ';}

-        if($cs['thousand_separator']=='none'){$separator = '';}

+    if (isset($cs['thousand_separator'])) {

+        if ($cs['thousand_separator'] == 'comma') {$separator = ','; }

+        if ($cs['thousand_separator'] == 'slash') {$separator = '\\'; }

+        if ($cs['thousand_separator'] == 'period') {$separator = '.'; }

+        if ($cs['thousand_separator'] == 'space') {$separator = ' '; }

+        if ($cs['thousand_separator'] == 'none') {$separator = ''; }

     }

 

     $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';

 

-    if($decimals>0 && $decimal_display=='if'){

-        if(is_int($number) || floor( $number ) == $number)

+    if ($decimals > 0 && $decimal_display == 'if') {

+        if (is_int($number) || floor($number) == $number)

             $decimals = 0;

     }

 

-    $number = number_format($number,$decimals,$decimalpoint,$separator);

+    $number = number_format($number, $decimals, $decimalpoint, $separator);

 

 

 

-    if($currency_symbol_placement=='left'){

-        $number = $symbol . $number;

-    }else{

-        $number = $number . $symbol;

+    if ($currency_symbol_placement == 'left') {

+        $number = $symbol.$number;

+    } else {

+        $number = $number.$symbol;

     }

 

 

Indentation +2267 added lines, -2267 removed lines

@@ -10,52 +10,52 @@ 
 global $wpdb, $table_prefix;

 

 if (!function_exists('geodir_column_exist')) {

-    /**

-     * Check table column exist or not.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $db The table name.

-     * @param string $column The column name.

-     * @return bool If column exists returns true. Otherwise false.

-     */

-    function geodir_column_exist($db, $column)

-    {

-        global $wpdb;

-        $exists = false;

-        $columns = $wpdb->get_col("show columns from $db");

-        foreach ($columns as $c) {

-            if ($c == $column) {

-                $exists = true;

-                break;

-            }

-        }

-        return $exists;

-    }

+	/**

+	 * Check table column exist or not.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $db The table name.

+	 * @param string $column The column name.

+	 * @return bool If column exists returns true. Otherwise false.

+	 */

+	function geodir_column_exist($db, $column)

+	{

+		global $wpdb;

+		$exists = false;

+		$columns = $wpdb->get_col("show columns from $db");

+		foreach ($columns as $c) {

+			if ($c == $column) {

+				$exists = true;

+				break;

+			}

+		}

+		return $exists;

+	}

 }

 

 if (!function_exists('geodir_add_column_if_not_exist')) {

-    /**

-     * Add column if table column not exist.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $db The table name.

-     * @param string $column The column name.

-     * @param string $column_attr The column attributes.

-     */

-    function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

-    {

-        global $wpdb;

-        $result = 0;// no rows affected

-        if (!geodir_column_exist($db, $column)) {

-            if (!empty($db) && !empty($column))

-                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

-        }

-        return $result;

-    }

+	/**

+	 * Add column if table column not exist.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $db The table name.

+	 * @param string $column The column name.

+	 * @param string $column_attr The column attributes.

+	 */

+	function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

+	{

+		global $wpdb;

+		$result = 0;// no rows affected

+		if (!geodir_column_exist($db, $column)) {

+			if (!empty($db) && !empty($column))

+				$result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

+		}

+		return $result;

+	}

 }

 

 /**

@@ -72,706 +72,706 @@ 
  */

 function geodir_post_custom_fields($package_id = '', $default = 'all', $post_type = 'gd_place', $fields_location = 'none')

 {

-    global $wpdb, $geodir_post_custom_fields_cache;

-

-    $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;

-

-    if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {

-        return $geodir_post_custom_fields_cache[$cache_stored];

-    }

-

-    $default_query = '';

-

-    if ($default == 'default')

-        $default_query .= " and is_admin IN ('1') ";

-    elseif ($default == 'custom')

-        $default_query .= " and is_admin = '0' ";

-

-    if ($fields_location == 'none') {

-    } else{

-        $fields_location = esc_sql( $fields_location );

-        $default_query .= " and show_in LIKE '%%[$fields_location]%%' ";

-    }

-

-    $post_meta_info = $wpdb->get_results(

-        $wpdb->prepare(

-            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

-            array($post_type)

-        )

-    );

-

-

-    $return_arr = array();

-    if ($post_meta_info) {

-

-        foreach ($post_meta_info as $post_meta_info_obj) {

-

-            $custom_fields = array(

-                "name" => $post_meta_info_obj->htmlvar_name,

-                "label" => $post_meta_info_obj->clabels,

-                "default" => $post_meta_info_obj->default_value,

-                "type" => $post_meta_info_obj->field_type,

-                "desc" => $post_meta_info_obj->admin_desc);

-

-            if ($post_meta_info_obj->field_type) {

-                $options = explode(',', $post_meta_info_obj->option_values);

-                $custom_fields["options"] = $options;

-            }

-

-            foreach ($post_meta_info_obj as $key => $val) {

-                $custom_fields[$key] = $val;

-            }

-

-            $pricearr = array();

-            $pricearr = explode(',', $post_meta_info_obj->packages);

-

-            if ($package_id != '' && in_array($package_id, $pricearr)) {

-                $return_arr[$post_meta_info_obj->sort_order] = $custom_fields;

-            } elseif ($package_id == '') {

-                $return_arr[$post_meta_info_obj->sort_order] = $custom_fields;

-            }

-        }

-    }

-    $geodir_post_custom_fields_cache[$cache_stored] = $return_arr;

-

-    if (has_filter('geodir_filter_geodir_post_custom_fields')) {

-        /**

-         * Filter the post custom fields array.

-         *

-         * @since 1.0.0

-         *

-         * @param array $return_arr Post custom fields array.

-         * @param int|string $package_id The package ID.

-         * @param string $post_type Optional. The wordpress post type.

-         * @param string $fields_location Optional. Where exactly are you going to place this custom fields?.

-         */

-        $return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);

-    }

-

-    return $return_arr;

+	global $wpdb, $geodir_post_custom_fields_cache;

+

+	$cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;

+

+	if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {

+		return $geodir_post_custom_fields_cache[$cache_stored];

+	}

+

+	$default_query = '';

+

+	if ($default == 'default')

+		$default_query .= " and is_admin IN ('1') ";

+	elseif ($default == 'custom')

+		$default_query .= " and is_admin = '0' ";

+

+	if ($fields_location == 'none') {

+	} else{

+		$fields_location = esc_sql( $fields_location );

+		$default_query .= " and show_in LIKE '%%[$fields_location]%%' ";

+	}

+

+	$post_meta_info = $wpdb->get_results(

+		$wpdb->prepare(

+			"select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

+			array($post_type)

+		)

+	);

+

+

+	$return_arr = array();

+	if ($post_meta_info) {

+

+		foreach ($post_meta_info as $post_meta_info_obj) {

+

+			$custom_fields = array(

+				"name" => $post_meta_info_obj->htmlvar_name,

+				"label" => $post_meta_info_obj->clabels,

+				"default" => $post_meta_info_obj->default_value,

+				"type" => $post_meta_info_obj->field_type,

+				"desc" => $post_meta_info_obj->admin_desc);

+

+			if ($post_meta_info_obj->field_type) {

+				$options = explode(',', $post_meta_info_obj->option_values);

+				$custom_fields["options"] = $options;

+			}

+

+			foreach ($post_meta_info_obj as $key => $val) {

+				$custom_fields[$key] = $val;

+			}

+

+			$pricearr = array();

+			$pricearr = explode(',', $post_meta_info_obj->packages);

+

+			if ($package_id != '' && in_array($package_id, $pricearr)) {

+				$return_arr[$post_meta_info_obj->sort_order] = $custom_fields;

+			} elseif ($package_id == '') {

+				$return_arr[$post_meta_info_obj->sort_order] = $custom_fields;

+			}

+		}

+	}

+	$geodir_post_custom_fields_cache[$cache_stored] = $return_arr;

+

+	if (has_filter('geodir_filter_geodir_post_custom_fields')) {

+		/**

+		 * Filter the post custom fields array.

+		 *

+		 * @since 1.0.0

+		 *

+		 * @param array $return_arr Post custom fields array.

+		 * @param int|string $package_id The package ID.

+		 * @param string $post_type Optional. The wordpress post type.

+		 * @param string $fields_location Optional. Where exactly are you going to place this custom fields?.

+		 */

+		$return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);

+	}

+

+	return $return_arr;

 }

 

-    /**

-     * Adds admin html for custom fields.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $field_type The form field type.

-     * @param object|int $result_str The custom field results object or row id.

-     * @param string $field_ins_upd When set to "submit" displays form.

-     * @param string $field_type_key The key of the custom field.

-     */

-    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')

-    {

-        global $wpdb;

-        $cf = $result_str;

-        if (!is_object($cf)) {

-

-            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));

-

-        } else {

-            $field_info = $cf;

-            $result_str = $cf->id;

-        }

-        /**

-         * Contains custom field html.

-         *

-         * @since 1.0.0

-         */

-        include('custom_field_html.php');

-

-    }

+	/**

+	 * Adds admin html for custom fields.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $field_type The form field type.

+	 * @param object|int $result_str The custom field results object or row id.

+	 * @param string $field_ins_upd When set to "submit" displays form.

+	 * @param string $field_type_key The key of the custom field.

+	 */

+	function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')

+	{

+		global $wpdb;

+		$cf = $result_str;

+		if (!is_object($cf)) {

+

+			$field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));

+

+		} else {

+			$field_info = $cf;

+			$result_str = $cf->id;

+		}

+		/**

+		 * Contains custom field html.

+		 *

+		 * @since 1.0.0

+		 */

+		include('custom_field_html.php');

+

+	}

 

 

 if (!function_exists('geodir_custom_field_delete')) {

-    /**

-     * Delete custom field using field id.

-     *

-     * @since 1.0.0

-     * @since 1.5.7 Delete field from sorting fields table when custom field deleted.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param string $field_id The custom field ID.

-     * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.

-     */

-    function geodir_custom_field_delete($field_id = '') {

-        global $wpdb, $plugin_prefix;

-

-        if ($field_id != '') {

-            $cf = trim($field_id, '_');

-

-            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

-                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

-

-                $post_type = $field->post_type;

-                $htmlvar_name = $field->htmlvar_name;

-

-                if ($post_type != '' && $htmlvar_name != '') {

-                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

-                }

-

-                /**

-                 * Called after a custom field is deleted.

-                 *

-                 * @since 1.0.0

-                 * @param string $cf The fields ID.

-                 * @param string $field->htmlvar_name The html variable name for the field.

-                 * @param string $post_type The post type the field belongs to.

-                 */

-                do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);

-

-                if ($field->field_type == 'address') {

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");

-                } else {

-                    if ($field->field_type != 'fieldset') {

-                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");

-                    }

-                }

-

-                return $field_id;

-            } else

-                return 0;

-        } else

-            return 0;

-    }

+	/**

+	 * Delete custom field using field id.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.7 Delete field from sorting fields table when custom field deleted.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param string $field_id The custom field ID.

+	 * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.

+	 */

+	function geodir_custom_field_delete($field_id = '') {

+		global $wpdb, $plugin_prefix;

+

+		if ($field_id != '') {

+			$cf = trim($field_id, '_');

+

+			if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

+				$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

+

+				$post_type = $field->post_type;

+				$htmlvar_name = $field->htmlvar_name;

+

+				if ($post_type != '' && $htmlvar_name != '') {

+					$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

+				}

+

+				/**

+				 * Called after a custom field is deleted.

+				 *

+				 * @since 1.0.0

+				 * @param string $cf The fields ID.

+				 * @param string $field->htmlvar_name The html variable name for the field.

+				 * @param string $post_type The post type the field belongs to.

+				 */

+				do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);

+

+				if ($field->field_type == 'address') {

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");

+				} else {

+					if ($field->field_type != 'fieldset') {

+						$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");

+					}

+				}

+

+				return $field_id;

+			} else

+				return 0;

+		} else

+			return 0;

+	}

 }

 

 if (!function_exists('geodir_custom_field_save')) {

-    /**

-     * Save or Update custom fields into the database.

-     *

-     * @since 1.0.0

-     * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param array $request_field {

-     *    Attributes of the request field array.

-     *

-     *    @type string $action Ajax Action name. Default "geodir_ajax_action".

-     *    @type string $manage_field_type Field type Default "custom_fields".

-     *    @type string $create_field Create field Default "true".

-     *    @type string $field_ins_upd Field ins upd Default "submit".

-     *    @type string $_wpnonce WP nonce value.

-     *    @type string $listing_type Listing type Example "gd_place".

-     *    @type string $field_type Field type Example "radio".

-     *    @type string $field_id Field id Example "12".

-     *    @type string $data_type Data type Example "VARCHAR".

-     *    @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere.

-     *    @type array $show_on_pkg Package list to display this field.

-     *    @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings.

-     *    @type string $site_title Section title which you wish to display in frontend.

-     *    @type string $admin_desc Section description which will appear in frontend.

-     *    @type string $htmlvar_name Html variable name. This should be a unique name.

-     *    @type string $clabels Section Title which will appear in backend.

-     *    @type string $default_value The default value (for "link" this will be used as the link text).

-     *    @type string $sort_order The display order of this field in backend. e.g. 5.

-     *    @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field.

-     *    @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field.

-     *    @type string $is_required Use "1" to set field as required.

-     *    @type string $required_msg Enter text for error message if field required and have not full fill requirement.

-     *    @type string $show_on_listing Want to show this on listing page?.

-     *    @type string $show_in What locations to show the custom field in.

-     *    @type string $show_on_detail Want to show this in More Info tab on detail page?.

-     *    @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes.

-     *    @type string $option_values Option Values should be separated by comma.

-     *    @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class.

-     *    @type string $css_class Enter custom css class for field custom style.

-     *    @type array $extra_fields An array of extra fields to store.

-     *

-     * }

-     * @param bool $default Not yet implemented.

-     * @return int|string If field is unique returns inserted row id. Otherwise returns error string.

-     */

-    function geodir_custom_field_save($request_field = array(), $default = false)

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $old_html_variable = '';

-

-        $data_type = trim($request_field['data_type']);

-

-        $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

-

-        // some servers fail if a POST value is VARCHAR so we change it.

-        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){

-            $request_field['data_type'] = 'VARCHAR';

-        }

-

-        $cf = trim($result_str, '_');

-

-

-        /*-------- check duplicate validation --------*/

-

-        $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

-        $post_type = $request_field['listing_type'];

-

-        if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {

-            $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;

-        }

-

-        $check_html_variable = $wpdb->get_var(

-            $wpdb->prepare(

-                "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",

-                array($cf, $cehhtmlvar_name, $post_type)

-            )

-        );

-

-

-        if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {

-

-            if ($cf != '') {

-

-                $post_meta_info = $wpdb->get_row(

-                    $wpdb->prepare(

-                        "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",

-                        array($cf)

-                    )

-                );

-

-            }

-

-            if (!empty($post_meta_info)) {

-                $post_val = $post_meta_info;

-                $old_html_variable = $post_val->htmlvar_name;

-

-            }

-

-

-

-            if ($post_type == '') $post_type = 'gd_place';

-

-

-            $detail_table = $plugin_prefix . $post_type . '_detail';

-

-            $admin_title = $request_field['admin_title'];

-            $site_title = $request_field['site_title'];

-            $data_type = $request_field['data_type'];

-            $field_type = $request_field['field_type'];

-            $field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type;

-            $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

-            $admin_desc = $request_field['admin_desc'];

-            $clabels = isset($request_field['clabels']) ? $request_field['clabels'] : '';

-            $default_value = isset($request_field['default_value']) ? $request_field['default_value'] : '';

-            $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : '';

-            $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : '';

-            $is_required = isset($request_field['is_required']) ? $request_field['is_required'] : '';

-            $required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : '';

-            $css_class = isset($request_field['css_class']) ? $request_field['css_class'] : '';

-            $field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : '';

-            $show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : '';

-            $show_in = isset($request_field['show_in']) ? $request_field['show_in'] : '';

-            $show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : '';

-            $show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : '';

-            $decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type

-            $decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : '';

-            $validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : '';

-            $validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : '';

-            $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';

+	/**

+	 * Save or Update custom fields into the database.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param array $request_field {

+	 *    Attributes of the request field array.

+	 *

+	 *    @type string $action Ajax Action name. Default "geodir_ajax_action".

+	 *    @type string $manage_field_type Field type Default "custom_fields".

+	 *    @type string $create_field Create field Default "true".

+	 *    @type string $field_ins_upd Field ins upd Default "submit".

+	 *    @type string $_wpnonce WP nonce value.

+	 *    @type string $listing_type Listing type Example "gd_place".

+	 *    @type string $field_type Field type Example "radio".

+	 *    @type string $field_id Field id Example "12".

+	 *    @type string $data_type Data type Example "VARCHAR".

+	 *    @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere.

+	 *    @type array $show_on_pkg Package list to display this field.

+	 *    @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings.

+	 *    @type string $site_title Section title which you wish to display in frontend.

+	 *    @type string $admin_desc Section description which will appear in frontend.

+	 *    @type string $htmlvar_name Html variable name. This should be a unique name.

+	 *    @type string $clabels Section Title which will appear in backend.

+	 *    @type string $default_value The default value (for "link" this will be used as the link text).

+	 *    @type string $sort_order The display order of this field in backend. e.g. 5.

+	 *    @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field.

+	 *    @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field.

+	 *    @type string $is_required Use "1" to set field as required.

+	 *    @type string $required_msg Enter text for error message if field required and have not full fill requirement.

+	 *    @type string $show_on_listing Want to show this on listing page?.

+	 *    @type string $show_in What locations to show the custom field in.

+	 *    @type string $show_on_detail Want to show this in More Info tab on detail page?.

+	 *    @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes.

+	 *    @type string $option_values Option Values should be separated by comma.

+	 *    @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class.

+	 *    @type string $css_class Enter custom css class for field custom style.

+	 *    @type array $extra_fields An array of extra fields to store.

+	 *

+	 * }

+	 * @param bool $default Not yet implemented.

+	 * @return int|string If field is unique returns inserted row id. Otherwise returns error string.

+	 */

+	function geodir_custom_field_save($request_field = array(), $default = false)

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$old_html_variable = '';

+

+		$data_type = trim($request_field['data_type']);

+

+		$result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

+

+		// some servers fail if a POST value is VARCHAR so we change it.

+		if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){

+			$request_field['data_type'] = 'VARCHAR';

+		}

+

+		$cf = trim($result_str, '_');

+

+

+		/*-------- check duplicate validation --------*/

+

+		$cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

+		$post_type = $request_field['listing_type'];

+

+		if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {

+			$cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;

+		}

+

+		$check_html_variable = $wpdb->get_var(

+			$wpdb->prepare(

+				"select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",

+				array($cf, $cehhtmlvar_name, $post_type)

+			)

+		);

+

+

+		if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {

+

+			if ($cf != '') {

+

+				$post_meta_info = $wpdb->get_row(

+					$wpdb->prepare(

+						"select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",

+						array($cf)

+					)

+				);

+

+			}

+

+			if (!empty($post_meta_info)) {

+				$post_val = $post_meta_info;

+				$old_html_variable = $post_val->htmlvar_name;

+

+			}

+

+

+

+			if ($post_type == '') $post_type = 'gd_place';

+

+

+			$detail_table = $plugin_prefix . $post_type . '_detail';

+

+			$admin_title = $request_field['admin_title'];

+			$site_title = $request_field['site_title'];

+			$data_type = $request_field['data_type'];

+			$field_type = $request_field['field_type'];

+			$field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type;

+			$htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

+			$admin_desc = $request_field['admin_desc'];

+			$clabels = isset($request_field['clabels']) ? $request_field['clabels'] : '';

+			$default_value = isset($request_field['default_value']) ? $request_field['default_value'] : '';

+			$sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : '';

+			$is_active = isset($request_field['is_active']) ? $request_field['is_active'] : '';

+			$is_required = isset($request_field['is_required']) ? $request_field['is_required'] : '';

+			$required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : '';

+			$css_class = isset($request_field['css_class']) ? $request_field['css_class'] : '';

+			$field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : '';

+			$show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : '';

+			$show_in = isset($request_field['show_in']) ? $request_field['show_in'] : '';

+			$show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : '';

+			$show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : '';

+			$decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type

+			$decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : '';

+			$validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : '';

+			$validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : '';

+			$for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';

 

             

-            if(is_array($show_in)){

-                $show_in = implode(",", $request_field['show_in']);

-            }

+			if(is_array($show_in)){

+				$show_in = implode(",", $request_field['show_in']);

+			}

             

-            if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {

-                $htmlvar_name = 'geodir_' . $htmlvar_name;

-            }

+			if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {

+				$htmlvar_name = 'geodir_' . $htmlvar_name;

+			}

 

-            $option_values = '';

-            if (isset($request_field['option_values']))

-                $option_values = $request_field['option_values'];

+			$option_values = '';

+			if (isset($request_field['option_values']))

+				$option_values = $request_field['option_values'];

 

-            $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0';

+			$cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0';

 

-            $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0';

+			$cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0';

 

-            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))

-                $price_pkg = implode(",", $request_field['show_on_pkg']);

-            else {

-                $package_info = array();

+			if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))

+				$price_pkg = implode(",", $request_field['show_on_pkg']);

+			else {

+				$package_info = array();

 

-                $package_info = geodir_post_package_info($package_info, '', $post_type);

-                $price_pkg = !empty($package_info->pid) ? $package_info->pid : '';

-            }

+				$package_info = geodir_post_package_info($package_info, '', $post_type);

+				$price_pkg = !empty($package_info->pid) ? $package_info->pid : '';

+			}

 

 

-            if (isset($request_field['extra']) && !empty($request_field['extra']))

-                $extra_fields = $request_field['extra'];

+			if (isset($request_field['extra']) && !empty($request_field['extra']))

+				$extra_fields = $request_field['extra'];

 

-            if (isset($request_field['is_default']) && $request_field['is_default'] != '')

-                $is_default = $request_field['is_default'];

-            else

-                $is_default = '0';

+			if (isset($request_field['is_default']) && $request_field['is_default'] != '')

+				$is_default = $request_field['is_default'];

+			else

+				$is_default = '0';

 

-            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')

-                $is_admin = $request_field['is_admin'];

-            else

-                $is_admin = '0';

+			if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')

+				$is_admin = $request_field['is_admin'];

+			else

+				$is_admin = '0';

 

 

-            if ($is_active == '') $is_active = 1;

-            if ($is_required == '') $is_required = 0;

+			if ($is_active == '') $is_active = 1;

+			if ($is_required == '') $is_required = 0;

 

 

-            if ($sort_order == '') {

+			if ($sort_order == '') {

 

-                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);

+				$last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);

 

-                $sort_order = (int)$last_order + 1;

-            }

+				$sort_order = (int)$last_order + 1;

+			}

 

-            $default_value_add = '';

+			$default_value_add = '';

 

 

-            if (!empty($post_meta_info)) {

-                switch ($field_type):

+			if (!empty($post_meta_info)) {

+				switch ($field_type):

 

-                    case 'address':

+					case 'address':

 

-                        if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

-                        }

-                        $old_prefix = $old_html_variable . '_';

+						if ($htmlvar_name != '') {

+							$prefix = $htmlvar_name . '_';

+						}

+						$old_prefix = $old_html_variable . '_';

 

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";

+						$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";

 

-                        if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                        }

+						if ($default_value != '') {

+							$meta_field_add .= " DEFAULT '" . $default_value . "'";

+						}

 

-                        $wpdb->query($meta_field_add);

+						$wpdb->query($meta_field_add);

 

-                        if ($extra_fields != '') {

+						if ($extra_fields != '') {

 

-                            if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

+							if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "VARCHAR( 50 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+									$meta_field_add = "VARCHAR( 50 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

+									geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

 

-                                }

+								}

 

 

-                            }

+							}

 

 

-                            if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

+							if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");

 

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

-                                    $meta_field_add = "VARCHAR( 50 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$wpdb->query($meta_field_add);

+								} else {

+									$meta_field_add = "VARCHAR( 50 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

-                                }

+									geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+								}

 

-                            }

-                            if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

+							}

+							if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");

 

-                                if ($is_column) {

+								if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "VARCHAR( 50 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "VARCHAR( 50 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+									geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

 

-                                }

+								}

 

-                            }

-                            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

+							}

+							if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");

 

-                                if ($is_column) {

+								if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "VARCHAR( 50 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "VARCHAR( 50 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+									geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

 

-                                }

+								}

 

-                            }

-                            if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

+							}

+							if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");

-                                if ($is_column) {

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");

+								if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

-                                    $meta_field_add = "VARCHAR( 20 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+									$meta_field_add = "VARCHAR( 20 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+									geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

 

-                                }

+								}

 

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");

 

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

-                                    $meta_field_add = "VARCHAR( 20 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+									$meta_field_add = "VARCHAR( 20 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

-                                }

+									geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+								}

 

-                            }

-                            if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

+							}

+							if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");

 

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

 

-                                    $meta_field_add = "VARCHAR( 15 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "VARCHAR( 15 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

-                                }

+									geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+								}

 

 

-                            }

-                            if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

+							}

+							if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

+									$wpdb->query($meta_field_add);

 

-                                } else {

+								} else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

 

-                                    $meta_field_add = "VARCHAR( 3 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "VARCHAR( 3 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

-                                }

+									geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+								}

 

-                            }

-                            // show lat lng

-                            if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");

+							}

+							// show lat lng

+							if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");

 

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

-                                    $meta_field_add .= " DEFAULT '1'";

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+									$meta_field_add .= " DEFAULT '1'";

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+									$wpdb->query($meta_field_add);

+								} else {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

 

-                                    $meta_field_add = "VARCHAR( 3 ) NULL";

-                                    $meta_field_add .= " DEFAULT '1'";

+									$meta_field_add = "VARCHAR( 3 ) NULL";

+									$meta_field_add .= " DEFAULT '1'";

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

-                                }

+									geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+								}

 

-                            }

-                        }// end extra

+							}

+						}// end extra

 

-                        break;

+						break;

 

-                    case 'checkbox':

-                    case 'multiselect':

-                    case 'select':

-                    case 'taxonomy':

+					case 'checkbox':

+					case 'multiselect':

+					case 'select':

+					case 'taxonomy':

 

-                        $op_size = '500';

+						$op_size = '500';

 

-                        // only make the field as big as it needs to be.

-                        if(isset($option_values) && $option_values && $field_type=='select'){

-                            $option_values_arr = explode(',',$option_values);

-                            if(is_array($option_values_arr)){

-                                $op_max = 0;

-                                foreach($option_values_arr as $op_val){

-                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}

-                                }

-                                if($op_max){$op_size =$op_max; }

-                            }

-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

-                            if(strlen($option_values)){

-                                $op_size =  strlen($option_values);

-                            }

-                        }

+						// only make the field as big as it needs to be.

+						if(isset($option_values) && $option_values && $field_type=='select'){

+							$option_values_arr = explode(',',$option_values);

+							if(is_array($option_values_arr)){

+								$op_max = 0;

+								foreach($option_values_arr as $op_val){

+									if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}

+								}

+								if($op_max){$op_size =$op_max; }

+							}

+						}elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

+							if(strlen($option_values)){

+								$op_size =  strlen($option_values);

+							}

+						}

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";

+						$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";

 

-                        if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                        }

+						if ($default_value != '') {

+							$meta_field_add .= " DEFAULT '" . $default_value . "'";

+						}

 

-                        $alter_result = $wpdb->query($meta_field_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

-                        }

+						$alter_result = $wpdb->query($meta_field_add);

+						if($alter_result===false){

+							return __('Column change failed, you may have too many columns.','geodirectory');

+						}

 

-                        if (isset($request_field['cat_display_type']))

-                            $extra_fields = $request_field['cat_display_type'];

+						if (isset($request_field['cat_display_type']))

+							$extra_fields = $request_field['cat_display_type'];

 

-                        if (isset($request_field['multi_display_type']))

-                            $extra_fields = $request_field['multi_display_type'];

+						if (isset($request_field['multi_display_type']))

+							$extra_fields = $request_field['multi_display_type'];

 

 

-                        break;

+						break;

 

-                    case 'textarea':

-                    case 'html':

-                    case 'url':

-                    case 'file':

+					case 'textarea':

+					case 'html':

+					case 'url':

+					case 'file':

 

-                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

-                        }

-                        if (isset($request_field['advanced_editor']))

-                            $extra_fields = $request_field['advanced_editor'];

-

-                        break;

+						$alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");

+						if($alter_result===false){

+							return __('Column change failed, you may have too many columns.','geodirectory');

+						}

+						if (isset($request_field['advanced_editor']))

+							$extra_fields = $request_field['advanced_editor'];

+

+						break;

 

-                    case 'fieldset':

-                        // Nothing happened for fieldset

-                        break;

+					case 'fieldset':

+						// Nothing happened for fieldset

+						break;

 

-                    default:

-                        if ($data_type != 'VARCHAR' && $data_type != '') {

-                            if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";

-                            } else {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";

-                            }

-

-                            if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                            }

-                        } else {

-                            $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";

-                            if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                            }

-                        }

-

-                        $alter_result = $wpdb->query($default_value_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

-                        }

-                        break;

-                endswitch;

-

-                $extra_field_query = '';

-                if (!empty($extra_fields)) {

-                    $extra_field_query = serialize($extra_fields);

-                }

-

-                $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';

-

-                $wpdb->query(

-

-                    $wpdb->prepare(

-

-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+					default:

+						if ($data_type != 'VARCHAR' && $data_type != '') {

+							if ($data_type == 'FLOAT' && $decimal_point > 0) {

+								$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";

+							} else {

+								$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";

+							}

+

+							if (is_numeric($default_value) && $default_value != '') {

+								$default_value_add .= " DEFAULT '" . $default_value . "'";

+							}

+						} else {

+							$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";

+							if ($default_value != '') {

+								$default_value_add .= " DEFAULT '" . $default_value . "'";

+							}

+						}

+

+						$alter_result = $wpdb->query($default_value_add);

+						if($alter_result===false){

+							return __('Column change failed, you may have too many columns.','geodirectory');

+						}

+						break;

+				endswitch;

+

+				$extra_field_query = '';

+				if (!empty($extra_fields)) {

+					$extra_field_query = serialize($extra_fields);

+				}

+

+				$decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';

+

+				$wpdb->query(

+

+					$wpdb->prepare(

+

+						"update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -805,308 +805,308 @@ 
 					for_admin_use = %s

 					where id = %d",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)

-                    )

+						array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)

+					)

 

-                );

+				);

 

-                $lastid = trim($cf);

+				$lastid = trim($cf);

 

 

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+				$wpdb->query(

+					$wpdb->prepare(

+						"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

 					 	site_title=%s

 					where post_type = %s and htmlvar_name = %s",

-                        array($site_title, $post_type, $htmlvar_name)

-                    )

-                );

-

-

-                if ($cat_sort == '')

-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

-

-

-                /**

-                 * Called after all custom fields are saved for a post.

-                 *

-                 * @since 1.0.0

-                 * @param int $lastid The post ID.

-                 */

-                do_action('geodir_after_custom_fields_updated', $lastid);

-

-            } else {

-

-                switch ($field_type):

-

-                    case 'address':

-

-                        $data_type = '';

-

-                        if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

-                        }

-                        $old_prefix = $old_html_variable;

-

-                        //$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL";

-

-                        $meta_field_add = "VARCHAR( 254 ) NULL";

-                        if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                        }

-

-                        geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);

-                        //$wpdb->query($meta_field_add);

-

-

-                        if (!empty($extra_fields)) {

+						array($site_title, $post_type, $htmlvar_name)

+					)

+				);

+

+

+				if ($cat_sort == '')

+					$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

+

+

+				/**

+				 * Called after all custom fields are saved for a post.

+				 *

+				 * @since 1.0.0

+				 * @param int $lastid The post ID.

+				 */

+				do_action('geodir_after_custom_fields_updated', $lastid);

+

+			} else {

+

+				switch ($field_type):

+

+					case 'address':

+

+						$data_type = '';

+

+						if ($htmlvar_name != '') {

+							$prefix = $htmlvar_name . '_';

+						}

+						$old_prefix = $old_html_variable;

+

+						//$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL";

+

+						$meta_field_add = "VARCHAR( 254 ) NULL";

+						if ($default_value != '') {

+							$meta_field_add .= " DEFAULT '" . $default_value . "'";

+						}

+

+						geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);

+						//$wpdb->query($meta_field_add);

+

+

+						if (!empty($extra_fields)) {

 

-                            if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";

-                                $meta_field_add = "VARCHAR( 50 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";

-                                $meta_field_add = "VARCHAR( 50 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 30 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";

-                                $meta_field_add = "VARCHAR( 15 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

-                                $meta_field_add = "VARCHAR( 20 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 20 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

-

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 15 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

-

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 3 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

-

-                                //$wpdb->query($meta_field_add);

-                            }

-                            // show lat lng

-                            if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 3 ) NULL";

-                                $meta_field_add .= " DEFAULT '1'";

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                        }

-

-                        break;

-

-                    case 'checkbox':

-                        $data_type = 'TINYINT';

-

-                        $meta_field_add = $data_type . "( 1 ) NOT NULL ";

-                        if ((int)$default_value === 1) {

-                            $meta_field_add .= " DEFAULT '1'";

-                        }

-

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

-                        }

-                        break;

-                    case 'multiselect':

-                    case 'select':

-                        $data_type = 'VARCHAR';

-                        $op_size = '500';

-

-                        // only make the field as big as it needs to be.

-                        if (isset($option_values) && $option_values && $field_type == 'select') {

-                            $option_values_arr = explode(',', $option_values);

-

-                            if (is_array($option_values_arr)) {

-                                $op_max = 0;

-

-                                foreach ($option_values_arr as $op_val) {

-                                    if (strlen($op_val) && strlen($op_val) > $op_max) {

-                                        $op_max = strlen($op_val);

-                                    }

-                                }

-

-                                if ($op_max) {

-                                    $op_size = $op_max;

-                                }

-                            }

-                        } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

-                            if (strlen($option_values)) {

-                                $op_size =  strlen($option_values);

-                            }

-

-                            if (isset($request_field['multi_display_type'])) {

-                                $extra_fields = $request_field['multi_display_type'];

-                            }

-                        }

-

-                        $meta_field_add = $data_type . "( $op_size ) NULL ";

-                        if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                        }

-

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

-                        }

-                        break;

-                    case 'textarea':

-                    case 'html':

-                    case 'url':

-                    case 'file':

-

-                        $data_type = 'TEXT';

-

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

-

-                        $meta_field_add = $data_type . " NULL ";

-                        /*if($default_value != '')

+							if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";

+								$meta_field_add = "VARCHAR( 50 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";

+								$meta_field_add = "VARCHAR( 50 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";

+

+								$meta_field_add = "VARCHAR( 30 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";

+								$meta_field_add = "VARCHAR( 15 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+								$meta_field_add = "VARCHAR( 20 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+

+								$meta_field_add = "VARCHAR( 20 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+

+								$meta_field_add = "VARCHAR( 15 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+

+								$meta_field_add = "VARCHAR( 3 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+

+								//$wpdb->query($meta_field_add);

+							}

+							// show lat lng

+							if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+

+								$meta_field_add = "VARCHAR( 3 ) NULL";

+								$meta_field_add .= " DEFAULT '1'";

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+						}

+

+						break;

+

+					case 'checkbox':

+						$data_type = 'TINYINT';

+

+						$meta_field_add = $data_type . "( 1 ) NOT NULL ";

+						if ((int)$default_value === 1) {

+							$meta_field_add .= " DEFAULT '1'";

+						}

+

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

+						}

+						break;

+					case 'multiselect':

+					case 'select':

+						$data_type = 'VARCHAR';

+						$op_size = '500';

+

+						// only make the field as big as it needs to be.

+						if (isset($option_values) && $option_values && $field_type == 'select') {

+							$option_values_arr = explode(',', $option_values);

+

+							if (is_array($option_values_arr)) {

+								$op_max = 0;

+

+								foreach ($option_values_arr as $op_val) {

+									if (strlen($op_val) && strlen($op_val) > $op_max) {

+										$op_max = strlen($op_val);

+									}

+								}

+

+								if ($op_max) {

+									$op_size = $op_max;

+								}

+							}

+						} elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

+							if (strlen($option_values)) {

+								$op_size =  strlen($option_values);

+							}

+

+							if (isset($request_field['multi_display_type'])) {

+								$extra_fields = $request_field['multi_display_type'];

+							}

+						}

+

+						$meta_field_add = $data_type . "( $op_size ) NULL ";

+						if ($default_value != '') {

+							$meta_field_add .= " DEFAULT '" . $default_value . "'";

+						}

+

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

+						}

+						break;

+					case 'textarea':

+					case 'html':

+					case 'url':

+					case 'file':

+

+						$data_type = 'TEXT';

+

+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+

+						$meta_field_add = $data_type . " NULL ";

+						/*if($default_value != '')

 					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/

 

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

-                        }

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

+						}

 

-                        break;

+						break;

 

-                    case 'datepicker':

+					case 'datepicker':

 

-                        $data_type = 'DATE';

+						$data_type = 'DATE';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+						$meta_field_add = $data_type . " NULL ";

 

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value might have a invalid date format.', 'geodirectory');

-                        }

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value might have a invalid date format.', 'geodirectory');

+						}

 

-                        break;

+						break;

 

-                    case 'time':

+					case 'time':

 

-                        $data_type = 'TIME';

+						$data_type = 'TIME';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+						$meta_field_add = $data_type . " NULL ";

 

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value might have a invalid time format.', 'geodirectory');

-                        }

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value might have a invalid time format.', 'geodirectory');

+						}

 

-                        break;

+						break;

 

-                    default:

+					default:

 

-                        if ($data_type != 'VARCHAR' && $data_type != '') {

-                            $meta_field_add = $data_type . " NULL ";

+						if ($data_type != 'VARCHAR' && $data_type != '') {

+							$meta_field_add = $data_type . " NULL ";

 

-                            if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";

-                            }

+							if ($data_type == 'FLOAT' && $decimal_point > 0) {

+								$meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";

+							}

 

-                            if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                            }

-                        } else {

-                            $meta_field_add = " VARCHAR( 254 ) NULL ";

+							if (is_numeric($default_value) && $default_value != '') {

+								$default_value_add .= " DEFAULT '" . $default_value . "'";

+								$meta_field_add .= " DEFAULT '" . $default_value . "'";

+							}

+						} else {

+							$meta_field_add = " VARCHAR( 254 ) NULL ";

 

-                            if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                            }

-                        }

+							if ($default_value != '') {

+								$default_value_add .= " DEFAULT '" . $default_value . "'";

+								$meta_field_add .= " DEFAULT '" . $default_value . "'";

+							}

+						}

 

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

-                        }

-                        break;

-                endswitch;

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

+						}

+						break;

+				endswitch;

 

-                $extra_field_query = '';

-                if (!empty($extra_fields)) {

-                    $extra_field_query = serialize($extra_fields);

-                }

+				$extra_field_query = '';

+				if (!empty($extra_fields)) {

+					$extra_field_query = serialize($extra_fields);

+				}

 

-                $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';

+				$decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';

 

-                $wpdb->query(

+				$wpdb->query(

 

-                    $wpdb->prepare(

+					$wpdb->prepare(

 

-                        "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+						"insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -1139,26 +1139,26 @@ 
 					validation_msg = %s,

 					for_admin_use = %s ",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)

+						array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)

 

-                    )

+					)

 

-                );

+				);

 

-                $lastid = $wpdb->insert_id;

+				$lastid = $wpdb->insert_id;

 

-                $lastid = trim($lastid);

+				$lastid = trim($lastid);

 

-            }

+			}

 

-            return (int)$lastid;

+			return (int)$lastid;

 

 

-        } else {

-            return 'HTML Variable Name should be a unique name';

-        }

+		} else {

+			return 'HTML Variable Name should be a unique name';

+		}

 

-    }

+	}

 }

 

 /**

@@ -1173,63 +1173,63 @@ 
 function godir_set_field_order($field_ids = array())

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    $count = 0;

-    if (!empty($field_ids)):

-        $post_meta_info = false;

-        foreach ($field_ids as $id) {

+	$count = 0;

+	if (!empty($field_ids)):

+		$post_meta_info = false;

+		foreach ($field_ids as $id) {

 

-            $cf = trim($id, '_');

+			$cf = trim($id, '_');

 

-            $post_meta_info = $wpdb->query(

-                $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+			$post_meta_info = $wpdb->query(

+				$wpdb->prepare(

+					"update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

 															sort_order=%d 

 															where id= %d",

-                    array($count, $cf)

-                )

-            );

-            $count++;

-        }

-

-        return $post_meta_info;

-    else:

-        return false;

-    endif;

+					array($count, $cf)

+				)

+			);

+			$count++;

+		}

+

+		return $post_meta_info;

+	else:

+		return false;

+	endif;

 }

 

 function geodir_get_cf_value($cf) {

-    global $gd_session;

-    $value = '';

-    if (is_admin()) {

-        global $post;

-

-        if (isset($_REQUEST['post'])) {

-            $_REQUEST['pid'] = (int)$_REQUEST['post'];

-        }

-    }

-

-    if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

-        $post = $gd_ses_listing;

-        $value = isset($post[$cf['name']]) ? $post[$cf['name']] : '';

-    } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-        $value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true);

-    } else {

-        if ($value == '') {

-            $value = $cf['default'];

-        }

-    }

+	global $gd_session;

+	$value = '';

+	if (is_admin()) {

+		global $post;

+

+		if (isset($_REQUEST['post'])) {

+			$_REQUEST['pid'] = (int)$_REQUEST['post'];

+		}

+	}

+

+	if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

+		$post = $gd_ses_listing;

+		$value = isset($post[$cf['name']]) ? $post[$cf['name']] : '';

+	} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+		$value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true);

+	} else {

+		if ($value == '') {

+			$value = $cf['default'];

+		}

+	}

     

-    /**

-     * Filter the custom field value.

-     *

-     * @since 1.6.20

-     * 

-     * @param mixed $value Custom field value.

-     * @param array $cf Custom field info.

-     */

-    return apply_filters( 'geodir_get_cf_value', $value, $cf );

+	/**

+	 * Filter the custom field value.

+	 *

+	 * @since 1.6.20

+	 * 

+	 * @param mixed $value Custom field value.

+	 * @param array $cf Custom field info.

+	 */

+	return apply_filters( 'geodir_get_cf_value', $value, $cf );

 }

 

 /**

@@ -1248,422 +1248,422 @@ 
  * @param string $post_type Optional. The wordpress post type.

  */

 function geodir_get_custom_fields_html($package_id = '', $default = 'custom', $post_type = 'gd_place') {

-    global $is_default, $mapzoom, $gd_session;

+	global $is_default, $mapzoom, $gd_session;

 

-    $listing_type = $post_type;

+	$listing_type = $post_type;

 

-    $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);

+	$custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);

 

-    foreach ($custom_fields as $key => $val) {

-        if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}

-        $val = stripslashes_deep($val); // strip slashes from labels

-        if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}

+	foreach ($custom_fields as $key => $val) {

+		if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}

+		$val = stripslashes_deep($val); // strip slashes from labels

+		if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}

 

-        $name = $val['name'];

-        $type = $val['type'];

-        $is_default = $val['is_default'];

+		$name = $val['name'];

+		$type = $val['type'];

+		$is_default = $val['is_default'];

 

-        /* field available to site admin only for edit */

-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;

-        if ($for_admin_use && !is_super_admin()) {

-            continue;

-        }

+		/* field available to site admin only for edit */

+		$for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;

+		if ($for_admin_use && !is_super_admin()) {

+			continue;

+		}

 

-        if (is_admin()) {

-            global $post;

+		if (is_admin()) {

+			global $post;

 

-            if (isset($_REQUEST['post']))

-                $_REQUEST['pid'] = $_REQUEST['post'];

-        }

+			if (isset($_REQUEST['post']))

+				$_REQUEST['pid'] = $_REQUEST['post'];

+		}

 

         

 

-        /**

-         * Called before the custom fields info is output for submitting a post.

-         *

-         * Used dynamic hook type geodir_before_custom_form_field_$name.

-         *

-         * @since 1.0.0

-         * @param string $listing_type The post post type.

-         * @param int $package_id The price package ID for the post.

-         * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

-         * @see 'geodir_after_custom_form_field_$name'

-         */

-        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);

-

-

-        $custom_field = $val;

-        $html ='';

-        /**

-         * Filter the output for custom fields.

-         *

-         * Here we can remove or add new functions depending on the field type.

-         *

-         * @param string $html The html to be filtered (blank).

-         * @param array $custom_field The custom field array values.

-         */

-        echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);

-

-

-

-        /**

-         * Called after the custom fields info is output for submitting a post.

-         *

-         * Used dynamic hook type geodir_after_custom_form_field_$name.

-         *

-         * @since 1.0.0

-         * @param string $listing_type The post post type.

-         * @param int $package_id The price package ID for the post.

-         * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

-         * @see 'geodir_before_custom_form_field_$name'

-         */

-        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);

-

-    }

+		/**

+		 * Called before the custom fields info is output for submitting a post.

+		 *

+		 * Used dynamic hook type geodir_before_custom_form_field_$name.

+		 *

+		 * @since 1.0.0

+		 * @param string $listing_type The post post type.

+		 * @param int $package_id The price package ID for the post.

+		 * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

+		 * @see 'geodir_after_custom_form_field_$name'

+		 */

+		do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);

+

+

+		$custom_field = $val;

+		$html ='';

+		/**

+		 * Filter the output for custom fields.

+		 *

+		 * Here we can remove or add new functions depending on the field type.

+		 *

+		 * @param string $html The html to be filtered (blank).

+		 * @param array $custom_field The custom field array values.

+		 */

+		echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);

+

+

+

+		/**

+		 * Called after the custom fields info is output for submitting a post.

+		 *

+		 * Used dynamic hook type geodir_after_custom_form_field_$name.

+		 *

+		 * @since 1.0.0

+		 * @param string $listing_type The post post type.

+		 * @param int $package_id The price package ID for the post.

+		 * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

+		 * @see 'geodir_before_custom_form_field_$name'

+		 */

+		do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);

+

+	}

 

 }

 

 

 if (!function_exists('geodir_get_field_infoby')) {

-    /**

-     * Get custom field using key and value.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $key The key you want to look for.

-     * @param string $value The value of the key you want to look for.

-     * @param string $geodir_post_type The post type.

-     * @return bool|mixed Returns field info when available. otherwise returns false.

-     */

-    function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')

-    {

-

-        global $wpdb;

-

-        $filter = $wpdb->get_row(

-            $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",

-                array($geodir_post_type)

-            )

-        );

-

-        if ($filter) {

-            return $filter;

-        } else {

-            return false;

-        }

-

-    }

+	/**

+	 * Get custom field using key and value.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $key The key you want to look for.

+	 * @param string $value The value of the key you want to look for.

+	 * @param string $geodir_post_type The post type.

+	 * @return bool|mixed Returns field info when available. otherwise returns false.

+	 */

+	function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')

+	{

+

+		global $wpdb;

+

+		$filter = $wpdb->get_row(

+			$wpdb->prepare(

+				"SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",

+				array($geodir_post_type)

+			)

+		);

+

+		if ($filter) {

+			return $filter;

+		} else {

+			return false;

+		}

+

+	}

 }

 

 

 function geodir_field_icon_proccess($cf){

 

 

-    if (strpos($cf['field_icon'], 'http') !== false) {

-        $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

-    } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {

-        $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';

-    }else{

-        $field_icon = $cf['field_icon'];

-    }

+	if (strpos($cf['field_icon'], 'http') !== false) {

+		$field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

+	} elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {

+		$field_icon = '<i class="' . $cf['field_icon'] . '"></i>';

+	}else{

+		$field_icon = $cf['field_icon'];

+	}

 

-    return $field_icon;

+	return $field_icon;

 }

 

 if (!function_exists('geodir_show_listing_info')) {

-    /**

-     * Show listing info depending on field location.

-     *

-     * @since 1.0.0

-     * @since 1.5.7 Custom fields option values added to db translation.

-     *              Changes to display url fields title.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post The current post object.

-     * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false.

-     *

-     * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.

-     * @return string Returns listing info html.

-     */

-    function geodir_show_listing_info($fields_location = '') {

-        global $post, $preview, $wpdb, $send_to_friend;

-

-        $package_info = array();

-

-        $package_info = geodir_post_package_info($package_info, $post);

-        $post_package_id = !empty($package_info->pid) ? $package_info->pid : '';

-        $p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype();

-        $send_to_friend = false;

-

-        ob_start();

-        $fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location);

-

-        if (!empty($fields_info)) {

-            $post = stripslashes_deep($post); // strip slashes

+	/**

+	 * Show listing info depending on field location.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.7 Custom fields option values added to db translation.

+	 *              Changes to display url fields title.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post The current post object.

+	 * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false.

+	 *

+	 * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.

+	 * @return string Returns listing info html.

+	 */

+	function geodir_show_listing_info($fields_location = '') {

+		global $post, $preview, $wpdb, $send_to_friend;

+

+		$package_info = array();

+

+		$package_info = geodir_post_package_info($package_info, $post);

+		$post_package_id = !empty($package_info->pid) ? $package_info->pid : '';

+		$p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype();

+		$send_to_friend = false;

+

+		ob_start();

+		$fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location);

+

+		if (!empty($fields_info)) {

+			$post = stripslashes_deep($post); // strip slashes

             

-            //echo '<div class="geodir-company_info field-group">';

-            global $field_set_start;

-            $field_set_start = 0;

-

-

-

-            foreach ($fields_info as $type) {

-                if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}

-                $type = stripslashes_deep($type); // strip slashes

-                if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}

-                $html = '';

-                $field_icon = geodir_field_icon_proccess($type);

-                $filed_type = $type['type'];

-                $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';

-                if($html_var=='post'){$html_var='post_address';}

-

-                /**

-                 * Filter the output for custom fields.

-                 *

-                 * Here we can remove or add new functions depending on the field type.

-                 *

-                 * @param string $html The html to be filtered (blank).

-                 * @param string $fields_location The location the field is to be show.

-                 * @param array $type The array of field values.

-                 */

-                $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);

-

-                $variables_array = array();

-

-

-                if ($type['type'] != 'fieldset'):

-                    $variables_array['post_id'] = !empty($post->ID) ? $post->ID : (!empty($post->pid) ? $post->pid : NULL);

-                    $variables_array['label'] = __($type['site_title'], 'geodirectory');

-                    $variables_array['value'] = '';

-                    if (isset($post->{$type['htmlvar_name']}))

-                        $variables_array['value'] = $post->{$type['htmlvar_name']};

-                endif;

-

-

-                if ($html):

-

-                    /**

-                     * Called before a custom fields is output on the frontend.

-                     *

-                     * @since 1.0.0

-                     * @param string $html_var The HTML variable name for the field.

-                     */

-                    do_action("geodir_before_show_{$html_var}");

-                    /**

-                     * Filter custom field output.

-                     *

-                     * @since 1.0.0

-                     *

-                     * @param string $html_var The HTML variable name for the field.

-                     * @param string $html Custom field unfiltered HTML.

-                     * @param array $variables_array Custom field variables array.

-                     */

-                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);

-

-                    /**

-                     * Called after a custom fields is output on the frontend.

-                     *

-                     * @since 1.0.0

-                     * @param string $html_var The HTML variable name for the field.

-                     */

-                    do_action("geodir_after_show_{$html_var}");

-

-                endif;

-

-            }

-

-            //echo '</div>';

-

-        }

-

-

-        $html = ob_get_clean();

-

-        /**

-         * Filter the custom fields over all output.

-         *

-         * @param string $html The html of the custom fields.

-         * @param string $fields_location The location the fields are being output.

-         * @since 1.6.9

-         */

-        return apply_filters('geodir_show_listing_info',$html,$fields_location);

-

-    }

+			//echo '<div class="geodir-company_info field-group">';

+			global $field_set_start;

+			$field_set_start = 0;

+

+

+

+			foreach ($fields_info as $type) {

+				if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}

+				$type = stripslashes_deep($type); // strip slashes

+				if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}

+				$html = '';

+				$field_icon = geodir_field_icon_proccess($type);

+				$filed_type = $type['type'];

+				$html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';

+				if($html_var=='post'){$html_var='post_address';}

+

+				/**

+				 * Filter the output for custom fields.

+				 *

+				 * Here we can remove or add new functions depending on the field type.

+				 *

+				 * @param string $html The html to be filtered (blank).

+				 * @param string $fields_location The location the field is to be show.

+				 * @param array $type The array of field values.

+				 */

+				$html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);

+

+				$variables_array = array();

+

+

+				if ($type['type'] != 'fieldset'):

+					$variables_array['post_id'] = !empty($post->ID) ? $post->ID : (!empty($post->pid) ? $post->pid : NULL);

+					$variables_array['label'] = __($type['site_title'], 'geodirectory');

+					$variables_array['value'] = '';

+					if (isset($post->{$type['htmlvar_name']}))

+						$variables_array['value'] = $post->{$type['htmlvar_name']};

+				endif;

+

+

+				if ($html):

+

+					/**

+					 * Called before a custom fields is output on the frontend.

+					 *

+					 * @since 1.0.0

+					 * @param string $html_var The HTML variable name for the field.

+					 */

+					do_action("geodir_before_show_{$html_var}");

+					/**

+					 * Filter custom field output.

+					 *

+					 * @since 1.0.0

+					 *

+					 * @param string $html_var The HTML variable name for the field.

+					 * @param string $html Custom field unfiltered HTML.

+					 * @param array $variables_array Custom field variables array.

+					 */

+					if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);

+

+					/**

+					 * Called after a custom fields is output on the frontend.

+					 *

+					 * @since 1.0.0

+					 * @param string $html_var The HTML variable name for the field.

+					 */

+					do_action("geodir_after_show_{$html_var}");

+

+				endif;

+

+			}

+

+			//echo '</div>';

+

+		}

+

+

+		$html = ob_get_clean();

+

+		/**

+		 * Filter the custom fields over all output.

+		 *

+		 * @param string $html The html of the custom fields.

+		 * @param string $fields_location The location the fields are being output.

+		 * @since 1.6.9

+		 */

+		return apply_filters('geodir_show_listing_info',$html,$fields_location);

+

+	}

 }

 

 if (!function_exists('geodir_default_date_format')) {

-    /**

-     * Returns default date format.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return mixed|string|void Returns default date format.

-     */

-    function geodir_default_date_format()

-    {

-        if ($format = get_option('date_format'))

-            return $format;

-        else

-            return 'dd-mm-yy';

-    }

+	/**

+	 * Returns default date format.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return mixed|string|void Returns default date format.

+	 */

+	function geodir_default_date_format()

+	{

+		if ($format = get_option('date_format'))

+			return $format;

+		else

+			return 'dd-mm-yy';

+	}

 }

 

 if (!function_exists('geodir_get_formated_date')) {

-    /**

-     * Returns formatted date.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $date Date string to convert.

-     * @return bool|int|string Returns formatted date.

-     */

-    function geodir_get_formated_date($date)

-    {

-        return mysql2date(get_option('date_format'), $date);

-    }

+	/**

+	 * Returns formatted date.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $date Date string to convert.

+	 * @return bool|int|string Returns formatted date.

+	 */

+	function geodir_get_formated_date($date)

+	{

+		return mysql2date(get_option('date_format'), $date);

+	}

 }

 

 if (!function_exists('geodir_get_formated_time')) {

-    /**

-     * Returns formatted time.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $time Time string to convert.

-     * @return bool|int|string Returns formatted time.

-     */

-    function geodir_get_formated_time($time)

-    {

-        return mysql2date(get_option('time_format'), $time, $translate = true);

-    }

+	/**

+	 * Returns formatted time.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $time Time string to convert.

+	 * @return bool|int|string Returns formatted time.

+	 */

+	function geodir_get_formated_time($time)

+	{

+		return mysql2date(get_option('time_format'), $time, $translate = true);

+	}

 }

 

 

 if (!function_exists('geodir_save_post_file_fields')) {

-    /**

-     * Save post file fields

-     *

-     * @since 1.0.0

-     * @since 1.4.7 Added `$extra_fields` parameter.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @global object $current_user Current user object.

-     * @param int $post_id

-     * @param string $field_id

-     * @param array $post_image

-     * @param array $extra_fields Array of extra fields.

-     */

-    function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())

-    {

+	/**

+	 * Save post file fields

+	 *

+	 * @since 1.0.0

+	 * @since 1.4.7 Added `$extra_fields` parameter.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @global object $current_user Current user object.

+	 * @param int $post_id

+	 * @param string $field_id

+	 * @param array $post_image

+	 * @param array $extra_fields Array of extra fields.

+	 */

+	function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())

+	{

 

-        global $wpdb, $plugin_prefix, $current_user;

+		global $wpdb, $plugin_prefix, $current_user;

 

-        $post_type = get_post_type($post_id);

-        //echo $field_id; exit;

-        $table = $plugin_prefix . $post_type . '_detail';

+		$post_type = get_post_type($post_id);

+		//echo $field_id; exit;

+		$table = $plugin_prefix . $post_type . '_detail';

 

-        $postcurr_images = array();

-        $postcurr_images = geodir_get_post_meta($post_id, $field_id, true);

-        $file_urls = '';

+		$postcurr_images = array();

+		$postcurr_images = geodir_get_post_meta($post_id, $field_id, true);

+		$file_urls = '';

 

-        if (!empty($post_image)) {

+		if (!empty($post_image)) {

 

-            $invalid_files = array();

+			$invalid_files = array();

 

-            //Get and remove all old images of post from database to set by new order

-            $geodir_uploaddir = '';

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

+			//Get and remove all old images of post from database to set by new order

+			$geodir_uploaddir = '';

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

 

-            $geodir_uploadpath = $uploads['path'];

-            $geodir_uploadurl = $uploads['url'];

-            $sub_dir = $uploads['subdir'];

+			$geodir_uploadpath = $uploads['path'];

+			$geodir_uploadurl = $uploads['url'];

+			$sub_dir = $uploads['subdir'];

 

-            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

 

-            for ($m = 0; $m < count($post_image); $m++) {

+			for ($m = 0; $m < count($post_image); $m++) {

 

-                /* --------- start ------- */

+				/* --------- start ------- */

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

+				if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

 

 

-                    $curr_img_url = $post_image[$m];

-                    $image_name_arr = explode('/', $curr_img_url);

-                    $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];

-                    $filename = end($image_name_arr);

-                    $img_name_arr = explode('.', $filename);

+					$curr_img_url = $post_image[$m];

+					$image_name_arr = explode('/', $curr_img_url);

+					$curr_img_dir = $image_name_arr[count($image_name_arr) - 2];

+					$filename = end($image_name_arr);

+					$img_name_arr = explode('.', $filename);

 

-                    $arr_file_type = wp_check_filetype($filename);

+					$arr_file_type = wp_check_filetype($filename);

 

-                    if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

-                        continue;

-                    }

+					if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

+						continue;

+					}

 

-                    $uploaded_file_type = $arr_file_type['type'];

-                    $uploaded_file_ext = $arr_file_type['ext'];

+					$uploaded_file_type = $arr_file_type['type'];

+					$uploaded_file_ext = $arr_file_type['ext'];

 

-                    if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

-                        continue; // Invalid file type.

-                    }

+					if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

+						continue; // Invalid file type.

+					}

 

-                    // Set an array containing a list of acceptable formats

-                    //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

+					// Set an array containing a list of acceptable formats

+					//$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

-                    if (!function_exists('wp_handle_upload'))

-                        require_once(ABSPATH . 'wp-admin/includes/file.php');

+					if (!function_exists('wp_handle_upload'))

+						require_once(ABSPATH . 'wp-admin/includes/file.php');

 

-                    if (!is_dir($geodir_uploadpath))

-                        mkdir($geodir_uploadpath);

+					if (!is_dir($geodir_uploadpath))

+						mkdir($geodir_uploadpath);

 

-                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

-                    $explode_sub_dir = explode("/", $sub_dir);

-                    if ($curr_img_dir == end($explode_sub_dir)) {

-                        $img_path = $geodir_uploadpath . '/' . $filename;

-                        $img_url = $geodir_uploadurl . '/' . $filename;

-                    } else {

-                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

-                    }

+					$new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

+					$explode_sub_dir = explode("/", $sub_dir);

+					if ($curr_img_dir == end($explode_sub_dir)) {

+						$img_path = $geodir_uploadpath . '/' . $filename;

+						$img_url = $geodir_uploadurl . '/' . $filename;

+					} else {

+						$img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+						$img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+					}

 

-                    $uploaded_file = '';

-                    if (file_exists($img_path))

-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+					$uploaded_file = '';

+					if (file_exists($img_path))

+						$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

 

-                    if ($curr_img_dir != $geodir_uploaddir) {

-                        if (file_exists($img_path))

-                            unlink($img_path);

-                    }

+					if ($curr_img_dir != $geodir_uploaddir) {

+						if (file_exists($img_path))

+							unlink($img_path);

+					}

 

-                    if (!empty($uploaded_file))

-                        $file_urls = $geodir_uploadurl . '/' . $new_name;

+					if (!empty($uploaded_file))

+						$file_urls = $geodir_uploadurl . '/' . $new_name;

 

-                } else {

-                    $file_urls = $post_image[$m];

-                }

-            }

+				} else {

+					$file_urls = $post_image[$m];

+				}

+			}

 

 

-        }

+		}

 

-        //Remove all old attachments and temp images

-        if (!empty($postcurr_images)) {

+		//Remove all old attachments and temp images

+		if (!empty($postcurr_images)) {

 

-            if ($file_urls != $postcurr_images) {

-                $invalid_files[] = (object)array('src' => $postcurr_images);

-                $invalid_files = (object)$invalid_files;

-            }

-        }

+			if ($file_urls != $postcurr_images) {

+				$invalid_files[] = (object)array('src' => $postcurr_images);

+				$invalid_files = (object)$invalid_files;

+			}

+		}

 

-        geodir_save_post_meta($post_id, $field_id, $file_urls);

+		geodir_save_post_meta($post_id, $field_id, $file_urls);

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

+		if (!empty($invalid_files))

+			geodir_remove_attachments($invalid_files);

 

-    }

+	}

 }

 

 

@@ -1678,76 +1678,76 @@ 
  */

 function geodir_custom_upload_mimes($existing_mimes = array())

 {

-    $existing_mimes['wif'] = 'text/plain';

-    $existing_mimes['jpg|jpeg'] = 'image/jpeg';

-    $existing_mimes['gif'] = 'image/gif';

-    $existing_mimes['png'] = 'image/png';

-    $existing_mimes['pdf'] = 'application/pdf';

-    $existing_mimes['txt'] = 'text/text';

-    $existing_mimes['csv'] = 'application/octet-stream';

-    $existing_mimes['doc'] = 'application/msword';

-    $existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel';

-    $existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';

-    $existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';

-    return $existing_mimes;

+	$existing_mimes['wif'] = 'text/plain';

+	$existing_mimes['jpg|jpeg'] = 'image/jpeg';

+	$existing_mimes['gif'] = 'image/gif';

+	$existing_mimes['png'] = 'image/png';

+	$existing_mimes['pdf'] = 'application/pdf';

+	$existing_mimes['txt'] = 'text/text';

+	$existing_mimes['csv'] = 'application/octet-stream';

+	$existing_mimes['doc'] = 'application/msword';

+	$existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel';

+	$existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';

+	$existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';

+	return $existing_mimes;

 }

 

 if (!function_exists('geodir_plupload_action')) {

 

-    /**

-     * Get upload directory path details

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $current_user Current user object.

-     * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.

-     * @return mixed Returns upload directory details as an array.

-     */

-    function geodir_upload_dir($upload)

-    {

-        global $current_user;

-        $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

-        $upload['path'] = $upload['basedir'] . $upload['subdir'];

-        $upload['url'] = $upload['baseurl'] . $upload['subdir'];

-        return $upload;

-    }

-

-    /**

-     * Handles place file and image upload.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_plupload_action()

-    {

-        // check ajax nonce

-        $imgid = $_POST["imgid"];

-

-        check_ajax_referer($imgid . 'pluploadan');

-

-        // handle custom file uploaddir

-        add_filter('upload_dir', 'geodir_upload_dir');

-

-        // change file orientation if needed

-        $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);

-

-        // handle file upload

-        $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));

-        // remove handle custom file uploaddir

-        remove_filter('upload_dir', 'geodir_upload_dir');

-

-        if(!isset($status['url']) && isset($status['error'])){

-            print_r($status);

-        }

-

-        // send the uploaded file url in response

-        if (isset($status['url'])) {

-            echo $status['url'];

-        } else {

-            echo 'x';

-        }

-        exit;

-    }

+	/**

+	 * Get upload directory path details

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $current_user Current user object.

+	 * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.

+	 * @return mixed Returns upload directory details as an array.

+	 */

+	function geodir_upload_dir($upload)

+	{

+		global $current_user;

+		$upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

+		$upload['path'] = $upload['basedir'] . $upload['subdir'];

+		$upload['url'] = $upload['baseurl'] . $upload['subdir'];

+		return $upload;

+	}

+

+	/**

+	 * Handles place file and image upload.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_plupload_action()

+	{

+		// check ajax nonce

+		$imgid = $_POST["imgid"];

+

+		check_ajax_referer($imgid . 'pluploadan');

+

+		// handle custom file uploaddir

+		add_filter('upload_dir', 'geodir_upload_dir');

+

+		// change file orientation if needed

+		$fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);

+

+		// handle file upload

+		$status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));

+		// remove handle custom file uploaddir

+		remove_filter('upload_dir', 'geodir_upload_dir');

+

+		if(!isset($status['url']) && isset($status['error'])){

+			print_r($status);

+		}

+

+		// send the uploaded file url in response

+		if (isset($status['url'])) {

+			echo $status['url'];

+		} else {

+			echo 'x';

+		}

+		exit;

+	}

 }

 

 /**

@@ -1762,17 +1762,17 @@ 
  */

 function geodir_get_video($post_id)

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $table = $plugin_prefix . $post_type . '_detail';

+	$table = $plugin_prefix . $post_type . '_detail';

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));

+	$results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));

 

-    if ($results) {

-        return $results[0]->geodir_video;

-    }

+	if ($results) {

+		return $results[0]->geodir_video;

+	}

 

 }

 

@@ -1788,40 +1788,40 @@ 
  */

 function geodir_get_special_offers($post_id)

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $table = $plugin_prefix . $post_type . '_detail';

+	$table = $plugin_prefix . $post_type . '_detail';

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));

+	$results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));

 

-    if ($results) {

-        return $results[0]->geodir_special_offers;

-    }

+	if ($results) {

+		return $results[0]->geodir_special_offers;

+	}

 

 }

 

 if (!function_exists('geodir_max_upload_size')) {

-    /**

-     * Get max upload file size

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return mixed|void Returns max upload file size.

-     */

-    function geodir_max_upload_size()

-    {

-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

-

-        if ($max_filesize > 0 && $max_filesize < 1) {

-            $max_filesize = (int)($max_filesize * 1024) . 'kb';

-        } else {

-            $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

-        }

-        /** Filter documented in geodirectory-functions/general_functions.php **/

-        return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

-    }

+	/**

+	 * Get max upload file size

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return mixed|void Returns max upload file size.

+	 */

+	function geodir_max_upload_size()

+	{

+		$max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

+

+		if ($max_filesize > 0 && $max_filesize < 1) {

+			$max_filesize = (int)($max_filesize * 1024) . 'kb';

+		} else {

+			$max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

+		}

+		/** Filter documented in geodirectory-functions/general_functions.php **/

+		return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

+	}

 }

 

 

@@ -1839,33 +1839,33 @@ 
  */

 function geodir_add_custom_sort_options($fields, $post_type)

 {

-    global $wpdb;

+	global $wpdb;

 

-    if ($post_type != '') {

+	if ($post_type != '') {

 

-        $all_postypes = geodir_get_posttypes();

+		$all_postypes = geodir_get_posttypes();

 

-        if (in_array($post_type, $all_postypes)) {

+		if (in_array($post_type, $all_postypes)) {

 

-            $custom_fields = $wpdb->get_results(

-                $wpdb->prepare(

-                    "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

-                    array($post_type)

-                ), 'ARRAY_A'

-            );

+			$custom_fields = $wpdb->get_results(

+				$wpdb->prepare(

+					"select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

+					array($post_type)

+				), 'ARRAY_A'

+			);

 

-            if (!empty($custom_fields)) {

+			if (!empty($custom_fields)) {

 

-                foreach ($custom_fields as $val) {

-                    $fields[] = $val;

-                }

-            }

+				foreach ($custom_fields as $val) {

+					$fields[] = $val;

+				}

+			}

 

-        }

+		}

 

-    }

+	}

 

-    return $fields;

+	return $fields;

 }

 

 

@@ -1881,76 +1881,76 @@ 
 function geodir_get_custom_sort_options($post_type = '')

 {

 

-    global $wpdb;

-

-    if ($post_type != '') {

-

-        $all_postypes = geodir_get_posttypes();

-

-        if (!in_array($post_type, $all_postypes))

-            return false;

-

-        $fields = array();

-

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'random',

-            'site_title' => 'Random',

-            'htmlvar_name' => 'post_title',

-            'field_icon' =>  'fa fa-random',

-            'description' =>  __('Random sort (not recommended for large sites)', 'geodirectory')

-        );

-

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'datetime',

-            'site_title' => __('Add date', 'geodirectory'),

-            'htmlvar_name' => 'post_date',

-            'field_icon' =>  'fa fa-calendar',

-            'description' =>  __('Sort by date added', 'geodirectory')

-        );

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'bigint',

-            'site_title' => __('Review', 'geodirectory'),

-            'htmlvar_name' => 'comment_count',

-            'field_icon' =>  'fa fa-commenting-o',

-            'description' =>  __('Sort by the number of reviews', 'geodirectory')

-        );

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'float',

-            'site_title' => __('Rating', 'geodirectory'),

-            'htmlvar_name' => 'overall_rating',

-            'field_icon' =>  'fa fa-star-o',

-            'description' =>  __('Sort by the overall rating value', 'geodirectory')

-        );

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'text',

-            'site_title' => __('Title', 'geodirectory'),

-            'htmlvar_name' => 'post_title',

-            'field_icon' =>  'fa fa-sort-alpha-desc',

-            'description' =>  __('Sort alphabetically by title', 'geodirectory')

-        );

-

-        /**

-         * Hook to add custom sort options.

-         *

-         * @since 1.0.0

-         * @param array $fields Unmodified sort options array.

-         * @param string $post_type Post type.

-         */

-        return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);

-

-    }

-

-    return false;

+	global $wpdb;

+

+	if ($post_type != '') {

+

+		$all_postypes = geodir_get_posttypes();

+

+		if (!in_array($post_type, $all_postypes))

+			return false;

+

+		$fields = array();

+

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'random',

+			'site_title' => 'Random',

+			'htmlvar_name' => 'post_title',

+			'field_icon' =>  'fa fa-random',

+			'description' =>  __('Random sort (not recommended for large sites)', 'geodirectory')

+		);

+

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'datetime',

+			'site_title' => __('Add date', 'geodirectory'),

+			'htmlvar_name' => 'post_date',

+			'field_icon' =>  'fa fa-calendar',

+			'description' =>  __('Sort by date added', 'geodirectory')

+		);

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'bigint',

+			'site_title' => __('Review', 'geodirectory'),

+			'htmlvar_name' => 'comment_count',

+			'field_icon' =>  'fa fa-commenting-o',

+			'description' =>  __('Sort by the number of reviews', 'geodirectory')

+		);

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'float',

+			'site_title' => __('Rating', 'geodirectory'),

+			'htmlvar_name' => 'overall_rating',

+			'field_icon' =>  'fa fa-star-o',

+			'description' =>  __('Sort by the overall rating value', 'geodirectory')

+		);

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'text',

+			'site_title' => __('Title', 'geodirectory'),

+			'htmlvar_name' => 'post_title',

+			'field_icon' =>  'fa fa-sort-alpha-desc',

+			'description' =>  __('Sort alphabetically by title', 'geodirectory')

+		);

+

+		/**

+		 * Hook to add custom sort options.

+		 *

+		 * @since 1.0.0

+		 * @param array $fields Unmodified sort options array.

+		 * @param string $post_type Post type.

+		 */

+		return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);

+

+	}

+

+	return false;

 }

 

 

@@ -1966,117 +1966,117 @@ 
 function godir_set_sort_field_order($field_ids = array())

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    $count = 0;

-    if (!empty($field_ids)):

-        foreach ($field_ids as $id) {

+	$count = 0;

+	if (!empty($field_ids)):

+		foreach ($field_ids as $id) {

 

-            $cf = trim($id, '_');

+			$cf = trim($id, '_');

 

-            $post_meta_info = $wpdb->query(

-                $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+			$post_meta_info = $wpdb->query(

+				$wpdb->prepare(

+					"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

 															sort_order=%d 

 															where id= %d",

-                    array($count, $cf)

-                )

-            );

-            $count++;

-        }

-

-        return $field_ids;

-    else:

-        return false;

-    endif;

+					array($count, $cf)

+				)

+			);

+			$count++;

+		}

+

+		return $field_ids;

+	else:

+		return false;

+	endif;

 }

 

 

 if (!function_exists('geodir_custom_sort_field_save')) {

-    /**

-     * Save or Update custom sort fields into the database.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param array $request_field {

-     *    Attributes of the Request field.

-     *

-     *    @type string $action Ajax action name.

-     *    @type string $manage_field_type Manage field type Default "sorting_options".

-     *    @type string $create_field Do you want to create this field?.

-     *    @type string $field_ins_upd Field created or updated?.

-     *    @type string $_wpnonce Nonce value.

-     *    @type string $listing_type The Post type.

-     *    @type string $field_type Field Type.

-     *    @type string $field_id Field ID.

-     *    @type string $data_type Data Type.

-     *    @type string $htmlvar_name HTML variable name.

-     *    @type string $site_title Section title which you wish to display in frontend.

-     *    @type string $is_default Is this default sorting?.

-     *    @type string $is_active If not active then the field will not be displayed anywhere.

-     *    @type string $sort_order Sort Order.

-     *

-     * }

-     * @param bool $default Not yet implemented.

-     * @return int Returns the last affected db table row id.

-     */

-    function geodir_custom_sort_field_save($request_field = array(), $default = false)

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

-

-        $cf = trim($result_str, '_');

-

-        /*-------- check duplicate validation --------*/

-

-        $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';

-        $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

-

-        $post_type = $request_field['listing_type'];

-        $data_type = isset($request_field['data_type']) ? $request_field['data_type'] : '';

-        $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';

-        $site_title = isset($request_field['site_title']) ? $request_field['site_title'] : '';

-        $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

-        $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0;

-        $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0;

-        $is_default = isset($request_field['is_default']) ? $request_field['is_default'] : '';

-        $asc = isset($request_field['asc']) ? $request_field['asc'] : 0;

-        $desc = isset($request_field['desc']) ? $request_field['desc'] : 0;

-        $asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : '';

-        $desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : '';

-

-        $default_order = '';

-        if ($is_default != '') {

-            $default_order = $is_default;

-            $is_default = '1';

-        }

-

-

-        $check_html_variable = $wpdb->get_var(

-            $wpdb->prepare(

-                "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",

-                array($cehhtmlvar_name, $post_type, $field_type)

-            )

-        );

-

-        if ($is_default == 1) {

-

-            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));

-

-        }

-

-

-        if (!$check_html_variable) {

-

-            $wpdb->query(

-

-                $wpdb->prepare(

-

-                    "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+	/**

+	 * Save or Update custom sort fields into the database.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param array $request_field {

+	 *    Attributes of the Request field.

+	 *

+	 *    @type string $action Ajax action name.

+	 *    @type string $manage_field_type Manage field type Default "sorting_options".

+	 *    @type string $create_field Do you want to create this field?.

+	 *    @type string $field_ins_upd Field created or updated?.

+	 *    @type string $_wpnonce Nonce value.

+	 *    @type string $listing_type The Post type.

+	 *    @type string $field_type Field Type.

+	 *    @type string $field_id Field ID.

+	 *    @type string $data_type Data Type.

+	 *    @type string $htmlvar_name HTML variable name.

+	 *    @type string $site_title Section title which you wish to display in frontend.

+	 *    @type string $is_default Is this default sorting?.

+	 *    @type string $is_active If not active then the field will not be displayed anywhere.

+	 *    @type string $sort_order Sort Order.

+	 *

+	 * }

+	 * @param bool $default Not yet implemented.

+	 * @return int Returns the last affected db table row id.

+	 */

+	function geodir_custom_sort_field_save($request_field = array(), $default = false)

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

+

+		$cf = trim($result_str, '_');

+

+		/*-------- check duplicate validation --------*/

+

+		$field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';

+		$cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

+

+		$post_type = $request_field['listing_type'];

+		$data_type = isset($request_field['data_type']) ? $request_field['data_type'] : '';

+		$field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';

+		$site_title = isset($request_field['site_title']) ? $request_field['site_title'] : '';

+		$htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

+		$sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0;

+		$is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0;

+		$is_default = isset($request_field['is_default']) ? $request_field['is_default'] : '';

+		$asc = isset($request_field['asc']) ? $request_field['asc'] : 0;

+		$desc = isset($request_field['desc']) ? $request_field['desc'] : 0;

+		$asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : '';

+		$desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : '';

+

+		$default_order = '';

+		if ($is_default != '') {

+			$default_order = $is_default;

+			$is_default = '1';

+		}

+

+

+		$check_html_variable = $wpdb->get_var(

+			$wpdb->prepare(

+				"select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",

+				array($cehhtmlvar_name, $post_type, $field_type)

+			)

+		);

+

+		if ($is_default == 1) {

+

+			$wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));

+

+		}

+

+

+		if (!$check_html_variable) {

+

+			$wpdb->query(

+

+				$wpdb->prepare(

+

+					"insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -2091,23 +2091,23 @@ 
 				asc_title = %s,

 				desc_title = %s",

 

-                    array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title)

-                )

+					array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title)

+				)

 

-            );

+			);

 

 

-            $lastid = $wpdb->insert_id;

+			$lastid = $wpdb->insert_id;

 

-            $lastid = trim($lastid);

+			$lastid = trim($lastid);

 

-        } else {

+		} else {

 

-            $wpdb->query(

+			$wpdb->query(

 

-                $wpdb->prepare(

+				$wpdb->prepare(

 

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+					"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -2123,123 +2123,123 @@ 
 				desc_title = %s

 				where id = %d",

 

-                    array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf)

-                )

+					array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf)

+				)

 

-            );

+			);

 

-            $lastid = trim($cf);

+			$lastid = trim($cf);

 

-        }

+		}

 

 

-        return (int)$lastid;

+		return (int)$lastid;

 

-    }

+	}

 }

 

 

 if (!function_exists('geodir_custom_sort_field_delete')) {

-    /**

-     * Delete a custom sort field using field id.

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param string $field_id The field ID.

-     * @return int|string Returns field id when successful deletion, else returns 0.

-     */

-    function geodir_custom_sort_field_delete($field_id = '')

-    {

-

-        global $wpdb, $plugin_prefix;

-        if ($field_id != '') {

-            $cf = trim($field_id, '_');

-

-            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));

-

-            return $field_id;

-

-        } else

-            return 0;

-

-    }

+	/**

+	 * Delete a custom sort field using field id.

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param string $field_id The field ID.

+	 * @return int|string Returns field id when successful deletion, else returns 0.

+	 */

+	function geodir_custom_sort_field_delete($field_id = '')

+	{

+

+		global $wpdb, $plugin_prefix;

+		if ($field_id != '') {

+			$cf = trim($field_id, '_');

+

+			$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));

+

+			return $field_id;

+

+		} else

+			return 0;

+

+	}

 }

 

 

 if (!function_exists('geodir_custom_sort_field_adminhtml')) {

-    /**

-     * Custom sort field admin html.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $field_type The form field type.

-     * @param object|int $result_str The custom field results object or row id.

-     * @param string $field_ins_upd When set to "submit" displays form.

-     * @param bool $default when set to true field will be for admin use only.

-     */

-    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')

-    {

-        global $wpdb;

-        $cf = $result_str;

-        if (!is_object($cf)) {

-            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));

-        } else {

-            $field_info = $cf;

-            $result_str = $cf->id;

-        }

-

-        $field_info = stripslashes_deep($field_info); // strip slashes

-

-        if (!isset($field_info->post_type)) {

-            $post_type = sanitize_text_field($_REQUEST['listing_type']);

-        } else {

-            $post_type = $field_info->post_type;

-        }

-

-

-        $htmlvar_name = isset($field_type_key) ? $field_type_key : '';

-

-        $site_title = '';

-        if ($site_title == '')

-            $site_title = isset($field_info->site_title) ? $field_info->site_title : '';

-

-        if ($site_title == '') {

-            $fields = geodir_get_custom_sort_options($post_type);

-

-            foreach ($fields as $val) {

-                $val = stripslashes_deep($val); // strip slashes

-

-                if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {

-                    $site_title = isset($val['site_title']) ? $val['site_title'] : '';

-                }

-            }

-        }

-

-        if ($htmlvar_name == '')

-            $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

-

-        $nonce = wp_create_nonce('custom_fields_' . $result_str);

-

-        $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

-        $cso_arr = geodir_get_custom_sort_options($post_type);

-

-        $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);

-        foreach($cso_arr as $cso){

-            if($cur_field_type==$cso['field_type']){

-

-                if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {

-                    $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';

-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){

-                    $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';

-                }

-

-            }

-        }

-

-        $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);

-        ?>

+	/**

+	 * Custom sort field admin html.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $field_type The form field type.

+	 * @param object|int $result_str The custom field results object or row id.

+	 * @param string $field_ins_upd When set to "submit" displays form.

+	 * @param bool $default when set to true field will be for admin use only.

+	 */

+	function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')

+	{

+		global $wpdb;

+		$cf = $result_str;

+		if (!is_object($cf)) {

+			$field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));

+		} else {

+			$field_info = $cf;

+			$result_str = $cf->id;

+		}

+

+		$field_info = stripslashes_deep($field_info); // strip slashes

+

+		if (!isset($field_info->post_type)) {

+			$post_type = sanitize_text_field($_REQUEST['listing_type']);

+		} else {

+			$post_type = $field_info->post_type;

+		}

+

+

+		$htmlvar_name = isset($field_type_key) ? $field_type_key : '';

+

+		$site_title = '';

+		if ($site_title == '')

+			$site_title = isset($field_info->site_title) ? $field_info->site_title : '';

+

+		if ($site_title == '') {

+			$fields = geodir_get_custom_sort_options($post_type);

+

+			foreach ($fields as $val) {

+				$val = stripslashes_deep($val); // strip slashes

+

+				if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {

+					$site_title = isset($val['site_title']) ? $val['site_title'] : '';

+				}

+			}

+		}

+

+		if ($htmlvar_name == '')

+			$htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

+

+		$nonce = wp_create_nonce('custom_fields_' . $result_str);

+

+		$field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

+		$cso_arr = geodir_get_custom_sort_options($post_type);

+

+		$cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);

+		foreach($cso_arr as $cso){

+			if($cur_field_type==$cso['field_type']){

+

+				if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {

+					$field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';

+				}elseif(isset($cso['field_icon']) && $cso['field_icon']){

+					$field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';

+				}

+

+			}

+		}

+

+		$radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);

+		?>

 

         <li class="text" id="licontainer_<?php echo $result_str;?>">

             <form><!-- we need to wrap in a form so we can use radio buttons with same name -->

@@ -2248,7 +2248,7 @@ 
                  ondblclick="show_hide('field_frm<?php echo $result_str;?>')">

                 <?php

 

-                ?>

+				?>

 

                 <div title="<?php _e('Click to remove field', 'geodirectory');?>"

                      onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

@@ -2263,17 +2263,17 @@ 
 

             <div id="field_frm<?php echo $result_str;?>" class="field_frm"

                  style="display:<?php if ($field_ins_upd == 'submit') {

-                     echo 'block;';

-                 } else {

-                     echo 'none;';

-                 } ?>">

+					 echo 'block;';

+				 } else {

+					 echo 'none;';

+				 } ?>">

                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>

                 <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>

                 <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>

                 <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/>

                 <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {

-                    echo $field_info->data_type;

-                }?>"/>

+					echo $field_info->data_type;

+				}?>"/>

                 <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/>

 

 

@@ -2296,14 +2296,14 @@ 
 

                                 <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled"  value="1"

                                     <?php if ($value == '1') {

-                                        echo 'checked';

-                                    } ?>/>

+										echo 'checked';

+									} ?>/>

                                 <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                                 <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0"

                                     <?php if ($value == '0' || !$value) {

-                                        echo 'checked';

-                                    } ?>/>

+										echo 'checked';

+									} ?>/>

                                 <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                             </div>

@@ -2340,8 +2340,8 @@ 
 

                                 <input type="radio" name="is_default"

                                        value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {

-                                    echo 'checked="checked"';

-                                } ?>/>

+									echo 'checked="checked"';

+								} ?>/>

                             </div>

 

                         </li>

@@ -2361,14 +2361,14 @@ 
 

                                 <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled"  value="1"

                                     <?php if ($value == '1') {

-                                        echo 'checked';

-                                    } ?>/>

+										echo 'checked';

+									} ?>/>

                                 <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                                 <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0"

                                     <?php if ($value == '0' || !$value) {

-                                        echo 'checked';

-                                    } ?>/>

+										echo 'checked';

+									} ?>/>

                                 <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                             </div>

@@ -2404,8 +2404,8 @@ 
 

                                 <input type="radio" name="is_default"

                                        value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {

-                                    echo 'checked="checked"';

-                                } ?>/>

+									echo 'checked="checked"';

+								} ?>/>

                             </div>

 

                         </li>

@@ -2447,8 +2447,8 @@ 
 

                                 <input type="checkbox" name="is_default"

                                        value="<?php echo $field_type; ?>"  <?php if (isset($value) && $value == '1') {

-                                    echo 'checked="checked"';

-                                } ?>/>

+									echo 'checked="checked"';

+								} ?>/>

                             </div>

 

 

@@ -2471,14 +2471,14 @@ 
 

                             <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"

                                 <?php if ($value == '1') {

-                                    echo 'checked';

-                                } ?>/>

+									echo 'checked';

+								} ?>/>

                             <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                             <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"

                                 <?php if ($value == '0' || !$value) {

-                                    echo 'checked';

-                                } ?>/>

+									echo 'checked';

+								} ?>/>

                             <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                         </div>

@@ -2488,8 +2488,8 @@ 
 

                     <input type="hidden" readonly="readonly" name="sort_order" id="sort_order"

                                                 value="<?php if (isset($field_info->sort_order)) {

-                                                    echo esc_attr($field_info->sort_order);

-                                                }?>" size="50"/>

+													echo esc_attr($field_info->sort_order);

+												}?>" size="50"/>

 

 

 

@@ -2513,38 +2513,38 @@ 
             </form>

         </li> <?php

 

-    }

+	}

 }

 

 if (!function_exists('check_field_visibility')) {

-    /**

-     * Check field visibility as per price package.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global array $geodir_addon_list List of active GeoDirectory extensions.

-     * @param int|string $package_id The package ID.

-     * @param string $field_name The field name.

-     * @param string $post_type Optional. The wordpress post type.

-     * @return bool Returns true when field visible, otherwise false.

-     */

-    function check_field_visibility($package_id, $field_name, $post_type)

-    {

-        global $wpdb, $geodir_addon_list;

-        if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {

-            return true;

-        }

-        if (!$package_id || !$field_name || !$post_type) {

-            return true;

-        }

-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));

-

-        if ($wpdb->get_var($sql)) {

-            return true;

-        }

-        return false;

-    }

+	/**

+	 * Check field visibility as per price package.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global array $geodir_addon_list List of active GeoDirectory extensions.

+	 * @param int|string $package_id The package ID.

+	 * @param string $field_name The field name.

+	 * @param string $post_type Optional. The wordpress post type.

+	 * @return bool Returns true when field visible, otherwise false.

+	 */

+	function check_field_visibility($package_id, $field_name, $post_type)

+	{

+		global $wpdb, $geodir_addon_list;

+		if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {

+			return true;

+		}

+		if (!$package_id || !$field_name || !$post_type) {

+			return true;

+		}

+		$sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));

+

+		if ($wpdb->get_var($sql)) {

+			return true;

+		}

+		return false;

+	}

 }

 

 /**

@@ -2560,43 +2560,43 @@ 
  */

 function geodir_string_to_options($input = '', $translated = false)

 {

-    $return = array();

-    if ($input != '') {

-        $input = trim($input);

-        $input = rtrim($input, ",");

-        $input = ltrim($input, ",");

-        $input = trim($input);

-    }

-

-    $input_arr = explode(',', $input);

-

-    if (!empty($input_arr)) {

-        foreach ($input_arr as $input_str) {

-            $input_str = trim($input_str);

-

-            if (strpos($input_str, "/") !== false) {

-                $input_str = explode("/", $input_str, 2);

-                $label = trim($input_str[0]);

-                if ($translated && $label != '') {

-                    $label = __($label, 'geodirectory');

-                }

-                $label = geodir_utf8_ucfirst($label);

-                $value = trim($input_str[1]);

-            } else {

-                $value = $input_str;

-                if ($translated && $input_str != '') {

-                    $input_str = __($input_str, 'geodirectory');

-                }

-                $label = geodir_utf8_ucfirst($input_str);

-            }

-

-            if ($label != '') {

-                $return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);

-            }

-        }

-    }

-

-    return $return;

+	$return = array();

+	if ($input != '') {

+		$input = trim($input);

+		$input = rtrim($input, ",");

+		$input = ltrim($input, ",");

+		$input = trim($input);

+	}

+

+	$input_arr = explode(',', $input);

+

+	if (!empty($input_arr)) {

+		foreach ($input_arr as $input_str) {

+			$input_str = trim($input_str);

+

+			if (strpos($input_str, "/") !== false) {

+				$input_str = explode("/", $input_str, 2);

+				$label = trim($input_str[0]);

+				if ($translated && $label != '') {

+					$label = __($label, 'geodirectory');

+				}

+				$label = geodir_utf8_ucfirst($label);

+				$value = trim($input_str[1]);

+			} else {

+				$value = $input_str;

+				if ($translated && $input_str != '') {

+					$input_str = __($input_str, 'geodirectory');

+				}

+				$label = geodir_utf8_ucfirst($input_str);

+			}

+

+			if ($label != '') {

+				$return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);

+			}

+		}

+	}

+

+	return $return;

 }

 

 /**

@@ -2611,66 +2611,66 @@ 
  */

 function geodir_string_values_to_options($option_values = '', $translated = false)

 {

-    $options = array();

-    if ($option_values == '') {

-        return NULL;

-    }

-

-    if (strpos($option_values, "{/optgroup}") !== false) {

-        $option_values_arr = explode("{/optgroup}", $option_values);

-

-        foreach ($option_values_arr as $optgroup) {

-            if (strpos($optgroup, "{optgroup}") !== false) {

-                $optgroup_arr = explode("{optgroup}", $optgroup);

-

-                $count = 0;

-                foreach ($optgroup_arr as $optgroup_str) {

-                    $count++;

-                    $optgroup_str = trim($optgroup_str);

-

-                    $optgroup_label = '';

-                    if (strpos($optgroup_str, "|") !== false) {

-                        $optgroup_str_arr = explode("|", $optgroup_str, 2);

-                        $optgroup_label = trim($optgroup_str_arr[0]);

-                        if ($translated && $optgroup_label != '') {

-                            $optgroup_label = __($optgroup_label, 'geodirectory');

-                        }

-                        $optgroup_label = geodir_utf8_ucfirst($optgroup_label);

-                        $optgroup_str = $optgroup_str_arr[1];

-                    }

-

-                    $optgroup3 = geodir_string_to_options($optgroup_str, $translated);

-

-                    if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {

-                        $optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));

-                        $optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));

-                        $optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end);

-                    }

-                    $options = array_merge($options, $optgroup3);

-                }

-            } else {

-                $optgroup1 = geodir_string_to_options($optgroup, $translated);

-                $options = array_merge($options, $optgroup1);

-            }

-        }

-    } else {

-        $options = geodir_string_to_options($option_values, $translated);

-    }

-

-    return $options;

+	$options = array();

+	if ($option_values == '') {

+		return NULL;

+	}

+

+	if (strpos($option_values, "{/optgroup}") !== false) {

+		$option_values_arr = explode("{/optgroup}", $option_values);

+

+		foreach ($option_values_arr as $optgroup) {

+			if (strpos($optgroup, "{optgroup}") !== false) {

+				$optgroup_arr = explode("{optgroup}", $optgroup);

+

+				$count = 0;

+				foreach ($optgroup_arr as $optgroup_str) {

+					$count++;

+					$optgroup_str = trim($optgroup_str);

+

+					$optgroup_label = '';

+					if (strpos($optgroup_str, "|") !== false) {

+						$optgroup_str_arr = explode("|", $optgroup_str, 2);

+						$optgroup_label = trim($optgroup_str_arr[0]);

+						if ($translated && $optgroup_label != '') {

+							$optgroup_label = __($optgroup_label, 'geodirectory');

+						}

+						$optgroup_label = geodir_utf8_ucfirst($optgroup_label);

+						$optgroup_str = $optgroup_str_arr[1];

+					}

+

+					$optgroup3 = geodir_string_to_options($optgroup_str, $translated);

+

+					if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {

+						$optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));

+						$optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));

+						$optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end);

+					}

+					$options = array_merge($options, $optgroup3);

+				}

+			} else {

+				$optgroup1 = geodir_string_to_options($optgroup, $translated);

+				$options = array_merge($options, $optgroup1);

+			}

+		}

+	} else {

+		$options = geodir_string_to_options($option_values, $translated);

+	}

+

+	return $options;

 }

 

 

 function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){

-    ob_start();

-

-    $dt_value = '';

-    if (isset($field_info->data_type)) {

-        $dt_value  = esc_attr($field_info->data_type);

-    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

-        $dt_value  = $cf['defaults']['data_type'];

-    }

-    ?>

+	ob_start();

+

+	$dt_value = '';

+	if (isset($field_info->data_type)) {

+		$dt_value  = esc_attr($field_info->data_type);

+	}elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

+		$dt_value  = $cf['defaults']['data_type'];

+	}

+	?>

     <li>

         <label for="data_type"><?php _e('Field Data Type ? :', 'geodirectory'); ?></label>

         <div class="gd-cf-input-wrap">

@@ -2679,16 +2679,16 @@ 
                     onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');">

                 <option

                     value="XVARCHAR" <?php if ($dt_value  == 'VARCHAR') {

-                    echo 'selected="selected"';

-                } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>

+					echo 'selected="selected"';

+				} ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>

                 <option

                     value="INT" <?php if ($dt_value   == 'INT') {

-                    echo 'selected="selected"';

-                } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>

+					echo 'selected="selected"';

+				} ?>><?php _e('NUMBER', 'geodirectory'); ?></option>

                 <option

                     value="FLOAT" <?php if ($dt_value   == 'FLOAT') {

-                    echo 'selected="selected"';

-                } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>

+					echo 'selected="selected"';

+				} ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>

             </select>

             <br/> <span><?php _e('Select Custom Field type', 'geodirectory'); ?></span>

 

@@ -2696,13 +2696,13 @@ 
     </li>

 

     <?php

-    $value = '';

-    if (isset($field_info->decimal_point)) {

-        $value = esc_attr($field_info->decimal_point);

-    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){

-        $value = $cf['defaults']['decimal_point'];

-    }

-    ?>

+	$value = '';

+	if (isset($field_info->decimal_point)) {

+		$value = esc_attr($field_info->decimal_point);

+	}elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){

+		$value = $cf['defaults']['decimal_point'];

+	}

+	?>

 

     <li class="decimal-point-wrapper"

         style="<?php echo ($dt_value  == 'FLOAT') ? '' : 'display:none' ?>">

@@ -2711,7 +2711,7 @@ 
             <select name="decimal_point" id="decimal_point">

                 <option value=""><?php echo _e('Select', 'geodirectory'); ?></option>

                 <?php for ($i = 1; $i <= 10; $i++) {

-                    $selected = $i == $value ? 'selected="selected"' : ''; ?>

+					$selected = $i == $value ? 'selected="selected"' : ''; ?>

                     <option value="<?php echo $i; ?>" <?php echo $selected; ?>><?php echo $i; ?></option>

                 <?php } ?>

             </select>

@@ -2720,8 +2720,8 @@ 
     </li>

 <?php

 

-    $output = ob_get_clean();

-    return $output;

+	$output = ob_get_clean();

+	return $output;

 }

 add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);

 

@@ -2757,9 +2757,9 @@ 
 

 

 function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){

-    if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}

-    ob_start();

-    ?>

+	if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}

+	ob_start();

+	?>

     <li>

         <label for="advanced_editor" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show advanced editor :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

@@ -2770,13 +2770,13 @@ 
         <div class="gd-cf-input-wrap">

 

             <?php

-            $selected = '';

-            if (isset($field_info->extra_fields))

-                $advanced_editor = unserialize($field_info->extra_fields);

+			$selected = '';

+			if (isset($field_info->extra_fields))

+				$advanced_editor = unserialize($field_info->extra_fields);

 

-            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))

-                $selected = 'checked="checked"';

-            ?>

+			if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))

+				$selected = 'checked="checked"';

+			?>

 

             <input type="checkbox" name="advanced_editor[]" id="advanced_editor"

                    value="1" <?php echo $selected; ?>/>

@@ -2785,22 +2785,22 @@ 
     </li>

     <?php

 

-    $output = ob_get_clean();

-    return $output;

+	$output = ob_get_clean();

+	return $output;

 }

 add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);

 

 

 function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){

-    ob_start();

-

-    $value = '';

-    if (isset($field_info->validation_pattern)) {

-        $value = esc_attr($field_info->validation_pattern);

-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){

-        $value = esc_attr($cf['defaults']['validation_pattern']);

-    }

-    ?>

+	ob_start();

+

+	$value = '';

+	if (isset($field_info->validation_pattern)) {

+		$value = esc_attr($field_info->validation_pattern);

+	}elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){

+		$value = esc_attr($cf['defaults']['validation_pattern']);

+	}

+	?>

     <li>

         <label for="validation_pattern" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Pattern:', 'geodirectory'); ?>

@@ -2814,13 +2814,13 @@ 
         </div>

     </li>

     <?php

-    $value = '';

-    if (isset($field_info->validation_msg)) {

-        $value = esc_attr($field_info->validation_msg);

-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){

-        $value = esc_attr($cf['defaults']['validation_msg']);

-    }

-    ?>

+	$value = '';

+	if (isset($field_info->validation_msg)) {

+		$value = esc_attr($field_info->validation_msg);

+	}elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){

+		$value = esc_attr($cf['defaults']['validation_msg']);

+	}

+	?>

     <li>

         <label for="validation_msg" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Message:', 'geodirectory'); ?>

@@ -2835,21 +2835,21 @@ 
     </li>

     <?php

 

-    $output = ob_get_clean();

-    return $output;

+	$output = ob_get_clean();

+	return $output;

 }

 add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);

 

 

 function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){

-    ob_start();

-    global $post_type;

-

-    if (!isset($field_info->post_type)) {

-        $post_type = sanitize_text_field($_REQUEST['listing_type']);

-    } else

-        $post_type = $field_info->post_type;

-    ?>

+	ob_start();

+	global $post_type;

+

+	if (!isset($field_info->post_type)) {

+		$post_type = sanitize_text_field($_REQUEST['listing_type']);

+	} else

+		$post_type = $field_info->post_type;

+	?>

     <li style="display: none;">

         <label for="htmlvar_name" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Select taxonomy:', 'geodirectory'); ?>

@@ -2860,15 +2860,15 @@ 
         <div class="gd-cf-input-wrap">

             <select name="htmlvar_name" id="htmlvar_name">

                 <?php

-                $gd_taxonomy = geodir_get_taxonomies($post_type);

+				$gd_taxonomy = geodir_get_taxonomies($post_type);

 

-                foreach ($gd_taxonomy as $gd_tax) {

-                    ?>

+				foreach ($gd_taxonomy as $gd_tax) {

+					?>

                     <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {

-                        echo 'selected="selected"';

-                    }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php

-                }

-                ?>

+						echo 'selected="selected"';

+					}?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php

+				}

+				?>

             </select>

         </div>

     </li>

@@ -2884,49 +2884,49 @@ 
 

             <select name="cat_display_type" id="cat_display_type">

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {

-                    echo 'selected="selected"';

-                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {

-                    echo 'selected="selected"';

-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="select"><?php _e('Select', 'geodirectory');?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {

-                    echo 'selected="selected"';

-                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {

-                    echo 'selected="selected"';

-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {

-                    echo 'selected="selected"';

-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

             </select>

         </div>

     </li>

     <?php

 

-    $output = ob_get_clean();

-    return $output;

+	$output = ob_get_clean();

+	return $output;

 }

 add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);

 

 

 function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){

 

-    ob_start();

-    if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

-        $address = stripslashes_deep(unserialize($field_info->extra_fields));

-    }

+	ob_start();

+	if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

+		$address = stripslashes_deep(unserialize($field_info->extra_fields));

+	}

 

-    $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);

-    ?>

+	$radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);

+	?>

     <?php

-    /**

-     * Called on the add custom fields settings page before the address field is output.

-     *

-     * @since 1.0.0

-     * @param array $address The address settings array.

-     * @param object $field_info Extra fields info.

-     */

-    do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>

+	/**

+	 * Called on the add custom fields settings page before the address field is output.

+	 *

+	 * @since 1.0.0

+	 * @param array $address The address settings array.

+	 * @param object $field_info Extra fields info.

+	 */

+	do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>

 

     <li>

         <label for="show_zip" class="gd-cf-tooltip-wrap">

@@ -2939,14 +2939,14 @@ 
 

             <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

             <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

 

@@ -2963,8 +2963,8 @@ 
         <div class="gd-cf-input-wrap">

             <input type="text" name="extra[zip_lable]" id="zip_lable"

                    value="<?php if (isset($address['zip_lable'])) {

-                       echo esc_attr($address['zip_lable']);

-                   }?>"/>

+					   echo esc_attr($address['zip_lable']);

+				   }?>"/>

         </div>

     </li>

 

@@ -2981,8 +2981,8 @@ 
         <div class="gd-cf-input-wrap">

             <input type="text" name="extra[map_lable]" id="map_lable"

                    value="<?php if (isset($address['map_lable'])) {

-                       echo esc_attr($address['map_lable']);

-                   }?>"/>

+					   echo esc_attr($address['map_lable']);

+				   }?>"/>

         </div>

     </li>

 

@@ -2997,14 +2997,14 @@ 
 

             <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

             <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

@@ -3021,14 +3021,14 @@ 
 

             <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

             <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

@@ -3045,8 +3045,8 @@ 
         <div class="gd-cf-input-wrap">

             <input type="text" name="extra[mapview_lable]" id="mapview_lable"

                    value="<?php if (isset($address['mapview_lable'])) {

-                       echo esc_attr($address['mapview_lable']);

-                   }?>"/>

+					   echo esc_attr($address['mapview_lable']);

+				   }?>"/>

         </div>

     </li>

     <li>

@@ -3060,29 +3060,29 @@ 
 

             <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

             <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

     <?php

 

-    $html = ob_get_clean();

-    return $output.$html;

+	$html = ob_get_clean();

+	return $output.$html;

 }

 add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);

 

 

 function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){

-    ob_start();

-    ?>

+	ob_start();

+	?>

     <li>

         <label for="multi_display_type" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>

@@ -3094,14 +3094,14 @@ 
 

             <select name="multi_display_type" id="multi_display_type">

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {

-                    echo 'selected="selected"';

-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="select"><?php _e('Select', 'geodirectory');?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {

-                    echo 'selected="selected"';

-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {

-                    echo 'selected="selected"';

-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

             </select>

 

             <br/>

@@ -3109,25 +3109,25 @@ 
     </li>

     <?php

 

-    $html = ob_get_clean();

-    return $output.$html;

+	$html = ob_get_clean();

+	return $output.$html;

 }

 add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);

 

 

 function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){

 

-    ob_start();

+	ob_start();

 

-    $value = '';

-    if (isset($field_info->option_values)) {

-        $value = esc_attr($field_info->option_values);

-    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){

-        $value = esc_attr($cf['defaults']['option_values']);

-    }

+	$value = '';

+	if (isset($field_info->option_values)) {

+		$value = esc_attr($field_info->option_values);

+	}elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){

+		$value = esc_attr($cf['defaults']['option_values']);

+	}

 

-    $field_type = isset($field_info->field_type) ? $field_info->field_type : '';

-    ?>

+	$field_type = isset($field_info->field_type) ? $field_info->field_type : '';

+	?>

     <li>

         <label for="option_values" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>

@@ -3154,8 +3154,8 @@ 
     </li>

     <?php

 

-    $html = ob_get_clean();

-    return $output.$html;

+	$html = ob_get_clean();

+	return $output.$html;

 }

 add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);

 add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);

@@ -3163,12 +3163,12 @@ 
 

 

 function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){

-    ob_start();

-    $extra = array();

-    if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

-        $extra = unserialize($field_info->extra_fields);

-    }

-    ?>

+	ob_start();

+	$extra = array();

+	if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

+		$extra = unserialize($field_info->extra_fields);

+	}

+	?>

     <li>

         <label for="date_format" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>

@@ -3178,52 +3178,52 @@ 
         </label>

         <div class="gd-cf-input-wrap" style="overflow:inherit;">

             <?php

-            $date_formats = array(

-                'm/d/Y',

-                'd/m/Y',

-                'Y/m/d',

-                'm-d-Y',

-                'd-m-Y',

-                'Y-m-d',

-                'F j, Y',

-            );

-            /**

-             * Filter the custom field date format options.

-             *

-             * @since 1.6.5

-             * @param array $date_formats The PHP date format array.

-             */

-            $date_formats = apply_filters('geodir_date_formats',$date_formats);

-            ?>

+			$date_formats = array(

+				'm/d/Y',

+				'd/m/Y',

+				'Y/m/d',

+				'm-d-Y',

+				'd-m-Y',

+				'Y-m-d',

+				'F j, Y',

+			);

+			/**

+			 * Filter the custom field date format options.

+			 *

+			 * @since 1.6.5

+			 * @param array $date_formats The PHP date format array.

+			 */

+			$date_formats = apply_filters('geodir_date_formats',$date_formats);

+			?>

             <select name="extra[date_format]" id="date_format">

                 <?php

-                foreach($date_formats as $format){

-                    $selected = '';

-                    if(!empty($extra) && esc_attr($extra['date_format'])==$format){

-                        $selected = "selected='selected'";

-                    }

-                    echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";

-                }

-                ?>

+				foreach($date_formats as $format){

+					$selected = '';

+					if(!empty($extra) && esc_attr($extra['date_format'])==$format){

+						$selected = "selected='selected'";

+					}

+					echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";

+				}

+				?>

             </select>

 

         </div>

     </li>

     <?php

 

-    $html = ob_get_clean();

-    return $output.$html;

+	$html = ob_get_clean();

+	return $output.$html;

 }

 add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);

 

 

 function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){

-    ob_start();

-    $allowed_file_types = geodir_allowed_mime_types();

+	ob_start();

+	$allowed_file_types = geodir_allowed_mime_types();

 

-    $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

-    $gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');

-    ?>

+	$extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

+	$gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');

+	?>

     <li>

         <label for="gd_file_types" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>

@@ -3246,33 +3246,33 @@ 
     </li>

     <?php

 

-    $html = ob_get_clean();

-    return $output.$html;

+	$html = ob_get_clean();

+	return $output.$html;

 }

 add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);

 

 function geodir_cfa_extra_fields_text($output,$result_str,$cf,$field_info){

-    ob_start();

+	ob_start();

 

-    $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

+	$extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

    // print_r($cf);echo '###';

 

 

 

-    $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);

+	$radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);

 

 

-    $value = '';

-    if ($extra_fields && isset($extra_fields['is_price'])) {

-    $value = esc_attr($extra_fields['is_price']);

-    }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){

-    $value = esc_attr($cf['defaults']['extra_fields']['is_price']);

-    }

+	$value = '';

+	if ($extra_fields && isset($extra_fields['is_price'])) {

+	$value = esc_attr($extra_fields['is_price']);

+	}elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){

+	$value = esc_attr($cf['defaults']['extra_fields']['is_price']);

+	}

 

-    $show_price_extra = ($value==1) ? 1 : 0;

+	$show_price_extra = ($value==1) ? 1 : 0;

 

-    $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0;

-    ?>

+	$show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0;

+	?>

     <li class="gdcf-price-extra-set" <?php if(!$show_price){ echo "style='display:none;'";}?>>

         <label for="is_price" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display as price? :', 'geodirectory'); ?>

@@ -3284,14 +3284,14 @@ 
 

             <input type="radio" id="is_price_yes<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-enabled"  value="1"

                 <?php if ($value == '1') {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

             <input type="radio" id="is_price_no<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-disabled" value="0"

                 <?php if ($value == '0' || !$value) {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

@@ -3299,13 +3299,13 @@ 
 

     <?php

 

-    $value = '';

-    if ($extra_fields && isset($extra_fields['thousand_separator'])) {

-        $value = esc_attr($extra_fields['thousand_separator']);

-    }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){

-        $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']);

-    }

-    ?>

+	$value = '';

+	if ($extra_fields && isset($extra_fields['thousand_separator'])) {

+		$value = esc_attr($extra_fields['thousand_separator']);

+	}elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){

+		$value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']);

+	}

+	?>

     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

         <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory');?>

             <div class="gdcf-tooltip">

@@ -3326,13 +3326,13 @@ 
 

     <?php

 

-    $value = '';

-    if ($extra_fields && isset($extra_fields['decimal_separator'])) {

-        $value = esc_attr($extra_fields['decimal_separator']);

-    }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){

-        $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']);

-    }

-    ?>

+	$value = '';

+	if ($extra_fields && isset($extra_fields['decimal_separator'])) {

+		$value = esc_attr($extra_fields['decimal_separator']);

+	}elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){

+		$value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']);

+	}

+	?>

     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

         <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory');?>

             <div class="gdcf-tooltip">

@@ -3349,13 +3349,13 @@ 
 

     <?php

 

-    $value = '';

-    if ($extra_fields && isset($extra_fields['decimal_display'])) {

-        $value = esc_attr($extra_fields['decimal_display']);

-    }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){

-        $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']);

-    }

-    ?>

+	$value = '';

+	if ($extra_fields && isset($extra_fields['decimal_display'])) {

+		$value = esc_attr($extra_fields['decimal_display']);

+	}elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){

+		$value = esc_attr($cf['defaults']['extra_fields']['decimal_display']);

+	}

+	?>

     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

         <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory');?>

             <div class="gdcf-tooltip">

@@ -3372,13 +3372,13 @@ 
 

     <?php

 

-    $value = '';

-    if ($extra_fields && isset($extra_fields['currency_symbol'])) {

-        $value = esc_attr($extra_fields['currency_symbol']);

-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){

-        $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']);

-    }

-    ?>

+	$value = '';

+	if ($extra_fields && isset($extra_fields['currency_symbol'])) {

+		$value = esc_attr($extra_fields['currency_symbol']);

+	}elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){

+		$value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']);

+	}

+	?>

     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

         <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory');?>

             <div class="gdcf-tooltip">

@@ -3393,13 +3393,13 @@ 
 

     <?php

 

-    $value = '';

-    if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {

-        $value = esc_attr($extra_fields['currency_symbol_placement']);

-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){

-        $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']);

-    }

-    ?>

+	$value = '';

+	if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {

+		$value = esc_attr($extra_fields['currency_symbol_placement']);

+	}elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){

+		$value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']);

+	}

+	?>

     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

         <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory');?>

             <div class="gdcf-tooltip">

@@ -3417,225 +3417,225 @@ 
 

     <?php

 

-    $html = ob_get_clean();

-    return $output.$html;

+	$html = ob_get_clean();

+	return $output.$html;

 }

 add_filter('geodir_cfa_extra_fields_text','geodir_cfa_extra_fields_text',10,4);

 

 function geodir_default_custom_fields($post_type='gd_place',$package_id=''){

-    $fields = array();

-    $package = ($package_id=='') ? '' : array($package_id);

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'taxonomy',

-                      'admin_title' => __('Category', 'geodirectory'),

-                      'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),

-                      'site_title' => __('Category', 'geodirectory'),

-                      'htmlvar_name' => $post_type.'category',

-                      'default_value' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'is_required' => '1',

-                      'show_in'   =>  '[detail]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Category', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'address',

-                      'admin_title' => __('Address', 'geodirectory'),

-                      'admin_desc' => ADDRESS_MSG,

-                      'site_title' => __('Address', 'geodirectory'),

-                      'htmlvar_name' => 'post',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'is_required' => '1',

-                      'show_in'   =>  '[detail],[mapbubble]',

-                      'show_on_pkg' => $package,

-                      'required_msg' => __('Address fields are required', 'geodirectory'),

-                      'clabels' => __('Address', 'geodirectory'),

-                      'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),

-                                       'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),

-                                       'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),

-                                       'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),

-                                       'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),

-                                       'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),

-                                       'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden',

-                                       'show_latlng' => 1));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'text',

-                      'admin_title' => __('Time', 'geodirectory'),

-                      'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),

-                      'site_title' => __('Time', 'geodirectory'),

-                      'htmlvar_name' => 'timing',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'show_in' =>  '[detail],[mapbubble]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Time', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'phone',

-                      'admin_title' => __('Phone', 'geodirectory'),

-                      'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),

-                      'site_title' => __('Phone', 'geodirectory'),

-                      'htmlvar_name' => 'contact',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'show_in' =>  '[detail],[mapbubble]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Phone', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'email',

-                      'admin_title' => __('Email', 'geodirectory'),

-                      'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),

-                      'site_title' => __('Email', 'geodirectory'),

-                      'htmlvar_name' => 'email',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'show_in' => '[detail]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Email', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'url',

-                      'admin_title' => __('Website', 'geodirectory'),

-                      'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),

-                      'site_title' => __('Website', 'geodirectory'),

-                      'htmlvar_name' => 'website',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'show_in' => '[detail]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Website', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'url',

-                      'admin_title' => __('Twitter', 'geodirectory'),

-                      'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),

-                      'site_title' => __('Twitter', 'geodirectory'),

-                      'htmlvar_name' => 'twitter',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'show_in' => '[detail]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Twitter', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'url',

-                      'admin_title' => __('Facebook', 'geodirectory'),

-                      'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),

-                      'site_title' => __('Facebook', 'geodirectory'),

-                      'htmlvar_name' => 'facebook',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'show_in' => '[detail]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Facebook', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'TEXT',

-                      'field_type' => 'textarea',

-                      'admin_title' => __('Video', 'geodirectory'),

-                      'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),

-                      'site_title' => __('Video', 'geodirectory'),

-                      'htmlvar_name' => 'video',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '0',

-                      'is_admin' => '1',

-                      'show_in' => '[owntab]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Video', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'TEXT',

-                      'field_type' => 'textarea',

-                      'admin_title' => __('Special Offers', 'geodirectory'),

-                      'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),

-                      'site_title' => __('Special Offers', 'geodirectory'),

-                      'htmlvar_name' => 'special_offers',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '0',

-                      'is_admin' => '1',

-                      'show_in' => '[owntab]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Special Offers', 'geodirectory'));

-

-    /**

-     * Filter the array of default custom fields DB table data.

-     *

-     * @since 1.6.6

-     * @param string $fields The default custom fields as an array.

-     */

-    $fields = apply_filters('geodir_default_custom_fields', $fields);

-

-    return  $fields;

+	$fields = array();

+	$package = ($package_id=='') ? '' : array($package_id);

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'taxonomy',

+					  'admin_title' => __('Category', 'geodirectory'),

+					  'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),

+					  'site_title' => __('Category', 'geodirectory'),

+					  'htmlvar_name' => $post_type.'category',

+					  'default_value' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'is_required' => '1',

+					  'show_in'   =>  '[detail]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Category', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'address',

+					  'admin_title' => __('Address', 'geodirectory'),

+					  'admin_desc' => ADDRESS_MSG,

+					  'site_title' => __('Address', 'geodirectory'),

+					  'htmlvar_name' => 'post',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'is_required' => '1',

+					  'show_in'   =>  '[detail],[mapbubble]',

+					  'show_on_pkg' => $package,

+					  'required_msg' => __('Address fields are required', 'geodirectory'),

+					  'clabels' => __('Address', 'geodirectory'),

+					  'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),

+									   'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),

+									   'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),

+									   'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),

+									   'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),

+									   'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),

+									   'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden',

+									   'show_latlng' => 1));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'text',

+					  'admin_title' => __('Time', 'geodirectory'),

+					  'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),

+					  'site_title' => __('Time', 'geodirectory'),

+					  'htmlvar_name' => 'timing',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'show_in' =>  '[detail],[mapbubble]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Time', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'phone',

+					  'admin_title' => __('Phone', 'geodirectory'),

+					  'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),

+					  'site_title' => __('Phone', 'geodirectory'),

+					  'htmlvar_name' => 'contact',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'show_in' =>  '[detail],[mapbubble]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Phone', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'email',

+					  'admin_title' => __('Email', 'geodirectory'),

+					  'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),

+					  'site_title' => __('Email', 'geodirectory'),

+					  'htmlvar_name' => 'email',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'show_in' => '[detail]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Email', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'url',

+					  'admin_title' => __('Website', 'geodirectory'),

+					  'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),

+					  'site_title' => __('Website', 'geodirectory'),

+					  'htmlvar_name' => 'website',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'show_in' => '[detail]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Website', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'url',

+					  'admin_title' => __('Twitter', 'geodirectory'),

+					  'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),

+					  'site_title' => __('Twitter', 'geodirectory'),

+					  'htmlvar_name' => 'twitter',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'show_in' => '[detail]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Twitter', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'url',

+					  'admin_title' => __('Facebook', 'geodirectory'),

+					  'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),

+					  'site_title' => __('Facebook', 'geodirectory'),

+					  'htmlvar_name' => 'facebook',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'show_in' => '[detail]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Facebook', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'TEXT',

+					  'field_type' => 'textarea',

+					  'admin_title' => __('Video', 'geodirectory'),

+					  'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),

+					  'site_title' => __('Video', 'geodirectory'),

+					  'htmlvar_name' => 'video',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '0',

+					  'is_admin' => '1',

+					  'show_in' => '[owntab]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Video', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'TEXT',

+					  'field_type' => 'textarea',

+					  'admin_title' => __('Special Offers', 'geodirectory'),

+					  'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),

+					  'site_title' => __('Special Offers', 'geodirectory'),

+					  'htmlvar_name' => 'special_offers',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '0',

+					  'is_admin' => '1',

+					  'show_in' => '[owntab]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Special Offers', 'geodirectory'));

+

+	/**

+	 * Filter the array of default custom fields DB table data.

+	 *

+	 * @since 1.6.6

+	 * @param string $fields The default custom fields as an array.

+	 */

+	$fields = apply_filters('geodir_default_custom_fields', $fields);

+

+	return  $fields;

 }

 

 function geodir_currency_format_number($number='',$cf=''){

 

-    $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : '';

+	$cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : '';

 

-    $symbol = isset($cs['currency_symbol']) ? $cs['currency_symbol'] : '$';

-    $decimals = isset($cf['decimal_point']) && $cf['decimal_point'] ? $cf['decimal_point'] : 2;

-    $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if');

-    $decimalpoint = '.';

+	$symbol = isset($cs['currency_symbol']) ? $cs['currency_symbol'] : '$';

+	$decimals = isset($cf['decimal_point']) && $cf['decimal_point'] ? $cf['decimal_point'] : 2;

+	$decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if');

+	$decimalpoint = '.';

 

-    if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){

-        $decimalpoint = ',';

-    }

+	if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){

+		$decimalpoint = ',';

+	}

 

-    $separator = ',';

+	$separator = ',';

 

-    if(isset($cs['thousand_separator'])){

-        if($cs['thousand_separator']=='comma'){$separator = ',';}

-        if($cs['thousand_separator']=='slash'){$separator = '\\';}

-        if($cs['thousand_separator']=='period'){$separator = '.';}

-        if($cs['thousand_separator']=='space'){$separator = ' ';}

-        if($cs['thousand_separator']=='none'){$separator = '';}

-    }

+	if(isset($cs['thousand_separator'])){

+		if($cs['thousand_separator']=='comma'){$separator = ',';}

+		if($cs['thousand_separator']=='slash'){$separator = '\\';}

+		if($cs['thousand_separator']=='period'){$separator = '.';}

+		if($cs['thousand_separator']=='space'){$separator = ' ';}

+		if($cs['thousand_separator']=='none'){$separator = '';}

+	}

 

-    $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';

+	$currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';

 

-    if($decimals>0 && $decimal_display=='if'){

-        if(is_int($number) || floor( $number ) == $number)

-            $decimals = 0;

-    }

+	if($decimals>0 && $decimal_display=='if'){

+		if(is_int($number) || floor( $number ) == $number)

+			$decimals = 0;

+	}

 

-    $number = number_format($number,$decimals,$decimalpoint,$separator);

+	$number = number_format($number,$decimals,$decimalpoint,$separator);

 

 

 

-    if($currency_symbol_placement=='left'){

-        $number = $symbol . $number;

-    }else{

-        $number = $number . $symbol;

-    }

+	if($currency_symbol_placement=='left'){

+		$number = $symbol . $number;

+	}else{

+		$number = $number . $symbol;

+	}

 

 

    return $number;

geodirectory-widgets/geodirectory_listing_slider_widget.php

Spacing +18 added lines, -18 removed lines

@@ -94,7 +94,7 @@ 
     {

 

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance,

+        $instance = wp_parse_args((array) $instance,

             array('title' => '',

                 'post_type' => '',

                 'category' => '',

@@ -153,7 +153,7 @@ 
         ?>

 

         <p>

-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>

+            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>

 

                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"

                        name="<?php echo $this->get_field_name('title'); ?>" type="text"

@@ -163,7 +163,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory'); ?>

 

                 <?php $postypes = geodir_get_posttypes(); ?>

 

@@ -187,7 +187,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory'); ?>

 

                 <?php

                 $category_taxonomy = geodir_get_taxonomies('gd_place');

@@ -224,7 +224,7 @@ 
         </p>

         <p>

             <label

-                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts(total):', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts(total):', 'geodirectory'); ?>

                 <input class="widefat" id="<?php echo $this->get_field_id('post_number'); ?>"

                        name="<?php echo $this->get_field_name('post_number'); ?>" type="text"

                        value="<?php echo esc_attr($post_number); ?>"/>

@@ -233,7 +233,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('max_show'); ?>"><?php _e('Number of posts(shown at one time, requires a slide width to be set):', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('max_show'); ?>"><?php _e('Number of posts(shown at one time, requires a slide width to be set):', 'geodirectory'); ?>

                 <input class="widefat" id="<?php echo $this->get_field_id('max_show'); ?>"

                        name="<?php echo $this->get_field_name('max_show'); ?>" type="text"

                        value="<?php echo esc_attr($max_show); ?>"/>

@@ -242,7 +242,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('slide_width'); ?>"><?php _e('Slide width(leave blank unless showing more than one slide at a time, ex: 210):', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('slide_width'); ?>"><?php _e('Slide width(leave blank unless showing more than one slide at a time, ex: 210):', 'geodirectory'); ?>

                 <input class="widefat" id="<?php echo $this->get_field_id('slide_width'); ?>"

                        name="<?php echo $this->get_field_name('slide_width'); ?>" type="text"

                        value="<?php echo esc_attr($slide_width); ?>"/>

@@ -251,7 +251,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('animation'); ?>"><?php _e('Animation:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('animation'); ?>"><?php _e('Animation:', 'geodirectory'); ?>

 

                 <select class="widefat" id="<?php echo $this->get_field_id('animation'); ?>"

                         name="<?php echo $this->get_field_name('animation'); ?>">

@@ -269,7 +269,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('slideshowSpeed'); ?>"><?php _e('Slide Show Speed: (milliseconds)', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('slideshowSpeed'); ?>"><?php _e('Slide Show Speed: (milliseconds)', 'geodirectory'); ?>

 

                 <input class="widefat" id="<?php echo $this->get_field_id('slideshowSpeed'); ?>"

                        name="<?php echo $this->get_field_name('slideshowSpeed'); ?>" type="text"

@@ -279,7 +279,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('animationSpeed'); ?>"><?php _e('Animation Speed: (milliseconds)', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('animationSpeed'); ?>"><?php _e('Animation Speed: (milliseconds)', 'geodirectory'); ?>

 

                 <input class="widefat" id="<?php echo $this->get_field_id('animationSpeed'); ?>"

                        name="<?php echo $this->get_field_name('animationSpeed'); ?>" type="text"

@@ -289,7 +289,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory'); ?>

 

                 <input type="checkbox" <?php if ($slideshow) {

                     echo 'checked="checked"';

@@ -301,7 +301,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory'); ?>

 

                 <input type="checkbox" <?php if ($animationLoop) {

                     echo 'checked="checked"';

@@ -313,7 +313,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory'); ?>

 

                 <input type="checkbox" <?php if ($directionNav) {

                     echo 'checked="checked"';

@@ -326,7 +326,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory'); ?>

 

                 <input type="checkbox" <?php if ($show_title) {

                     echo 'checked="checked"';

@@ -345,9 +345,9 @@ 
         </p>

         <p>

             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">

-                <?php _e('Enable Location Filter:', 'geodirectory');?>

+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>

                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"

-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>

+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>

                        value="1"/>

             </label>

         </p>

@@ -368,10 +368,10 @@ 
 

             }

 

-            <?php if(is_active_widget( false, false, $this->id_base, true )){ ?>

+            <?php if (is_active_widget(false, false, $this->id_base, true)) { ?>

             var post_type = jQuery('#<?php echo $this->get_field_id('post_type'); ?>').val();

 

-            geodir_change_category_list(post_type, '<?php echo $category;?>');

+            geodir_change_category_list(post_type, '<?php echo $category; ?>');

             <?php } ?>

 

         </script>

Braces +13 added lines, -6 removed lines

@@ -74,10 +74,11 @@ 
         $instance['animation'] = $new_instance['animation'];

         $instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';

         $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);

-        else

-            $instance['add_location_filter'] = '0';

+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+        } else {
+                    $instance['add_location_filter'] = '0';
+        }
 

         return $instance;

     }

@@ -339,7 +340,10 @@ 
             <label

                 for="<?php echo $this->get_field_id('show_featured_only'); ?>"><?php _e('Show only featured listings:', 'geodirectory'); ?>

                 <input type="checkbox" id="<?php echo $this->get_field_id('show_featured_only'); ?>"

-                       name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) echo 'checked="checked"'; ?>

+                       name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) {
+	echo 'checked="checked"';
+}
+?>

                        value="1"/>

             </label>

         </p>

@@ -347,7 +351,10 @@ 
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">

                 <?php _e('Enable Location Filter:', 'geodirectory');?>

                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"

-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>

+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
+	echo 'checked="checked"';
+}
+?>

                        value="1"/>

             </label>

         </p>

Indentation +109 added lines, -109 removed lines

@@ -15,40 +15,40 @@ 
 class geodir_listing_slider_widget extends WP_Widget

 {

 

-    /**

+	/**

 	 * Register the listing slider widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'geodir_listing_slider_view', 'description' => __('GD > Listing Slider', 'geodirectory'));

-        parent::__construct(

-            'listing_slider_view', // Base ID

-            __('GD > Listing Slider', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_listing_slider_view', 'description' => __('GD > Listing Slider', 'geodirectory'));

+		parent::__construct(

+			'listing_slider_view', // Base ID

+			__('GD > Listing Slider', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 	

 	/**

 	 * Front-end display content for listing slider widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

-    public function widget($args, $instance)

-    {

-        geodir_listing_slider_widget_output($args, $instance);

-    }

+	public function widget($args, $instance)

+	{

+		geodir_listing_slider_widget_output($args, $instance);

+	}

 

 	/**

 	 * Sanitize listing slider widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $new_instance Values just sent to be saved.

 	 * @param array $old_instance Previously saved values from database.

@@ -56,101 +56,101 @@ 
 	 * @return array Updated safe values to be saved.

 	 */

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

-        $instance['title'] = strip_tags($new_instance['title']);

-        $instance['post_type'] = strip_tags($new_instance['post_type']);

-        $instance['category'] = strip_tags($new_instance['category']);

-        $instance['post_number'] = strip_tags($new_instance['post_number']);

-        $instance['max_show'] = strip_tags($new_instance['max_show']);

-        $instance['slide_width'] = strip_tags($new_instance['slide_width']);

-        $instance['show_title'] = isset($new_instance['show_title']) ? $new_instance['show_title'] : '';

-        $instance['slideshow'] = isset($new_instance['slideshow']) ? $new_instance['slideshow'] : '';

-        $instance['animationLoop'] = isset($new_instance['animationLoop']) ? $new_instance['animationLoop'] : '';

-        $instance['directionNav'] = isset($new_instance['directionNav']) ? $new_instance['directionNav'] : '';

-        $instance['slideshowSpeed'] = $new_instance['slideshowSpeed'];

-        $instance['animationSpeed'] = $new_instance['animationSpeed'];

-        $instance['animation'] = $new_instance['animation'];

-        $instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';

-        $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);

-        else

-            $instance['add_location_filter'] = '0';

-

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

+		$instance['title'] = strip_tags($new_instance['title']);

+		$instance['post_type'] = strip_tags($new_instance['post_type']);

+		$instance['category'] = strip_tags($new_instance['category']);

+		$instance['post_number'] = strip_tags($new_instance['post_number']);

+		$instance['max_show'] = strip_tags($new_instance['max_show']);

+		$instance['slide_width'] = strip_tags($new_instance['slide_width']);

+		$instance['show_title'] = isset($new_instance['show_title']) ? $new_instance['show_title'] : '';

+		$instance['slideshow'] = isset($new_instance['slideshow']) ? $new_instance['slideshow'] : '';

+		$instance['animationLoop'] = isset($new_instance['animationLoop']) ? $new_instance['animationLoop'] : '';

+		$instance['directionNav'] = isset($new_instance['directionNav']) ? $new_instance['directionNav'] : '';

+		$instance['slideshowSpeed'] = $new_instance['slideshowSpeed'];

+		$instance['animationSpeed'] = $new_instance['animationSpeed'];

+		$instance['animation'] = $new_instance['animation'];

+		$instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';

+		$instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

+			$instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);

+		else

+			$instance['add_location_filter'] = '0';

+

+		return $instance;

+	}

 

 	/**

 	 * Back-end listing slider widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $instance Previously saved values from database.

 	 */

 	public function form($instance)

-    {

+	{

 

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance,

-            array('title' => '',

-                'post_type' => '',

-                'category' => '',

-                'post_number' => '5',

-                'max_show' => '1',

-                'slide_width' => '',

-                'show_title' => '',

-                'slideshow' => '',

-                'animationLoop' => '',

-                'directionNav' => '',

-                'slideshowSpeed' => 5000,

-                'animationSpeed' => 600,

-                'animation' => '',

-                'list_sort' => 'latest',

-                'show_featured_only' => '',

-                'add_location_filter' => '0',

-            )

-        );

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance,

+			array('title' => '',

+				'post_type' => '',

+				'category' => '',

+				'post_number' => '5',

+				'max_show' => '1',

+				'slide_width' => '',

+				'show_title' => '',

+				'slideshow' => '',

+				'animationLoop' => '',

+				'directionNav' => '',

+				'slideshowSpeed' => 5000,

+				'animationSpeed' => 600,

+				'animation' => '',

+				'list_sort' => 'latest',

+				'show_featured_only' => '',

+				'add_location_filter' => '0',

+			)

+		);

 

-        $title = strip_tags($instance['title']);

+		$title = strip_tags($instance['title']);

 

-        $post_type = strip_tags($instance['post_type']);

+		$post_type = strip_tags($instance['post_type']);

 

-        $category = strip_tags($instance['category']);

+		$category = strip_tags($instance['category']);

 

-        $post_number = strip_tags($instance['post_number']);

+		$post_number = strip_tags($instance['post_number']);

 

-        $max_show = strip_tags($instance['max_show']);

+		$max_show = strip_tags($instance['max_show']);

 

-        $slide_width = strip_tags($instance['slide_width']);

+		$slide_width = strip_tags($instance['slide_width']);

 

-        $show_title = $instance['show_title'];

+		$show_title = $instance['show_title'];

 

-        $slideshow = $instance['slideshow'];

+		$slideshow = $instance['slideshow'];

 

-        $animationLoop = $instance['animationLoop'];

+		$animationLoop = $instance['animationLoop'];

 

-        $directionNav = $instance['directionNav'];

+		$directionNav = $instance['directionNav'];

 

-        $slideshowSpeed = $instance['slideshowSpeed'];

+		$slideshowSpeed = $instance['slideshowSpeed'];

 

-        $animationSpeed = $instance['animationSpeed'];

+		$animationSpeed = $instance['animationSpeed'];

 

-        $add_location_filter = strip_tags($instance['add_location_filter']);

+		$add_location_filter = strip_tags($instance['add_location_filter']);

 

-        $animation = $instance['animation'];

-        $list_sort = $instance['list_sort'];

-        $show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;

+		$animation = $instance['animation'];

+		$list_sort = $instance['list_sort'];

+		$show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;

 

-        $sort_fields = array();

-        $sort_fields[] = array('field' => 'latest', 'label' => __('Latest', 'geodirectory'));

-        $sort_fields[] = array('field' => 'featured', 'label' => __('Featured', 'geodirectory'));

-        $sort_fields[] = array('field' => 'high_review', 'label' => __('Review', 'geodirectory'));

-        $sort_fields[] = array('field' => 'high_rating', 'label' => __('Rating', 'geodirectory'));

-        $sort_fields[] = array('field' => 'random', 'label' => __('Random', 'geodirectory'));

-        ?>

+		$sort_fields = array();

+		$sort_fields[] = array('field' => 'latest', 'label' => __('Latest', 'geodirectory'));

+		$sort_fields[] = array('field' => 'featured', 'label' => __('Featured', 'geodirectory'));

+		$sort_fields[] = array('field' => 'high_review', 'label' => __('Review', 'geodirectory'));

+		$sort_fields[] = array('field' => 'high_rating', 'label' => __('Rating', 'geodirectory'));

+		$sort_fields[] = array('field' => 'random', 'label' => __('Random', 'geodirectory'));

+		?>

 

         <p>

             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>

@@ -174,9 +174,9 @@ 
                     <?php foreach ($postypes as $postypes_obj) { ?>

 

                         <option <?php if ($post_type == $postypes_obj) {

-                            echo 'selected="selected"';

-                        } ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);

-                            echo geodir_utf8_ucfirst($extvalue[1]); ?></option>

+							echo 'selected="selected"';

+						} ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);

+							echo geodir_utf8_ucfirst($extvalue[1]); ?></option>

 

                     <?php } ?>

 

@@ -190,20 +190,20 @@ 
                 for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory');?>

 

                 <?php

-                $category_taxonomy = geodir_get_taxonomies('gd_place');

-                $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));

-                ?>

+				$category_taxonomy = geodir_get_taxonomies('gd_place');

+				$categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));

+				?>

 

                 <select class="widefat" id="<?php echo $this->get_field_id('category'); ?>"

                         name="<?php echo $this->get_field_name('category'); ?>">

                     <option <?php if ($category == '0') {

-                        echo 'selected="selected"';

-                    } ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

                     <?php foreach ($categories as $category_obj) { ?>

 

                         <option <?php if ($category == $category_obj->term_id) {

-                            echo 'selected="selected"';

-                        } ?>

+							echo 'selected="selected"';

+						} ?>

                             value="<?php echo $category_obj->term_id; ?>"><?php echo geodir_utf8_ucfirst($category_obj->name); ?></option>

 

                     <?php } ?>

@@ -256,12 +256,12 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('animation'); ?>"

                         name="<?php echo $this->get_field_name('animation'); ?>">

                     <option <?php if ($animation == 'slide') {

-                        echo 'selected="selected"';

-                    } ?> value="slide">Slide

+						echo 'selected="selected"';

+					} ?> value="slide">Slide

                     </option>

                     <option <?php if ($animation == 'fade') {

-                        echo 'selected="selected"';

-                    } ?> value="fade">Fade

+						echo 'selected="selected"';

+					} ?> value="fade">Fade

                     </option>

                 </select>

             </label>

@@ -292,8 +292,8 @@ 
                 for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($slideshow) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('slideshow'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('slideshow'); ?>" value="1"

                        name="<?php echo $this->get_field_name('slideshow'); ?>"/>

 

             </label>

@@ -304,8 +304,8 @@ 
                 for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($animationLoop) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('animationLoop'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('animationLoop'); ?>" value="1"

                        name="<?php echo $this->get_field_name('animationLoop'); ?>"/>

 

             </label>

@@ -316,8 +316,8 @@ 
                 for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($directionNav) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('directionNav'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('directionNav'); ?>" value="1"

                        name="<?php echo $this->get_field_name('directionNav'); ?>"/>

 

             </label>

@@ -329,8 +329,8 @@ 
                 for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($show_title) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('show_title'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('show_title'); ?>" value="1"

                        name="<?php echo $this->get_field_name('show_title'); ?>"/>

 

             </label>

@@ -378,7 +378,7 @@ 
 

 

     <?php

-    }

+	}

 } // class geodir_listing_slider_widget

 

 register_widget('geodir_listing_slider_widget');
\ No newline at end of file

geodirectory-functions/custom_functions.php

Indentation +4 added lines, -4 removed lines

@@ -2348,10 +2348,10 @@
 	?>

 	<input class="search_text" name="s"

 	       value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {

-		       echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) );

-	       } else {

-		       echo $default_search_for_text;

-	       } ?>" type="text"

+			   echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) );

+		   } else {

+			   echo $default_search_for_text;

+		   } ?>" type="text"

 	       onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"

 	       onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"

 	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);">

Braces +7 added lines, -7 removed lines

@@ -242,7 +242,7 @@ 
 

 		$author_id  = $p_post->post_author;

 

-	}else{

+	} else{

 		gd_die();

 	}

 

@@ -387,7 +387,7 @@ 
 

 		check_ajax_referer( 'send_to_frnd_'.$pid );

 

-	}else{

+	} else{

 		gd_die();

 	}

 

@@ -2274,7 +2274,7 @@ 
 

 	if ( $new_style ) {

 		$default_search_button_label = '<i class="fa fa-search" aria-hidden="true"></i>';

-	}else{

+	} else{

 		$default_search_button_label = 'Search';

 	}

 	if ( get_option( 'geodir_search_button_label' ) && get_option( 'geodir_search_button_label' ) != 'Search' ) {

@@ -2301,7 +2301,7 @@ 
 	if ( $new_style ) {

 		?>

 		<button class="geodir_submit_search <?php echo $fa_class; ?>"><?php _e( $default_search_button_label ,'geodirectory'); ?></button>

-	<?php }else{?>

+	<?php } else{?>

 		<input type="button" value="<?php esc_attr_e( $default_search_button_label ); ?>"

 		       class="geodir_submit_search <?php echo $fa_class; ?>"/>

 	<?php }

@@ -2351,17 +2351,17 @@ 
 			if ( $new_style ) {

 				echo "</div>";

 			}

-		}else{

+		} else{

 			if(! empty( $post_types )){

 				$pt_arr = (array)$post_types;

 				echo '<input type="hidden" name="stype" value="' . key( $pt_arr  ) . '"  />';

-			}else{

+			} else{

 				echo '<input type="hidden" name="stype" value="gd_place"  />';

 			}

 

 		}

 

-	}elseif ( ! empty( $post_types ) ) {

+	} elseif ( ! empty( $post_types ) ) {

 		echo '<input type="hidden" name="stype" value="gd_place"  />';

 	}

 }

Doc Comments +4 added lines, -7 removed lines

@@ -161,7 +161,7 @@ 
  * @param object|string $post The post object.

  * @param string $post_type   The post type.

  *

- * @return object Returns filtered package info as an object.

+ * @return string Returns filtered package info as an object.

  */

 function geodir_post_package_info( $package_info, $post = '', $post_type = '' ) {

 	$package_info['pid']              = 0;

@@ -2507,7 +2507,7 @@ 
  *

  * @since 1.5.0

  *

- * @return True if WPML is active else False.

+ * @return boolean if WPML is active else False.

  */

 function geodir_is_wpml() {

 	if (class_exists('SitePress') && function_exists('icl_object_id')) {

@@ -2583,7 +2583,6 @@ 
  * @since 1.6.25 "geodir_wpml_listing_duplicated" action added.

  *

  * @param int $post_id The Post ID.

- * @param string $lang Language code for translating post.

  * @param array $request_info The post details in an array.

  */

 function geodir_wpml_duplicate_listing($post_id, $request_info) {

@@ -2673,7 +2672,7 @@ 
  * @param int $master_post_id Original Post ID.

  * @param int $tr_post_id Translation Post ID.

  * @param string $lang Language code for translating post.

- * @return bool True for success, False for fail.

+ * @return boolean|null True for success, False for fail.

  */

 function geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang) {

 	global $sitepress, $wpdb;

@@ -2916,8 +2915,6 @@ 
  *

  * @since 1.6.16

  *

- * @param string $post_type WP post type or WP texonomy. Ex: gd_place.

- * @param bool $taxonomy Whether $post_type is taxonomy or not.

  * @return bool True if review star disabled, otherwise false.

  */

 function geodir_rating_disabled_post_types() {

@@ -3189,7 +3186,7 @@ 
  * @param string      $element_type               Use post, page, {custom post type name}, nav_menu, nav_menu_item, category, tag, etc.

  *                                                You can also pass 'any', to let WPML guess the type, but this will only work for posts.

  * @param bool        $return_original_if_missing Optional, default is FALSE. If set to true it will always return a value (the original value, if translation is missing).

- * @param string|NULL $language_code              Optional, default is NULL. If missing, it will use the current language.

+ * @param string|NULL $ulanguage_code              Optional, default is NULL. If missing, it will use the current language.

  *                                                If set to a language code, it will return a translation for that language code or

  *                                                the original if the translation is missing and $return_original_if_missing is set to TRUE.

  *

Spacing +720 added lines, -720 removed lines

@@ -52,31 +52,31 @@ 
 				jQuery(listSel).children('li').switchClass('gridview_onehalf gridview_onethird gridview_onefourth', 'gridview_onefifth', 600);

 			}

 

-			jQuery.post("<?php echo geodir_get_ajax_url();?>&gd_listing_view=" + val, function (data) {

+			jQuery.post("<?php echo geodir_get_ajax_url(); ?>&gd_listing_view=" + val, function (data) {

 				//alert(data );

 			});

 		}

 	</script>

 	<div class="geodir-list-view-select">

 		<select name="gd_list_view" id="gd_list_view" onchange="geodir_list_view_select(this);">

-			<?php $listing_view = (int) $gd_session->get( 'gd_listing_view' ); ?>

-			<option value=""><?php _e( 'View:', 'geodirectory' ); ?></option>

+			<?php $listing_view = (int) $gd_session->get('gd_listing_view'); ?>

+			<option value=""><?php _e('View:', 'geodirectory'); ?></option>

 			<option

-				value="1" <?php selected( 1, $listing_view ); ?>><?php _e( 'View: List', 'geodirectory' ); ?></option>

+				value="1" <?php selected(1, $listing_view); ?>><?php _e('View: List', 'geodirectory'); ?></option>

 			<option

-				value="2" <?php selected( 2, $listing_view ); ?>><?php _e( 'View: Grid 2', 'geodirectory' ); ?></option>

+				value="2" <?php selected(2, $listing_view); ?>><?php _e('View: Grid 2', 'geodirectory'); ?></option>

 			<option

-				value="3" <?php selected( 3, $listing_view ); ?>><?php _e( 'View: Grid 3', 'geodirectory' ); ?></option>

+				value="3" <?php selected(3, $listing_view); ?>><?php _e('View: Grid 3', 'geodirectory'); ?></option>

 			<option

-				value="4" <?php selected( 4, $listing_view ); ?>><?php _e( 'View: Grid 4', 'geodirectory' ); ?></option>

+				value="4" <?php selected(4, $listing_view); ?>><?php _e('View: Grid 4', 'geodirectory'); ?></option>

 			<option

-				value="5" <?php selected( 5, $listing_view ); ?>><?php _e( 'View: Grid 5', 'geodirectory' ); ?></option>

+				value="5" <?php selected(5, $listing_view); ?>><?php _e('View: Grid 5', 'geodirectory'); ?></option>

 		</select>

 	</div>

 	<?php

 }

 

-add_action( 'geodir_before_listing', 'geodir_list_view_select', 100 );

+add_action('geodir_before_listing', 'geodir_list_view_select', 100);

 

 /**

  * Limit the listing excerpt.

@@ -91,9 +91,9 @@ 
  * @global object $post          The current post object.

  * @return string The modified excerpt.

  */

-function geodir_max_excerpt( $charlength ) {

+function geodir_max_excerpt($charlength) {

 	global $post;

-	if ( $charlength == '0' ) {

+	if ($charlength == '0') {

 		return;

 	}

 	$out = '';

@@ -101,46 +101,46 @@ 
 	$temp_post = $post;

 	$excerpt   = get_the_excerpt();

 

-	$charlength ++;

-	$excerpt_more = function_exists( 'geodirf_excerpt_more' ) ? geodirf_excerpt_more( '' ) : geodir_excerpt_more( '' );

-	if ( geodir_utf8_strlen( $excerpt ) > $charlength ) {

-		if ( geodir_utf8_strlen( $excerpt_more ) > 0 && geodir_utf8_strpos( $excerpt, $excerpt_more ) !== false ) {

-			$excut = - ( geodir_utf8_strlen( $excerpt_more ) );

-			$subex = geodir_utf8_substr( $excerpt, 0, $excut );

-			if ( $charlength > 0 && geodir_utf8_strlen( $subex ) > $charlength ) {

-				$subex = geodir_utf8_substr( $subex, 0, $charlength );

+	$charlength++;

+	$excerpt_more = function_exists('geodirf_excerpt_more') ? geodirf_excerpt_more('') : geodir_excerpt_more('');

+	if (geodir_utf8_strlen($excerpt) > $charlength) {

+		if (geodir_utf8_strlen($excerpt_more) > 0 && geodir_utf8_strpos($excerpt, $excerpt_more) !== false) {

+			$excut = - (geodir_utf8_strlen($excerpt_more));

+			$subex = geodir_utf8_substr($excerpt, 0, $excut);

+			if ($charlength > 0 && geodir_utf8_strlen($subex) > $charlength) {

+				$subex = geodir_utf8_substr($subex, 0, $charlength);

 			}

 			$out .= $subex;

 		} else {

-			$subex   = geodir_utf8_substr( $excerpt, 0, $charlength - 5 );

-			$exwords = explode( ' ', $subex );

-			$excut   = - ( geodir_utf8_strlen( $exwords[ count( $exwords ) - 1 ] ) );

-			if ( $excut < 0 ) {

-				$out .= geodir_utf8_substr( $subex, 0, $excut );

+			$subex   = geodir_utf8_substr($excerpt, 0, $charlength - 5);

+			$exwords = explode(' ', $subex);

+			$excut   = - (geodir_utf8_strlen($exwords[count($exwords) - 1]));

+			if ($excut < 0) {

+				$out .= geodir_utf8_substr($subex, 0, $excut);

 			} else {

 				$out .= $subex;

 			}

 		}

-		$out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">';

+		$out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">';

 		/**

 		 * Filter excerpt read more text.

 		 *

 		 * @since 1.0.0

 		 */

-		$out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );

+		$out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));

 		$out .= '</a>';

 

 	} else {

-		if ( geodir_utf8_strlen( $excerpt_more ) > 0 && geodir_utf8_strpos( $excerpt, $excerpt_more ) !== false ) {

-			$excut = - ( geodir_utf8_strlen( $excerpt_more ) );

-			$out .= geodir_utf8_substr( $excerpt, 0, $excut );

-			$out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">';

+		if (geodir_utf8_strlen($excerpt_more) > 0 && geodir_utf8_strpos($excerpt, $excerpt_more) !== false) {

+			$excut = - (geodir_utf8_strlen($excerpt_more));

+			$out .= geodir_utf8_substr($excerpt, 0, $excut);

+			$out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">';

 			/**

 			 * Filter excerpt read more text.

 			 *

 			 * @since 1.0.0

 			 */

-			$out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );

+			$out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));

 			$out .= '</a>';

 		} else {

 			$out .= $excerpt;

@@ -163,7 +163,7 @@ 
  *

  * @return object Returns filtered package info as an object.

  */

-function geodir_post_package_info( $package_info, $post = '', $post_type = '' ) {

+function geodir_post_package_info($package_info, $post = '', $post_type = '') {

 	$package_info['pid']              = 0;

 	$package_info['days']             = 0;

 	$package_info['amount']           = 0;

@@ -192,7 +192,7 @@ 
 	 * @param object|string $post  The post object.

 	 * @param string $post_type    The post type.

 	 */

-	return (object) apply_filters( 'geodir_post_package_info', $package_info, $post, $post_type );

+	return (object) apply_filters('geodir_post_package_info', $package_info, $post, $post_type);

 

 }

 

@@ -220,11 +220,11 @@ 
  *

  * }

  */

-function geodir_send_inquiry( $request ) {

+function geodir_send_inquiry($request) {

 	global $wpdb;

 

 	// strip slashes from text

-	$request = ! empty( $request ) ? stripslashes_deep( $request ) : $request;

+	$request = !empty($request) ? stripslashes_deep($request) : $request;

 

 	$yourname      = sanitize_text_field($request['inq_name']);

 	$youremail     = sanitize_email($request['inq_email']);

@@ -232,25 +232,25 @@ 
 	$frnd_comments = sanitize_text_field($request['inq_msg']);

 	$pid           = absint($request['pid']);

 

-	$author_id  = '';

+	$author_id = '';

 

-	if ( $pid && 'publish' == get_post_status ( $pid  ) ) {

+	if ($pid && 'publish' == get_post_status($pid)) {

 

-		check_ajax_referer( 'send_inquiry_'.$pid );

+		check_ajax_referer('send_inquiry_'.$pid);

 

 		$p_post = get_post($pid);

 

-		$author_id  = $p_post->post_author;

+		$author_id = $p_post->post_author;

 

-	}else{

+	} else {

 		gd_die();

 	}

 

-	$to_email  = geodir_get_post_meta( $pid, 'geodir_email', true );

-	$to_name   = geodir_get_client_name( $author_id );

+	$to_email  = geodir_get_post_meta($pid, 'geodir_email', true);

+	$to_name   = geodir_get_client_name($author_id);

 

-	if ( $to_email == '' ) {

-		$to_email = get_option( 'admin_email' );

+	if ($to_email == '') {

+		$to_email = get_option('admin_email');

 	}

 

 	/**

@@ -271,10 +271,10 @@ 
 	 * }

 	 * @param string $type     The form type, default: `Enquiry`.

 	 */

-	do_action( 'geodir_after_send_enquiry', $request, 'Enquiry' );

+	do_action('geodir_after_send_enquiry', $request, 'Enquiry');

 

 	$client_message = $frnd_comments;

-	$client_message .= '<br>' . __( 'From :', 'geodirectory' ) . ' ' . $yourname . '<br>' . __( 'Phone :', 'geodirectory' ) . ' ' . $inq_phone . '<br>' . __( 'Email :', 'geodirectory' ) . ' ' . $youremail . '<br><br>' . __( 'Sent from', 'geodirectory' ) . ' - <b><a href="' . trailingslashit( home_url() ) . '">' . get_option( 'blogname' ) . '</a></b>.';

+	$client_message .= '<br>'.__('From :', 'geodirectory').' '.$yourname.'<br>'.__('Phone :', 'geodirectory').' '.$inq_phone.'<br>'.__('Email :', 'geodirectory').' '.$youremail.'<br><br>'.__('Sent from', 'geodirectory').' - <b><a href="'.trailingslashit(home_url()).'">'.get_option('blogname').'</a></b>.';

 	/**

 	 * Filter client message text.

 	 *

@@ -282,7 +282,7 @@ 
 	 *

 	 * @param string $client_message Client message text.

 	 */

-	$client_message = apply_filters( 'geodir_inquiry_email_msg', $client_message );

+	$client_message = apply_filters('geodir_inquiry_email_msg', $client_message);

 

 	/**

 	 * Called before the send enquiry email is sent.

@@ -301,12 +301,12 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_before_send_enquiry_email', $request );

-	if ( $to_email ) {

+	do_action('geodir_before_send_enquiry_email', $request);

+	if ($to_email) {

 		// strip slashes message

-		$client_message = stripslashes_deep( $client_message );

+		$client_message = stripslashes_deep($client_message);

 

-		geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid'] );//To client email

+		geodir_sendEmail($youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid']); //To client email

 	}

 

 	/**

@@ -326,12 +326,12 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_after_send_enquiry_email', $request );

-	$url = get_permalink( $pid );

-	if ( strstr( $url, '?' ) ) {

-		$url = $url . "&send_inquiry=success";

+	do_action('geodir_after_send_enquiry_email', $request);

+	$url = get_permalink($pid);

+	if (strstr($url, '?')) {

+		$url = $url."&send_inquiry=success";

 	} else {

-		$url = $url . "?send_inquiry=success";

+		$url = $url."?send_inquiry=success";

 	}

 	/**

 	 * Filter redirect url after the send enquiry email is sent.

@@ -340,8 +340,8 @@ 
 	 *

 	 * @param string $url Redirect url.

 	 */

-	$url = apply_filters( 'geodir_send_enquiry_after_submit_redirect', $url );

-	wp_redirect( $url );

+	$url = apply_filters('geodir_send_enquiry_after_submit_redirect', $url);

+	wp_redirect($url);

 	gd_die();

 

 }

@@ -370,11 +370,11 @@ 
  * }

  * @global object $wpdb        WordPress Database object.

  */

-function geodir_send_friend( $request ) {

+function geodir_send_friend($request) {

 	global $wpdb;

 

 	// strip slashes from text

-	$request = ! empty( $request ) ? stripslashes_deep( $request ) : $request;

+	$request = !empty($request) ? stripslashes_deep($request) : $request;

 

 	$yourname      = sanitize_text_field($request['yourname']);

 	$youremail     = sanitize_email($request['youremail']);

@@ -383,11 +383,11 @@ 
 	$pid           = absint($request['pid']);

 	$to_email      = sanitize_email($request['to_email']);

 	$to_name       = sanitize_text_field($request['to_name']);

-	if ( $pid && 'publish' == get_post_status ( $pid  ) ) {

+	if ($pid && 'publish' == get_post_status($pid)) {

 

-		check_ajax_referer( 'send_to_frnd_'.$pid );

+		check_ajax_referer('send_to_frnd_'.$pid);

 

-	}else{

+	} else {

 		gd_die();

 	}

 

@@ -410,8 +410,8 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_before_send_to_friend_email', $request );

-	geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid'] );//To client email

+	do_action('geodir_before_send_to_friend_email', $request);

+	geodir_sendEmail($youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid']); //To client email

 

 	/**

 	 * Called after the send to friend email is sent.

@@ -432,13 +432,13 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_after_send_to_friend_email', $request );

+	do_action('geodir_after_send_to_friend_email', $request);

 

-	$url = get_permalink( $pid );

-	if ( strstr( $url, '?' ) ) {

-		$url = $url . "&sendtofrnd=success";

+	$url = get_permalink($pid);

+	if (strstr($url, '?')) {

+		$url = $url."&sendtofrnd=success";

 	} else {

-		$url = $url . "?sendtofrnd=success";

+		$url = $url."?sendtofrnd=success";

 	}

 	/**

 	 * Filter redirect url after the send to friend email is sent.

@@ -447,8 +447,8 @@ 
 	 *

 	 * @param string $url Redirect url.

 	 */

-	$url = apply_filters( 'geodir_send_to_friend_after_submit_redirect', $url );

-	wp_redirect( $url );

+	$url = apply_filters('geodir_send_to_friend_after_submit_redirect', $url);

+	wp_redirect($url);

 	gd_die();

 }

 

@@ -462,8 +462,8 @@ 
  *

  * @param string $hash_key

  */

-function geodir_before_tab_content( $hash_key ) {

-	switch ( $hash_key ) {

+function geodir_before_tab_content($hash_key) {

+	switch ($hash_key) {

 		case 'post_info' :

 			echo '<div class="geodir-company_info field-group">';

 			break;

@@ -473,7 +473,7 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			echo ' <div id="' . apply_filters( 'geodir_post_gallery_id', 'geodir-post-gallery' ) . '" class="clearfix" >';

+			echo ' <div id="'.apply_filters('geodir_post_gallery_id', 'geodir-post-gallery').'" class="clearfix" >';

 			break;

 		case 'reviews' :

 			echo '<div id="reviews-wrap" class="clearfix"> ';

@@ -497,8 +497,8 @@ 
  *

  * @param string $hash_key

  */

-function geodir_after_tab_content( $hash_key ) {

-	switch ( $hash_key ) {

+function geodir_after_tab_content($hash_key) {

+	switch ($hash_key) {

 		case 'post_info' :

 			echo '</div>';

 			break;

@@ -529,25 +529,25 @@ 
  * @global object $wpdb     WordPress Database object.

  * @return bool|null|string Returns default sort results, when the post type is valid. Otherwise returns false.

  */

-function geodir_get_posts_default_sort( $post_type ) {

+function geodir_get_posts_default_sort($post_type) {

 

 	global $wpdb;

 

-	if ( $post_type != '' ) {

+	if ($post_type != '') {

 

 		$all_postypes = geodir_get_posttypes();

 

-		if ( ! in_array( $post_type, $all_postypes ) ) {

+		if (!in_array($post_type, $all_postypes)) {

 			return false;

 		}

 

-		$sort_field_info = $wpdb->get_var( $wpdb->prepare( "select default_order from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where	post_type= %s and is_active=%d and is_default=%d", array(

+		$sort_field_info = $wpdb->get_var($wpdb->prepare("select default_order from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where	post_type= %s and is_active=%d and is_default=%d", array(

 			$post_type,

 			1,

 			1

-		) ) );

+		)));

 

-		if ( ! empty( $sort_field_info ) ) {

+		if (!empty($sort_field_info)) {

 			return $sort_field_info;

 		}

 

@@ -567,20 +567,20 @@ 
  * @global object $wpdb     WordPress Database object.

  * @return bool|mixed|void Returns sort results, when the post type is valid. Otherwise returns false.

  */

-function geodir_get_sort_options( $post_type ) {

+function geodir_get_sort_options($post_type) {

 	global $wpdb;

 

-	if ( $post_type != '' ) {

+	if ($post_type != '') {

 		$all_postypes = geodir_get_posttypes();

 

-		if ( ! in_array( $post_type, $all_postypes ) ) {

+		if (!in_array($post_type, $all_postypes)) {

 			return false;

 		}

 

-		$sort_field_info = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array(

+		$sort_field_info = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array(

 			$post_type,

 			1

-		) ) );

+		)));

 

 		/**

 		 * Filter post sort options.

@@ -590,7 +590,7 @@ 
 		 * @param array $sort_field_info Unfiltered sort field array.

 		 * @param string $post_type      Post type.

 		 */

-		return apply_filters( 'geodir_get_sort_options', $sort_field_info, $post_type );

+		return apply_filters('geodir_get_sort_options', $sort_field_info, $post_type);

 	}

 

 }

@@ -611,63 +611,63 @@ 
 	 *

 	 * @since 1.4.4

 	 */

-	if ( is_search() ) {

+	if (is_search()) {

 		return;

 	}

 

 	$sort_by = '';

 

-	if ( isset( $_REQUEST['sort_by'] ) ) {

+	if (isset($_REQUEST['sort_by'])) {

 		$sort_by = $_REQUEST['sort_by'];

 	}

 

 	$gd_post_type = geodir_get_current_posttype();

 

-	$sort_options = geodir_get_sort_options( $gd_post_type );

+	$sort_options = geodir_get_sort_options($gd_post_type);

 

 

 	$sort_field_options = '';

 

-	if ( ! empty( $sort_options ) ) {

-		foreach ( $sort_options as $sort ) {

-			$sort = stripslashes_deep( $sort ); // strip slashes

+	if (!empty($sort_options)) {

+		foreach ($sort_options as $sort) {

+			$sort = stripslashes_deep($sort); // strip slashes

 

-			$label = __( $sort->site_title, 'geodirectory' );

+			$label = __($sort->site_title, 'geodirectory');

 

-			if ( $sort->field_type == 'random' ) {

+			if ($sort->field_type == 'random') {

 				$key = $sort->field_type;

-				( $sort_by == $key || ( $sort->is_default == '1' && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';

-				$sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';

+				($sort_by == $key || ($sort->is_default == '1' && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';

+				$sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';

 			}

 

-			if ( $sort->htmlvar_name == 'comment_count' ) {

+			if ($sort->htmlvar_name == 'comment_count') {

 				$sort->htmlvar_name = 'rating_count';

 			}

 

-			if ( $sort->sort_asc ) {

-				$key   = $sort->htmlvar_name . '_asc';

+			if ($sort->sort_asc) {

+				$key   = $sort->htmlvar_name.'_asc';

 				$label = $sort->site_title;

-				if ( $sort->asc_title ) {

+				if ($sort->asc_title) {

 					$label = $sort->asc_title;

 				}

-				( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';

-				$sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';

+				($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';

+				$sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';

 			}

 

-			if ( $sort->sort_desc ) {

-				$key   = $sort->htmlvar_name . '_desc';

+			if ($sort->sort_desc) {

+				$key   = $sort->htmlvar_name.'_desc';

 				$label = $sort->site_title;

-				if ( $sort->desc_title ) {

+				if ($sort->desc_title) {

 					$label = $sort->desc_title;

 				}

-				( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';

-				$sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';

+				($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';

+				$sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';

 			}

 

 		}

 	}

 

-	if ( $sort_field_options != '' ) {

+	if ($sort_field_options != '') {

 

 		?>

 

@@ -676,9 +676,9 @@ 
 			<select name="sort_by" id="sort_by" onchange="javascript:window.location=this.value;">

 

 				<option

-					value="<?php echo esc_url( add_query_arg( 'sort_by', '' ) ); ?>" <?php if ( $sort_by == '' ) {

+					value="<?php echo esc_url(add_query_arg('sort_by', '')); ?>" <?php if ($sort_by == '') {

 					echo 'selected="selected"';

-				} ?>><?php _e( 'Sort By', 'geodirectory' ); ?></option><?php

+				} ?>><?php _e('Sort By', 'geodirectory'); ?></option><?php

 

 				echo $sort_field_options; ?>

 

@@ -706,9 +706,9 @@ 
  *

  * @return string Returns the section title.

  */

-function geodir_advance_customfields_heading( $title, $field_type ) {

+function geodir_advance_customfields_heading($title, $field_type) {

 

-	if ( in_array( $field_type, array( 'multiselect', 'textarea', 'taxonomy' ) ) ) {

+	if (in_array($field_type, array('multiselect', 'textarea', 'taxonomy'))) {

 		$title = '';

 	}

 

@@ -730,19 +730,19 @@ 
  * @global object $gd_session       GeoDirectory Session object.

  * @return string Returns related posts html.

  */

-function geodir_related_posts_display( $request ) {

-	if ( ! empty( $request ) ) {

-		$before_title = ( isset( $request['before_title'] ) && ! empty( $request['before_title'] ) ) ? $request['before_title'] : '';

-		$after_title  = ( isset( $request['after_title'] ) && ! empty( $request['after_title'] ) ) ? $request['after_title'] : '';

-

-		$title               = ( isset( $request['title'] ) && ! empty( $request['title'] ) ) ? $request['title'] : __( 'Related Listings', 'geodirectory' );

-		$post_number         = ( isset( $request['post_number'] ) && ! empty( $request['post_number'] ) ) ? $request['post_number'] : '5';

-		$relate_to           = ( isset( $request['relate_to'] ) && ! empty( $request['relate_to'] ) ) ? $request['relate_to'] : 'category';

-		$layout              = ( isset( $request['layout'] ) && ! empty( $request['layout'] ) ) ? $request['layout'] : 'gridview_onehalf';

-		$add_location_filter = ( isset( $request['add_location_filter'] ) && ! empty( $request['add_location_filter'] ) ) ? $request['add_location_filter'] : '0';

-		$listing_width       = ( isset( $request['listing_width'] ) && ! empty( $request['listing_width'] ) ) ? $request['listing_width'] : '';

-		$list_sort           = ( isset( $request['list_sort'] ) && ! empty( $request['list_sort'] ) ) ? $request['list_sort'] : 'latest';

-		$character_count     = ( isset( $request['character_count'] ) && ! empty( $request['character_count'] ) ) ? $request['character_count'] : '';

+function geodir_related_posts_display($request) {

+	if (!empty($request)) {

+		$before_title = (isset($request['before_title']) && !empty($request['before_title'])) ? $request['before_title'] : '';

+		$after_title  = (isset($request['after_title']) && !empty($request['after_title'])) ? $request['after_title'] : '';

+

+		$title               = (isset($request['title']) && !empty($request['title'])) ? $request['title'] : __('Related Listings', 'geodirectory');

+		$post_number         = (isset($request['post_number']) && !empty($request['post_number'])) ? $request['post_number'] : '5';

+		$relate_to           = (isset($request['relate_to']) && !empty($request['relate_to'])) ? $request['relate_to'] : 'category';

+		$layout              = (isset($request['layout']) && !empty($request['layout'])) ? $request['layout'] : 'gridview_onehalf';

+		$add_location_filter = (isset($request['add_location_filter']) && !empty($request['add_location_filter'])) ? $request['add_location_filter'] : '0';

+		$listing_width       = (isset($request['listing_width']) && !empty($request['listing_width'])) ? $request['listing_width'] : '';

+		$list_sort           = (isset($request['list_sort']) && !empty($request['list_sort'])) ? $request['list_sort'] : 'latest';

+		$character_count     = (isset($request['character_count']) && !empty($request['character_count'])) ? $request['character_count'] : '';

 

 		global $wpdb, $post, $gd_session, $related_nearest, $related_parent_lat, $related_parent_lon;

 		$related_parent_lat   = !empty($post->post_latitude) ? $post->post_latitude : '';

@@ -750,10 +750,10 @@ 
 		$arr_detail_page_tabs = geodir_detail_page_tabs_list();

 

 		$related_listing_array = array();

-		if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {

-			$related_listing_array = get_option( 'geodir_add_related_listing_posttypes' );

+		if (get_option('geodir_add_related_listing_posttypes')) {

+			$related_listing_array = get_option('geodir_add_related_listing_posttypes');

 		}

-		if ( isset($post->post_type) && in_array( $post->post_type, $related_listing_array ) ) {

+		if (isset($post->post_type) && in_array($post->post_type, $related_listing_array)) {

 			$arr_detail_page_tabs['related_listing']['is_display'] = true;

 		}

 

@@ -765,90 +765,90 @@ 
 		$tax_field         = 'id';

 		$category          = array();

 

-		if ( isset( $_REQUEST['backandedit'] ) ) {

-			$post      = (object) $gd_session->get( 'listing' );

+		if (isset($_REQUEST['backandedit'])) {

+			$post      = (object) $gd_session->get('listing');

 			$post_type = $post->listing_type;

-			if ( isset( $_REQUEST['pid'] ) && $_REQUEST['pid'] != '' ) {

+			if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

 				$post_id = $_REQUEST['pid'];

 			}

-		} elseif ( isset( $_REQUEST['pid'] ) && $_REQUEST['pid'] != '' ) {

-			$post      = geodir_get_post_info( $_REQUEST['pid'] );

+		} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			$post      = geodir_get_post_info($_REQUEST['pid']);

 			$post_type = $post->post_type;

 			$post_id   = $_REQUEST['pid'];

-		} elseif ( isset( $post->post_type ) && $post->post_type != '' ) {

+		} elseif (isset($post->post_type) && $post->post_type != '') {

 			$post_type = $post->post_type;

 			$post_id   = $post->ID;

 		}

 

-		if ( $relate_to == 'category' ) {

+		if ($relate_to == 'category') {

 

-			$category_taxonomy = $post_type . $relate_to;

-			if ( isset( $post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '' ) {

-				$category = explode( ',', trim( $post->{$category_taxonomy}, ',' ) );

+			$category_taxonomy = $post_type.$relate_to;

+			if (isset($post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '') {

+				$category = explode(',', trim($post->{$category_taxonomy}, ','));

 			}

 

-		} elseif ( $relate_to == 'tags' ) {

+		} elseif ($relate_to == 'tags') {

 

-			$category_taxonomy = $post_type . '_' . $relate_to;

-			if ( $post->post_tags != '' ) {

-				$category = explode( ',', trim( $post->post_tags, ',' ) );

+			$category_taxonomy = $post_type.'_'.$relate_to;

+			if ($post->post_tags != '') {

+				$category = explode(',', trim($post->post_tags, ','));

 			}

 			$tax_field = 'name';

 		}

 

 		/* --- return false in invalid request --- */

-		if ( empty( $category ) ) {

+		if (empty($category)) {

 			return false;

 		}

 

 		$all_postypes = geodir_get_posttypes();

 

-		if ( ! in_array( $post_type, $all_postypes ) ) {

+		if (!in_array($post_type, $all_postypes)) {

 			return false;

 		}

 

 		/* --- return false in invalid request --- */

 

 		$location_url = '';

-		if ( $add_location_filter != '0' ) {

+		if ($add_location_filter != '0') {

 			$location_url             = array();

-			$geodir_show_location_url = get_option( 'geodir_show_location_url' );

+			$geodir_show_location_url = get_option('geodir_show_location_url');

 

-			$gd_city = get_query_var( 'gd_city' );

+			$gd_city = get_query_var('gd_city');

 

-			if ( $gd_city ) {

-				$gd_country = get_query_var( 'gd_country' );

-				$gd_region  = get_query_var( 'gd_region' );

+			if ($gd_city) {

+				$gd_country = get_query_var('gd_country');

+				$gd_region  = get_query_var('gd_region');

 			} else {

 				$location = geodir_get_default_location();

 

-				$gd_country = isset( $location->country_slug ) ? $location->country_slug : '';

-				$gd_region  = isset( $location->region_slug ) ? $location->region_slug : '';

-				$gd_city    = isset( $location->city_slug ) ? $location->city_slug : '';

+				$gd_country = isset($location->country_slug) ? $location->country_slug : '';

+				$gd_region  = isset($location->region_slug) ? $location->region_slug : '';

+				$gd_city    = isset($location->city_slug) ? $location->city_slug : '';

 			}

 

-			if ( $geodir_show_location_url == 'all' ) {

+			if ($geodir_show_location_url == 'all') {

 				$location_url[] = $gd_country;

 				$location_url[] = $gd_region;

-			} else if ( $geodir_show_location_url == 'country_city' ) {

+			} else if ($geodir_show_location_url == 'country_city') {

 				$location_url[] = $gd_country;

-			} else if ( $geodir_show_location_url == 'region_city' ) {

+			} else if ($geodir_show_location_url == 'region_city') {

 				$location_url[] = $gd_region;

 			}

 

 			$location_url[] = $gd_city;

 

-			$location_url = implode( '/', $location_url );

+			$location_url = implode('/', $location_url);

 		}

 

 

-		if ( ! empty( $category ) ) {

+		if (!empty($category)) {

 			global $geodir_add_location_url;

 			$geodir_add_location_url = '0';

-			if ( $add_location_filter != '0' ) {

+			if ($add_location_filter != '0') {

 				$geodir_add_location_url = '1';

 			}

-			$viewall_url             = get_term_link( (int) $category[0], $post_type . $category_taxonomy );

+			$viewall_url             = get_term_link((int) $category[0], $post_type.$category_taxonomy);

 			$geodir_add_location_url = null;

 		}

 		ob_start();

@@ -858,24 +858,24 @@ 
 		<div class="geodir_locations geodir_location_listing">

 

 			<?php

-			if ( isset( $request['is_widget'] ) && $request['is_widget'] == '1' ) {

+			if (isset($request['is_widget']) && $request['is_widget'] == '1') {

 				/** geodir_before_title filter Documented in geodirectory_widgets.php */

-				$before_title = isset( $before_title ) ? $before_title : apply_filters( 'geodir_before_title', '<h3 class="widget-title">' );

+				$before_title = isset($before_title) ? $before_title : apply_filters('geodir_before_title', '<h3 class="widget-title">');

 				/** geodir_after_title filter Documented in geodirectory_widgets.php */

-				$after_title = isset( $after_title ) ? $after_title : apply_filters( 'geodir_after_title', '</h3>' );

+				$after_title = isset($after_title) ? $after_title : apply_filters('geodir_after_title', '</h3>');

 				?>

 				<div class="location_list_heading clearfix">

-					<?php echo $before_title . $title . $after_title; ?>

+					<?php echo $before_title.$title.$after_title; ?>

 				</div>

 				<?php

 			}

 			$query_args = array(

 				'posts_per_page'   => $post_number,

 				'is_geodir_loop'   => true,

-				'gd_location'      => ( $add_location_filter ) ? true : false,

+				'gd_location'      => ($add_location_filter) ? true : false,

 				'post_type'        => $post_type,

 				'order_by'         => $list_sort,

-				'post__not_in'     => array( $post_id ),

+				'post__not_in'     => array($post_id),

 				'excerpt_length'   => $character_count,

 				'related_listings' => $is_display

 			);

@@ -886,7 +886,7 @@ 
 				'terms'    => $category

 			);

 

-			$query_args['tax_query'] = array( $tax_query );

+			$query_args['tax_query'] = array($tax_query);

 

 			global $gridview_columns, $post;

 

@@ -898,21 +898,21 @@ 
 			 * @param array $query_args The query array.

 			 * @param array $request Related posts request array.

 			 */

-			$query_args = apply_filters( 'geodir_related_posts_widget_query_args', $query_args, $request );

+			$query_args = apply_filters('geodir_related_posts_widget_query_args', $query_args, $request);

 

-			query_posts( $query_args );

+			query_posts($query_args);

 

-			if ( strstr( $layout, 'gridview' ) ) {

-				$listing_view_exp = explode( '_', $layout );

+			if (strstr($layout, 'gridview')) {

+				$listing_view_exp = explode('_', $layout);

 				$gridview_columns = $layout;

 				$layout           = $listing_view_exp[0];

-			} else if ( $layout == 'list' ) {

+			} else if ($layout == 'list') {

 				$gridview_columns = '';

 			}

 			$related_posts = true;

 

 			$related_nearest = false;

-			if ( $list_sort == 'nearest' ) {

+			if ($list_sort == 'nearest') {

 				$related_nearest = true;

 			}

 

@@ -922,14 +922,14 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			$template = apply_filters( "geodir_template_part-related-listing-listview", geodir_locate_template( 'listing-listview' ) );

+			$template = apply_filters("geodir_template_part-related-listing-listview", geodir_locate_template('listing-listview'));

 

 			/**

 			 * Includes related listing listview template.

 			 *

 			 * @since 1.0.0

 			 */

-			include( $template );

+			include($template);

 

 			wp_reset_query();

 			$post            = $origi_post;

@@ -957,12 +957,12 @@ 
 function geodir_category_count_script() {

 	global $geodir_post_category_str;

 

-	if ( ! empty( $geodir_post_category_str ) ) {

-		$geodir_post_category_str = serialize( $geodir_post_category_str );

+	if (!empty($geodir_post_category_str)) {

+		$geodir_post_category_str = serialize($geodir_post_category_str);

 	}

 

-	$all_var['post_category_array'] = html_entity_decode( (string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8' );

-	$script                         = "var post_category_array = " . json_encode( $all_var ) . ';';

+	$all_var['post_category_array'] = html_entity_decode((string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8');

+	$script                         = "var post_category_array = ".json_encode($all_var).';';

 	echo '<script>';

 	echo $script;

 	echo '</script>';

@@ -977,8 +977,8 @@ 
  * @return string Returns the default language.

  */

 function geodir_get_map_default_language() {

-	$geodir_default_map_language = get_option( 'geodir_default_map_language' );

-	if ( empty( $geodir_default_map_language ) ) {

+	$geodir_default_map_language = get_option('geodir_default_map_language');

+	if (empty($geodir_default_map_language)) {

 		$geodir_default_map_language = 'en';

 	}

 

@@ -989,7 +989,7 @@ 
 	 *

 	 * @param string $geodir_default_map_language Default map language.

 	 */

-	return apply_filters( 'geodir_default_map_language', $geodir_default_map_language );

+	return apply_filters('geodir_default_map_language', $geodir_default_map_language);

 }

 

 /**

@@ -1000,7 +1000,7 @@ 
  * @return string Returns the api key.

  */

 function geodir_get_map_api_key() {

-	$key = get_option( 'geodir_google_api_key' );

+	$key = get_option('geodir_google_api_key');

 

 	/**

 	 * Filter Google maps api key.

@@ -1009,7 +1009,7 @@ 
 	 *

 	 * @param string $key Google maps api key.

 	 */

-	return apply_filters( 'geodir_google_api_key', $key );

+	return apply_filters('geodir_google_api_key', $key);

 }

 

 

@@ -1029,20 +1029,20 @@ 
 	global $wp, $post, $wp_query, $wpdb, $geodir_addon_list;

 

 	$is_geodir_page = geodir_is_geodir_page();

-	if ( ! $is_geodir_page ) {

+	if (!$is_geodir_page) {

 		return;

 	}// if non GD page, bail

 

 	$use_gd_meta = true;

-	if ( ( class_exists( 'WPSEO_Frontend' ) || class_exists( 'All_in_One_SEO_Pack' ) ) && !geodir_disable_yoast_seo_metas() ) {

+	if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {

 		$use_gd_meta = false;

 

-		if ( geodir_is_page( 'search' ) ) {

+		if (geodir_is_page('search')) {

 			$use_gd_meta = true;

 		}

 	}

 

-	if ( ! $use_gd_meta ) {

+	if (!$use_gd_meta) {

 		return;

 	}// bail if Yoast Wordpress SEO or All_in_One_SEO_Pack active.

 

@@ -1050,68 +1050,68 @@ 
 

 	$all_postypes = geodir_get_posttypes();

 

-	$geodir_taxonomies = geodir_get_taxonomies( '', true );

+	$geodir_taxonomies = geodir_get_taxonomies('', true);

 

 	$meta_desc = '';

 	$meta_key  = '';

-	if ( isset( $current_term->ID ) && $current_term->ID == geodir_location_page_id() ) {

+	if (isset($current_term->ID) && $current_term->ID == geodir_location_page_id()) {

 		/**

 		 * Filter SEO meta location description.

 		 *

 		 * @since 1.0.0

 		 */

-		$meta_desc = apply_filters( 'geodir_seo_meta_location_description', '' );

+		$meta_desc = apply_filters('geodir_seo_meta_location_description', '');

 		$meta_desc .= '';

 	}

-	if ( have_posts() && is_single() OR is_page() ) {

-		while ( have_posts() ) {

+	if (have_posts() && is_single() OR is_page()) {

+		while (have_posts()) {

 			the_post();

 

-			if ( has_excerpt() ) {

-				$out_excerpt = strip_tags( strip_shortcodes( get_the_excerpt() ) );

-				if ( empty( $out_excerpt ) ) {

-					$out_excerpt = strip_tags( do_shortcode( get_the_excerpt() ) );

+			if (has_excerpt()) {

+				$out_excerpt = strip_tags(strip_shortcodes(get_the_excerpt()));

+				if (empty($out_excerpt)) {

+					$out_excerpt = strip_tags(do_shortcode(get_the_excerpt()));

 				}

-				$out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $out_excerpt );

+				$out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $out_excerpt);

 			} else {

-				$out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $post->post_content );

-				$out_excerpt = strip_tags( strip_shortcodes( $out_excerpt ) );

-				if ( empty( $out_excerpt ) ) {

-					$out_excerpt = strip_tags( do_shortcode( $out_excerpt ) ); // parse short code from content

+				$out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $post->post_content);

+				$out_excerpt = strip_tags(strip_shortcodes($out_excerpt));

+				if (empty($out_excerpt)) {

+					$out_excerpt = strip_tags(do_shortcode($out_excerpt)); // parse short code from content

 				}

-				$out_excerpt = trim( wp_trim_words( $out_excerpt, 35, '' ), '.!?,;:-' );

+				$out_excerpt = trim(wp_trim_words($out_excerpt, 35, ''), '.!?,;:-');

 			}

 

 			$meta_desc .= $out_excerpt;

 		}

-	} elseif ( ( is_category() || is_tag() ) && isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {

-		if ( is_category() ) {

-			$meta_desc .= __( "Posts related to Category:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_cat_title( "", false ) );

-		} elseif ( is_tag() ) {

-			$meta_desc .= __( "Posts related to Tag:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_tag_title( "", false ) );

+	} elseif ((is_category() || is_tag()) && isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {

+		if (is_category()) {

+			$meta_desc .= __("Posts related to Category:", 'geodirectory')." ".geodir_utf8_ucfirst(single_cat_title("", false));

+		} elseif (is_tag()) {

+			$meta_desc .= __("Posts related to Tag:", 'geodirectory')." ".geodir_utf8_ucfirst(single_tag_title("", false));

 		}

-	} elseif ( isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {

-		$meta_desc .= isset( $current_term->description ) ? $current_term->description : '';

+	} elseif (isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {

+		$meta_desc .= isset($current_term->description) ? $current_term->description : '';

 	}

 

 

 	$geodir_post_type       = geodir_get_current_posttype();

-	$geodir_post_type_info  = get_post_type_object( $geodir_post_type );

-	$geodir_is_page_listing = geodir_is_page( 'listing' ) ? true : false;

-

-	$category_taxonomy = geodir_get_taxonomies( $geodir_post_type );

-	$tag_taxonomy      = geodir_get_taxonomies( $geodir_post_type, true );

-

-	$geodir_is_category = isset( $category_taxonomy[0] ) && get_query_var( $category_taxonomy[0] ) ? get_query_var( $category_taxonomy[0] ) : false;

-	$geodir_is_tag      = isset( $tag_taxonomy[0] ) && get_query_var( $tag_taxonomy[0] ) ? true : false;

-

-	$geodir_is_search        = geodir_is_page( 'search' ) ? true : false;

-	$geodir_is_location      = geodir_is_page( 'location' ) ? true : false;

-	$geodir_location_manager = isset( $geodir_addon_list['geodir_location_manager'] ) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false;

-	$godir_location_terms    = geodir_get_current_location_terms( 'query_vars' );

-	$gd_city                 = $geodir_location_manager && isset( $godir_location_terms['gd_city'] ) ? $godir_location_terms['gd_city'] : null;

-	$gd_region               = $geodir_location_manager && isset( $godir_location_terms['gd_region'] ) ? $godir_location_terms['gd_region'] : null;

-	$gd_country              = $geodir_location_manager && isset( $godir_location_terms['gd_country'] ) ? $godir_location_terms['gd_country'] : null;

+	$geodir_post_type_info  = get_post_type_object($geodir_post_type);

+	$geodir_is_page_listing = geodir_is_page('listing') ? true : false;

+

+	$category_taxonomy = geodir_get_taxonomies($geodir_post_type);

+	$tag_taxonomy      = geodir_get_taxonomies($geodir_post_type, true);

+

+	$geodir_is_category = isset($category_taxonomy[0]) && get_query_var($category_taxonomy[0]) ? get_query_var($category_taxonomy[0]) : false;

+	$geodir_is_tag      = isset($tag_taxonomy[0]) && get_query_var($tag_taxonomy[0]) ? true : false;

+

+	$geodir_is_search        = geodir_is_page('search') ? true : false;

+	$geodir_is_location      = geodir_is_page('location') ? true : false;

+	$geodir_location_manager = isset($geodir_addon_list['geodir_location_manager']) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false;

+	$godir_location_terms    = geodir_get_current_location_terms('query_vars');

+	$gd_city                 = $geodir_location_manager && isset($godir_location_terms['gd_city']) ? $godir_location_terms['gd_city'] : null;

+	$gd_region               = $geodir_location_manager && isset($godir_location_terms['gd_region']) ? $godir_location_terms['gd_region'] : null;

+	$gd_country              = $geodir_location_manager && isset($godir_location_terms['gd_country']) ? $godir_location_terms['gd_country'] : null;

 	/**

 	 * Filter the Everywhere text in location description.

 	 *

@@ -1119,108 +1119,108 @@ 
 	 *

 	 * @param string $replace_location Everywhere text.

 	 */

-	$replace_location        = apply_filters( 'geodir_location_description_everywhere_text', __( 'Everywhere', 'geodirectory' ) );

+	$replace_location        = apply_filters('geodir_location_description_everywhere_text', __('Everywhere', 'geodirectory'));

 	$location_id             = null;

-	if ( $geodir_location_manager ) {

-		$sql           = $wpdb->prepare( "SELECT location_id FROM " . POST_LOCATION_TABLE . " WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array( $gd_city ) );

-		$location_id   = (int) $wpdb->get_var( $sql );

+	if ($geodir_location_manager) {

+		$sql           = $wpdb->prepare("SELECT location_id FROM ".POST_LOCATION_TABLE." WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array($gd_city));

+		$location_id   = (int) $wpdb->get_var($sql);

 		$location_type = geodir_what_is_current_location();

-		if ( $location_type == 'city' ) {

-			$replace_location = geodir_get_current_location( array( 'what' => 'city', 'echo' => false ) );

-		} elseif ( $location_type == 'region' ) {

-			$replace_location = geodir_get_current_location( array( 'what' => 'region', 'echo' => false ) );

-		} elseif ( $location_type == 'country' ) {

-			$replace_location = geodir_get_current_location( array( 'what' => 'country', 'echo' => false ) );

-			$replace_location = __( $replace_location, 'geodirectory' );

-		}

-		$country          = get_query_var( 'gd_country' );

-		$region           = get_query_var( 'gd_region' );

-		$city             = get_query_var( 'gd_city' );

+		if ($location_type == 'city') {

+			$replace_location = geodir_get_current_location(array('what' => 'city', 'echo' => false));

+		} elseif ($location_type == 'region') {

+			$replace_location = geodir_get_current_location(array('what' => 'region', 'echo' => false));

+		} elseif ($location_type == 'country') {

+			$replace_location = geodir_get_current_location(array('what' => 'country', 'echo' => false));

+			$replace_location = __($replace_location, 'geodirectory');

+		}

+		$country          = get_query_var('gd_country');

+		$region           = get_query_var('gd_region');

+		$city             = get_query_var('gd_city');

 		$current_location = '';

-		if ( $country != '' ) {

-			$current_location = get_actual_location_name( 'country', $country, true );

+		if ($country != '') {

+			$current_location = get_actual_location_name('country', $country, true);

 		}

-		if ( $region != '' ) {

-			$current_location = get_actual_location_name( 'region', $region );

+		if ($region != '') {

+			$current_location = get_actual_location_name('region', $region);

 		}

-		if ( $city != '' ) {

-			$current_location = get_actual_location_name( 'city', $city );

+		if ($city != '') {

+			$current_location = get_actual_location_name('city', $city);

 		}

 		$replace_location = $current_location != '' ? $current_location : $replace_location;

 	}

 

 	$geodir_meta_keys = '';

 	$geodir_meta_desc = '';

-	if ( $is_geodir_page && ! empty( $geodir_post_type_info ) ) {

-		if ( $geodir_is_page_listing || $geodir_is_search || geodir_is_page( 'add-listing' ) ) {

-			$geodir_meta_keys = isset( $geodir_post_type_info->seo['meta_keyword'] ) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys;

+	if ($is_geodir_page && !empty($geodir_post_type_info)) {

+		if ($geodir_is_page_listing || $geodir_is_search || geodir_is_page('add-listing')) {

+			$geodir_meta_keys = isset($geodir_post_type_info->seo['meta_keyword']) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys;

 

-			$geodir_meta_desc = isset( $geodir_post_type_info->description ) ? $geodir_post_type_info->description : $geodir_meta_desc;

-			$geodir_meta_desc = isset( $geodir_post_type_info->seo['meta_description'] ) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc;

+			$geodir_meta_desc = isset($geodir_post_type_info->description) ? $geodir_post_type_info->description : $geodir_meta_desc;

+			$geodir_meta_desc = isset($geodir_post_type_info->seo['meta_description']) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc;

 

-			if ( $geodir_is_category ) {

-				$category = $geodir_is_category ? get_term_by( 'slug', $geodir_is_category, $category_taxonomy[0] ) : null;

-				if ( isset( $category->term_id ) && ! empty( $category->term_id ) ) {

+			if ($geodir_is_category) {

+				$category = $geodir_is_category ? get_term_by('slug', $geodir_is_category, $category_taxonomy[0]) : null;

+				if (isset($category->term_id) && !empty($category->term_id)) {

 					$category_id   = $category->term_id;

-					$category_desc = trim( $category->description ) != '' ? trim( $category->description ) : geodir_get_tax_meta( $category_id, 'ct_cat_top_desc', false, $geodir_post_type );

-					if ( $location_id ) {

-						$option_name    = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id;

-						$cat_loc_option = get_option( $option_name );

-

-						$gd_cat_loc_default = ! empty( $cat_loc_option ) && isset( $cat_loc_option['gd_cat_loc_default'] ) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false;

-						if ( ! $gd_cat_loc_default ) {

-							$option_name   = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id . '_' . $location_id;

-							$option        = get_option( $option_name );

-							$category_desc = isset( $option['gd_cat_loc_desc'] ) && trim( $option['gd_cat_loc_desc'] ) != '' ? trim( $option['gd_cat_loc_desc'] ) : $category_desc;

+					$category_desc = trim($category->description) != '' ? trim($category->description) : geodir_get_tax_meta($category_id, 'ct_cat_top_desc', false, $geodir_post_type);

+					if ($location_id) {

+						$option_name    = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id;

+						$cat_loc_option = get_option($option_name);

+

+						$gd_cat_loc_default = !empty($cat_loc_option) && isset($cat_loc_option['gd_cat_loc_default']) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false;

+						if (!$gd_cat_loc_default) {

+							$option_name   = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id.'_'.$location_id;

+							$option        = get_option($option_name);

+							$category_desc = isset($option['gd_cat_loc_desc']) && trim($option['gd_cat_loc_desc']) != '' ? trim($option['gd_cat_loc_desc']) : $category_desc;

 						}

 					}

-					$geodir_meta_desc = __( "Posts related to Category:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_cat_title( "", false ) ) . '. ' . $category_desc;

+					$geodir_meta_desc = __("Posts related to Category:", 'geodirectory')." ".geodir_utf8_ucfirst(single_cat_title("", false)).'. '.$category_desc;

 				}

-			} else if ( $geodir_is_tag ) {

-				$geodir_meta_desc = __( "Posts related to Tag:", 'geodirectory' ) . " " . geodir_utf8_ucfirst( single_tag_title( "", false ) ) . '. ' . $geodir_meta_desc;

+			} else if ($geodir_is_tag) {

+				$geodir_meta_desc = __("Posts related to Tag:", 'geodirectory')." ".geodir_utf8_ucfirst(single_tag_title("", false)).'. '.$geodir_meta_desc;

 			}

 		}

 	}

 

 

 	$gd_page = '';

-	if ( geodir_is_page( 'home' ) ) {

+	if (geodir_is_page('home')) {

 		$gd_page   = 'home';

-		$meta_desc = ( get_option( 'geodir_meta_desc_homepage' ) ) ? get_option( 'geodir_meta_desc_homepage' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'detail' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_homepage')) ? get_option('geodir_meta_desc_homepage') : $meta_desc;

+	} elseif (geodir_is_page('detail')) {

 		$gd_page   = 'detail';

-		$meta_desc = ( get_option( 'geodir_meta_desc_detail' ) ) ? get_option( 'geodir_meta_desc_detail' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'pt' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_detail')) ? get_option('geodir_meta_desc_detail') : $meta_desc;

+	} elseif (geodir_is_page('pt')) {

 		$gd_page   = 'pt';

-		$meta_desc = ( get_option( 'geodir_meta_desc_pt' ) ) ? get_option( 'geodir_meta_desc_pt' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'listing' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_pt')) ? get_option('geodir_meta_desc_pt') : $meta_desc;

+	} elseif (geodir_is_page('listing')) {

 		$gd_page   = 'listing';

-		$meta_desc = ( get_option( 'geodir_meta_desc_listing' ) ) ? get_option( 'geodir_meta_desc_listing' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'location' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_listing')) ? get_option('geodir_meta_desc_listing') : $meta_desc;

+	} elseif (geodir_is_page('location')) {

 		$gd_page   = 'location';

-		$meta_desc = ( get_option( 'geodir_meta_desc_location' ) ) ? get_option( 'geodir_meta_desc_location' ) : $meta_desc;

-		$meta_desc = apply_filters( 'geodir_seo_meta_location_description', $meta_desc );

+		$meta_desc = (get_option('geodir_meta_desc_location')) ? get_option('geodir_meta_desc_location') : $meta_desc;

+		$meta_desc = apply_filters('geodir_seo_meta_location_description', $meta_desc);

 

-	} elseif ( geodir_is_page( 'search' ) ) {

+	} elseif (geodir_is_page('search')) {

 		$gd_page   = 'search';

-		$meta_desc = ( get_option( 'geodir_meta_desc_search' ) ) ? get_option( 'geodir_meta_desc_search' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'add-listing' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_search')) ? get_option('geodir_meta_desc_search') : $meta_desc;

+	} elseif (geodir_is_page('add-listing')) {

 		$gd_page   = 'add-listing';

-		$meta_desc = ( get_option( 'geodir_meta_desc_add-listing' ) ) ? get_option( 'geodir_meta_desc_add-listing' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'author' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_add-listing')) ? get_option('geodir_meta_desc_add-listing') : $meta_desc;

+	} elseif (geodir_is_page('author')) {

 		$gd_page   = 'author';

-		$meta_desc = ( get_option( 'geodir_meta_desc_author' ) ) ? get_option( 'geodir_meta_desc_author' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'login' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_author')) ? get_option('geodir_meta_desc_author') : $meta_desc;

+	} elseif (geodir_is_page('login')) {

 		$gd_page   = 'login';

-		$meta_desc = ( get_option( 'geodir_meta_desc_login' ) ) ? get_option( 'geodir_meta_desc_login' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'listing-success' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_login')) ? get_option('geodir_meta_desc_login') : $meta_desc;

+	} elseif (geodir_is_page('listing-success')) {

 		$gd_page   = 'listing-success';

-		$meta_desc = ( get_option( 'geodir_meta_desc_listing-success' ) ) ? get_option( 'geodir_meta_desc_listing-success' ) : $meta_desc;

+		$meta_desc = (get_option('geodir_meta_desc_listing-success')) ? get_option('geodir_meta_desc_listing-success') : $meta_desc;

 	}

 

 

-	if ( $meta_desc ) {

-		$meta_desc = stripslashes_deep( $meta_desc );

+	if ($meta_desc) {

+		$meta_desc = stripslashes_deep($meta_desc);

 		/**

 		 * Filter page description to replace variables.

 		 *

@@ -1229,7 +1229,7 @@ 
 		 * @param string $title   The page description including variables.

 		 * @param string $gd_page The GeoDirectory page type if any.

 		 */

-		$meta_desc = apply_filters( 'geodir_seo_meta_description_pre', __( $meta_desc, 'geodirectory' ), $gd_page, '' );

+		$meta_desc = apply_filters('geodir_seo_meta_description_pre', __($meta_desc, 'geodirectory'), $gd_page, '');

 

 		/**

 		 * Filter SEO meta description.

@@ -1238,49 +1238,49 @@ 
 		 *

 		 * @param string $meta_desc Meta description content.

 		 */

-		echo apply_filters( 'geodir_seo_meta_description', '<meta name="description" content="' . $meta_desc . '" />', $meta_desc );

+		echo apply_filters('geodir_seo_meta_description', '<meta name="description" content="'.$meta_desc.'" />', $meta_desc);

 	}

 

 	// meta keywords

-	if ( isset( $post->post_type ) && in_array( $post->post_type, $all_postypes ) ) {

-		$place_tags = wp_get_post_terms( $post->ID, $post->post_type . '_tags', array( "fields" => "names" ) );

-		$place_cats = wp_get_post_terms( $post->ID, $post->post_type . 'category', array( "fields" => "names" ) );

+	if (isset($post->post_type) && in_array($post->post_type, $all_postypes)) {

+		$place_tags = wp_get_post_terms($post->ID, $post->post_type.'_tags', array("fields" => "names"));

+		$place_cats = wp_get_post_terms($post->ID, $post->post_type.'category', array("fields" => "names"));

 

-		$meta_key .= implode( ", ", array_merge( (array) $place_cats, (array) $place_tags ) );

+		$meta_key .= implode(", ", array_merge((array) $place_cats, (array) $place_tags));

 	} else {

 		$posttags = get_the_tags();

-		if ( $posttags ) {

-			foreach ( $posttags as $tag ) {

-				$meta_key .= $tag->name . ' ';

+		if ($posttags) {

+			foreach ($posttags as $tag) {

+				$meta_key .= $tag->name.' ';

 			}

 		} else {

-			$tags = get_tags( array( 'orderby' => 'count', 'order' => 'DESC' ) );

+			$tags = get_tags(array('orderby' => 'count', 'order' => 'DESC'));

 			$xt   = 1;

 

-			foreach ( $tags as $tag ) {

-				if ( $xt <= 20 ) {

-					$meta_key .= $tag->name . ", ";

+			foreach ($tags as $tag) {

+				if ($xt <= 20) {

+					$meta_key .= $tag->name.", ";

 				}

 

-				$xt ++;

+				$xt++;

 			}

 		}

 	}

 

-	$meta_key         = $meta_key != '' ? rtrim( trim( $meta_key ), "," ) : $meta_key;

-	$geodir_meta_keys = $geodir_meta_keys != '' ? ( $meta_key != '' ? $meta_key . ', ' . $geodir_meta_keys : $geodir_meta_keys ) : $meta_key;

-	if ( $geodir_meta_keys != '' ) {

-		$geodir_meta_keys = strip_tags( $geodir_meta_keys );

-		$geodir_meta_keys = esc_html( $geodir_meta_keys );

-		$geodir_meta_keys = geodir_strtolower( $geodir_meta_keys );

-		$geodir_meta_keys = wp_html_excerpt( $geodir_meta_keys, 1000, '' );

-		$geodir_meta_keys = str_replace( '%location%', $replace_location, $geodir_meta_keys );

+	$meta_key         = $meta_key != '' ? rtrim(trim($meta_key), ",") : $meta_key;

+	$geodir_meta_keys = $geodir_meta_keys != '' ? ($meta_key != '' ? $meta_key.', '.$geodir_meta_keys : $geodir_meta_keys) : $meta_key;

+	if ($geodir_meta_keys != '') {

+		$geodir_meta_keys = strip_tags($geodir_meta_keys);

+		$geodir_meta_keys = esc_html($geodir_meta_keys);

+		$geodir_meta_keys = geodir_strtolower($geodir_meta_keys);

+		$geodir_meta_keys = wp_html_excerpt($geodir_meta_keys, 1000, '');

+		$geodir_meta_keys = str_replace('%location%', $replace_location, $geodir_meta_keys);

 

-		$meta_key = rtrim( trim( $geodir_meta_keys ), "," );

+		$meta_key = rtrim(trim($geodir_meta_keys), ",");

 	}

 

-	if ( $meta_key ) {

-		$meta_key = stripslashes_deep( $meta_key );

+	if ($meta_key) {

+		$meta_key = stripslashes_deep($meta_key);

 		/**

 		 * Filter SEO meta keywords.

 		 *

@@ -1288,7 +1288,7 @@ 
 		 *

 		 * @param string $meta_desc Meta keywords.

 		 */

-		echo apply_filters( 'geodir_seo_meta_keywords', '<meta name="keywords" content="' . $meta_key . '" />', $meta_key );

+		echo apply_filters('geodir_seo_meta_keywords', '<meta name="keywords" content="'.$meta_key.'" />', $meta_key);

 	}

 

 }

@@ -1308,8 +1308,8 @@ 
 

 	$geodir_detail_page_tabs_array = geodir_detail_page_tabs_array();

 

-	foreach ( $geodir_detail_page_tabs_array as $key => $tabs_obj ) {

-		$geodir_detail_page_tabs_key_value_array[ $key ] = $tabs_obj['heading_text'];

+	foreach ($geodir_detail_page_tabs_array as $key => $tabs_obj) {

+		$geodir_detail_page_tabs_key_value_array[$key] = $tabs_obj['heading_text'];

 	}

 

 	return $geodir_detail_page_tabs_key_value_array;

@@ -1331,57 +1331,57 @@ 
 	 * @since 1.0.0

 	 */

 	$arr_tabs['post_profile'] = array(

-		'heading_text'  => __( 'Profile', 'geodirectory' ),

+		'heading_text'  => __('Profile', 'geodirectory'),

 		'is_active_tab' => true,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_profile' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_profile'),

 		'tab_content'   => ''

 	);

-	$arr_tabs['post_info']    = array(

-		'heading_text'  => __( 'More Info', 'geodirectory' ),

+	$arr_tabs['post_info'] = array(

+		'heading_text'  => __('More Info', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_info' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_info'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['post_images'] = array(

-		'heading_text'  => __( 'Photos', 'geodirectory' ),

+		'heading_text'  => __('Photos', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_images' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_images'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['post_video'] = array(

-		'heading_text'  => __( 'Video', 'geodirectory' ),

+		'heading_text'  => __('Video', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_video' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_video'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['special_offers'] = array(

-		'heading_text'  => __( 'Special Offers', 'geodirectory' ),

+		'heading_text'  => __('Special Offers', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'special_offers' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'special_offers'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['post_map'] = array(

-		'heading_text'  => __( 'Map', 'geodirectory' ),

+		'heading_text'  => __('Map', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_map' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_map'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['reviews'] = array(

-		'heading_text'  => __( 'Reviews', 'geodirectory' ),

+		'heading_text'  => __('Reviews', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'reviews' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'reviews'),

 		'tab_content'   => 'review display'

 	);

 

 	$arr_tabs['related_listing'] = array(

-		'heading_text'  => __( 'Related Listing', 'geodirectory' ),

+		'heading_text'  => __('Related Listing', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'related_listing' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'related_listing'),

 		'tab_content'   => ''

 	);

 

@@ -1390,7 +1390,7 @@ 
 	 *

 	 * @since 1.0.0

 	 */

-	return apply_filters( 'geodir_detail_page_tab_list_extend', $arr_tabs );

+	return apply_filters('geodir_detail_page_tab_list_extend', $arr_tabs);

 

 

 }

@@ -1404,13 +1404,13 @@ 
  * @return mixed|array Tabs array.

  */

 function geodir_detail_page_tabs_list() {

-	$tabs_excluded = get_option( 'geodir_detail_page_tabs_excluded' );

+	$tabs_excluded = get_option('geodir_detail_page_tabs_excluded');

 	$tabs_array    = geodir_detail_page_tabs_array();

 

-	if ( ! empty( $tabs_excluded ) ) {

-		foreach ( $tabs_excluded as $tab ) {

-			if ( array_key_exists( $tab, $tabs_array ) ) {

-				unset( $tabs_array[ $tab ] );

+	if (!empty($tabs_excluded)) {

+		foreach ($tabs_excluded as $tab) {

+			if (array_key_exists($tab, $tabs_array)) {

+				unset($tabs_array[$tab]);

 			}

 		}

 	}

@@ -1434,66 +1434,66 @@ 
 function geodir_show_detail_page_tabs() {

 	global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields, $preview;

 

-	$post_id            = ! empty( $post ) && isset( $post->ID ) ? (int) $post->ID : 0;

-	$request_post_id    = ! empty( $_REQUEST['p'] ) ? (int) $_REQUEST['p'] : 0;

-	$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

+	$post_id            = !empty($post) && isset($post->ID) ? (int) $post->ID : 0;

+	$request_post_id    = !empty($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;

+	$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 ( $is_backend_preview && ! $post_id > 0 && $request_post_id > 0 ) {

-		$post = geodir_get_post_info( $request_post_id );

-		setup_postdata( $post );

+	if ($is_backend_preview && !$post_id > 0 && $request_post_id > 0) {

+		$post = geodir_get_post_info($request_post_id);

+		setup_postdata($post);

 	}

 

-	$geodir_post_detail_fields = geodir_show_listing_info( 'moreinfo' );

+	$geodir_post_detail_fields = geodir_show_listing_info('moreinfo');

 

 	$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 ( geodir_is_page( 'detail' ) ) {

-		$video                 = geodir_get_video( $post->ID );

-		$special_offers        = geodir_get_special_offers( $post->ID );

+	if (geodir_is_page('detail')) {

+		$video                 = geodir_get_video($post->ID);

+		$special_offers        = geodir_get_special_offers($post->ID);

 		$related_listing_array = array();

-		if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {

-			$related_listing_array = get_option( 'geodir_add_related_listing_posttypes' );

+		if (get_option('geodir_add_related_listing_posttypes')) {

+			$related_listing_array = get_option('geodir_add_related_listing_posttypes');

 		}

 

-		$excluded_tabs = get_option( 'geodir_detail_page_tabs_excluded' );

-		if ( ! $excluded_tabs ) {

+		$excluded_tabs = get_option('geodir_detail_page_tabs_excluded');

+		if (!$excluded_tabs) {

 			$excluded_tabs = array();

 		}

 

 		$related_listing = '';

-		if ( in_array( $post->post_type, $related_listing_array ) && ! in_array( 'related_listing', $excluded_tabs ) ) {

+		if (in_array($post->post_type, $related_listing_array) && !in_array('related_listing', $excluded_tabs)) {

 			$request = array(

-				'post_number'         => get_option( 'geodir_related_post_count' ),

-				'relate_to'           => get_option( 'geodir_related_post_relate_to' ),

-				'layout'              => get_option( 'geodir_related_post_listing_view' ),

-				'add_location_filter' => get_option( 'geodir_related_post_location_filter' ),

-				'list_sort'           => get_option( 'geodir_related_post_sortby' ),

-				'character_count'     => get_option( 'geodir_related_post_excerpt' )

+				'post_number'         => get_option('geodir_related_post_count'),

+				'relate_to'           => get_option('geodir_related_post_relate_to'),

+				'layout'              => get_option('geodir_related_post_listing_view'),

+				'add_location_filter' => get_option('geodir_related_post_location_filter'),

+				'list_sort'           => get_option('geodir_related_post_sortby'),

+				'character_count'     => get_option('geodir_related_post_excerpt')

 			);

 

-			if ( $post->post_type == 'gd_event' && defined( 'GDEVENTS_VERSION' ) ) {

-				$related_listing = geodir_get_detail_page_related_events( $request );

+			if ($post->post_type == 'gd_event' && defined('GDEVENTS_VERSION')) {

+				$related_listing = geodir_get_detail_page_related_events($request);

 			} else {

-				$related_listing = geodir_related_posts_display( $request );

+				$related_listing = geodir_related_posts_display($request);

 			}

 

 		}

 

-		$post_images = geodir_get_images( $post->ID, 'thumbnail' );

+		$post_images = geodir_get_images($post->ID, 'thumbnail');

 		$thumb_image = '';

-		if ( ! empty( $post_images ) ) {

+		if (!empty($post_images)) {

 			$count = 1;

-			foreach ( $post_images as $image ) {

+			foreach ($post_images as $image) {

 				if ($image_limit !== '' && $count > $image_limit) {

 					break;

 				}

-				$caption = ( ! empty( $image->caption ) ) ? $image->caption : '';

-				$thumb_image .= '<a href="' . $image->src . '" title="' . $caption . '">';

-				$thumb_image .= geodir_show_image( $image, 'thumbnail', true, false );

+				$caption = (!empty($image->caption)) ? $image->caption : '';

+				$thumb_image .= '<a href="'.$image->src.'" title="'.$caption.'">';

+				$thumb_image .= geodir_show_image($image, 'thumbnail', true, false);

 				$thumb_image .= '</a>';

 				$count++;

 			}

@@ -1503,11 +1503,11 @@ 
 		$map_args['map_canvas_name'] = 'detail_page_map_canvas';

 		$map_args['width']           = '600';

 		$map_args['height']          = '300';

-		if ( $post->post_mapzoom ) {

-			$map_args['zoom'] = '' . $post->post_mapzoom . '';

+		if ($post->post_mapzoom) {

+			$map_args['zoom'] = ''.$post->post_mapzoom.'';

 		}

 		$map_args['autozoom']                 = false;

-		$map_args['scrollwheel']              = ( get_option( 'geodir_add_listing_mouse_scroll' ) ) ? 0 : 1;

+		$map_args['scrollwheel']              = (get_option('geodir_add_listing_mouse_scroll')) ? 0 : 1;

 		$map_args['child_collapse']           = '0';

 		$map_args['enable_cat_filters']       = false;

 		$map_args['enable_text_search']       = false;

@@ -1516,29 +1516,29 @@ 
 		$map_args['enable_jason_on_load']     = true;

 		$map_args['enable_map_direction']     = true;

 		$map_args['map_class_name']           = 'geodir-map-detail-page';

-		$map_args['maptype']                  = ( ! empty( $post->post_mapview ) ) ? $post->post_mapview : 'ROADMAP';

-	} else if ( geodir_is_page( 'preview' ) ) {

-		$video          = isset( $post->geodir_video ) ? $post->geodir_video : '';

-		$special_offers = isset( $post->geodir_special_offers ) ? $post->geodir_special_offers : '';

+		$map_args['maptype']                  = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';

+	} else if (geodir_is_page('preview')) {

+		$video          = isset($post->geodir_video) ? $post->geodir_video : '';

+		$special_offers = isset($post->geodir_special_offers) ? $post->geodir_special_offers : '';

 

-		if ( isset( $post->post_images ) ) {

-			$post->post_images = trim( $post->post_images, "," );

+		if (isset($post->post_images)) {

+			$post->post_images = trim($post->post_images, ",");

 		}

 

-		if ( isset( $post->post_images ) && ! empty( $post->post_images ) ) {

-			$post_images = explode( ",", $post->post_images );

+		if (isset($post->post_images) && !empty($post->post_images)) {

+			$post_images = explode(",", $post->post_images);

 		}

 

 		$thumb_image = '';

-		if ( ! empty( $post_images ) ) {

+		if (!empty($post_images)) {

 			$count = 1;

-			foreach ( $post_images as $image ) {

-				if ( $image != '' ) {

+			foreach ($post_images as $image) {

+				if ($image != '') {

 					if ($image_limit !== '' && $count > $image_limit) {

 						break;

 					}

-					$thumb_image .= '<a href="' . $image . '">';

-					$thumb_image .= geodir_show_image( array( 'src' => $image ), 'thumbnail', true, false );

+					$thumb_image .= '<a href="'.$image.'">';

+					$thumb_image .= geodir_show_image(array('src' => $image), 'thumbnail', true, false);

 					$thumb_image .= '</a>';

 					$count++;

 				}

@@ -1546,18 +1546,18 @@ 
 		}

 

 		global $map_jason;

-		$marker_json      = $post->marker_json != '' ? json_decode( $post->marker_json, true ) : array();

-		$marker_icon      = ( ! empty( $marker_json ) && ! empty( $marker_json['i'] ) ) ? $marker_json['i'] : '';

-		$icon_size        = geodir_get_marker_size( $marker_icon );

+		$marker_json      = $post->marker_json != '' ? json_decode($post->marker_json, true) : array();

+		$marker_icon      = (!empty($marker_json) && !empty($marker_json['i'])) ? $marker_json['i'] : '';

+		$icon_size        = geodir_get_marker_size($marker_icon);

 		$marker_json['w'] = $icon_size['w'];

 		$marker_json['h'] = $icon_size['h'];

-		$map_jason[]      = json_encode( $marker_json );

+		$map_jason[]      = json_encode($marker_json);

 

-		$address_latitude  = isset( $post->post_latitude ) ? $post->post_latitude : '';

-		$address_longitude = isset( $post->post_longitude ) ? $post->post_longitude : '';

-		$mapview           = isset( $post->post_mapview ) ? $post->post_mapview : '';

-		$mapzoom           = isset( $post->post_mapzoom ) ? $post->post_mapzoom : '';

-		if ( ! $mapzoom ) {

+		$address_latitude  = isset($post->post_latitude) ? $post->post_latitude : '';

+		$address_longitude = isset($post->post_longitude) ? $post->post_longitude : '';

+		$mapview           = isset($post->post_mapview) ? $post->post_mapview : '';

+		$mapzoom           = isset($post->post_mapzoom) ? $post->post_mapzoom : '';

+		if (!$mapzoom) {

 			$mapzoom = 12;

 		}

 

@@ -1580,37 +1580,37 @@ 
 		$map_args['map_class_name']           = 'geodir-map-preview-page';

 	}

 

-	$arr_detail_page_tabs = geodir_detail_page_tabs_list();// get this sooner so we can get the active tab for the user

+	$arr_detail_page_tabs = geodir_detail_page_tabs_list(); // get this sooner so we can get the active tab for the user

 

 	$active_tab       = '';

 	$active_tab_name  = '';

 	$default_tab      = '';

 	$default_tab_name = '';

-	foreach ( $arr_detail_page_tabs as $tab_index => $tabs ) {

-		if ( isset( $tabs['is_active_tab'] ) && $tabs['is_active_tab'] && ! empty( $tabs['is_display'] ) && isset( $tabs['heading_text'] ) && $tabs['heading_text'] ) {

+	foreach ($arr_detail_page_tabs as $tab_index => $tabs) {

+		if (isset($tabs['is_active_tab']) && $tabs['is_active_tab'] && !empty($tabs['is_display']) && isset($tabs['heading_text']) && $tabs['heading_text']) {

 			$active_tab      = $tab_index;

-			$active_tab_name = __( $tabs['heading_text'], 'geodirectory' );

+			$active_tab_name = __($tabs['heading_text'], 'geodirectory');

 		}

 

-		if ( $default_tab === '' && ! empty( $tabs['is_display'] ) && ! empty( $tabs['heading_text'] ) ) {

+		if ($default_tab === '' && !empty($tabs['is_display']) && !empty($tabs['heading_text'])) {

 			$default_tab      = $tab_index;

-			$default_tab_name = __( $tabs['heading_text'], 'geodirectory' );

+			$default_tab_name = __($tabs['heading_text'], 'geodirectory');

 		}

 	}

 

-	if ( $active_tab === '' && $default_tab !== '' ) { // Make first tab as a active tab if not any tab is active.

-		if ( isset( $arr_detail_page_tabs[ $active_tab ] ) && isset( $arr_detail_page_tabs[ $active_tab ]['is_active_tab'] ) ) {

-			$arr_detail_page_tabs[ $active_tab ]['is_active_tab'] = false;

+	if ($active_tab === '' && $default_tab !== '') { // Make first tab as a active tab if not any tab is active.

+		if (isset($arr_detail_page_tabs[$active_tab]) && isset($arr_detail_page_tabs[$active_tab]['is_active_tab'])) {

+			$arr_detail_page_tabs[$active_tab]['is_active_tab'] = false;

 		}

 

-		$arr_detail_page_tabs[ $default_tab ]['is_active_tab'] = true;

+		$arr_detail_page_tabs[$default_tab]['is_active_tab'] = true;

 		$active_tab                                            = $default_tab;

 		$active_tab_name                                       = $default_tab_name;

 	}

-	$tab_list = ( get_option( 'geodir_disable_tabs', false ) ) ? true : false;

+	$tab_list = (get_option('geodir_disable_tabs', false)) ? true : false;

 	?>

 	<div class="geodir-tabs" id="gd-tabs" style="position:relative;">

-		<?php if ( ! $tab_list ){ ?>

+		<?php if (!$tab_list) { ?>

 		<div id="geodir-tab-mobile-menu">

 			<i class="fa fa-bars"></i>

 			<span class="geodir-mobile-active-tab"><?php echo $active_tab_name; ?></span>

@@ -1625,26 +1625,26 @@ 
 			 * @since 1.0.0

 			 * @see   'geodir_after_tab_list'

 			 */

-			do_action( 'geodir_before_tab_list' ); ?>

+			do_action('geodir_before_tab_list'); ?>

 			<?php

 

-			foreach ( $arr_detail_page_tabs as $tab_index => $detail_page_tab ) {

-				if ( $detail_page_tab['is_display'] ) {

+			foreach ($arr_detail_page_tabs as $tab_index => $detail_page_tab) {

+				if ($detail_page_tab['is_display']) {

 

-					if ( ! $tab_list ) {

+					if (!$tab_list) {

 						?>

 						<dt></dt> <!-- added to comply with validation -->

-						<dd <?php if ( $detail_page_tab['is_active_tab'] ){ ?>class="geodir-tab-active"<?php } ?> ><a

+						<dd <?php if ($detail_page_tab['is_active_tab']) { ?>class="geodir-tab-active"<?php } ?> ><a

 								data-tab="#<?php echo $tab_index; ?>"

-								data-status="enable"><?php _e( $detail_page_tab['heading_text'], 'geodirectory' ); ?></a>

+								data-status="enable"><?php _e($detail_page_tab['heading_text'], 'geodirectory'); ?></a>

 						</dd>

 						<?php

 					}

 					ob_start() // start tab content buffering

 					?>

 					<li id="<?php echo $tab_index; ?>Tab">

-						<?php if ( $tab_list ) {

-							$tab_title = '<span class="gd-tab-list-title" ><a href="#' . $tab_index . '">' . __( $detail_page_tab['heading_text'], 'geodirectory' ) . '</a></span><hr />';

+						<?php if ($tab_list) {

+							$tab_title = '<span class="gd-tab-list-title" ><a href="#'.$tab_index.'">'.__($detail_page_tab['heading_text'], 'geodirectory').'</a></span><hr />';

 							/**

 							 * Filter the tab list title html.

 							 *

@@ -1654,7 +1654,7 @@ 
 							 * @param string $tab_index      The tab index type.

 							 * @param array $detail_page_tab The array of values including title text.

 							 */

-							echo apply_filters( 'geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab );

+							echo apply_filters('geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab);

 						} ?>

 						<div id="<?php echo $tab_index; ?>" class="hash-offset"></div>

 						<?php

@@ -1665,7 +1665,7 @@ 
 						 *

 						 * @param string $tab_index The tab name ID.

 						 */

-						do_action( 'geodir_before_tab_content', $tab_index );

+						do_action('geodir_before_tab_content', $tab_index);

 

 						/**

 						 * Called before the details tab content is output per tab.

@@ -1675,21 +1675,21 @@ 
 						 * @since 1.0.0

 						 * @todo  do we need this if we have the hook above? 'geodir_before_tab_content'

 						 */

-						do_action( 'geodir_before_' . $tab_index . '_tab_content' );

+						do_action('geodir_before_'.$tab_index.'_tab_content');

 						/// write a code to generate content of each tab

-						switch ( $tab_index ) {

+						switch ($tab_index) {

 							case 'post_profile':

 								/**

 								 * Called before the listing description content on the details page tab.

 								 *

 								 * @since 1.0.0

 								 */

-								do_action( 'geodir_before_description_on_listing_detail' );

-								if ( geodir_is_page( 'detail' ) ) {

+								do_action('geodir_before_description_on_listing_detail');

+								if (geodir_is_page('detail')) {

 									the_content();

 								} else {

 									/** This action is documented in geodirectory_template_actions.php */

-									echo apply_filters( 'the_content', stripslashes( $post->post_desc ) );

+									echo apply_filters('the_content', stripslashes($post->post_desc));

 								}

 

 								/**

@@ -1697,7 +1697,7 @@ 
 								 *

 								 * @since 1.0.0

 								 */

-								do_action( 'geodir_after_description_on_listing_detail' );

+								do_action('geodir_after_description_on_listing_detail');

 								break;

 							case 'post_info':

 								echo $geodir_post_detail_fields;

@@ -1707,32 +1707,32 @@ 
 								break;

 							case 'post_video':

 								// some browsers hide $_POST data if used for embeds so we replace with a placeholder

-								if ( $preview ) {

-									if ( $video ) {

-										echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fa fa-video-camera\" aria-hidden=\"true\"></i><br />" . __( 'Video Preview Placeholder', 'geodirectory' ) . "</p></span>";

+								if ($preview) {

+									if ($video) {

+										echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fa fa-video-camera\" aria-hidden=\"true\"></i><br />".__('Video Preview Placeholder', 'geodirectory')."</p></span>";

 									}

 								} else {

 

 									// 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);

 									}

 

 									/** This action is documented in geodirectory_template_actions.php */

-									echo apply_filters( 'the_content', stripslashes( $video ) );// we apply the_content filter so oembed works also;

+									echo apply_filters('the_content', stripslashes($video)); // we apply the_content filter so oembed works also;

 

-									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);

 									}

 								}

 								break;

 							case 'special_offers':

-								echo apply_filters( 'gd_special_offers_content', wpautop( stripslashes( $special_offers ) ) );

+								echo apply_filters('gd_special_offers_content', wpautop(stripslashes($special_offers)));

 

 								break;

 							case 'post_map':

-								geodir_draw_map( $map_args );

+								geodir_draw_map($map_args);

 								break;

 							case 'reviews':

 								comments_template();

@@ -1741,7 +1741,7 @@ 
 								echo $related_listing;

 								break;

 							default: {

-								if ( ( isset( $post->{$tab_index} ) || ( ! isset( $post->{$tab_index} ) && ( strpos( $tab_index, 'gd_tab_' ) !== false || $tab_index == 'link_business' ) ) ) && ! empty( $detail_page_tab['tab_content'] ) ) {

+								if ((isset($post->{$tab_index} ) || (!isset($post->{$tab_index} ) && (strpos($tab_index, 'gd_tab_') !== false || $tab_index == 'link_business'))) && !empty($detail_page_tab['tab_content'])) {

 									echo $detail_page_tab['tab_content'];

 								}

 							}

@@ -1753,7 +1753,7 @@ 
 						 *

 						 * @since 1.0.0

 						 */

-						do_action( 'geodir_after_tab_content', $tab_index );

+						do_action('geodir_after_tab_content', $tab_index);

 

 						/**

 						 * Called after the details tab content is output per tab.

@@ -1763,7 +1763,7 @@ 
 						 * @since 1.0.0

 						 * @todo  do we need this if we have the hook above? 'geodir_after_tab_content'

 						 */

-						do_action( 'geodir_after_' . $tab_index . '_tab_content' );

+						do_action('geodir_after_'.$tab_index.'_tab_content');

 						?> </li>

 					<?php

 					/**

@@ -1771,7 +1771,7 @@ 
 					 *

 					 * @since 1.0.0

 					 */

-					$arr_detail_page_tabs[ $tab_index ]['tab_content'] = apply_filters( "geodir_modify_" . $detail_page_tab['tab_content'] . "_tab_content", ob_get_clean() );

+					$arr_detail_page_tabs[$tab_index]['tab_content'] = apply_filters("geodir_modify_".$detail_page_tab['tab_content']."_tab_content", ob_get_clean());

 				} // end of if for is_display

 			}// end of foreach

 

@@ -1781,14 +1781,14 @@ 
 			 * @since 1.0.0

 			 * @see   'geodir_before_tab_list'

 			 */

-			do_action( 'geodir_after_tab_list' );

+			do_action('geodir_after_tab_list');

 			?>

-			<?php if ( ! $tab_list ){ ?></dl><?php } ?>

-		<ul class="geodir-tabs-content entry-content <?php if ( $tab_list ) { ?>geodir-tabs-list<?php } ?>"

+			<?php if (!$tab_list) { ?></dl><?php } ?>

+		<ul class="geodir-tabs-content entry-content <?php if ($tab_list) { ?>geodir-tabs-list<?php } ?>"

 		    style="position:relative;">

 			<?php

-			foreach ( $arr_detail_page_tabs as $detail_page_tab ) {

-				if ( $detail_page_tab['is_display'] && ! empty( $detail_page_tab['tab_content'] ) ) {

+			foreach ($arr_detail_page_tabs as $detail_page_tab) {

+				if ($detail_page_tab['is_display'] && !empty($detail_page_tab['tab_content'])) {

 					echo $detail_page_tab['tab_content'];

 				}// end of if

 			}// end of foreach

@@ -1798,11 +1798,11 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			do_action( 'geodir_add_tab_content' ); ?>

+			do_action('geodir_add_tab_content'); ?>

 		</ul>

 		<!--gd-tabs-content ul end-->

 	</div>

-	<?php if ( ! $tab_list ) { ?>

+	<?php if (!$tab_list) { ?>

 		<script>

 			if (window.location.hash && window.location.hash.indexOf('&') === -1 && jQuery(window.location.hash + 'Tab').length) {

 				hashVal = window.location.hash;

@@ -1834,31 +1834,31 @@ 
  *

  * @return mixed Image file.

  */

-function geodir_exif( $file ) {

-	if ( empty( $file ) || ! is_array( $file ) ) {

+function geodir_exif($file) {

+	if (empty($file) || !is_array($file)) {

 		return $file;

 	}

 

-	$file_path = ! empty( $file['tmp_name'] ) ? sanitize_text_field( $file['tmp_name'] ) : '';

-	if ( ! ( $file_path && file_exists( $file_path ) ) ) {

+	$file_path = !empty($file['tmp_name']) ? sanitize_text_field($file['tmp_name']) : '';

+	if (!($file_path && file_exists($file_path))) {

 		return $file;

 	}

 	$file['file'] = $file_path;

 

-	if ( ! file_is_valid_image( $file_path ) ) {

+	if (!file_is_valid_image($file_path)) {

 		return $file; // Bail if file is not an image.

 	}

 

-	if ( ! function_exists( 'wp_get_image_editor' ) ) {

+	if (!function_exists('wp_get_image_editor')) {

 		return $file;

 	}

 

 	$mime_type = $file['type'];

 	$exif      = array();

-	if ( $mime_type == 'image/jpeg' && function_exists( 'exif_read_data' ) ) {

+	if ($mime_type == 'image/jpeg' && function_exists('exif_read_data')) {

 		try {

-			$exif = exif_read_data( $file_path );

-		} catch ( Exception $e ) {

+			$exif = exif_read_data($file_path);

+		} catch (Exception $e) {

 			$exif = array();

 		}

 	}

@@ -1867,13 +1867,13 @@ 
 	$flip        = false;

 	$modify      = false;

 	$orientation = 0;

-	if ( ! empty( $exif ) && isset( $exif['Orientation'] ) ) {

-		switch ( (int) $exif['Orientation'] ) {

+	if (!empty($exif) && isset($exif['Orientation'])) {

+		switch ((int) $exif['Orientation']) {

 			case 1:

 				// do nothing

 				break;

 			case 2:

-				$flip   = array( false, true );

+				$flip   = array(false, true);

 				$modify = true;

 				break;

 			case 3:

@@ -1882,13 +1882,13 @@ 
 				$modify      = true;

 				break;

 			case 4:

-				$flip   = array( true, false );

+				$flip   = array(true, false);

 				$modify = true;

 				break;

 			case 5:

 				$orientation = - 90;

 				$rotate      = true;

-				$flip        = array( false, true );

+				$flip        = array(false, true);

 				$modify      = true;

 				break;

 			case 6:

@@ -1899,7 +1899,7 @@ 
 			case 7:

 				$orientation = - 270;

 				$rotate      = true;

-				$flip        = array( false, true );

+				$flip        = array(false, true);

 				$modify      = true;

 				break;

 			case 8:

@@ -1925,31 +1925,31 @@ 
 	 * @param int|null $quality Image Compression quality between 1-100% scale. Default null.

 	 * @param string $quality   Image mime type.

 	 */

-	$quality = apply_filters( 'geodir_image_upload_set_quality', $quality, $mime_type );

-	if ( $quality !== null ) {

+	$quality = apply_filters('geodir_image_upload_set_quality', $quality, $mime_type);

+	if ($quality !== null) {

 		$modify = true;

 	}

 

-	if ( ! $modify ) {

+	if (!$modify) {

 		return $file; // no change

 	}

 

-	$image = wp_get_image_editor( $file_path );

-	if ( ! is_wp_error( $image ) ) {

-		if ( $rotate ) {

-			$image->rotate( $orientation );

+	$image = wp_get_image_editor($file_path);

+	if (!is_wp_error($image)) {

+		if ($rotate) {

+			$image->rotate($orientation);

 		}

 

-		if ( ! empty( $flip ) ) {

-			$image->flip( $flip[0], $flip[1] );

+		if (!empty($flip)) {

+			$image->flip($flip[0], $flip[1]);

 		}

 

-		if ( $quality !== null ) {

-			$image->set_quality( (int) $quality );

+		if ($quality !== null) {

+			$image->set_quality((int) $quality);

 		}

 

-		$result = $image->save( $file_path );

-		if ( ! is_wp_error( $result ) ) {

+		$result = $image->save($file_path);

+		if (!is_wp_error($result)) {

 			$file['file']     = $result['path'];

 			$file['tmp_name'] = $result['path'];

 		}

@@ -1977,7 +1977,7 @@ 
  *

  * @return string Returns the recent reviews html.

  */

-function geodir_get_recent_reviews( $g_size = 60, $no_comments = 5, $comment_lenth = 60, $show_pass_post = false ) {

+function geodir_get_recent_reviews($g_size = 60, $no_comments = 5, $comment_lenth = 60, $show_pass_post = false) {

 	global $wpdb, $tablecomments, $tableposts, $rating_table_name, $gd_session, $table_prefix;

 	$tablecomments = $wpdb->comments;

 	$tableposts    = $wpdb->posts;

@@ -1987,17 +1987,17 @@ 
 	$region_filter  = '';

 	$country_filter = '';

 

-	if ( $gd_session->get( 'gd_multi_location' ) ) {

-		if ( $gd_ses_country = $gd_session->get( 'gd_country' ) ) {

-			$country_filter = $wpdb->prepare( " AND r.post_country=%s ", str_replace( "-", " ", $gd_ses_country ) );

+	if ($gd_session->get('gd_multi_location')) {

+		if ($gd_ses_country = $gd_session->get('gd_country')) {

+			$country_filter = $wpdb->prepare(" AND r.post_country=%s ", str_replace("-", " ", $gd_ses_country));

 		}

 

-		if ( $gd_ses_region = $gd_session->get( 'gd_region' ) ) {

-			$region_filter = $wpdb->prepare( " AND r.post_region=%s ", str_replace( "-", " ", $gd_ses_region ) );

+		if ($gd_ses_region = $gd_session->get('gd_region')) {

+			$region_filter = $wpdb->prepare(" AND r.post_region=%s ", str_replace("-", " ", $gd_ses_region));

 		}

 

-		if ( $gd_ses_city = $gd_session->get( 'gd_city' ) ) {

-			$city_filter = $wpdb->prepare( " AND r.post_city=%s ", str_replace( "-", " ", $gd_ses_city ) );

+		if ($gd_ses_city = $gd_session->get('gd_city')) {

+			$city_filter = $wpdb->prepare(" AND r.post_city=%s ", str_replace("-", " ", $gd_ses_city));

 		}

 	}

 

@@ -2008,84 +2008,84 @@ 
 		$lang_code = ICL_LANGUAGE_CODE;

 

 		if ($lang_code) {

-			$join .= " JOIN " . $table_prefix . "icl_translations AS icltr2 ON icltr2.element_id = c.comment_post_ID AND p.ID = icltr2.element_id AND CONCAT('post_', p.post_type) = icltr2.element_type LEFT JOIN " . $table_prefix . "icl_translations AS icltr_comment ON icltr_comment.element_id = c.comment_ID AND icltr_comment.element_type = 'comment'";

-			$where .= " AND icltr2.language_code = '" . $lang_code . "' AND (icltr_comment.language_code IS NULL OR icltr_comment.language_code = icltr2.language_code)";

+			$join .= " JOIN ".$table_prefix."icl_translations AS icltr2 ON icltr2.element_id = c.comment_post_ID AND p.ID = icltr2.element_id AND CONCAT('post_', p.post_type) = icltr2.element_type LEFT JOIN ".$table_prefix."icl_translations AS icltr_comment ON icltr_comment.element_id = c.comment_ID AND icltr_comment.element_type = 'comment'";

+			$where .= " AND icltr2.language_code = '".$lang_code."' AND (icltr_comment.language_code IS NULL OR icltr_comment.language_code = icltr2.language_code)";

 		}

 	}

 

-	$request = "SELECT r.id AS ID, r.post_type, r.comment_id AS comment_ID, r.post_date AS comment_date, r.overall_rating, r.user_id, r.post_id FROM " . GEODIR_REVIEW_TABLE . " AS r JOIN " . $wpdb->comments . " AS c ON c.comment_ID = r.comment_id JOIN " . $wpdb->posts . " AS p ON p.ID = c.comment_post_ID " . $join . " WHERE c.comment_parent = 0 AND c.comment_approved = 1 AND r.status = 1 AND r.overall_rating >= 1 AND p.post_status = 'publish' " . $where . " ORDER BY r.post_date DESC, r.id DESC LIMIT ". $no_comments;

+	$request = "SELECT r.id AS ID, r.post_type, r.comment_id AS comment_ID, r.post_date AS comment_date, r.overall_rating, r.user_id, r.post_id FROM ".GEODIR_REVIEW_TABLE." AS r JOIN ".$wpdb->comments." AS c ON c.comment_ID = r.comment_id JOIN ".$wpdb->posts." AS p ON p.ID = c.comment_post_ID ".$join." WHERE c.comment_parent = 0 AND c.comment_approved = 1 AND r.status = 1 AND r.overall_rating >= 1 AND p.post_status = 'publish' ".$where." ORDER BY r.post_date DESC, r.id DESC LIMIT ".$no_comments;

 

-	$comments = $wpdb->get_results( $request );

+	$comments = $wpdb->get_results($request);

 

-	foreach ( $comments as $comment ) {

+	foreach ($comments as $comment) {

 		// Set the extra comment info needed.

-		$comment_extra = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID" );

+		$comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");

 		$comment->comment_content      = $comment_extra->comment_content;

 		$comment->comment_author       = $comment_extra->comment_author;

 		$comment->comment_author_email = $comment_extra->comment_author_email;

 

 		$comment_id      = '';

 		$comment_id      = $comment->comment_ID;

-		$comment_content = strip_tags( $comment->comment_content );

+		$comment_content = strip_tags($comment->comment_content);

 

-		$comment_content = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content );

+		$comment_content = preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content);

 

-		$permalink            = get_permalink( $comment->ID ) . "#comment-" . $comment->comment_ID;

+		$permalink            = get_permalink($comment->ID)."#comment-".$comment->comment_ID;

 		$comment_author_email = $comment->comment_author_email;

 		$comment_post_ID      = $comment->post_id;

 

-		$post_title        = get_the_title( $comment_post_ID );

-		$permalink         = get_permalink( $comment_post_ID );

-		$comment_permalink = $permalink . "#comment-" . $comment->comment_ID;

-		$read_more         = '<a class="comment_excerpt" href="' . $comment_permalink . '">' . __( 'Read more', 'geodirectory' ) . '</a>';

+		$post_title        = get_the_title($comment_post_ID);

+		$permalink         = get_permalink($comment_post_ID);

+		$comment_permalink = $permalink."#comment-".$comment->comment_ID;

+		$read_more         = '<a class="comment_excerpt" href="'.$comment_permalink.'">'.__('Read more', 'geodirectory').'</a>';

 

-		$comment_content_length = strlen( $comment_content );

-		if ( $comment_content_length > $comment_lenth ) {

-			$comment_excerpt = geodir_utf8_substr( $comment_content, 0, $comment_lenth ) . '... ' . $read_more;

+		$comment_content_length = strlen($comment_content);

+		if ($comment_content_length > $comment_lenth) {

+			$comment_excerpt = geodir_utf8_substr($comment_content, 0, $comment_lenth).'... '.$read_more;

 		} else {

 			$comment_excerpt = $comment_content;

 		}

 

-		if ( $comment->user_id ) {

-			$user_profile_url = get_author_posts_url( $comment->user_id );

+		if ($comment->user_id) {

+			$user_profile_url = get_author_posts_url($comment->user_id);

 		} else {

 			$user_profile_url = '';

 		}

 

-		if ( $comment_id ) {

+		if ($comment_id) {

 			$comments_echo .= '<li class="clearfix">';

-			$comments_echo .= "<span class=\"li" . $comment_id . " geodir_reviewer_image\">";

-			if ( function_exists( 'get_avatar' ) ) {

-				if ( ! isset( $comment->comment_type ) ) {

-					if ( $user_profile_url ) {

-						$comments_echo .= '<a href="' . $user_profile_url . '">';

+			$comments_echo .= "<span class=\"li".$comment_id." geodir_reviewer_image\">";

+			if (function_exists('get_avatar')) {

+				if (!isset($comment->comment_type)) {

+					if ($user_profile_url) {

+						$comments_echo .= '<a href="'.$user_profile_url.'">';

 					}

-					$comments_echo .= get_avatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

-					if ( $user_profile_url ) {

+					$comments_echo .= get_avatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

+					if ($user_profile_url) {

 						$comments_echo .= '</a>';

 					}

-				} elseif ( ( isset( $comment->comment_type ) && $comment->comment_type == 'trackback' ) || ( isset( $comment->comment_type ) && $comment->comment_type == 'pingback' ) ) {

-					if ( $user_profile_url ) {

-						$comments_echo .= '<a href="' . $user_profile_url . '">';

+				} elseif ((isset($comment->comment_type) && $comment->comment_type == 'trackback') || (isset($comment->comment_type) && $comment->comment_type == 'pingback')) {

+					if ($user_profile_url) {

+						$comments_echo .= '<a href="'.$user_profile_url.'">';

 					}

-					$comments_echo .= get_avatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

+					$comments_echo .= get_avatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

 				}

-			} elseif ( function_exists( 'gravatar' ) ) {

-				if ( $user_profile_url ) {

-					$comments_echo .= '<a href="' . $user_profile_url . '">';

+			} elseif (function_exists('gravatar')) {

+				if ($user_profile_url) {

+					$comments_echo .= '<a href="'.$user_profile_url.'">';

 				}

 				$comments_echo .= "<img src=\"";

-				if ( '' == $comment->comment_type ) {

-					$comments_echo .= gravatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

-					if ( $user_profile_url ) {

+				if ('' == $comment->comment_type) {

+					$comments_echo .= gravatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

+					if ($user_profile_url) {

 						$comments_echo .= '</a>';

 					}

-				} elseif ( ( 'trackback' == $comment->comment_type ) || ( 'pingback' == $comment->comment_type ) ) {

-					if ( $user_profile_url ) {

-						$comments_echo .= '<a href="' . $user_profile_url . '">';

+				} elseif (('trackback' == $comment->comment_type) || ('pingback' == $comment->comment_type)) {

+					if ($user_profile_url) {

+						$comments_echo .= '<a href="'.$user_profile_url.'">';

 					}

-					$comments_echo .= gravatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

-					if ( $user_profile_url ) {

+					$comments_echo .= gravatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

+					if ($user_profile_url) {

 						$comments_echo .= '</a>';

 					}

 				}

@@ -2096,17 +2096,17 @@ 
 

 			$comments_echo .= '<span class="geodir_reviewer_content">';

 			$author_link = apply_filters('geodir_reviewer_content_author_link', true);

-			if ( $comment->user_id && $author_link ) {

-				$comments_echo .= '<a href="' . get_author_posts_url( $comment->user_id ) . '">';

+			if ($comment->user_id && $author_link) {

+				$comments_echo .= '<a href="'.get_author_posts_url($comment->user_id).'">';

 			}

-			$comments_echo .= '<span class="geodir_reviewer_author">' . $comment->comment_author . '</span> ';

-			if ( $comment->user_id && $author_link ) {

+			$comments_echo .= '<span class="geodir_reviewer_author">'.$comment->comment_author.'</span> ';

+			if ($comment->user_id && $author_link) {

 				$comments_echo .= '</a>';

 			}

-			$comments_echo .= '<span class="geodir_reviewer_reviewed">' . __( 'reviewed', 'geodirectory' ) . '</span> ';

-			$comments_echo .= '<a href="' . $permalink . '" class="geodir_reviewer_title">' . $post_title . '</a>';

-			$comments_echo .= geodir_get_rating_stars( $comment->overall_rating, $comment_post_ID );

-			$comments_echo .= '<p class="geodir_reviewer_text">' . $comment_excerpt . '';

+			$comments_echo .= '<span class="geodir_reviewer_reviewed">'.__('reviewed', 'geodirectory').'</span> ';

+			$comments_echo .= '<a href="'.$permalink.'" class="geodir_reviewer_title">'.$post_title.'</a>';

+			$comments_echo .= geodir_get_rating_stars($comment->overall_rating, $comment_post_ID);

+			$comments_echo .= '<p class="geodir_reviewer_text">'.$comment_excerpt.'';

 			//echo preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_excerpt);

 			$comments_echo .= '</p>';

 

@@ -2126,25 +2126,25 @@ 
  * @return array Returns post categories as an array.

  */

 function geodir_home_map_cats_key_value_array() {

-	$post_types = geodir_get_posttypes( 'object' );

+	$post_types = geodir_get_posttypes('object');

 

 	$return = array();

-	if ( ! empty( $post_types ) ) {

-		foreach ( $post_types as $key => $post_type ) {

-			$cpt_name       = __( $post_type->labels->singular_name, 'geodirectory' );

-			$post_type_name = sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name );

-			$taxonomies     = geodir_get_taxonomies( $key );

-			$cat_taxonomy   = ! empty( $taxonomies[0] ) ? $taxonomies[0] : null;

-			$cat_terms      = $cat_taxonomy ? get_terms( $cat_taxonomy ) : null;

-

-			if ( ! empty( $cat_terms ) ) {

-				$return[ 'optgroup_start-' . $key ] = $post_type_name;

-

-				foreach ( $cat_terms as $cat_term ) {

-					$return[ $key . '_' . $cat_term->term_id ] = $cat_term->name;

+	if (!empty($post_types)) {

+		foreach ($post_types as $key => $post_type) {

+			$cpt_name       = __($post_type->labels->singular_name, 'geodirectory');

+			$post_type_name = sprintf(__('%s Categories', 'geodirectory'), $cpt_name);

+			$taxonomies     = geodir_get_taxonomies($key);

+			$cat_taxonomy   = !empty($taxonomies[0]) ? $taxonomies[0] : null;

+			$cat_terms      = $cat_taxonomy ? get_terms($cat_taxonomy) : null;

+

+			if (!empty($cat_terms)) {

+				$return['optgroup_start-'.$key] = $post_type_name;

+

+				foreach ($cat_terms as $cat_term) {

+					$return[$key.'_'.$cat_term->term_id] = $cat_term->name;

 				}

 

-				$return[ 'optgroup_end-' . $key ] = $post_type_name;

+				$return['optgroup_end-'.$key] = $post_type_name;

 			}

 		}

 	}

@@ -2160,14 +2160,14 @@ 
  * @package GeoDirectory

  */

 function geodir_twitter_tweet_button() {

-	if ( isset( $_GET['gde'] ) ) {

-		$link = '?url=' . urlencode( geodir_curPageURL() );

+	if (isset($_GET['gde'])) {

+		$link = '?url='.urlencode(geodir_curPageURL());

 	} else {

 		$link = '';

 	}

 	?>

 	<a href="http://twitter.com/share<?php echo $link; ?>"

-	   class="twitter-share-button"><?php _e( 'Tweet', 'geodirectory' ); ?></a>

+	   class="twitter-share-button"><?php _e('Tweet', 'geodirectory'); ?></a>

 	<script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>

 	<?php

 }

@@ -2184,10 +2184,10 @@ 
 function geodir_fb_like_button() {

 	global $post;

 	?>

-	<iframe <?php if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false ) ) {

+	<iframe <?php if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {

 		echo 'allowtransparency="true"';

 	} ?> class="facebook"

-	     src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode( get_permalink( $post->ID ) ); ?>&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light"

+	     src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode(get_permalink($post->ID)); ?>&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light"

 	     style="border:none; overflow:hidden; width:100px; height:20px"></iframe>

 	<?php

 }

@@ -2218,7 +2218,7 @@ 
 

 

 function geodir_listing_bounce_map_pin_on_hover() {

-	if ( get_option( 'geodir_listing_hover_bounce_map_pin', true ) ) {

+	if (get_option('geodir_listing_hover_bounce_map_pin', true)) {

 		?>

 		<script>

 			jQuery(function ($) {

@@ -2241,44 +2241,44 @@ 
 	}

 }

 

-add_action( 'geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10 );

+add_action('geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10);

 

-add_action( 'geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1 );

-function geodir_output_favourite_html_listings( $post_id ) {

-	geodir_favourite_html( '', $post_id );

+add_action('geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1);

+function geodir_output_favourite_html_listings($post_id) {

+	geodir_favourite_html('', $post_id);

 }

 

-add_action( 'geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2 );

-function geodir_output_pinpoint_html_listings( $post_id, $post = array() ) {

+add_action('geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2);

+function geodir_output_pinpoint_html_listings($post_id, $post = array()) {

 	global $wp_query;

 

 	$show_pin_point = $wp_query->is_main_query();

 

-	if ( ! empty( $post ) && ! empty( $show_pin_point ) && is_active_widget( false, "", "geodir_map_v3_listing_map" ) ) {

-		$term_icon_url = geodir_get_tax_meta( $post->default_category, 'ct_cat_icon', false, $post->post_type );

-		$marker_icon   = isset( $term_icon_url['src'] ) ? $term_icon_url['src'] : get_option( 'geodir_default_marker_icon' );

+	if (!empty($post) && !empty($show_pin_point) && is_active_widget(false, "", "geodir_map_v3_listing_map")) {

+		$term_icon_url = geodir_get_tax_meta($post->default_category, 'ct_cat_icon', false, $post->post_type);

+		$marker_icon   = isset($term_icon_url['src']) ? $term_icon_url['src'] : get_option('geodir_default_marker_icon');

 		?>

 		<span class="geodir-pinpoint"

-		      style="background:url('<?php echo $marker_icon; ?>') no-repeat scroll left top transparent;background-size:auto 100%; -webkit-background-size:auto 100%;-moz-background-size:auto 100%;height:9px;width:14px;"><?php echo apply_filters( 'geodir_listing_listview_pinpoint_inner_content', '', 'listing' ); ?></span>

+		      style="background:url('<?php echo $marker_icon; ?>') no-repeat scroll left top transparent;background-size:auto 100%; -webkit-background-size:auto 100%;-moz-background-size:auto 100%;height:9px;width:14px;"><?php echo apply_filters('geodir_listing_listview_pinpoint_inner_content', '', 'listing'); ?></span>

 		<a class="geodir-pinpoint-link" href="javascript:void(0)"

 		   onclick="if(typeof openMarker=='function'){openMarker('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"

 		   onmouseover="if(typeof animate_marker=='function'){animate_marker('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"

-		   onmouseout="if(typeof stop_marker_animation=='function'){stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"><?php _e( 'Pinpoint', 'geodirectory' ); ?></a>

+		   onmouseout="if(typeof stop_marker_animation=='function'){stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')}"><?php _e('Pinpoint', 'geodirectory'); ?></a>

 		<?php

 	}

 }

 

 function geodir_search_form_submit_button() {

 

-	$new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true;

+	$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

 

-	if ( $new_style ) {

+	if ($new_style) {

 		$default_search_button_label = '<i class="fa fa-search" aria-hidden="true"></i>';

-	}else{

+	} else {

 		$default_search_button_label = 'Search';

 	}

-	if ( get_option( 'geodir_search_button_label' ) && get_option( 'geodir_search_button_label' ) != 'Search' ) {

-		$default_search_button_label = __( get_option( 'geodir_search_button_label' ), 'geodirectory' );

+	if (get_option('geodir_search_button_label') && get_option('geodir_search_button_label') != 'Search') {

+		$default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');

 	}

 

 	/**

@@ -2290,78 +2290,78 @@ 
 	 *

 	 * @param string $default_search_button_label The current search button text.

 	 */

-	$default_search_button_label = apply_filters( 'geodir_search_default_search_button_text', $default_search_button_label );

+	$default_search_button_label = apply_filters('geodir_search_default_search_button_text', $default_search_button_label);

 

 	$fa_class = '';

-	if ( strpos( $default_search_button_label, '&#' ) !== false ) {

+	if (strpos($default_search_button_label, '&#') !== false) {

 		$fa_class = 'fa';

 	}

 

 

-	if ( $new_style ) {

+	if ($new_style) {

 		?>

-		<button class="geodir_submit_search <?php echo $fa_class; ?>"><?php _e( $default_search_button_label ,'geodirectory'); ?></button>

-	<?php }else{?>

-		<input type="button" value="<?php esc_attr_e( $default_search_button_label ); ?>"

+		<button class="geodir_submit_search <?php echo $fa_class; ?>"><?php _e($default_search_button_label, 'geodirectory'); ?></button>

+	<?php } else {?>

+		<input type="button" value="<?php esc_attr_e($default_search_button_label); ?>"

 		       class="geodir_submit_search <?php echo $fa_class; ?>"/>

 	<?php }

 }

 

-add_action( 'geodir_before_search_button', 'geodir_search_form_submit_button', 5000 );

+add_action('geodir_before_search_button', 'geodir_search_form_submit_button', 5000);

 

 function geodir_search_form_post_type_input() {

 	global $geodir_search_post_type;

-	$post_types     = apply_filters( 'geodir_search_form_post_types', geodir_get_posttypes( 'object' ) );

+	$post_types     = apply_filters('geodir_search_form_post_types', geodir_get_posttypes('object'));

 	$curr_post_type = $geodir_search_post_type;

 

-	if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {

+	if (!empty($post_types) && count((array) $post_types) > 1) {

 

-		foreach ( $post_types as $post_type => $info ){

+		foreach ($post_types as $post_type => $info) {

 			global $wpdb;

-			$has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-			if ( ! $has_posts ) {

+			$has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));

+			if (!$has_posts) {

 				unset($post_types->{$post_type});

 			}

 		}

 

-		if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {

+		if (!empty($post_types) && count((array) $post_types) > 1) {

 

-			$new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true;

-			if ( $new_style ) {

+			$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

+			if ($new_style) {

 				echo "<div class='gd-search-input-wrapper gd-search-field-cpt'>";

 			}

 			?>

 			<select name="stype" class="search_by_post">

-				<?php foreach ( $post_types as $post_type => $info ):

+				<?php foreach ($post_types as $post_type => $info):

 					global $wpdb;

 					?>

 

-					<option data-label="<?php echo get_post_type_archive_link( $post_type ); ?>"

-					        value="<?php echo $post_type; ?>" <?php if ( isset( $_REQUEST['stype'] ) ) {

-						if ( $post_type == $_REQUEST['stype'] ) {

+					<option data-label="<?php echo get_post_type_archive_link($post_type); ?>"

+					        value="<?php echo $post_type; ?>" <?php if (isset($_REQUEST['stype'])) {

+						if ($post_type == $_REQUEST['stype']) {

 							echo 'selected="selected"';

 						}

-					} elseif ( $curr_post_type == $post_type ) {

+					} elseif ($curr_post_type == $post_type) {

 						echo 'selected="selected"';

-					} ?>><?php _e( geodir_utf8_ucfirst( $info->labels->name ), 'geodirectory' ); ?></option>

+					} ?>><?php _e(geodir_utf8_ucfirst($info->labels->name), 'geodirectory'); ?></option>

 

 				<?php endforeach; ?>

 			</select>

 			<?php

-			if ( $new_style ) {

+			if ($new_style) {

 				echo "</div>";

 			}

-		}else{

-			if(! empty( $post_types )){

-				$pt_arr = (array)$post_types;

-				echo '<input type="hidden" name="stype" value="' . key( $pt_arr  ) . '"  />';

-			}else{

+		} else {

+			if (!empty($post_types)) {

+				$pt_arr = (array) $post_types;

+				echo '<input type="hidden" name="stype" value="'.key($pt_arr).'"  />';

+			} else {

 				echo '<input type="hidden" name="stype" value="gd_place"  />';

 			}

 

 		}

 

-	}elseif ( ! empty( $post_types ) ) {

+	}elseif (!empty($post_types)) {

 		echo '<input type="hidden" name="stype" value="gd_place"  />';

 	}

 }

@@ -2369,26 +2369,26 @@ 
 function geodir_search_form_search_input() {

 

 	$default_search_for_text = SEARCH_FOR_TEXT;

-	if ( get_option( 'geodir_search_field_default_text' ) ) {

-		$default_search_for_text = __( get_option( 'geodir_search_field_default_text' ), 'geodirectory' );

+	if (get_option('geodir_search_field_default_text')) {

+		$default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

 	}

 

 	$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

-	if($new_style){

+	if ($new_style) {

 		echo "<div class='gd-search-input-wrapper gd-search-field-search'>";

 	}

 	?>

 	<input class="search_text" name="s"

-	       value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {

-		       echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) );

+	       value="<?php if (isset($_REQUEST['s']) && trim($_REQUEST['s']) != '') {

+		       echo esc_attr(stripslashes_deep($_REQUEST['s']));

 	       } else {

 		       echo $default_search_for_text;

 	       } ?>" type="text"

-	       onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"

-	       onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"

+	       onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql($default_search_for_text); ?>';}"

+	       onfocus="if (this.value == '<?php echo esc_sql($default_search_for_text); ?>') {this.value = '';}"

 	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);">

 	<?php

-	if($new_style){

+	if ($new_style) {

 		echo "</div>";

 	}

 }

@@ -2396,12 +2396,12 @@ 
 function geodir_search_form_near_input() {

 

 	$default_near_text = NEAR_TEXT;

-	if ( get_option( 'geodir_near_field_default_text' ) ) {

-		$default_near_text = __( get_option( 'geodir_near_field_default_text' ), 'geodirectory' );

+	if (get_option('geodir_near_field_default_text')) {

+		$default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

 	}

 

-	if ( isset( $_REQUEST['snear'] ) && $_REQUEST['snear'] != '' ) {

-		$near = esc_attr( stripslashes_deep( $_REQUEST['snear'] ) );

+	if (isset($_REQUEST['snear']) && $_REQUEST['snear'] != '') {

+		$near = esc_attr(stripslashes_deep($_REQUEST['snear']));

 	} else {

 		$near = $default_near_text;

 	}

@@ -2415,7 +2415,7 @@ 
 	 * @since 1.6.9

 	 * @param string $curr_post_type The current post type.

 	 */

-	$near_input_extra = apply_filters('geodir_near_input_extra','',$curr_post_type);

+	$near_input_extra = apply_filters('geodir_near_input_extra', '', $curr_post_type);

 

 

 	/**

@@ -2428,7 +2428,7 @@ 
 	 * @param string $near              The current near value.

 	 * @param string $default_near_text The default near value.

 	 */

-	$near = apply_filters( 'geodir_search_near_text', $near, $default_near_text );

+	$near = apply_filters('geodir_search_near_text', $near, $default_near_text);

 	/**

 	 * Filter the default "Near" text value for the search form.

 	 *

@@ -2439,7 +2439,7 @@ 
 	 * @param string $near              The current near value.

 	 * @param string $default_near_text The default near value.

 	 */

-	$default_near_text = apply_filters( 'geodir_search_default_near_text', $default_near_text, $near );

+	$default_near_text = apply_filters('geodir_search_default_near_text', $default_near_text, $near);

 	/**

 	 * Filter the class for the near search input.

 	 *

@@ -2447,10 +2447,10 @@ 
 	 *

 	 * @param string $class The class for the HTML near input, default is blank.

 	 */

-	$near_class = apply_filters( 'geodir_search_near_class', '' );

+	$near_class = apply_filters('geodir_search_near_class', '');

 

 	$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

-	if($new_style){

+	if ($new_style) {

 		echo "<div class='gd-search-input-wrapper gd-search-field-near' $near_input_extra>";

 

 		do_action('geodir_before_near_input');

@@ -2458,30 +2458,30 @@ 
 

 	?>

 	<input name="snear" class="snear <?php echo $near_class; ?>" type="text" value="<?php echo $near; ?>"

-	       onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql( $near ); ?>' != '' ? '<?php echo esc_sql( $near ); ?>' : '<?php echo $default_near_text; ?>');}"

-	       onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql( $near ); ?>') {this.value = '';}"

-	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);" <?php echo $near_input_extra;?>/>

+	       onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql($near); ?>' != '' ? '<?php echo esc_sql($near); ?>' : '<?php echo $default_near_text; ?>');}"

+	       onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql($near); ?>') {this.value = '';}"

+	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);" <?php echo $near_input_extra; ?>/>

 	<?php

-	if($new_style){

+	if ($new_style) {

 		do_action('geodir_after_near_input');

 

 		echo "</div>";

 	}

 }

 

-add_action( 'geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10 );

-add_action( 'geodir_search_form_inputs', 'geodir_search_form_search_input', 20 );

-add_action( 'geodir_search_form_inputs', 'geodir_search_form_near_input', 30 );

+add_action('geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10);

+add_action('geodir_search_form_inputs', 'geodir_search_form_search_input', 20);

+add_action('geodir_search_form_inputs', 'geodir_search_form_near_input', 30);

 

-function geodir_get_search_post_type($pt=''){

+function geodir_get_search_post_type($pt = '') {

 	global $geodir_search_post_type;

 

-	if($pt!=''){return $geodir_search_post_type = $pt;}

-	if(!empty($geodir_search_post_type)){ return $geodir_search_post_type;}

+	if ($pt != '') {return $geodir_search_post_type = $pt; }

+	if (!empty($geodir_search_post_type)) { return $geodir_search_post_type; }

 

 	$geodir_search_post_type = geodir_get_current_posttype();

 

-	if(!$geodir_search_post_type) {

+	if (!$geodir_search_post_type) {

 		$geodir_search_post_type = geodir_get_default_posttype();

 	}

 

@@ -2489,7 +2489,7 @@ 
 	return $geodir_search_post_type;

 }

 

-function geodir_search_form(){

+function geodir_search_form() {

 

 	geodir_get_search_post_type();

 

@@ -2499,8 +2499,8 @@ 
 	die();

 }

 

-add_action( 'wp_ajax_geodir_search_form', 'geodir_search_form' );

-add_action( 'wp_ajax_nopriv_geodir_search_form', 'geodir_search_form' );

+add_action('wp_ajax_geodir_search_form', 'geodir_search_form');

+add_action('wp_ajax_nopriv_geodir_search_form', 'geodir_search_form');

 

 /**

  * Check wpml active or not.

@@ -2574,7 +2574,7 @@ 
 		}

 	}

 }

-add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

+add_filter('icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4);

 

 /**

  * Duplicate post listing manually after listing saved.

@@ -2598,7 +2598,7 @@ 
 		foreach ($post_duplicates as $lang => $dup_post_id) {

 			geodir_icl_make_duplicate($post_id, $lang, $request_info, $dup_post_id, true);

 		}

-		do_action( 'geodir_wpml_listing_duplicated', $post_id, $request_info );

+		do_action('geodir_wpml_listing_duplicated', $post_id, $request_info);

 	}

 }

 

@@ -2617,7 +2617,7 @@ 
 function geodir_wpml_duplicate_post_reviews($master_post_id, $tr_post_id, $lang) {

 	global $wpdb;

 

-	$reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM " . GEODIR_REVIEW_TABLE . " WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);

+	$reviews = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM ".GEODIR_REVIEW_TABLE." WHERE post_id=%d ORDER BY id ASC", $master_post_id), ARRAY_A);

 

 	if (!empty($reviews)) {

 		foreach ($reviews as $review) {

@@ -2646,15 +2646,15 @@ 
 	global $wpdb, $plugin_prefix;

 

 	$post_type = get_post_type($master_post_id);

-	$post_table = $plugin_prefix . $post_type . '_detail';

+	$post_table = $plugin_prefix.$post_type.'_detail';

 

-	$query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

-	$data = (array)$wpdb->get_row($query);

+	$query = $wpdb->prepare("SELECT * FROM ".$post_table." WHERE post_id = %d", array($master_post_id));

+	$data = (array) $wpdb->get_row($query);

 

-	if ( !empty( $data ) ) {

-		$data = apply_filters( 'geodir_icl_duplicate_post_data', $data, $master_post_id, $tr_post_id, $lang );

+	if (!empty($data)) {

+		$data = apply_filters('geodir_icl_duplicate_post_data', $data, $master_post_id, $tr_post_id, $lang);

 		$data['post_id'] = $tr_post_id;

-		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category']);

+		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type.'category']);

 		$wpdb->update($post_table, $data, array('post_id' => $tr_post_id));

 		return true;

 	}

@@ -2679,7 +2679,7 @@ 
 	global $sitepress, $wpdb;

 	$post_type = get_post_type($master_post_id);

 

-	remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

+	remove_filter('get_term', array($sitepress, 'get_term_adjust_id')); // AVOID filtering to current language

 

 	$taxonomies = get_object_taxonomies($post_type);

 	foreach ($taxonomies as $taxonomy) {

@@ -2688,9 +2688,9 @@ 
 

 		if ($terms) {

 			foreach ($terms as $term) {

-				$tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

+				$tr_id = apply_filters('translate_object_id', $term->term_id, $taxonomy, false, $lang);

 

-				if (!is_null($tr_id)){

+				if (!is_null($tr_id)) {

 					// not using get_term - unfiltered get_term

 					$translated_term = $wpdb->get_row($wpdb->prepare("

                         SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));

@@ -2699,14 +2699,14 @@ 
 				}

 			}

 

-			if (!is_taxonomy_hierarchical($taxonomy)){

-				$terms_array = array_unique( array_map( 'intval', $terms_array ) );

+			if (!is_taxonomy_hierarchical($taxonomy)) {

+				$terms_array = array_unique(array_map('intval', $terms_array));

 			}

 

 			wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

 

-			if ($taxonomy == $post_type . 'category') {

-				geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

+			if ($taxonomy == $post_type.'category') {

+				geodir_set_postcat_structure($tr_post_id, $post_type.'category');

 			}

 		}

 	}

@@ -2727,15 +2727,15 @@ 
 function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {

 	global $wpdb;

 

-	$query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

+	$query = $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

 	$wpdb->query($query);

 

-	$query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

+	$query = $wpdb->prepare("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

 	$post_images = $wpdb->get_results($query);

 

-	if ( !empty( $post_images ) ) {

-		foreach ( $post_images as $post_image) {

-			$image_data = (array)$post_image;

+	if (!empty($post_images)) {

+		foreach ($post_images as $post_image) {

+			$image_data = (array) $post_image;

 			unset($image_data['ID']);

 			$image_data['post_id'] = $tr_post_id;

 

@@ -2768,13 +2768,13 @@ 
 function geodir_wpml_duplicate_post_review($master_comment_id, $master_post_id, $tr_post_id, $lang) {

 	global $wpdb, $plugin_prefix, $sitepress;

 

-	$review = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);

+	$review = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d ORDER BY id ASC", $master_comment_id), ARRAY_A);

 

 	if (empty($review)) {

 		return false;

 	}

 	if ($review['post_id'] != $master_post_id) {

-		$wpdb->query($wpdb->prepare("UPDATE " . GEODIR_REVIEW_TABLE . " SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));

+		$wpdb->query($wpdb->prepare("UPDATE ".GEODIR_REVIEW_TABLE." SET post_id=%d WHERE comment_id=%d", $master_post_id, $master_comment_id));

 		geodir_update_postrating($master_post_id, $post_type);

 	}

 

@@ -2785,9 +2785,9 @@ 
 	}

 

 	$post_type = get_post_type($master_post_id);

-	$post_table = $plugin_prefix . $post_type . '_detail';

+	$post_table = $plugin_prefix.$post_type.'_detail';

 

-	$translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM " . $post_table . " WHERE post_id = %d", $tr_post_id), ARRAY_A);

+	$translated_post = $wpdb->get_row($wpdb->prepare("SELECT post_title, post_latitude, post_longitude, post_city, post_region, post_country FROM ".$post_table." WHERE post_id = %d", $tr_post_id), ARRAY_A);

 	if (empty($translated_post)) {

 		return false;

 	}

@@ -2805,7 +2805,7 @@ 
 		unset($review['id']);

 	}

 

-	$tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));

+	$tr_review_id = $wpdb->get_var($wpdb->prepare("SELECT id FROM ".GEODIR_REVIEW_TABLE." WHERE comment_id=%d AND post_id=%d ORDER BY id ASC", $tr_comment_id, $tr_post_id));

 

 	if ($tr_review_id) { // update review

 		$wpdb->update(GEODIR_REVIEW_TABLE, $review, array('id' => $tr_review_id));

@@ -2818,8 +2818,8 @@ 
 		geodir_update_postrating($tr_post_id, $post_type);

 

 		if (defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_review') && $sitepress->get_setting('sync_comments_on_duplicates')) {

-			$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id = %d", array($tr_comment_id)));

-			$likes = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_COMMENTS_REVIEWS_TABLE . " WHERE comment_id=%d ORDER BY like_date ASC", $master_comment_id, $tr_post_id), ARRAY_A);

+			$wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_COMMENTS_REVIEWS_TABLE." WHERE comment_id = %d", array($tr_comment_id)));

+			$likes = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_COMMENTS_REVIEWS_TABLE." WHERE comment_id=%d ORDER BY like_date ASC", $master_comment_id, $tr_post_id), ARRAY_A);

 

 			if (!empty($likes)) {

 				foreach ($likes as $like) {

@@ -2921,7 +2921,7 @@ 
  * @return bool True if review star disabled, otherwise false.

  */

 function geodir_rating_disabled_post_types() {

-	$post_types = get_option( 'geodir_disable_rating_cpt' );

+	$post_types = get_option('geodir_disable_rating_cpt');

 

 	/**

 	 * Filter the post types array which have rating disabled.

@@ -2930,7 +2930,7 @@ 
 	 *

 	 * @param array $post_types Array of post types which have rating starts disabled.

 	 */

-	return apply_filters( 'geodir_rating_disabled_post_types', $post_types );

+	return apply_filters('geodir_rating_disabled_post_types', $post_types);

 }

 

 /**

@@ -2942,30 +2942,30 @@ 
  * @param bool $taxonomy Whether $post_type is taxonomy or not.

  * @return bool True if review star disabled, otherwise false.

  */

-function geodir_cpt_has_rating_disabled( $post_type = '', $taxonomy = false ) {

+function geodir_cpt_has_rating_disabled($post_type = '', $taxonomy = false) {

 	$post_types = geodir_rating_disabled_post_types();

 

-	if ( empty( $post_types ) ) {

+	if (empty($post_types)) {

 		return false;

 	}

 

-	if ( is_int( $post_type ) ) {

-		$post_type = get_post_type( $post_type );

+	if (is_int($post_type)) {

+		$post_type = get_post_type($post_type);

 	}

 

-	if ( $taxonomy && !empty( $post_types ) ) {

+	if ($taxonomy && !empty($post_types)) {

 		$posttypes = array();

 

-		foreach ( $post_types as $posttype ) {

-			$posttypes[] = $posttype . 'category';

-			$posttypes[] = $posttype . '_tags';

+		foreach ($post_types as $posttype) {

+			$posttypes[] = $posttype.'category';

+			$posttypes[] = $posttype.'_tags';

 		}

 

 		$post_types = $posttypes;

 	}

 

 	$return = false;

-	if ( $post_type != '' && !empty( $post_types ) && in_array( $post_type, $post_types ) ) {

+	if ($post_type != '' && !empty($post_types) && in_array($post_type, $post_types)) {

 		$return = true;

 	}

 

@@ -2980,7 +2980,7 @@ 
  * @return bool True if Yoast SEO disabled on GD pages.

  */

 function geodir_disable_yoast_seo_metas() {

-	return (bool)get_option( 'geodir_disable_yoast_meta' );

+	return (bool) get_option('geodir_disable_yoast_meta');

 }

 

 /**

@@ -2991,30 +2991,30 @@ 
  * @param int $post_id The post ID.

  * @return bool True if allowed.

  */

-function geodir_wpml_allowed_to_duplicate( $post_id ) {

+function geodir_wpml_allowed_to_duplicate($post_id) {

 	$allowed = false;

 

-	if ( !geodir_is_wpml() || empty( $post_id ) ) {

+	if (!geodir_is_wpml() || empty($post_id)) {

 		return $allowed;

 	}

 

-	$user_id = (int)get_current_user_id();

+	$user_id = (int) get_current_user_id();

 

-	if ( empty( $user_id ) ) {

+	if (empty($user_id)) {

 		return $allowed;

 	}

 

-	$post_type = get_post_type( $post_id );

-	if ( !geodir_wpml_is_post_type_translated( $post_type ) || get_post_meta( $post_id, '_icl_lang_duplicate_of', true ) ) {

+	$post_type = get_post_type($post_id);

+	if (!geodir_wpml_is_post_type_translated($post_type) || get_post_meta($post_id, '_icl_lang_duplicate_of', true)) {

 		return $allowed;

 	}

 

-	if ( geodir_listing_belong_to_current_user( $post_id ) ) {

+	if (geodir_listing_belong_to_current_user($post_id)) {

 		$allowed = true;

 	}

 

-	$disable_cpts = get_option( 'geodir_wpml_disable_duplicate' );

-	if ( $allowed && !empty( $disable_cpts ) && in_array( $post_type, $disable_cpts ) ) {

+	$disable_cpts = get_option('geodir_wpml_disable_duplicate');

+	if ($allowed && !empty($disable_cpts) && in_array($post_type, $disable_cpts)) {

 		$allowed = false;

 	}

 

@@ -3024,7 +3024,7 @@ 
 	 * @param bool $allowed True if allowed.

 	 * @param int $post_id The post ID.

 	 */

-	return apply_filters( 'geodir_wpml_allowed_to_duplicate', $allowed, $post_id );

+	return apply_filters('geodir_wpml_allowed_to_duplicate', $allowed, $post_id);

 }

 

 /**

@@ -3039,61 +3039,61 @@ 
  * @param string $content_html The output html of the geodir_edit_post_link() function.

  * @return string Filtered html of the geodir_edit_post_link() function.

  */

-function geodir_wpml_frontend_duplicate_listing( $content_html ) {

+function geodir_wpml_frontend_duplicate_listing($content_html) {

 	global $post, $preview, $sitepress;

 

-	if ( !empty( $post->ID ) && !$preview && geodir_is_page( 'detail' ) && geodir_wpml_allowed_to_duplicate( $post->ID ) ) {

+	if (!empty($post->ID) && !$preview && geodir_is_page('detail') && geodir_wpml_allowed_to_duplicate($post->ID)) {

 		$post_id = $post->ID;

-		$element_type = 'post_' . get_post_type( $post_id );

-		$original_post_id = $sitepress->get_original_element_id( $post_id, $element_type );

+		$element_type = 'post_'.get_post_type($post_id);

+		$original_post_id = $sitepress->get_original_element_id($post_id, $element_type);

 

-		if ( $original_post_id == $post_id ) {

+		if ($original_post_id == $post_id) {

 			$wpml_languages = $sitepress->get_active_languages();

-			$post_language = $sitepress->get_language_for_element( $post_id, $element_type );

+			$post_language = $sitepress->get_language_for_element($post_id, $element_type);

 

-			if ( !empty( $wpml_languages ) && isset( $wpml_languages[ $post_language ] ) ) {

-				unset( $wpml_languages[ $post_language ] );

+			if (!empty($wpml_languages) && isset($wpml_languages[$post_language])) {

+				unset($wpml_languages[$post_language]);

 			}

 

-			if ( !empty( $wpml_languages ) ) {

-				$trid  = $sitepress->get_element_trid( $post_id, $element_type );

-				$element_translations = $sitepress->get_element_translations( $trid, $element_type );

-				$duplicates = $sitepress->get_duplicates( $post_id );

+			if (!empty($wpml_languages)) {

+				$trid = $sitepress->get_element_trid($post_id, $element_type);

+				$element_translations = $sitepress->get_element_translations($trid, $element_type);

+				$duplicates = $sitepress->get_duplicates($post_id);

 

-				$wpml_content = '<div class="geodir-company_info gd-detail-duplicate"><h3 class="widget-title">' . __( 'Translate Listing', 'geodirectory' ) . '</h3>';

+				$wpml_content = '<div class="geodir-company_info gd-detail-duplicate"><h3 class="widget-title">'.__('Translate Listing', 'geodirectory').'</h3>';

 				$wpml_content .= '<table class="gd-duplicate-table" style="width:100%;margin:0"><tbody>';

-				$wpml_content .= '<tr style="border-bottom:solid 1px #efefef"><th style="padding:0 2px 2px 2px">' . __( 'Language', 'geodirectory' ) . '</th><th style="width:25px;"></th><th style="width:5em;text-align:center">' . __( 'Translate', 'geodirectory' ) . '</th></tr>';

+				$wpml_content .= '<tr style="border-bottom:solid 1px #efefef"><th style="padding:0 2px 2px 2px">'.__('Language', 'geodirectory').'</th><th style="width:25px;"></th><th style="width:5em;text-align:center">'.__('Translate', 'geodirectory').'</th></tr>';

 

 				$needs_translation = false;

 

-				foreach ( $wpml_languages as $lang_code => $lang ) {

+				foreach ($wpml_languages as $lang_code => $lang) {

 					$duplicates_text = '';

 					$translated = false;

 

-					if ( !empty( $element_translations ) && isset( $element_translations[$lang_code] ) ) {

+					if (!empty($element_translations) && isset($element_translations[$lang_code])) {

 						$translated = true;

 

-						if ( !empty( $duplicates ) && isset( $duplicates[$lang_code] ) ) {

-							$duplicates_text = ' ' . __( '(duplicate)', 'geodirectory' );

+						if (!empty($duplicates) && isset($duplicates[$lang_code])) {

+							$duplicates_text = ' '.__('(duplicate)', 'geodirectory');

 						}

 					} else {

 						$needs_translation = true;

 					}

 

-					$wpml_content .= '<tr><td style="padding:4px">' . $lang['english_name'] . $duplicates_text . '</td><td>&nbsp;</td><td style="text-align:center;">';

+					$wpml_content .= '<tr><td style="padding:4px">'.$lang['english_name'].$duplicates_text.'</td><td>&nbsp;</td><td style="text-align:center;">';

 

-					if ( $translated ) {

+					if ($translated) {

 						$wpml_content .= '<i class="fa fa-check" style="color:orange"></i>';

 					} else {

-						$wpml_content .= '<input name="gd_icl_dup[]" value="' . $lang_code . '" title="' . esc_attr__( 'Create duplicate', 'geodirectory' ) . '" type="checkbox">';

+						$wpml_content .= '<input name="gd_icl_dup[]" value="'.$lang_code.'" title="'.esc_attr__('Create duplicate', 'geodirectory').'" type="checkbox">';

 					}

 

 					$wpml_content .= '</td></tr>';

 				}

 

-				if ( $needs_translation ) {

-					$nonce = wp_create_nonce( 'geodir_duplicate_nonce' );

-					$wpml_content .= '<tr><td>&nbsp;</td><td style="vertical-align:middle;padding-top:13px"><i style="display:none" class="fa fa-spin fa-refresh"></i></td><td style="padding:15px 3px 3px 3px;text-align:right"><button data-nonce="' . esc_attr( $nonce ) . '" data-post-id="' . $post_id . '" id="gd_make_duplicates" class="button-secondary">' . __( 'Duplicate', 'geodirectory' ) . '</button></td></tr>';

+				if ($needs_translation) {

+					$nonce = wp_create_nonce('geodir_duplicate_nonce');

+					$wpml_content .= '<tr><td>&nbsp;</td><td style="vertical-align:middle;padding-top:13px"><i style="display:none" class="fa fa-spin fa-refresh"></i></td><td style="padding:15px 3px 3px 3px;text-align:right"><button data-nonce="'.esc_attr($nonce).'" data-post-id="'.$post_id.'" id="gd_make_duplicates" class="button-secondary">'.__('Duplicate', 'geodirectory').'</button></td></tr>';

 				}

 

 				$wpml_content .= '</tbody></table>';

@@ -3115,12 +3115,12 @@ 
  * @param array $settings GD design settings array.

  * @return array Filtered GD design settings array..

  */

-function geodir_wpml_duplicate_settings( $settings = array() ) {

+function geodir_wpml_duplicate_settings($settings = array()) {

 	$new_settings = array();

 

-	foreach ( $settings as $key => $setting ) {

+	foreach ($settings as $key => $setting) {

 

-		if ( isset( $setting['type'] ) && $setting['type'] == 'sectionend' && $setting['id'] == 'detail_page_settings' ) {

+		if (isset($setting['type']) && $setting['type'] == 'sectionend' && $setting['id'] == 'detail_page_settings') {

 			$new_settings[] = array(

 				'name' => __('Disable WPML duplicate translation', 'geodirectory'),

 				'desc' => __('Select post types to disable front end WPML duplicate translation. For selected post types the WPML duplicate option will be disabled from listing detail page sidebar.', 'geodirectory'),

@@ -3148,12 +3148,12 @@ 
  * @param string $taxonomy name/slug of a taxonomy.

  * @return bool true if the taxonomy is currently set to being translatable in WPML.

  */

-function geodir_wpml_is_taxonomy_translated( $taxonomy ) {

-	if ( empty( $taxonomy ) || !geodir_is_wpml() || !function_exists( 'is_taxonomy_translated' ) ) {

+function geodir_wpml_is_taxonomy_translated($taxonomy) {

+	if (empty($taxonomy) || !geodir_is_wpml() || !function_exists('is_taxonomy_translated')) {

 		return false;

 	}

 

-	if ( is_taxonomy_translated( $taxonomy ) ) {

+	if (is_taxonomy_translated($taxonomy)) {

 		return true;

 	}

 

@@ -3168,12 +3168,12 @@ 
  * @param string $post_type name/slug of a post_type.

  * @return bool true if the post_type is currently set to being translatable in WPML.

  */

-function geodir_wpml_is_post_type_translated( $post_type ) {

-	if ( empty( $post_type ) || !geodir_is_wpml() || !function_exists( 'is_post_type_translated' ) ) {

+function geodir_wpml_is_post_type_translated($post_type) {

+	if (empty($post_type) || !geodir_is_wpml() || !function_exists('is_post_type_translated')) {

 		return false;

 	}

 

-	if ( is_post_type_translated( $post_type ) ) {

+	if (is_post_type_translated($post_type)) {

 		return true;

 	}

 

@@ -3195,12 +3195,12 @@ 
  *

  * @return int|NULL

  */

-function geodir_wpml_object_id( $element_id, $element_type = 'post', $return_original_if_missing = false, $ulanguage_code = null ) {

-	if ( geodir_is_wpml() ) {

-		if ( function_exists( 'wpml_object_id_filter' ) ) {

-			return apply_filters( 'wpml_object_id', $element_id, $element_type, $return_original_if_missing, $ulanguage_code );

+function geodir_wpml_object_id($element_id, $element_type = 'post', $return_original_if_missing = false, $ulanguage_code = null) {

+	if (geodir_is_wpml()) {

+		if (function_exists('wpml_object_id_filter')) {

+			return apply_filters('wpml_object_id', $element_id, $element_type, $return_original_if_missing, $ulanguage_code);

 		} else {

-			return icl_object_id( $element_id, $element_type, $return_original_if_missing, $ulanguage_code );

+			return icl_object_id($element_id, $element_type, $return_original_if_missing, $ulanguage_code);

 		}

 	}

 

geodirectory-admin/admin_hooks_actions.php

Doc Comments +1 added lines, -1 removed lines

@@ -1844,6 +1844,7 @@ 
  * @since 1.0.0

  * @package GeoDirectory

  * @global object $current_user Current user object.

+ * @param string|null $input
  * @return array Returns parsed data as array.

  */

 function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")

@@ -2373,7 +2374,6 @@ 
  *

  * @since 1.6.9

  *

- * @param array $settings Array of GeoDirectory general settings.

  * @return array Array of settings.

  */

 function geodir_uninstall_settings($general_settings) {

Braces +61 added lines, -54 removed lines

@@ -24,8 +24,11 @@ 
             global $current_tab;

             geodir_redirect_to_admin_panel_on_installed();

             $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

-            if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests

-                geodir_handle_option_form_submit($current_tab); // located in admin function.php

+            if (!(isset($_REQUEST['action']))) {
+            	// this will avoid Ajax requests

+                geodir_handle_option_form_submit($current_tab);
+            }
+            // located in admin function.php

             /**

              * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

              *

@@ -324,8 +327,9 @@ 
     if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

 

         foreach ($notification as $key => $value) {

-            if ($value['type'] == 'textarea')

-                $notification[$key]['type'] = 'editor';

+            if ($value['type'] == 'textarea') {
+                            $notification[$key]['type'] = 'editor';
+            }
         }

 

     }

@@ -350,8 +354,9 @@ 
     if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

 

         foreach ($design_setting as $key => $value) {

-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

-                $design_setting[$key]['type'] = 'editor';

+            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') {
+                            $design_setting[$key]['type'] = 'editor';
+            }
         }

 

     }

@@ -470,9 +475,9 @@ 
                    class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">

                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {

                         echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){

+                    } elseif(isset($val['field_icon']) && $val['field_icon'] ){

                         echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

-                    }else{

+                    } else{

                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';

                     }?>

                     <?php echo $val['site_title'];?>

@@ -702,9 +707,9 @@ 
         <?php

         if($type=='predefined'){

             $cfs = geodir_custom_fields_predefined($listing_type);

-        }elseif($type=='custom'){

+        } elseif($type=='custom'){

             $cfs = geodir_custom_fields_custom($listing_type);

-        }else{

+        } else{

             $cfs = geodir_custom_fields($listing_type);

             ?>

             <ul class="full gd-cf-tooltip-wrap">

@@ -759,7 +764,7 @@ 
             </li>

             <?php

         }

-    }else{

+    } else{

         _e('There are no custom fields here yet.', 'geodirectory');

     }

         ?>

@@ -956,8 +961,9 @@ 
 

     if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'")) {
+                    $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
+        }
 

         update_option('geodir_remove_unnecessary_fields', '1');

 

@@ -993,8 +999,9 @@ 
                 break;

 

             case 'diagnosis-fix' :

-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
+                                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
+                }
                 call_user_func('geodir_diagnose_' . $diagnose_this);

                 exit();

                 break;

@@ -1609,11 +1616,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_home_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1634,11 +1641,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_add_listing_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1660,11 +1667,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_preview_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1685,11 +1692,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_success_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1710,11 +1717,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_info_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1735,11 +1742,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_login_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1760,11 +1767,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_location_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -2209,8 +2216,9 @@ 
                             );

 

                             $post_location_info = $request_info['post_location'];

-                            if ($location_id = geodir_add_new_location($post_location_info))

-                                $post_location_id = $location_id;

+                            if ($location_id = geodir_add_new_location($post_location_info)) {
+                                                            $post_location_id = $location_id;
+                            }
                         } else {

                             $post_location_id = 0;

                         }

@@ -2273,8 +2281,9 @@ 
                             $attachment_set = '';

 

                             foreach ($attachment as $key => $val) {

-                                if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                if ($val != '') {
+                                                                    $attachment_set .= $key . " = '" . $val . "', ";
+                                }
                             }

                             $attachment_set = trim($attachment_set, ", ");

 

@@ -2370,8 +2379,7 @@ 
 

         $parts = json_decode($response['body']);

         //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;} else{

 

             update_option('gd_ga_access_token', $parts->access_token);

             update_option('gd_ga_refresh_token', $parts->refresh_token);

@@ -2379,17 +2387,16 @@ 
         }

 

 

-    }

-    elseif(!empty($response['response']['code'])) {

+    } elseif(!empty($response['response']['code'])) {

         $parts = json_decode($response['body']);

 

         if(isset($parts->error)){

             echo $parts->error.": ".$parts->error_description;exit;

-        }else{

+        } else{

             echo $error_msg." - #2";exit;

         }

 

-    }else{

+    } else{

 

         echo $error_msg." - #3";exit;

 

@@ -2527,7 +2534,7 @@ 
         ob_start();

         geodir_diagnose_version_clear();

         ob_end_clean();

-    }else{

+    } else{

         $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";

     }

 

Indentation +1649 added lines, -1649 removed lines

@@ -10,33 +10,33 @@ 
 

 add_action('admin_init', 'geodir_admin_init');

 if (!function_exists('geodir_admin_init')) {

-    /**

-     * Adds GD setting pages in admin.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global string $current_tab The current settings tab name.

-     */

-    function geodir_admin_init()

-    {

-

-        if (is_admin()):

-            global $current_tab;

-            geodir_redirect_to_admin_panel_on_installed();

-            $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

-            if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests

-                geodir_handle_option_form_submit($current_tab); // located in admin function.php

-            /**

-             * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

-             *

-             * @since 1.0.0

-             */

-            do_action('admin_panel_init');

-            add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);

-

-

-        endif;

-    }

+	/**

+	 * Adds GD setting pages in admin.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global string $current_tab The current settings tab name.

+	 */

+	function geodir_admin_init()

+	{

+

+		if (is_admin()):

+			global $current_tab;

+			geodir_redirect_to_admin_panel_on_installed();

+			$current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

+			if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests

+				geodir_handle_option_form_submit($current_tab); // located in admin function.php

+			/**

+			 * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('admin_panel_init');

+			add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);

+

+

+		endif;

+	}

 }

 

 /**

@@ -47,10 +47,10 @@ 
  */

 function geodir_redirect_to_admin_panel_on_installed()

 {

-    if (get_option('geodir_installation_redirect', false)) {

-        delete_option('geodir_installation_redirect');

-        wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));

-    }

+	if (get_option('geodir_installation_redirect', false)) {

+		delete_option('geodir_installation_redirect');

+		wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));

+	}

 }

 

 /**

@@ -62,7 +62,7 @@ 
  */

 function geodir_get_admin_option_form($current_tab)

 {

-    geodir_admin_option_form($current_tab);// defined in admin template tags.php

+	geodir_admin_option_form($current_tab);// defined in admin template tags.php

 }

 

 

@@ -86,24 +86,24 @@ 
  */

 function geodir_conditional_admin_script_load()

 {

-    global $pagenow;

+	global $pagenow;

 	

 	// Get the current post type

 	$post_type = geodir_admin_current_post_type();

 	$geodir_post_types = geodir_get_posttypes();

     

 	if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'term.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {

-        add_action('admin_enqueue_scripts', 'geodir_admin_scripts');

-        add_action('admin_enqueue_scripts', 'geodir_admin_styles');

-        add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);

+		add_action('admin_enqueue_scripts', 'geodir_admin_scripts');

+		add_action('admin_enqueue_scripts', 'geodir_admin_styles');

+		add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);

         

-        // Disable VC editor for GD post types.

-        if (class_exists('Vc_Role_Access_Controller')) {

-            add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 );

-        }

-    }

+		// Disable VC editor for GD post types.

+		if (class_exists('Vc_Role_Access_Controller')) {

+			add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 );

+		}

+	}

 

-    add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');

+	add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');

 

 }

 

@@ -138,12 +138,12 @@ 
  */

 function create_default_admin_main_nav()

 {

-    add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);

-    add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);

-    add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);

-    add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);

-    add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);

-    //add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);

+	add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);

+	add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);

+	add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);

+	add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);

+	add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);

+	//add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);

 

 }

 

@@ -157,19 +157,19 @@ 
  */

 function geodir_admin_list_columns()

 {

-    if ($post_types = geodir_get_posttypes()) {

+	if ($post_types = geodir_get_posttypes()) {

 

-        foreach ($post_types as $post_type):

-            add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);

-            //Filter-Payment-Manager to show Package

-            add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);

+		foreach ($post_types as $post_type):

+			add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);

+			//Filter-Payment-Manager to show Package

+			add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);

 

-            add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');

+			add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');

             

-            // Filter bulk actions

-            add_filter("bulk_actions-edit-{$post_type}", 'geodir_filter_bulk_actions', 10, 1);

-        endforeach;

-    }

+			// Filter bulk actions

+			add_filter("bulk_actions-edit-{$post_type}", 'geodir_filter_bulk_actions', 10, 1);

+		endforeach;

+	}

 }

 

 /**

@@ -182,15 +182,15 @@ 
  */

 function geodir_default_admin_main_tabs($tabs)

 {

-    return $tabs = array(

-        'general_settings' => array('label' => __('General', 'geodirectory')),

-        'design_settings' => array('label' => __('Design', 'geodirectory')),

-        'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),

-        'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),

-        'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),

-        'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),

-

-    );

+	return $tabs = array(

+		'general_settings' => array('label' => __('General', 'geodirectory')),

+		'design_settings' => array('label' => __('Design', 'geodirectory')),

+		'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),

+		'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),

+		'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),

+		'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),

+

+	);

 }

 

 add_action('do_meta_boxes', 'geodir_remove_image_box');

@@ -203,16 +203,16 @@ 
  */

 function geodir_remove_image_box()

 {

-    global $post;

+	global $post;

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

-    if (isset($post) && in_array($post->post_type, $geodir_posttypes)):

+	if (isset($post) && in_array($post->post_type, $geodir_posttypes)):

 

-        remove_meta_box('postimagediv', $post->post_type, 'side');

-        remove_meta_box('revisionsdiv', $post->post_type, 'normal');

+		remove_meta_box('postimagediv', $post->post_type, 'side');

+		remove_meta_box('revisionsdiv', $post->post_type, 'normal');

 

-    endif;

+	endif;

 

 }

 

@@ -227,27 +227,27 @@ 
  */

 function geodir_meta_box_add()

 {

-    global $post;

+	global $post;

 

-    $geodir_post_types = geodir_get_posttypes('array');

-    $geodir_posttypes = array_keys($geodir_post_types);

+	$geodir_post_types = geodir_get_posttypes('array');

+	$geodir_posttypes = array_keys($geodir_post_types);

 

-    if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)):

+	if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)):

 

-        $geodir_posttype = $post->post_type;

-        $post_typename = __($geodir_post_types[$geodir_posttype]['labels']['singular_name'], 'geodirectory');

-        $post_typename = geodir_ucwords($post_typename);

+		$geodir_posttype = $post->post_type;

+		$post_typename = __($geodir_post_types[$geodir_posttype]['labels']['singular_name'], 'geodirectory');

+		$post_typename = geodir_ucwords($post_typename);

 

-        // Filter-Payment-Manager

+		// Filter-Payment-Manager

 

-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

+		add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

 

-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

+		add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

 

-        // no need of this box as all fields moved to main information box

-        //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

+		// no need of this box as all fields moved to main information box

+		//add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

 

-    endif;

+	endif;

 

 }

 

@@ -271,23 +271,23 @@ 
 function geodir_hide_post_taxonomy_meta_boxes()

 {

 

-    $geodir_post_types = get_option('geodir_post_types');

+	$geodir_post_types = get_option('geodir_post_types');

 

-    if (!empty($geodir_post_types)) {

-        foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {

+	if (!empty($geodir_post_types)) {

+		foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {

 

-            $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

+			$gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

 

-            if(!empty($gd_taxonomy)) {

-                foreach ($gd_taxonomy as $tax) {

+			if(!empty($gd_taxonomy)) {

+				foreach ($gd_taxonomy as $tax) {

 

-                    remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

+					remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

 

-                }

-            }

+				}

+			}

 

-        }

-    }

+		}

+	}

 }

 

 add_filter('geodir_add_listing_map_restrict', 'geodir_add_listing_map_restrict');

@@ -301,12 +301,12 @@ 
  */

 function geodir_add_listing_map_restrict($map_restirct)

 {

-    if (is_admin()) {

-        if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {

-            $map_restirct = false;

-        }

-    }

-    return $map_restirct;

+	if (is_admin()) {

+		if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {

+			$map_restirct = false;

+		}

+	}

+	return $map_restirct;

 }

 

 

@@ -325,16 +325,16 @@ 
 function geodir_enable_editor_on_notifications($notification)

 {

 

-    if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

+	if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

 

-        foreach ($notification as $key => $value) {

-            if ($value['type'] == 'textarea')

-                $notification[$key]['type'] = 'editor';

-        }

+		foreach ($notification as $key => $value) {

+			if ($value['type'] == 'textarea')

+				$notification[$key]['type'] = 'editor';

+		}

 

-    }

+	}

 

-    return $notification;

+	return $notification;

 }

 

 

@@ -351,16 +351,16 @@ 
 function geodir_enable_editor_on_design_settings($design_setting)

 {

 

-    if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

+	if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

 

-        foreach ($design_setting as $key => $value) {

-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

-                $design_setting[$key]['type'] = 'editor';

-        }

+		foreach ($design_setting as $key => $value) {

+			if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

+				$design_setting[$key]['type'] = 'editor';

+		}

 

-    }

+	}

 

-    return $design_setting;

+	return $design_setting;

 }

 

 /* ----------- START MANAGE CUSTOM FIELDS ---------------- */

@@ -368,15 +368,15 @@ 
 add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');

 

 function geodir_manage_available_fields_predefined($sub_tab){

-    if($sub_tab=='custom_fields'){

-        geodir_custom_available_fields('predefined');

-    }

+	if($sub_tab=='custom_fields'){

+		geodir_custom_available_fields('predefined');

+	}

 }

 

 function geodir_manage_available_fields_custom($sub_tab){

-    if($sub_tab=='custom_fields'){

-        geodir_custom_available_fields('custom');

-    }

+	if($sub_tab=='custom_fields'){

+		geodir_custom_available_fields('custom');

+	}

 }

 

 

@@ -395,16 +395,16 @@ 
 function geodir_manage_available_fields($sub_tab)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            geodir_custom_available_fields();

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			geodir_custom_available_fields();

+			break;

 

-        case 'sorting_options':

-            geodir_sorting_options_available_fields();

-            break;

+		case 'sorting_options':

+			geodir_sorting_options_available_fields();

+			break;

 

-    }

+	}

 }

 

 

@@ -420,16 +420,16 @@ 
 function geodir_manage_selected_fields($sub_tab)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            geodir_custom_selected_fields();

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			geodir_custom_selected_fields();

+			break;

 

-        case 'sorting_options':

-            geodir_sorting_options_selected_fields();

-            break;

+		case 'sorting_options':

+			geodir_sorting_options_selected_fields();

+			break;

 

-    }

+	}

 }

 

 /**

@@ -441,52 +441,52 @@ 
  */

 function geodir_sorting_options_available_fields()

 {

-    global $wpdb;

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	global $wpdb;

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul>

     <?php

-        $sort_options = geodir_get_custom_sort_options($listing_type);

+		$sort_options = geodir_get_custom_sort_options($listing_type);

         

-        foreach ($sort_options as $key => $val) {

-            $val = stripslashes_deep($val); // strip slashes

-

-            $check_html_variable = $wpdb->get_var(

-                $wpdb->prepare(

-                    "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

-                    array($val['htmlvar_name'], $listing_type, $val['field_type'])

-                )

-            );

+		foreach ($sort_options as $key => $val) {

+			$val = stripslashes_deep($val); // strip slashes

+

+			$check_html_variable = $wpdb->get_var(

+				$wpdb->prepare(

+					"SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

+					array($val['htmlvar_name'], $listing_type, $val['field_type'])

+				)

+			);

             

-            $display = $check_html_variable ? ' style="display:none;"' : '';

-           ?>

+			$display = $check_html_variable ? ' style="display:none;"' : '';

+		   ?>

 

             <li   class="gd-cf-tooltip-wrap" <?php echo $display;?>>

                 <?php

-                if(isset($val['description']) && $val['description']){

-                    echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';

-                }?>

+				if(isset($val['description']) && $val['description']){

+					echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';

+				}?>

 

                 <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>"  data-field-type="<?php echo $val['field_type'];?>"

                    title="<?php echo $val['site_title'];?>"

                    class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">

                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {

-                        echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){

-                        echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

-                    }else{

-                        echo '<i class="fa fa-cog" aria-hidden="true"></i>';

-                    }?>

+						echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

+					}elseif(isset($val['field_icon']) && $val['field_icon'] ){

+						echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

+					}else{

+						echo '<i class="fa fa-cog" aria-hidden="true"></i>';

+					}?>

                     <?php echo $val['site_title'];?>

                 </a>

             </li>

 

 

             <?php

-        }

-    ?>

+		}

+	?>

     </ul>

     <?php

 }

@@ -500,28 +500,28 @@ 
  */

 function geodir_sorting_options_selected_fields()

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul class="core">

     <?php 

-        global $wpdb;

+		global $wpdb;

         

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

+		$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

 

-        if (!empty($fields)) {

-            foreach ($fields as $field) {

-                //$result_str = $field->id;

-                $result_str = $field;

-                $field_type = $field->field_type;

-                $field_ins_upd = 'display';

+		if (!empty($fields)) {

+			foreach ($fields as $field) {

+				//$result_str = $field->id;

+				$result_str = $field;

+				$field_type = $field->field_type;

+				$field_ins_upd = 'display';

 

-                $default = false;

+				$default = false;

 

-                geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default);

-            }

-        }

-    ?>

+				geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default);

+			}

+		}

+	?>

     </ul>

     <?php

 }

@@ -534,12 +534,12 @@ 
  */

 function geodir_custom_fields_custom($post_type=''){

 

-    $custom_fields = array();

+	$custom_fields = array();

 

-    /**

-     * @see `geodir_custom_fields`

-     */

-    return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);

+	/**

+	 * @see `geodir_custom_fields`

+	 */

+	return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);

 }

 

 

@@ -552,140 +552,140 @@ 
  */

 function geodir_custom_fields($post_type=''){

     

-    $custom_fields = array(

-        'text' => array(

-            'field_type'  =>  'text',

-            'class' =>  'gd-text',

-            'icon'  =>  'fa fa-minus',

-            'name'  =>  __('Text', 'geodirectory'),

-            'description' =>  __('Add any sort of text field, text or numbers', 'geodirectory')

-        ),

-        'datepicker' => array(

-            'field_type'  =>  'datepicker',

-            'class' =>  'gd-datepicker',

-            'icon'  =>  'fa fa-calendar',

-            'name'  =>  __('Date', 'geodirectory'),

-            'description' =>  __('Adds a date picker.', 'geodirectory')

-        ),

-        'textarea' => array(

-            'field_type'  =>  'textarea',

-            'class' =>  'gd-textarea',

-            'icon'  =>  'fa fa-bars',

-            'name'  =>  __('Textarea', 'geodirectory'),

-            'description' =>  __('Adds a textarea', 'geodirectory')

-        ),

-        'time' => array(

-            'field_type'  =>  'time',

-            'class' =>  'gd-time',

-            'icon' =>  'fa fa-clock-o',

-            'name'  =>  __('Time', 'geodirectory'),

-            'description' =>  __('Adds a time picker', 'geodirectory')

-        ),

-        'checkbox' => array(

-            'field_type'  =>  'checkbox',

-            'class' =>  'gd-checkbox',

-            'icon' =>  'fa fa-check-square-o',

-            'name'  =>  __('Checkbox', 'geodirectory'),

-            'description' =>  __('Adds a checkbox', 'geodirectory')

-        ),

-        'phone' => array(

-            'field_type'  =>  'phone',

-            'class' =>  'gd-phone',

-            'icon' =>  'fa fa-phone',

-            'name'  =>  __('Phone', 'geodirectory'),

-            'description' =>  __('Adds a phone input', 'geodirectory')

-        ),

-        'radio' => array(

-            'field_type'  =>  'radio',

-            'class' =>  'gd-radio',

-            'icon' =>  'fa fa-dot-circle-o',

-            'name'  =>  __('Radio', 'geodirectory'),

-            'description' =>  __('Adds a radio input', 'geodirectory')

-        ),

-        'email' => array(

-            'field_type'  =>  'email',

-            'class' =>  'gd-email',

-            'icon' =>  'fa fa-envelope-o',

-            'name'  =>  __('Email', 'geodirectory'),

-            'description' =>  __('Adds a email input', 'geodirectory')

-        ),

-        'select' => array(

-            'field_type'  =>  'select',

-            'class' =>  'gd-select',

-            'icon' =>  'fa fa-caret-square-o-down',

-            'name'  =>  __('Select', 'geodirectory'),

-            'description' =>  __('Adds a select input', 'geodirectory')

-        ),

-        'multiselect' => array(

-            'field_type'  =>  'multiselect',

-            'class' =>  'gd-multiselect',

-            'icon' =>  'fa fa-caret-square-o-down',

-            'name'  =>  __('Multi Select', 'geodirectory'),

-            'description' =>  __('Adds a multiselect input', 'geodirectory')

-        ),

-        'url' => array(

-            'field_type'  =>  'url',

-            'class' =>  'gd-url',

-            'icon' =>  'fa fa-link',

-            'name'  =>  __('URL', 'geodirectory'),

-            'description' =>  __('Adds a url input', 'geodirectory')

-        ),

-        'html' => array(

-            'field_type'  =>  'html',

-            'class' =>  'gd-html',

-            'icon' =>  'fa fa-code',

-            'name'  =>  __('HTML', 'geodirectory'),

-            'description' =>  __('Adds a html input textarea', 'geodirectory')

-        ),

-        'file' => array(

-            'field_type'  =>  'file',

-            'class' =>  'gd-file',

-            'icon' =>  'fa fa-file',

-            'name'  =>  __('File Upload', 'geodirectory'),

-            'description' =>  __('Adds a file input', 'geodirectory')

-        )

-    );

-

-    /**

-     * Filter the custom fields array to be able to add or remove items.

-     * 

-     * @since 1.6.6

-     *

-     * @param array $custom_fields {

-     *     The custom fields array to be filtered.

-     *

-     *     @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file.

-     *     @type string $class The class for the field in backend.

-     *     @type string $icon Can be font-awesome class name or icon image url.

-     *     @type string $name The name of the field.

-     *     @type string $description A short description about the field.

-     *     @type array $defaults {

-     *                    Optional. Used to set the default value of the field.

-     *

-     *                    @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE

-     *                    @type int decimal_point limit if using FLOAT data_type

-     *                    @type string admin_title The admin title for the field.

-     *                    @type string site_title This will be the title for the field on the frontend.

-     *                    @type string admin_desc This will be shown below the field on the add listing form.

-     *                    @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.

-     *                    @type bool is_active If false the field will not be displayed anywhere.

-     *                    @type bool for_admin_use If true then only site admin can see and edit this field.

-     *                    @type string default_value The default value for the input on the add listing page.

-     *                    @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble]

-     *                    @type bool is_required If true the field will be required on the add listing page.

-     *                    @type string option_values The option values for select and multiselect only

-     *                    @type string validation_pattern HTML5 validation pattern (text input only by default).

-     *                    @type string validation_msg HTML5 validation message (text input only by default).

-     *                    @type string required_msg Required warning message.

-     *                    @type string field_icon Icon url or font awesome class.

-     *                    @type string css_class Field custom css class for field custom style.

-     *                    @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option.

-     *                    @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required)

-     *     }

-     * }

-     * @param string $post_type The post type requested.

-     */

-    return apply_filters('geodir_custom_fields',$custom_fields,$post_type);

+	$custom_fields = array(

+		'text' => array(

+			'field_type'  =>  'text',

+			'class' =>  'gd-text',

+			'icon'  =>  'fa fa-minus',

+			'name'  =>  __('Text', 'geodirectory'),

+			'description' =>  __('Add any sort of text field, text or numbers', 'geodirectory')

+		),

+		'datepicker' => array(

+			'field_type'  =>  'datepicker',

+			'class' =>  'gd-datepicker',

+			'icon'  =>  'fa fa-calendar',

+			'name'  =>  __('Date', 'geodirectory'),

+			'description' =>  __('Adds a date picker.', 'geodirectory')

+		),

+		'textarea' => array(

+			'field_type'  =>  'textarea',

+			'class' =>  'gd-textarea',

+			'icon'  =>  'fa fa-bars',

+			'name'  =>  __('Textarea', 'geodirectory'),

+			'description' =>  __('Adds a textarea', 'geodirectory')

+		),

+		'time' => array(

+			'field_type'  =>  'time',

+			'class' =>  'gd-time',

+			'icon' =>  'fa fa-clock-o',

+			'name'  =>  __('Time', 'geodirectory'),

+			'description' =>  __('Adds a time picker', 'geodirectory')

+		),

+		'checkbox' => array(

+			'field_type'  =>  'checkbox',

+			'class' =>  'gd-checkbox',

+			'icon' =>  'fa fa-check-square-o',

+			'name'  =>  __('Checkbox', 'geodirectory'),

+			'description' =>  __('Adds a checkbox', 'geodirectory')

+		),

+		'phone' => array(

+			'field_type'  =>  'phone',

+			'class' =>  'gd-phone',

+			'icon' =>  'fa fa-phone',

+			'name'  =>  __('Phone', 'geodirectory'),

+			'description' =>  __('Adds a phone input', 'geodirectory')

+		),

+		'radio' => array(

+			'field_type'  =>  'radio',

+			'class' =>  'gd-radio',

+			'icon' =>  'fa fa-dot-circle-o',

+			'name'  =>  __('Radio', 'geodirectory'),

+			'description' =>  __('Adds a radio input', 'geodirectory')

+		),

+		'email' => array(

+			'field_type'  =>  'email',

+			'class' =>  'gd-email',

+			'icon' =>  'fa fa-envelope-o',

+			'name'  =>  __('Email', 'geodirectory'),

+			'description' =>  __('Adds a email input', 'geodirectory')

+		),

+		'select' => array(

+			'field_type'  =>  'select',

+			'class' =>  'gd-select',

+			'icon' =>  'fa fa-caret-square-o-down',

+			'name'  =>  __('Select', 'geodirectory'),

+			'description' =>  __('Adds a select input', 'geodirectory')

+		),

+		'multiselect' => array(

+			'field_type'  =>  'multiselect',

+			'class' =>  'gd-multiselect',

+			'icon' =>  'fa fa-caret-square-o-down',

+			'name'  =>  __('Multi Select', 'geodirectory'),

+			'description' =>  __('Adds a multiselect input', 'geodirectory')

+		),

+		'url' => array(

+			'field_type'  =>  'url',

+			'class' =>  'gd-url',

+			'icon' =>  'fa fa-link',

+			'name'  =>  __('URL', 'geodirectory'),

+			'description' =>  __('Adds a url input', 'geodirectory')

+		),

+		'html' => array(

+			'field_type'  =>  'html',

+			'class' =>  'gd-html',

+			'icon' =>  'fa fa-code',

+			'name'  =>  __('HTML', 'geodirectory'),

+			'description' =>  __('Adds a html input textarea', 'geodirectory')

+		),

+		'file' => array(

+			'field_type'  =>  'file',

+			'class' =>  'gd-file',

+			'icon' =>  'fa fa-file',

+			'name'  =>  __('File Upload', 'geodirectory'),

+			'description' =>  __('Adds a file input', 'geodirectory')

+		)

+	);

+

+	/**

+	 * Filter the custom fields array to be able to add or remove items.

+	 * 

+	 * @since 1.6.6

+	 *

+	 * @param array $custom_fields {

+	 *     The custom fields array to be filtered.

+	 *

+	 *     @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file.

+	 *     @type string $class The class for the field in backend.

+	 *     @type string $icon Can be font-awesome class name or icon image url.

+	 *     @type string $name The name of the field.

+	 *     @type string $description A short description about the field.

+	 *     @type array $defaults {

+	 *                    Optional. Used to set the default value of the field.

+	 *

+	 *                    @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE

+	 *                    @type int decimal_point limit if using FLOAT data_type

+	 *                    @type string admin_title The admin title for the field.

+	 *                    @type string site_title This will be the title for the field on the frontend.

+	 *                    @type string admin_desc This will be shown below the field on the add listing form.

+	 *                    @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.

+	 *                    @type bool is_active If false the field will not be displayed anywhere.

+	 *                    @type bool for_admin_use If true then only site admin can see and edit this field.

+	 *                    @type string default_value The default value for the input on the add listing page.

+	 *                    @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble]

+	 *                    @type bool is_required If true the field will be required on the add listing page.

+	 *                    @type string option_values The option values for select and multiselect only

+	 *                    @type string validation_pattern HTML5 validation pattern (text input only by default).

+	 *                    @type string validation_msg HTML5 validation message (text input only by default).

+	 *                    @type string required_msg Required warning message.

+	 *                    @type string field_icon Icon url or font awesome class.

+	 *                    @type string css_class Field custom css class for field custom style.

+	 *                    @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option.

+	 *                    @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required)

+	 *     }

+	 * }

+	 * @param string $post_type The post type requested.

+	 */

+	return apply_filters('geodir_custom_fields',$custom_fields,$post_type);

 }

 

 /**

@@ -698,19 +698,19 @@ 
  */

 function geodir_custom_available_fields($type='')

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" />

 

         <?php

-        if($type=='predefined'){

-            $cfs = geodir_custom_fields_predefined($listing_type);

-        }elseif($type=='custom'){

-            $cfs = geodir_custom_fields_custom($listing_type);

-        }else{

-            $cfs = geodir_custom_fields($listing_type);

-            ?>

+		if($type=='predefined'){

+			$cfs = geodir_custom_fields_predefined($listing_type);

+		}elseif($type=='custom'){

+			$cfs = geodir_custom_fields_custom($listing_type);

+		}else{

+			$cfs = geodir_custom_fields($listing_type);

+			?>

             <ul class="full gd-cf-tooltip-wrap">

                 <li>

                     <div class="gdcf-tooltip">

@@ -731,18 +731,18 @@ 
             </ul>

 

             <?php

-        }

+		}

 

-    if(!empty($cfs)) {

-        echo '<ul>';

-        foreach ( $cfs as $id => $cf ) {

-            ?>

+	if(!empty($cfs)) {

+		echo '<ul>';

+		foreach ( $cfs as $id => $cf ) {

+			?>

 

             <li class="gd-cf-tooltip-wrap">

                 <?php

-                if ( isset( $cf['description'] ) && $cf['description'] ) {

-                    echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';

-                } ?>

+				if ( isset( $cf['description'] ) && $cf['description'] ) {

+					echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';

+				} ?>

 

                 <a id="gd-<?php echo $id; ?>"

                    data-field-custom-type="<?php echo $type; ?>"

@@ -752,21 +752,21 @@ 
                    href="javascript:void(0);">

 

                     <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {

-                        echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';

-                    } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {

-                        echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';

-                    } else {

-                        echo '<i class="fa fa-cog" aria-hidden="true"></i>';

-                    } ?>

+						echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';

+					} elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {

+						echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';

+					} else {

+						echo '<i class="fa fa-cog" aria-hidden="true"></i>';

+					} ?>

                     <?php echo $cf['name']; ?>

                 </a>

             </li>

             <?php

-        }

-    }else{

-        _e('There are no custom fields here yet.', 'geodirectory');

-    }

-        ?>

+		}

+	}else{

+		_e('There are no custom fields here yet.', 'geodirectory');

+	}

+		?>

 

 

     </ul>

@@ -785,26 +785,26 @@ 
  */

 function geodir_custom_selected_fields()

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul class="core">

     <?php 

-        global $wpdb;

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

-

-        if (!empty($fields)) {

-            foreach ($fields as $field) {

-                //$result_str = $field->id;

-                $result_str = $field;

-                $field_type = $field->field_type;

-                $field_type_key = $field->field_type_key;

-                $field_ins_upd = 'display';

-

-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);

-            }

-        }

-        ?></ul>

+		global $wpdb;

+		$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

+

+		if (!empty($fields)) {

+			foreach ($fields as $field) {

+				//$result_str = $field->id;

+				$result_str = $field;

+				$field_type = $field->field_type;

+				$field_type_key = $field->field_type_key;

+				$field_ins_upd = 'display';

+

+				geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);

+			}

+		}

+		?></ul>

 <?php

 

 }

@@ -823,16 +823,16 @@ 
 function geodir_custom_fields_panel_head($heading, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

+			break;

 

-        case 'sorting_options':

-            $heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

-            break;

-    }

-    return $heading;

+		case 'sorting_options':

+			$heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

+			break;

+	}

+	return $heading;

 }

 

 

@@ -850,16 +850,16 @@ 
 function geodir_cf_panel_available_fields_head($heading, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

+			break;

 

-        case 'sorting_options':

-            $heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

-            break;

-    }

-    return $heading;

+		case 'sorting_options':

+			$heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

+			break;

+	}

+	return $heading;

 }

 

 

@@ -877,16 +877,16 @@ 
 function geodir_cf_panel_available_fields_note($note, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

+			break;

 

-        case 'sorting_options':

-            $note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

-            break;

-    }

-    return $note;

+		case 'sorting_options':

+			$note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

+			break;

+	}

+	return $note;

 }

 

 

@@ -904,16 +904,16 @@ 
 function geodir_cf_panel_selected_fields_head($heading, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

+			break;

 

-        case 'sorting_options':

-            $heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

-            break;

-    }

-    return $heading;

+		case 'sorting_options':

+			$heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

+			break;

+	}

+	return $heading;

 }

 

 

@@ -931,16 +931,16 @@ 
 function geodir_cf_panel_selected_fields_note($note, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

+			break;

 

-        case 'sorting_options':

-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

-            break;

-    }

-    return $note;

+		case 'sorting_options':

+			$note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));

+			break;

+	}

+	return $note;

 }

 

 

@@ -956,16 +956,16 @@ 
  */

 function geodir_remove_unnecessary_fields()

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if (!get_option('geodir_remove_unnecessary_fields')) {

+	if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+		if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

+			$wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

 

-        update_option('geodir_remove_unnecessary_fields', '1');

+		update_option('geodir_remove_unnecessary_fields', '1');

 

-    }

+	}

 

 }

 

@@ -983,28 +983,28 @@ 
  */

 function geodir_admin_ajax_handler()

 {

-    if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {

-        $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];

-        $diagnose_this = "";

-        switch ($geodir_admin_ajax_action) {

-            case 'diagnosis' :

-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                    call_user_func('geodir_diagnose_' . $diagnose_this);

-

-                }

-                exit();

-                break;

-

-            case 'diagnosis-fix' :

-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

-                exit();

-                break;

-        }

-    }

-    exit();

+	if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {

+		$geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];

+		$diagnose_this = "";

+		switch ($geodir_admin_ajax_action) {

+			case 'diagnosis' :

+				if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {

+					$diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+					call_user_func('geodir_diagnose_' . $diagnose_this);

+

+				}

+				exit();

+				break;

+

+			case 'diagnosis-fix' :

+				if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

+					$diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+				call_user_func('geodir_diagnose_' . $diagnose_this);

+				exit();

+				break;

+		}

+	}

+	exit();

 }

 

 

@@ -1022,127 +1022,127 @@ 
  */

 function geodir_diagnose_multisite_table($filter_arr, $table, $tabel_name, $fix)

 {

-    global $wpdb;

-    //$filter_arr['output_str'] .='###'.$table.'###';

-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count

-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count

-

-            if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2

-                //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;

-

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table

-

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

-                }

-

-            } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it

-

-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table

-

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

-                }

-

-            } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors

-

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2

-

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

-                }

-

-            }

-

-        }

-

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

-                if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

-                }

-

-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

-                }

-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-                }

-            } else {// else rename the original table to _ms_bak

-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

-                }

-            }

-        }

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            // if original table exists but new does not, rename

-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-            } else {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-            }

-

-        }

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            // if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run;

-            delete_option('geodirlocation_db_version');

-            delete_option('geodirevents_db_version');

-            delete_option('geodir_reviewrating_db_version');

-            delete_option('gdevents_db_version');

-            delete_option('geodirectory_db_version');

-            delete_option('geodirclaim_db_version');

-            delete_option('geodir_custom_posts_db_version');

-            delete_option('geodir_reviewratings_db_version');

-            delete_option('geodiradvancesearch_db_version');

-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

-        }

-

-    } else {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

-    }

-    return $filter_arr;

+	global $wpdb;

+	//$filter_arr['output_str'] .='###'.$table.'###';

+	if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

+		$filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+		$filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			$ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count

+			$new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count

+

+			if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2

+				//$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;

+

+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table

+

+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+				}

+

+			} elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it

+

+				$wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2

+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table

+

+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+				}

+

+			} elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors

+

+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2

+

+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+				}

+

+			}

+

+		}

+

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

+				if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

+				}

+

+			} elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

+				if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+				}

+				if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+				}

+			} else {// else rename the original table to _ms_bak

+				if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+				}

+			}

+		}

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			// if original table exists but new does not, rename

+			if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+				$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+			} else {

+				$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+			}

+

+		}

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			// if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run;

+			delete_option('geodirlocation_db_version');

+			delete_option('geodirevents_db_version');

+			delete_option('geodir_reviewrating_db_version');

+			delete_option('gdevents_db_version');

+			delete_option('geodirectory_db_version');

+			delete_option('geodirclaim_db_version');

+			delete_option('geodir_custom_posts_db_version');

+			delete_option('geodir_reviewratings_db_version');

+			delete_option('geodiradvancesearch_db_version');

+			$filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

+		}

+

+	} else {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

+	}

+	return $filter_arr;

 }

 

 

@@ -1156,111 +1156,111 @@ 
  */

 function geodir_diagnose_tags_sync()

 {

-    global $wpdb, $plugin_prefix;

-    $fix = isset($_POST['fix']) ? true : false;

-    $step = isset($_POST['step']) ? strip_tags(esc_sql($_POST['step'])) : 0;

-    $step_max_items = geodir_get_diagnose_step_max_items();

-    $offset = (int) $step * $step_max_items;

-    $ptype = isset($_POST['ptype']) ? strip_tags(esc_sql($_POST['ptype'])) : false;

-

-    $total_listings = geodir_total_listings_count();

-    $total_ptype_listings = 0;

-    if ($ptype) {

-        $total_ptype_listings = geodir_total_listings_count($ptype);

-    }

-    $max_step = ceil($total_ptype_listings / $step_max_items) - 1;

+	global $wpdb, $plugin_prefix;

+	$fix = isset($_POST['fix']) ? true : false;

+	$step = isset($_POST['step']) ? strip_tags(esc_sql($_POST['step'])) : 0;

+	$step_max_items = geodir_get_diagnose_step_max_items();

+	$offset = (int) $step * $step_max_items;

+	$ptype = isset($_POST['ptype']) ? strip_tags(esc_sql($_POST['ptype'])) : false;

+

+	$total_listings = geodir_total_listings_count();

+	$total_ptype_listings = 0;

+	if ($ptype) {

+		$total_ptype_listings = geodir_total_listings_count($ptype);

+	}

+	$max_step = ceil($total_ptype_listings / $step_max_items) - 1;

     

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

     

-    if ($ptype && !empty($ptype) && $total_listings > $step_max_items) {

-        $stepped_process = true;

-    } else {

-        $stepped_process = false;

-    }

-

-    if ($stepped_process) {

-        $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset );

-        $posts = $wpdb->get_results( $sql );

-

-        if (!empty($posts)) {

-

-            foreach ($posts as $p) {

-                $p->post_type = $ptype;

-                $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

-                if (empty($raw_tags)) {

-                    $post_tags = '';

-                } else {

-                    $post_tags = implode(",", $raw_tags);

-                }

-                $tablename = $plugin_prefix . $p->post_type . '_detail';

-                $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

-

-            }

-            if ($step >= $max_step) {

-                $output_str = "done";    

-            } else {

-                $output_str = $step + 1;

-            }

-        }

-

-    } else {

-        $all_postypes = geodir_get_posttypes();

-

-        if (!empty($all_postypes)) {

-            foreach ($all_postypes as $key) {

-                // update each GD CPT

-                $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail");

-

-                if (!empty($posts)) {

-

-                    foreach ($posts as $p) {

-                        $p->post_type = $key;

-                        $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

-                        if (empty($raw_tags)) {

-                            $post_tags = '';

-                        } else {

-                            $post_tags = implode(",", $raw_tags);

-                        }

-                        $tablename = $plugin_prefix . $p->post_type . '_detail';

-                        $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

-

-                    }

-                    $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

-                }

-

-            }

-

-        }

-    }

-

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-

-    if ($stepped_process) {

-        $percent = ($step/$max_step) * 100;

-        if ($output_str == 'done') {

-            echo $output_str;

-        } else {

-            $output = array(

-                'step' => $output_str,

-                'percent' => $percent

-            );

-            echo json_encode($output);

-        }

-    } else {

-        echo "<ul class='$info_div_class'>";

-        echo $output_str;

-        echo $fix_button_txt;

-        echo "</ul>";

-    }

+	if ($ptype && !empty($ptype) && $total_listings > $step_max_items) {

+		$stepped_process = true;

+	} else {

+		$stepped_process = false;

+	}

+

+	if ($stepped_process) {

+		$sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset );

+		$posts = $wpdb->get_results( $sql );

+

+		if (!empty($posts)) {

+

+			foreach ($posts as $p) {

+				$p->post_type = $ptype;

+				$raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+				if (empty($raw_tags)) {

+					$post_tags = '';

+				} else {

+					$post_tags = implode(",", $raw_tags);

+				}

+				$tablename = $plugin_prefix . $p->post_type . '_detail';

+				$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+

+			}

+			if ($step >= $max_step) {

+				$output_str = "done";    

+			} else {

+				$output_str = $step + 1;

+			}

+		}

+

+	} else {

+		$all_postypes = geodir_get_posttypes();

+

+		if (!empty($all_postypes)) {

+			foreach ($all_postypes as $key) {

+				// update each GD CPT

+				$posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail");

+

+				if (!empty($posts)) {

+

+					foreach ($posts as $p) {

+						$p->post_type = $key;

+						$raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+						if (empty($raw_tags)) {

+							$post_tags = '';

+						} else {

+							$post_tags = implode(",", $raw_tags);

+						}

+						$tablename = $plugin_prefix . $p->post_type . '_detail';

+						$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+

+					}

+					$output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+				}

+

+			}

+

+		}

+	}

+

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+

+	if ($stepped_process) {

+		$percent = ($step/$max_step) * 100;

+		if ($output_str == 'done') {

+			echo $output_str;

+		} else {

+			$output = array(

+				'step' => $output_str,

+				'percent' => $percent

+			);

+			echo json_encode($output);

+		}

+	} else {

+		echo "<ul class='$info_div_class'>";

+		echo $output_str;

+		echo $fix_button_txt;

+		echo "</ul>";

+	}

 }

 

 /**

@@ -1275,75 +1275,75 @@ 
  */

 function geodir_diagnose_cats_sync()

 {

-    global $wpdb, $plugin_prefix;

-    $fix = isset($_POST['fix']) ? true : false;

+	global $wpdb, $plugin_prefix;

+	$fix = isset($_POST['fix']) ? true : false;

 

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

 

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			$posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

 

-            if (!empty($posts)) {

+			if (!empty($posts)) {

 

-                foreach ($posts as $p) {

-                    $p->post_type = $key;

-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

+				foreach ($posts as $p) {

+					$p->post_type = $key;

+					$raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

 

-                    if (empty($raw_cats)) {

-                        $post_categories = get_post_meta($p->post_id, 'post_categories', true);

+					if (empty($raw_cats)) {

+						$post_categories = get_post_meta($p->post_id, 'post_categories', true);

 

-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

-                            $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);

-                            foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {

-                                if (is_numeric($cat_part)) {

-                                    $raw_cats[] = (int)$cat_part;

-                                }

-                            }

+						if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

+							$post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);

+							foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {

+								if (is_numeric($cat_part)) {

+									$raw_cats[] = (int)$cat_part;

+								}

+							}

 

-                        }

+						}

 

-                        if (!empty($raw_cats)) {

-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

+						if (!empty($raw_cats)) {

+							$term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

 

-                        }

+						}

 

-                    }

+					}

 

 

-                    if (empty($raw_cats)) {

-                        $post_cats = '';

-                    } else {

-                        $post_cats = ',' . implode(",", $raw_cats) . ',';

-                    }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

-                }

+					if (empty($raw_cats)) {

+						$post_cats = '';

+					} else {

+						$post_cats = ',' . implode(",", $raw_cats) . ',';

+					}

+					$tablename = $plugin_prefix . $p->post_type . '_detail';

+					$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

+				}

 

-            }

-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+			}

+			$output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

 

-        }

+		}

 

-    }

+	}

 

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1357,61 +1357,61 @@ 
  */

 function geodir_diagnose_version_clear()

 {

-    global $wpdb, $plugin_prefix;

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-

-    $gd_arr = array('GeoDirectory' => 'geodirectory_db_version',

-        'Payment Manager' => 'geodir_payments_db_version',

-        'GeoDirectory Framework' => 'gdf_db_version',

-        'Advanced Search' => 'geodiradvancesearch_db_version',

-        'Review Rating Manager' => 'geodir_reviewratings_db_version',

-        'Claim Manager' => 'geodirclaim_db_version',

-        'CPT Manager' => 'geodir_custom_posts_db_version',

-        'Location Manager' => 'geodirlocation_db_version',

-        'Payment Manager' => 'geodir_payments_db_version',

-        'Events Manager' => 'geodirevents_db_version',

-    );

-

-    /**

-     * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers.

-     *

-     * @since 1.0.0

-     * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...

-     */

-    $ver_arr = apply_filters('geodir_db_version_name', $gd_arr);

-

-    if (!empty($ver_arr)) {

-        foreach ($ver_arr as $key => $val) {

-            if (delete_option($val)) {

-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

-            } else {

-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

-            }

-

-        }

-

-        if ($output_str) {

-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

-        }

-

-    }

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb, $plugin_prefix;

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+

+	$gd_arr = array('GeoDirectory' => 'geodirectory_db_version',

+		'Payment Manager' => 'geodir_payments_db_version',

+		'GeoDirectory Framework' => 'gdf_db_version',

+		'Advanced Search' => 'geodiradvancesearch_db_version',

+		'Review Rating Manager' => 'geodir_reviewratings_db_version',

+		'Claim Manager' => 'geodirclaim_db_version',

+		'CPT Manager' => 'geodir_custom_posts_db_version',

+		'Location Manager' => 'geodirlocation_db_version',

+		'Payment Manager' => 'geodir_payments_db_version',

+		'Events Manager' => 'geodirevents_db_version',

+	);

+

+	/**

+	 * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers.

+	 *

+	 * @since 1.0.0

+	 * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...

+	 */

+	$ver_arr = apply_filters('geodir_db_version_name', $gd_arr);

+

+	if (!empty($ver_arr)) {

+		foreach ($ver_arr as $key => $val) {

+			if (delete_option($val)) {

+				$output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

+			} else {

+				$output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

+			}

+

+		}

+

+		if ($output_str) {

+			$output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

+		}

+

+	}

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1425,59 +1425,59 @@ 
  */

 function geodir_diagnose_ratings()

 {

-    global $wpdb;

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-    // check review locations

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

-        $is_error_during_diagnose = true;

-

-        if ($fix) {

-            if (geodir_fix_review_location()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-

-    } else {

-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

-    }

-

-    // check review content

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

-        $is_error_during_diagnose = true;

-

-        if ($fix) {

-            if (geodir_fix_review_content()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-

-    } else {

-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

-    }

-

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb;

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+	// check review locations

+	if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

+		$output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

+		$is_error_during_diagnose = true;

+

+		if ($fix) {

+			if (geodir_fix_review_location()) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+

+	} else {

+		$output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

+	}

+

+	// check review content

+	if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

+		$output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

+		$is_error_during_diagnose = true;

+

+		if ($fix) {

+			if (geodir_fix_review_content()) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+

+	} else {

+		$output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

+	}

+

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1491,57 +1491,57 @@ 
  */

 function geodir_diagnose_multisite_conversion()

 {

-    global $wpdb;

-    $fix = isset($_POST['fix']) ? true : false;

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-    $filter_arr = array();

-    $filter_arr['output_str'] = $output_str;

-    $filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose;

-    $table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),

-        'geodir_custom_fields' => __('Custom fields', 'geodirectory'),

-        'geodir_post_icon' => __('Post icon', 'geodirectory'),

-        'geodir_attachments' => __('Attachments', 'geodirectory'),

-        'geodir_post_review' => __('Reviews', 'geodirectory'),

-        'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),

-        'geodir_gd_place_detail' => __('Place detail', 'geodirectory')

-    );

-

-    // allow other addons to hook in and add their checks

-

-    /**

-     * Filter the array of tables.

-     *

-     * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks.

-     *

-     * @since 1.0.0

-     * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...

-     */

-    $table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);

-

-    foreach ($table_arr as $table => $table_name) {

-        // Diagnose table

-        $filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix);

-    }

-

-

-    $output_str = $filter_arr['output_str'];

-    $is_error_during_diagnose = $filter_arr['is_error_during_diagnose'];

-

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb;

+	$fix = isset($_POST['fix']) ? true : false;

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+	$filter_arr = array();

+	$filter_arr['output_str'] = $output_str;

+	$filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose;

+	$table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),

+		'geodir_custom_fields' => __('Custom fields', 'geodirectory'),

+		'geodir_post_icon' => __('Post icon', 'geodirectory'),

+		'geodir_attachments' => __('Attachments', 'geodirectory'),

+		'geodir_post_review' => __('Reviews', 'geodirectory'),

+		'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),

+		'geodir_gd_place_detail' => __('Place detail', 'geodirectory')

+	);

+

+	// allow other addons to hook in and add their checks

+

+	/**

+	 * Filter the array of tables.

+	 *

+	 * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks.

+	 *

+	 * @since 1.0.0

+	 * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...

+	 */

+	$table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);

+

+	foreach ($table_arr as $table => $table_name) {

+		// Diagnose table

+		$filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix);

+	}

+

+

+	$output_str = $filter_arr['output_str'];

+	$is_error_during_diagnose = $filter_arr['is_error_during_diagnose'];

+

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 }

 

 /**

@@ -1559,39 +1559,39 @@ 
  */

 function geodir_fix_virtual_page($slug, $page_title, $old_id, $option)

 {

-    global $wpdb, $current_user;

-

-    if (!empty($old_id)) {

-        wp_delete_post($old_id, true);

-    }//delete post if already there

-    else {

-        $page_found = $wpdb->get_var(

-            $wpdb->prepare(

-                "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

-                array($slug)

-            )

-        );

-        wp_delete_post($page_found, true);

-

-    }

-

-    $page_data = array(

-        'post_status' => 'publish',

-        'post_type' => 'page',

-        'post_author' => $current_user->ID,

-        'post_name' => $slug,

-        'post_title' => $page_title,

-        'post_content' => '',

-        'post_parent' => 0,

-        'comment_status' => 'closed'

-    );

-    $page_id = wp_insert_post($page_data);

-    update_option($option, $page_id);

-    if ($page_id) {

-        return true;

-    } else {

-        return false;

-    }

+	global $wpdb, $current_user;

+

+	if (!empty($old_id)) {

+		wp_delete_post($old_id, true);

+	}//delete post if already there

+	else {

+		$page_found = $wpdb->get_var(

+			$wpdb->prepare(

+				"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+				array($slug)

+			)

+		);

+		wp_delete_post($page_found, true);

+

+	}

+

+	$page_data = array(

+		'post_status' => 'publish',

+		'post_type' => 'page',

+		'post_author' => $current_user->ID,

+		'post_name' => $slug,

+		'post_title' => $page_title,

+		'post_content' => '',

+		'post_parent' => 0,

+		'comment_status' => 'closed'

+	);

+	$page_id = wp_insert_post($page_data);

+	update_option($option, $page_id);

+	if ($page_id) {

+		return true;

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -1603,212 +1603,212 @@ 
  */

 function geodir_diagnose_default_pages()

 {

-    global $wpdb;

-    $is_error_during_diagnose = false;

-    $output_str = '';

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //////////////////////////////////

-    /* Diagnose GD Home Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_home_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose GD Home Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Add Listing Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_add_listing_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Add Listing Page Ends */

-    ////////////////////////////////

-

-

-    //////////////////////////////////

-    /* Diagnose Listing Preview Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_preview_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Listing Preview Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Listing Success Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_success_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Listing Sucess Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Info Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_info_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Info Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Login Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_login_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Info Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Location Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_location_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Location Page Ends */

-    ////////////////////////////////

-

-    $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );

-    /**

-     * This action is called at the end of the GD Tools page check function.

-     *

-     * @since 1.5.2

-     */

-    $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);

-

-    $output_str = $page_chk_arr['output_str'];

-    $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

-

-    if ($is_error_during_diagnose) {

-        if ($fix) {

-            flush_rewrite_rules();

-        }

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb;

+	$is_error_during_diagnose = false;

+	$output_str = '';

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//////////////////////////////////

+	/* Diagnose GD Home Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_home_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose GD Home Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Add Listing Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_add_listing_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Add Listing Page Ends */

+	////////////////////////////////

+

+

+	//////////////////////////////////

+	/* Diagnose Listing Preview Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_preview_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Listing Preview Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Listing Success Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_success_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Listing Sucess Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Info Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_info_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Info Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Login Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_login_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Info Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Location Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_location_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Location Page Ends */

+	////////////////////////////////

+

+	$page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );

+	/**

+	 * This action is called at the end of the GD Tools page check function.

+	 *

+	 * @since 1.5.2

+	 */

+	$page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);

+

+	$output_str = $page_chk_arr['output_str'];

+	$is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

+

+	if ($is_error_during_diagnose) {

+		if ($fix) {

+			flush_rewrite_rules();

+		}

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1820,26 +1820,26 @@ 
  * @global object $wpdb WordPress Database object.

  */

 function geodir_diagnose_load_db_language() {

-    global $wpdb;

+	global $wpdb;

 	

 	$is_error_during_diagnose = geodirectory_load_db_language();

 

-    $output_str = '';

-    $fix_button_txt = '';

+	$output_str = '';

+	$fix_button_txt = '';

 

-    if ($is_error_during_diagnose) {

-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

+	if ($is_error_during_diagnose) {

+		$output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

 		$info_div_class = "geodir_problem_info";

-    } else {

-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

+	} else {

+		$output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

 		$info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

+		$fix_button_txt = '';

+	}

     

 	echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1870,23 +1870,23 @@ 
  */

 function geodir_posts_clauses_request($clauses)

 {

-    global $wpdb, $wp_query, $plugin_prefix;

+	global $wpdb, $wp_query, $plugin_prefix;

 

-    if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

+	if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

+		$table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

 

-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

-        $clauses['join'] = $join;

+		$join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

+		$clauses['join'] = $join;

 

-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

-        $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

-        $clauses['fields'] = $fields;

+		$fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

+		$fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

+		$clauses['fields'] = $fields;

 

-        $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

-        $orderby = 'gd_expire ' . $order;

-        $clauses['orderby'] = $orderby;

-    }

-    return $clauses;

+		$order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

+		$orderby = 'gd_expire ' . $order;

+		$clauses['orderby'] = $orderby;

+	}

+	return $clauses;

 }

 

 

@@ -1907,7 +1907,7 @@ 
  */

 function gd_theme_switch_compat_check()

 {

-    gd_set_theme_compat();

+	gd_set_theme_compat();

 }

 

 /**

@@ -1920,27 +1920,27 @@ 
  */

 function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")

 {

-    if (function_exists('str_getcsv')) {

-        $fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape);

-    } else {

-        global $current_user;

-        $upload_dir = wp_upload_dir();

-

-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

-        $handle = fopen($file, 'w');

-

-        fwrite($handle, $input);

-        fclose($handle);

-

-        $handle = fopen($file, 'rt');

-        if (PHP_VERSION >= '5.3.0') {

-            $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape);

-        } else {

-            $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure);

-        }

-        fclose($handle);

-    }

-    return $fgetcsv;

+	if (function_exists('str_getcsv')) {

+		$fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape);

+	} else {

+		global $current_user;

+		$upload_dir = wp_upload_dir();

+

+		$file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

+		$handle = fopen($file, 'w');

+

+		fwrite($handle, $input);

+		fclose($handle);

+

+		$handle = fopen($file, 'rt');

+		if (PHP_VERSION >= '5.3.0') {

+			$fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape);

+		} else {

+			$fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure);

+		}

+		fclose($handle);

+	}

+	return $fgetcsv;

 }

 

 add_action('wp_ajax_gdImportCsv', 'geodir_ajax_import_csv');

@@ -1955,375 +1955,375 @@ 
  */

 function geodir_ajax_import_csv()

 {

-    error_reporting(0); // hide error to get clean json response

+	error_reporting(0); // hide error to get clean json response

 

-    global $wpdb, $plugin_prefix, $current_user;

-    $uploads = wp_upload_dir();

-    ini_set('auto_detect_line_endings', true);

+	global $wpdb, $plugin_prefix, $current_user;

+	$uploads = wp_upload_dir();

+	ini_set('auto_detect_line_endings', true);

 	

 	$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

 

-    $task = isset($_POST['task']) ? $_POST['task'] : '';

-    $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;

-    $filename = $uploadedFile;

-

-    $uploads = wp_upload_dir();

-    $uploads_dir = $uploads['path'];

-    $image_name_arr = explode('/', $filename);

-    $filename = end($image_name_arr);

-    $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-    $return = array();

-    $return['file'] = $uploadedFile;

-    $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

-

-    if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {

-        $wp_filetype = wp_check_filetype_and_ext($target_path, $filename);

-

-        if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

-            $return['error'] = NULL;

-

-            $return['rows'] = 0;

-

-

-

-                if (($handle = fopen($target_path, "r")) !== FALSE) {

-                    while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

-                        if(is_array($data) && !empty($data)) {

-                            $file[] = '"' . implode('","', $data) . '"';

-                        }

-                    }

-                    fclose($handle);

-                    $file = $file;

-                }

-

-

-

-                $return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

-

-

-            if (!$return['rows'] > 0) {

-                $return['error'] = __('No data found in csv file.', 'geodirectory');

-            }

-        }

-    }

-    if ($task == 'prepare' || !empty($return['error'])) {

-        echo json_encode($return);

-        exit;

-    }

-

-    $totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL;

-    $importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1;

-    $count = $importlimit;

-    $requested_limit = $importlimit;

-    $tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0;

-

-    if ($count < $totRecords) {

-        $count = $tmpCnt + $count;

-        if ($count > $totRecords) {

-            $count = $totRecords;

-        }

-    } else {

-        $count = $totRecords;

-    }

-

-    $total_records = 0;

-    $rowcount = 0;

-    $address_invalid = 0;

-    $blank_address = 0;

-    $upload_files = 0;

-    $invalid_post_type = 0;

-    $invalid_title = 0;

-    $customKeyarray = array();

-    $gd_post_info = array();

-    $post_location = array();

-    $countpost = 0;

-

-    if (!empty($file)) {

-        $columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL;

-        $customKeyarray = $columns;

-

-        if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-            $return['error'] = CSV_INVAILD_FILE;

-            echo json_encode($return);

-            exit;

-        }

-

-        for ($i = 1; $i <= $importlimit; $i++) {

-            $current_index = $tmpCnt + $i;

-            if (isset($file[$current_index])) {

-                $total_records++;

-

-                $buffer = geodir_str_getcsv($file[$current_index]);

-                $post_title = addslashes($buffer[0]);

-                $current_post_author = $buffer[1];

-                $post_desc = addslashes($buffer[2]);

-                $post_cat = array();

-                $catids_arr = array();

-                $post_cat = trim($buffer[3]); // comma seperated category name

-

-                if ($post_cat) {

-                    $post_cat_arr = explode(',', $post_cat);

-

-                    for ($c = 0; $c < count($post_cat_arr); $c++) {

-                        $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));

-

-                        if (!empty($buffer[5])) {

-                            if (in_array($buffer[5], geodir_get_posttypes())) {

-

-                                $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));

-

-                                if (get_term_by('name', $catid, $p_taxonomy[0])) {

-                                    $cat = get_term_by('name', $catid, $p_taxonomy[0]);

-                                    $catids_arr[] = $cat->slug;

-                                } else if (get_term_by('slug', $catid, $p_taxonomy[0])) {

-                                    $cat = get_term_by('slug', $catid, $p_taxonomy[0]);

-                                    $catids_arr[] = $cat->slug;

-                                } else {

-                                    $ret = wp_insert_term($catid, $p_taxonomy[0]);

-                                    if ($ret && !is_wp_error($ret)) {

-                                        if (get_term_by('name', $catid, $p_taxonomy[0])) {

-                                            $cat = get_term_by('name', $catid, $p_taxonomy[0]);

-                                            $catids_arr[] = $cat->slug;

-                                        } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {

-                                            $cat = get_term_by('slug', $catid, $p_taxonomy[0]);

-                                            $catids_arr[] = $cat->slug;

-                                        }

-                                    }

-                                }

-                            }

-                        }

-                    }

-                }

-

-                if (!$catids_arr) {

-                    $catids_arr[] = 1;

-                }

-

-                $post_tags = trim($buffer[4]); // comma seperated tags

-

-                $tag_arr = '';

-                if ($post_tags) {

-                    $tag_arr = explode(',', $post_tags);

-                }

-

-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

-

-                $error = '';

-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

-                    $invalid_post_type++;

-                    continue;

-                }

-

-                if ($post_title != '') {

-                    $menu_order = 0;

-                    $image_folder_name = 'uplaod/';

-

-                    $image_names = array();

-

-                    for ($c = 5; $c < count($customKeyarray); $c++) {

-                        $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);

-

-                        if ($customKeyarray[$c] == 'IMAGE') {

-                            $buffer[$c] = trim($buffer[$c]);

-

-                            if (!empty($buffer[$c])) {

-                                $image_names[] = $buffer[$c];

-                            }

-                        }

-

-                        if ($customKeyarray[$c] == 'alive_days') {

-                            if ($buffer[$c] != '0' && $buffer[$c] != '') {

-                                $submitdata = date('Y-m-d');

-

-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

-                            } else {

-                                $gd_post_info['expire_date'] = 'Never';

-                            }

-                        }

-

-                        if ($customKeyarray[$c] == 'post_city') {

-                            $post_city = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_region') {

-                            $post_region = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_country') {

-                            $post_country = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_latitude') {

-                            $post_latitude = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_longitude') {

-                            $post_longitude = addslashes($buffer[$c]);

-                        }

+	$task = isset($_POST['task']) ? $_POST['task'] : '';

+	$uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;

+	$filename = $uploadedFile;

+

+	$uploads = wp_upload_dir();

+	$uploads_dir = $uploads['path'];

+	$image_name_arr = explode('/', $filename);

+	$filename = end($image_name_arr);

+	$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+	$return = array();

+	$return['file'] = $uploadedFile;

+	$return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

+

+	if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {

+		$wp_filetype = wp_check_filetype_and_ext($target_path, $filename);

+

+		if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

+			$return['error'] = NULL;

+

+			$return['rows'] = 0;

+

+

+

+				if (($handle = fopen($target_path, "r")) !== FALSE) {

+					while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

+						if(is_array($data) && !empty($data)) {

+							$file[] = '"' . implode('","', $data) . '"';

+						}

+					}

+					fclose($handle);

+					$file = $file;

+				}

+

+

+

+				$return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

+

+

+			if (!$return['rows'] > 0) {

+				$return['error'] = __('No data found in csv file.', 'geodirectory');

+			}

+		}

+	}

+	if ($task == 'prepare' || !empty($return['error'])) {

+		echo json_encode($return);

+		exit;

+	}

+

+	$totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL;

+	$importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1;

+	$count = $importlimit;

+	$requested_limit = $importlimit;

+	$tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0;

+

+	if ($count < $totRecords) {

+		$count = $tmpCnt + $count;

+		if ($count > $totRecords) {

+			$count = $totRecords;

+		}

+	} else {

+		$count = $totRecords;

+	}

+

+	$total_records = 0;

+	$rowcount = 0;

+	$address_invalid = 0;

+	$blank_address = 0;

+	$upload_files = 0;

+	$invalid_post_type = 0;

+	$invalid_title = 0;

+	$customKeyarray = array();

+	$gd_post_info = array();

+	$post_location = array();

+	$countpost = 0;

+

+	if (!empty($file)) {

+		$columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL;

+		$customKeyarray = $columns;

+

+		if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+			$return['error'] = CSV_INVAILD_FILE;

+			echo json_encode($return);

+			exit;

+		}

+

+		for ($i = 1; $i <= $importlimit; $i++) {

+			$current_index = $tmpCnt + $i;

+			if (isset($file[$current_index])) {

+				$total_records++;

+

+				$buffer = geodir_str_getcsv($file[$current_index]);

+				$post_title = addslashes($buffer[0]);

+				$current_post_author = $buffer[1];

+				$post_desc = addslashes($buffer[2]);

+				$post_cat = array();

+				$catids_arr = array();

+				$post_cat = trim($buffer[3]); // comma seperated category name

+

+				if ($post_cat) {

+					$post_cat_arr = explode(',', $post_cat);

+

+					for ($c = 0; $c < count($post_cat_arr); $c++) {

+						$catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));

+

+						if (!empty($buffer[5])) {

+							if (in_array($buffer[5], geodir_get_posttypes())) {

+

+								$p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));

+

+								if (get_term_by('name', $catid, $p_taxonomy[0])) {

+									$cat = get_term_by('name', $catid, $p_taxonomy[0]);

+									$catids_arr[] = $cat->slug;

+								} else if (get_term_by('slug', $catid, $p_taxonomy[0])) {

+									$cat = get_term_by('slug', $catid, $p_taxonomy[0]);

+									$catids_arr[] = $cat->slug;

+								} else {

+									$ret = wp_insert_term($catid, $p_taxonomy[0]);

+									if ($ret && !is_wp_error($ret)) {

+										if (get_term_by('name', $catid, $p_taxonomy[0])) {

+											$cat = get_term_by('name', $catid, $p_taxonomy[0]);

+											$catids_arr[] = $cat->slug;

+										} elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {

+											$cat = get_term_by('slug', $catid, $p_taxonomy[0]);

+											$catids_arr[] = $cat->slug;

+										}

+									}

+								}

+							}

+						}

+					}

+				}

+

+				if (!$catids_arr) {

+					$catids_arr[] = 1;

+				}

+

+				$post_tags = trim($buffer[4]); // comma seperated tags

+

+				$tag_arr = '';

+				if ($post_tags) {

+					$tag_arr = explode(',', $post_tags);

+				}

+

+				$table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

+

+				$error = '';

+				if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

+					$invalid_post_type++;

+					continue;

+				}

+

+				if ($post_title != '') {

+					$menu_order = 0;

+					$image_folder_name = 'uplaod/';

+

+					$image_names = array();

+

+					for ($c = 5; $c < count($customKeyarray); $c++) {

+						$gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);

+

+						if ($customKeyarray[$c] == 'IMAGE') {

+							$buffer[$c] = trim($buffer[$c]);

+

+							if (!empty($buffer[$c])) {

+								$image_names[] = $buffer[$c];

+							}

+						}

+

+						if ($customKeyarray[$c] == 'alive_days') {

+							if ($buffer[$c] != '0' && $buffer[$c] != '') {

+								$submitdata = date('Y-m-d');

+

+								$gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

+							} else {

+								$gd_post_info['expire_date'] = 'Never';

+							}

+						}

+

+						if ($customKeyarray[$c] == 'post_city') {

+							$post_city = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_region') {

+							$post_region = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_country') {

+							$post_country = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_latitude') {

+							$post_latitude = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_longitude') {

+							$post_longitude = addslashes($buffer[$c]);

+						}

 						

 						// Post status

 						if ($customKeyarray[$c] == 'post_status') {

-                            $post_status = sanitize_key( $buffer[$c] );

-                        }

-                    }

-

-                    /* ================ before array create ============== */

-                    $location_result = geodir_get_default_location();

-                    if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {

-                        $blank_address++;

-                        continue;

-                    } else if ($location_result->location_id == 0) {

-                        if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {

-                            $address_invalid++;

-                            continue;

-                        }

-                    }

+							$post_status = sanitize_key( $buffer[$c] );

+						}

+					}

+

+					/* ================ before array create ============== */

+					$location_result = geodir_get_default_location();

+					if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {

+						$blank_address++;

+						continue;

+					} else if ($location_result->location_id == 0) {

+						if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {

+							$address_invalid++;

+							continue;

+						}

+					}

 					

 					// Default post status

 					$default_status = 'publish';

 					$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;

 

-                    $my_post['post_title'] = $post_title;

-                    $my_post['post_content'] = $post_desc;

-                    $my_post['post_type'] = addslashes($buffer[5]);

-                    $my_post['post_author'] = $current_post_author;

-                    $my_post['post_status'] = $post_status;

-                    $my_post['post_category'] = $catids_arr;

-                    $my_post['post_tags'] = $tag_arr;

-

-                    $gd_post_info['post_tags'] = $tag_arr;

-                    $gd_post_info['post_title'] = $post_title;

-                    $gd_post_info['post_status'] = $post_status;

-                    $gd_post_info['submit_time'] = time();

-                    $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];

-

-                    $last_postid = wp_insert_post($my_post);

-                    $countpost++;

-

-                    // Check if we need to save post location as new location

-                    if ($location_result->location_id > 0) {

-                        if (isset($post_city) && isset($post_region)) {

-                            $request_info['post_location'] = array(

-                                'city' => $post_city,

-                                'region' => $post_region,

-                                'country' => $post_country,

-                                'geo_lat' => $post_latitude,

-                                'geo_lng' => $post_longitude

-                            );

-

-                            $post_location_info = $request_info['post_location'];

-                            if ($location_id = geodir_add_new_location($post_location_info))

-                                $post_location_id = $location_id;

-                        } else {

-                            $post_location_id = 0;

-                        }

-                    } else {

-                        $post_location_id = 0;

-                    }

-

-                    /* ------- get default package info ----- */

-                    $payment_info = array();

-                    $package_info = array();

-

-                    $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);

-                    $package_id = '';

-                    if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {

-                        $package_id = $gd_post_info['package_id'];

-                    }

-

-                    if (!empty($package_info)) {

-                        $payment_info['package_id'] = $package_info['pid'];

-

-                        if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {

-                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));

-                        } else {

-                            $payment_info['expire_date'] = 'Never';

-                        }

-

-                        $gd_post_info = array_merge($gd_post_info, $payment_info);

-                    }

-

-                    $gd_post_info['post_location_id'] = $post_location_id;

-

-                    $post_type = get_post_type($last_postid);

-

-                    $table = $plugin_prefix . $post_type . '_detail';

-

-                    geodir_save_post_info($last_postid, $gd_post_info);

-

-                    if (!empty($image_names)) {

-                        $upload_files++;

-                        $menu_order = 1;

-

-                        foreach ($image_names as $image_name) {

-                            $img_name_arr = explode('.', $image_name);

-

-                            $uploads = wp_upload_dir();

-                            $sub_dir = $uploads['subdir'];

-

-                            $arr_file_type = wp_check_filetype($image_name);

-                            $uploaded_file_type = $arr_file_type['type'];

-

-                            $attachment = array();

-                            $attachment['post_id'] = $last_postid;

-                            $attachment['title'] = $img_name_arr[0];

-                            $attachment['content'] = '';

-                            $attachment['file'] = $sub_dir . '/' . $image_name;

-                            $attachment['mime_type'] = $uploaded_file_type;

-                            $attachment['menu_order'] = $menu_order;

-                            $attachment['is_featured'] = 0;

-

-                            $attachment_set = '';

-

-                            foreach ($attachment as $key => $val) {

-                                if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

-                            }

-                            $attachment_set = trim($attachment_set, ", ");

-

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

-

-                            if ($menu_order == 1) {

-                                $post_type = get_post_type($last_postid);

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

-                            }

-                            $menu_order++;

-                        }

-                    }

-

-                    $gd_post_info['package_id'] = $package_id;

-

-                    /** This action is documented in geodirectory-functions/post-functions.php */

-                    do_action('geodir_after_save_listing', $last_postid, $gd_post_info);

-

-                    if (!empty($buffer[5])) {

-                        if (in_array($buffer[5], geodir_get_posttypes())) {

-                            $taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));

-                            wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);

-                            wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);

-

-                            $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';

-                            $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';

-                            geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);

-                        }

-                    }

-                } else {

-                    $invalid_title++;

-                }

-            }

-        }

-    }

-    $return['rowcount'] = $countpost;

-    $return['invalidcount'] = $address_invalid;

-    $return['blank_address'] = $blank_address;

-    $return['upload_files'] = $upload_files;

-    $return['invalid_post_type'] = $invalid_post_type;

-    $return['invalid_title'] = $invalid_title;

-    $return['total_records'] = $total_records;

-

-    echo json_encode($return);

-    exit;

+					$my_post['post_title'] = $post_title;

+					$my_post['post_content'] = $post_desc;

+					$my_post['post_type'] = addslashes($buffer[5]);

+					$my_post['post_author'] = $current_post_author;

+					$my_post['post_status'] = $post_status;

+					$my_post['post_category'] = $catids_arr;

+					$my_post['post_tags'] = $tag_arr;

+

+					$gd_post_info['post_tags'] = $tag_arr;

+					$gd_post_info['post_title'] = $post_title;

+					$gd_post_info['post_status'] = $post_status;

+					$gd_post_info['submit_time'] = time();

+					$gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];

+

+					$last_postid = wp_insert_post($my_post);

+					$countpost++;

+

+					// Check if we need to save post location as new location

+					if ($location_result->location_id > 0) {

+						if (isset($post_city) && isset($post_region)) {

+							$request_info['post_location'] = array(

+								'city' => $post_city,

+								'region' => $post_region,

+								'country' => $post_country,

+								'geo_lat' => $post_latitude,

+								'geo_lng' => $post_longitude

+							);

+

+							$post_location_info = $request_info['post_location'];

+							if ($location_id = geodir_add_new_location($post_location_info))

+								$post_location_id = $location_id;

+						} else {

+							$post_location_id = 0;

+						}

+					} else {

+						$post_location_id = 0;

+					}

+

+					/* ------- get default package info ----- */

+					$payment_info = array();

+					$package_info = array();

+

+					$package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);

+					$package_id = '';

+					if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {

+						$package_id = $gd_post_info['package_id'];

+					}

+

+					if (!empty($package_info)) {

+						$payment_info['package_id'] = $package_info['pid'];

+

+						if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {

+							$payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));

+						} else {

+							$payment_info['expire_date'] = 'Never';

+						}

+

+						$gd_post_info = array_merge($gd_post_info, $payment_info);

+					}

+

+					$gd_post_info['post_location_id'] = $post_location_id;

+

+					$post_type = get_post_type($last_postid);

+

+					$table = $plugin_prefix . $post_type . '_detail';

+

+					geodir_save_post_info($last_postid, $gd_post_info);

+

+					if (!empty($image_names)) {

+						$upload_files++;

+						$menu_order = 1;

+

+						foreach ($image_names as $image_name) {

+							$img_name_arr = explode('.', $image_name);

+

+							$uploads = wp_upload_dir();

+							$sub_dir = $uploads['subdir'];

+

+							$arr_file_type = wp_check_filetype($image_name);

+							$uploaded_file_type = $arr_file_type['type'];

+

+							$attachment = array();

+							$attachment['post_id'] = $last_postid;

+							$attachment['title'] = $img_name_arr[0];

+							$attachment['content'] = '';

+							$attachment['file'] = $sub_dir . '/' . $image_name;

+							$attachment['mime_type'] = $uploaded_file_type;

+							$attachment['menu_order'] = $menu_order;

+							$attachment['is_featured'] = 0;

+

+							$attachment_set = '';

+

+							foreach ($attachment as $key => $val) {

+								if ($val != '')

+									$attachment_set .= $key . " = '" . $val . "', ";

+							}

+							$attachment_set = trim($attachment_set, ", ");

+

+							$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+

+							if ($menu_order == 1) {

+								$post_type = get_post_type($last_postid);

+								$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

+							}

+							$menu_order++;

+						}

+					}

+

+					$gd_post_info['package_id'] = $package_id;

+

+					/** This action is documented in geodirectory-functions/post-functions.php */

+					do_action('geodir_after_save_listing', $last_postid, $gd_post_info);

+

+					if (!empty($buffer[5])) {

+						if (in_array($buffer[5], geodir_get_posttypes())) {

+							$taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));

+							wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);

+							wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);

+

+							$post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';

+							$post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';

+							geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);

+						}

+					}

+				} else {

+					$invalid_title++;

+				}

+			}

+		}

+	}

+	$return['rowcount'] = $countpost;

+	$return['invalidcount'] = $address_invalid;

+	$return['blank_address'] = $blank_address;

+	$return['upload_files'] = $upload_files;

+	$return['invalid_post_type'] = $invalid_post_type;

+	$return['invalid_title'] = $invalid_title;

+	$return['total_records'] = $total_records;

+

+	echo json_encode($return);

+	exit;

 }

 

 // Add the tab in left sidebar menu fro import & export page.

@@ -2343,9 +2343,9 @@ 
  * @param $post object $post The post object of the post being saved.

  */

 function geodir_update_location_prefix($post_id,$post){

-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

-        update_option('geodir_location_prefix',$post->post_name);

-    }

+	if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

+		update_option('geodir_location_prefix',$post->post_name);

+	}

 

 }

 

@@ -2356,50 +2356,50 @@ 
 function geodir_ga_callback(){

 

 if(isset($_REQUEST['code']) && $_REQUEST['code']) {

-    $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

-    $code = "code=".$_REQUEST['code'];

-    $grant_type = "&grant_type=authorization_code";

-    $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

-    $client_id = "&client_id=".get_option('geodir_ga_client_id');

-    $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

+	$oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

+	$code = "code=".$_REQUEST['code'];

+	$grant_type = "&grant_type=authorization_code";

+	$redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+	$client_id = "&client_id=".get_option('geodir_ga_client_id');

+	$client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

 

-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;

+	$auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;

 

-    $response = wp_remote_post($auth_url, array('timeout' => 15));

+	$response = wp_remote_post($auth_url, array('timeout' => 15));

 

-    //print_r($response);

+	//print_r($response);

 

-    $error_msg =  __('Something went wrong','geodirectory');

-    if(!empty($response['response']['code']) && $response['response']['code']==200){

+	$error_msg =  __('Something went wrong','geodirectory');

+	if(!empty($response['response']['code']) && $response['response']['code']==200){

 

-        $parts = json_decode($response['body']);

-        //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+		$parts = json_decode($response['body']);

+		//print_r($parts);

+		if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

+		else{

 

-            update_option('gd_ga_access_token', $parts->access_token);

-            update_option('gd_ga_refresh_token', $parts->refresh_token);

-            ?><script>window.close();</script><?php

-        }

+			update_option('gd_ga_access_token', $parts->access_token);

+			update_option('gd_ga_refresh_token', $parts->refresh_token);

+			?><script>window.close();</script><?php

+		}

 

 

-    }

-    elseif(!empty($response['response']['code'])) {

-        $parts = json_decode($response['body']);

+	}

+	elseif(!empty($response['response']['code'])) {

+		$parts = json_decode($response['body']);

 

-        if(isset($parts->error)){

-            echo $parts->error.": ".$parts->error_description;exit;

-        }else{

-            echo $error_msg." - #2";exit;

-        }

+		if(isset($parts->error)){

+			echo $parts->error.": ".$parts->error_description;exit;

+		}else{

+			echo $error_msg." - #2";exit;

+		}

 

-    }else{

+	}else{

 

-        echo $error_msg." - #3";exit;

+		echo $error_msg." - #3";exit;

 

-    }

+	}

 }

-    exit;

+	exit;

 }

 

 if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

@@ -2415,45 +2415,45 @@ 
  * @return array Array of settings.

  */

 function geodir_uninstall_settings($general_settings) {

-    $settings   = array();

-    $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));

-    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));

+	$settings   = array();

+	$settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));

+	$settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));

     

-    $plugins    = get_plugins();

-    $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());

+	$plugins    = get_plugins();

+	$un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());

     

-    if (!empty($plugins) && !empty($un_plugins)) {

-        foreach ($plugins as $plugin => $data) {

-            $plugin_name = plugin_basename(dirname($plugin));

+	if (!empty($plugins) && !empty($un_plugins)) {

+		foreach ($plugins as $plugin => $data) {

+			$plugin_name = plugin_basename(dirname($plugin));

             

-            if (in_array($plugin_name, $un_plugins)) {

-                $settings[] = array(

-                    'type' => 'checkbox',

-                    'id' => 'geodir_un_' . $plugin_name,

-                    'name' => $data['Name'],

-                    'desc' => __('Remove all data when deleted?', 'geodirectory'),

-                    'std' => '0'

-                );

-            }

-        }

-    }

+			if (in_array($plugin_name, $un_plugins)) {

+				$settings[] = array(

+					'type' => 'checkbox',

+					'id' => 'geodir_un_' . $plugin_name,

+					'name' => $data['Name'],

+					'desc' => __('Remove all data when deleted?', 'geodirectory'),

+					'std' => '0'

+				);

+			}

+		}

+	}

         

-    $settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');

+	$settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');

     

-    /**

-     * Filter the uninstall settings array.

-     *

-     * @since 1.6.9

-     *

-     * @param array $settings The settings array.

-     */

-    $settings = apply_filters('geodir_uninstall_settings', $settings);

+	/**

+	 * Filter the uninstall settings array.

+	 *

+	 * @since 1.6.9

+	 *

+	 * @param array $settings The settings array.

+	 */

+	$settings = apply_filters('geodir_uninstall_settings', $settings);

     

-    if (!empty($settings) && count($settings) > 3) {

-        return array_merge($general_settings, $settings);

-    }

+	if (!empty($settings) && count($settings) > 3) {

+		return array_merge($general_settings, $settings);

+	}

     

-    return $general_settings;

+	return $general_settings;

 }

 add_filter('geodir_general_settings', 'geodir_uninstall_settings', 100, 1);

 

@@ -2463,7 +2463,7 @@ 
  * @since 1.6.9

  */

 function geodir_uninstall_settings_desc() {

-    echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';

+	echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';

 }

 add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');

 

@@ -2479,18 +2479,18 @@ 
  * @return array The settings array.

  */

 function geodir_resave_settings($settings = array()) {

-    if (!empty($settings) && is_array($settings)) {

-        $c = 0;

+	if (!empty($settings) && is_array($settings)) {

+		$c = 0;

         

-        foreach ($settings as $setting) {

-            if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {

-                $settings[$c]['std'] = $value;

-            }

-            $c++;

-        }

-    }

-

-    return $settings;

+		foreach ($settings as $setting) {

+			if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {

+				$settings[$c]['std'] = $value;

+			}

+			$c++;

+		}

+	}

+

+	return $settings;

 }

 

 /**

@@ -2502,9 +2502,9 @@ 
  * @return array The modified settings.

  */

 function geodir_core_uninstall_settings($settings) {

-    $settings[] = plugin_basename(dirname(dirname(__FILE__)));

+	$settings[] = plugin_basename(dirname(dirname(__FILE__)));

     

-    return $settings;

+	return $settings;

 }

 add_filter('geodir_plugins_uninstall_settings', 'geodir_core_uninstall_settings', 10, 1);

 

@@ -2518,34 +2518,34 @@ 
  */

 function geodir_diagnose_reload_db_countries()

 {

-    global $wpdb, $plugin_prefix;

-

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-    $delete = $wpdb->query("TRUNCATE TABLE ".GEODIR_COUNTRIES_TABLE);

-

-

-    if ($delete) {

-            $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";

-        ob_start();

-        geodir_diagnose_version_clear();

-        ob_end_clean();

-    }else{

-        $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";

-    }

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb, $plugin_prefix;

+

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+	$delete = $wpdb->query("TRUNCATE TABLE ".GEODIR_COUNTRIES_TABLE);

+

+

+	if ($delete) {

+			$output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";

+		ob_start();

+		geodir_diagnose_version_clear();

+		ob_end_clean();

+	}else{

+		$output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";

+	}

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 }

 

 /**

@@ -2558,11 +2558,11 @@ 
  * @return array Filtered actions.

  */

 function geodir_disable_quick_edit( $actions = array(), $row = null ) {

-    if ( isset( $actions['inline hide-if-no-js'] ) ) {

-        unset( $actions['inline hide-if-no-js'] );

-    }

+	if ( isset( $actions['inline hide-if-no-js'] ) ) {

+		unset( $actions['inline hide-if-no-js'] );

+	}

 

-    return $actions;

+	return $actions;

 }

 

 /**

@@ -2576,26 +2576,26 @@ 
  * @global bool $gd_cpt_screen True if current scrrrn has GD post type.

  */

 function geodir_check_quick_edit() {

-    global $pagenow, $current_screen, $gd_cpt_screen;

-

-    if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {

-        if ( empty( $gd_cpt_screen ) ) {

-            if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {

-                $gd_cpt_screen = 'y';

-            } else {

-                $gd_cpt_screen = 'n';

-            }

-        }

-

-        if ( $gd_cpt_screen == 'y' ) {

-            if ( $pagenow == 'edit.php' ) {

-                add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 );

-                add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 );

-            } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {

-                add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 );

-            }

-        }

-    }

+	global $pagenow, $current_screen, $gd_cpt_screen;

+

+	if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {

+		if ( empty( $gd_cpt_screen ) ) {

+			if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {

+				$gd_cpt_screen = 'y';

+			} else {

+				$gd_cpt_screen = 'n';

+			}

+		}

+

+		if ( $gd_cpt_screen == 'y' ) {

+			if ( $pagenow == 'edit.php' ) {

+				add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 );

+				add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 );

+			} elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {

+				add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 );

+			}

+		}

+	}

 }

 add_action( 'admin_head', 'geodir_check_quick_edit', 10 );

 

@@ -2609,9 +2609,9 @@ 
  * @return array Filtered bulk actions.

  */

 function geodir_filter_bulk_actions( $actions ) {

-    if ( isset( $actions['edit'] ) ) {

-        unset( $actions['edit'] );

-    }

+	if ( isset( $actions['edit'] ) ) {

+		unset( $actions['edit'] );

+	}

     

-    return $actions;

+	return $actions;

 }

Spacing +247 added lines, -247 removed lines

@@ -62,7 +62,7 @@ 
  */

 function geodir_get_admin_option_form($current_tab)

 {

-    geodir_admin_option_form($current_tab);// defined in admin template tags.php

+    geodir_admin_option_form($current_tab); // defined in admin template tags.php

 }

 

 

@@ -70,7 +70,7 @@ 
 add_action('geodir_update_options_compatibility_settings', 'geodir_update_options_compatibility_settings');

 add_action('geodir_update_options_default_location_settings', 'geodir_location_form_submit');

 add_action('geodir_before_admin_panel', 'geodir_before_admin_panel'); // this function is in admin_functions.php

-add_action('geodir_before_update_options', 'geodir_before_update_options',10,2);

+add_action('geodir_before_update_options', 'geodir_before_update_options', 10, 2);

 

 //add_action('geodir_before_admin_panel', 'geodir_autoinstall_admin_header');

 

@@ -99,7 +99,7 @@ 
         

         // Disable VC editor for GD post types.

         if (class_exists('Vc_Role_Access_Controller')) {

-            add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 );

+            add_filter('vc_role_access_with_post_types_can', '__return_false', 100);

         }

     }

 

@@ -126,8 +126,8 @@ 
 add_action('admin_panel_init', 'geodir_admin_list_columns', 2);

 

 /* --- insert dummy post action ---*/

-add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1,3);

-add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1,3);

+add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1, 3);

+add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1, 3);

 

 

 /**

@@ -240,9 +240,9 @@ 
 

         // Filter-Payment-Manager

 

-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

+        add_meta_box('geodir_post_images', $post_typename.' '.__('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

 

-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

+        add_meta_box('geodir_post_info', $post_typename.' '.__('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

 

         // no need of this box as all fields moved to main information box

         //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

@@ -251,7 +251,7 @@ 
 

 }

 

-add_action('save_post', 'geodir_post_information_save',10,2);

+add_action('save_post', 'geodir_post_information_save', 10, 2);

 

 

 

@@ -278,10 +278,10 @@ 
 

             $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

 

-            if(!empty($gd_taxonomy)) {

+            if (!empty($gd_taxonomy)) {

                 foreach ($gd_taxonomy as $tax) {

 

-                    remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

+                    remove_meta_box($tax.'div', $geodir_post_type, 'normal');

 

                 }

             }

@@ -367,14 +367,14 @@ 
 add_action('geodir_manage_available_fields_predefined', 'geodir_manage_available_fields_predefined');

 add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');

 

-function geodir_manage_available_fields_predefined($sub_tab){

-    if($sub_tab=='custom_fields'){

+function geodir_manage_available_fields_predefined($sub_tab) {

+    if ($sub_tab == 'custom_fields') {

         geodir_custom_available_fields('predefined');

     }

 }

 

-function geodir_manage_available_fields_custom($sub_tab){

-    if($sub_tab=='custom_fields'){

+function geodir_manage_available_fields_custom($sub_tab) {

+    if ($sub_tab == 'custom_fields') {

         geodir_custom_available_fields('custom');

     }

 }

@@ -444,7 +444,7 @@ 
     global $wpdb;

     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

     ?>

-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul>

     <?php

@@ -455,7 +455,7 @@ 
 

             $check_html_variable = $wpdb->get_var(

                 $wpdb->prepare(

-                    "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

+                    "SELECT htmlvar_name FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

                     array($val['htmlvar_name'], $listing_type, $val['field_type'])

                 )

             );

@@ -463,23 +463,23 @@ 
             $display = $check_html_variable ? ' style="display:none;"' : '';

            ?>

 

-            <li   class="gd-cf-tooltip-wrap" <?php echo $display;?>>

+            <li   class="gd-cf-tooltip-wrap" <?php echo $display; ?>>

                 <?php

-                if(isset($val['description']) && $val['description']){

+                if (isset($val['description']) && $val['description']) {

                     echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';

                 }?>

 

-                <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>"  data-field-type="<?php echo $val['field_type'];?>"

-                   title="<?php echo $val['site_title'];?>"

-                   class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">

+                <a id="gd-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>" data-field-type-key="<?php echo $val['htmlvar_name']; ?>"  data-field-type="<?php echo $val['field_type']; ?>"

+                   title="<?php echo $val['site_title']; ?>"

+                   class="gd-draggable-form-items  gd-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>" href="javascript:void(0);">

                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {

                         echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){

+                    }elseif (isset($val['field_icon']) && $val['field_icon']) {

                         echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

-                    }else{

+                    } else {

                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';

                     }?>

-                    <?php echo $val['site_title'];?>

+                    <?php echo $val['site_title']; ?>

                 </a>

             </li>

 

@@ -507,7 +507,7 @@ 
     <?php 

         global $wpdb;

         

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

 

         if (!empty($fields)) {

             foreach ($fields as $field) {

@@ -532,14 +532,14 @@ 
  * @since 1.6.9

  * @package GeoDirectory

  */

-function geodir_custom_fields_custom($post_type=''){

+function geodir_custom_fields_custom($post_type = '') {

 

     $custom_fields = array();

 

     /**

      * @see `geodir_custom_fields`

      */

-    return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);

+    return apply_filters('geodir_custom_fields_custom', $custom_fields, $post_type);

 }

 

 

@@ -550,7 +550,7 @@ 
  * @since 1.6.6

  * @package GeoDirectory

  */

-function geodir_custom_fields($post_type=''){

+function geodir_custom_fields($post_type = '') {

     

     $custom_fields = array(

         'text' => array(

@@ -685,7 +685,7 @@ 
      * }

      * @param string $post_type The post type requested.

      */

-    return apply_filters('geodir_custom_fields',$custom_fields,$post_type);

+    return apply_filters('geodir_custom_fields', $custom_fields, $post_type);

 }

 

 /**

@@ -696,25 +696,25 @@ 
  * @param string $type The custom field type, predefined, custom or blank for default

  * @package GeoDirectory

  */

-function geodir_custom_available_fields($type='')

+function geodir_custom_available_fields($type = '')

 {

     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

     ?>

-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" />

 

         <?php

-        if($type=='predefined'){

+        if ($type == 'predefined') {

             $cfs = geodir_custom_fields_predefined($listing_type);

-        }elseif($type=='custom'){

+        }elseif ($type == 'custom') {

             $cfs = geodir_custom_fields_custom($listing_type);

-        }else{

+        } else {

             $cfs = geodir_custom_fields($listing_type);

             ?>

             <ul class="full gd-cf-tooltip-wrap">

                 <li>

                     <div class="gdcf-tooltip">

-                        <?php _e('This adds a section separator with a title.', 'geodirectory');?>

+                        <?php _e('This adds a section separator with a title.', 'geodirectory'); ?>

                     </div>

                     <a id="gt-fieldset"

                        class="gd-draggable-form-items gt-fieldset"

@@ -725,7 +725,7 @@ 
 

                         <i class="fa fa-long-arrow-left " aria-hidden="true"></i>

                         <i class="fa fa-long-arrow-right " aria-hidden="true"></i>

-                        <?php _e('Fieldset (section separator)', 'geodirectory');?>

+                        <?php _e('Fieldset (section separator)', 'geodirectory'); ?>

                     </a>

                 </li>

             </ul>

@@ -733,15 +733,15 @@ 
             <?php

         }

 

-    if(!empty($cfs)) {

+    if (!empty($cfs)) {

         echo '<ul>';

-        foreach ( $cfs as $id => $cf ) {

+        foreach ($cfs as $id => $cf) {

             ?>

 

             <li class="gd-cf-tooltip-wrap">

                 <?php

-                if ( isset( $cf['description'] ) && $cf['description'] ) {

-                    echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';

+                if (isset($cf['description']) && $cf['description']) {

+                    echo '<div class="gdcf-tooltip">'.$cf['description'].'</div>';

                 } ?>

 

                 <a id="gd-<?php echo $id; ?>"

@@ -751,10 +751,10 @@ 
                    class="gd-draggable-form-items <?php echo $cf['class']; ?>"

                    href="javascript:void(0);">

 

-                    <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {

-                        echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';

-                    } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {

-                        echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';

+                    <?php if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {

+                        echo '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

+                    } elseif (isset($cf['icon']) && $cf['icon']) {

+                        echo '<b style="background-image: url("'.$cf['icon'].'")"></b>';

                     } else {

                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';

                     } ?>

@@ -763,7 +763,7 @@ 
             </li>

             <?php

         }

-    }else{

+    } else {

         _e('There are no custom fields here yet.', 'geodirectory');

     }

         ?>

@@ -791,7 +791,7 @@ 
     <ul class="core">

     <?php 

         global $wpdb;

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

 

         if (!empty($fields)) {

             foreach ($fields as $field) {

@@ -801,7 +801,7 @@ 
                 $field_type_key = $field->field_type_key;

                 $field_ins_upd = 'display';

 

-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);

+                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd, $field_type_key);

             }

         }

         ?></ul>

@@ -960,8 +960,8 @@ 
 

     if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+        if ($wpdb->get_var("SHOW COLUMNS FROM ".$plugin_prefix."gd_place_detail WHERE field = 'categories'"))

+            $wpdb->query("ALTER TABLE `".$plugin_prefix."gd_place_detail` DROP `categories`");

 

         update_option('geodir_remove_unnecessary_fields', '1');

 

@@ -990,7 +990,7 @@ 
             case 'diagnosis' :

                 if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {

                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                    call_user_func('geodir_diagnose_' . $diagnose_this);

+                    call_user_func('geodir_diagnose_'.$diagnose_this);

 

                 }

                 exit();

@@ -999,7 +999,7 @@ 
             case 'diagnosis-fix' :

                 if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

+                call_user_func('geodir_diagnose_'.$diagnose_this);

                 exit();

                 break;

         }

@@ -1024,50 +1024,50 @@ 
 {

     global $wpdb;

     //$filter_arr['output_str'] .='###'.$table.'###';

-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

+    if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0) {

+        $filter_arr['output_str'] .= "<li>".__('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory')."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

+        $filter_arr['output_str'] .= "<li>".__('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory')."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count

-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count

+            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$table."_ms_bak"); // get backup table count

+            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table"); // get new table count

 

             if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2

                 //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;

 

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table

+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename bak table to new table

 

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";

+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".__('-->FIXED: Renamed and backed up the tables', 'geodirectory')."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it

 

-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table

+                $wpdb->query("RENAME TABLE ".$wpdb->prefix."$table TO ".$table."_ms_bak2"); // rename new table to bak2

+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$wpdb->prefix."$table"); // rename bak table to new table

 

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";

+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors

 

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2

+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename ms_bak table to ms_bak2

 

-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";

+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             }

@@ -1075,54 +1075,54 @@ 
         }

 

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

             if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

                 if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table)."</li>";

                 }

 

-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table") == 0) {// if main table is empty but original is not, delete main and rename original

+                if ($wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."$table")) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix.$table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix.$table)."</li>";

                 }

-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

                 }

             } else {// else rename the original table to _ms_bak

-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+                if ($wpdb->query("RENAME TABLE $table TO ".$table."_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table."_ms_bak")."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table."_ms_bak")."</li>";

                 }

             }

         }

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

             // if original table exists but new does not, rename

-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+            if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

             } else {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

             }

 

         }

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

@@ -1136,11 +1136,11 @@ 
             delete_option('geodir_custom_posts_db_version');

             delete_option('geodir_reviewratings_db_version');

             delete_option('geodiradvancesearch_db_version');

-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

+            $filter_arr['output_str'] .= "<li>".__('-->TRY: Please refresh page to run table install functions', 'geodirectory')."</li>";

         }

 

     } else {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

+        $filter_arr['output_str'] .= "<li>".sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name)."</li>";

     }

     return $filter_arr;

 }

@@ -1181,21 +1181,21 @@ 
     }

 

     if ($stepped_process) {

-        $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset );

-        $posts = $wpdb->get_results( $sql );

+        $sql = $wpdb->prepare("SELECT * FROM ".$wpdb->prefix."geodir_".$ptype."_detail LIMIT %d OFFSET %d", $step_max_items, $offset);

+        $posts = $wpdb->get_results($sql);

 

         if (!empty($posts)) {

 

             foreach ($posts as $p) {

                 $p->post_type = $ptype;

-                $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+                $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));

                 if (empty($raw_tags)) {

                     $post_tags = '';

                 } else {

                     $post_tags = implode(",", $raw_tags);

                 }

-                $tablename = $plugin_prefix . $p->post_type . '_detail';

-                $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+                $tablename = $plugin_prefix.$p->post_type.'_detail';

+                $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

 

             }

             if ($step >= $max_step) {

@@ -1211,23 +1211,23 @@ 
         if (!empty($all_postypes)) {

             foreach ($all_postypes as $key) {

                 // update each GD CPT

-                $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail");

+                $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail");

 

                 if (!empty($posts)) {

 

                     foreach ($posts as $p) {

                         $p->post_type = $key;

-                        $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+                        $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));

                         if (empty($raw_tags)) {

                             $post_tags = '';

                         } else {

                             $post_tags = implode(",", $raw_tags);

                         }

-                        $tablename = $plugin_prefix . $p->post_type . '_detail';

-                        $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+                        $tablename = $plugin_prefix.$p->post_type.'_detail';

+                        $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

 

                     }

-                    $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+                    $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";

                 }

 

             }

@@ -1238,14 +1238,14 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

     }

 

     if ($stepped_process) {

-        $percent = ($step/$max_step) * 100;

+        $percent = ($step / $max_step) * 100;

         if ($output_str == 'done') {

             echo $output_str;

         } else {

@@ -1288,29 +1288,29 @@ 
     if (!empty($all_postypes)) {

         foreach ($all_postypes as $key) {

             // update each GD CTP

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

+            $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d WHERE d.".$key."category='' ");

 

             if (!empty($posts)) {

 

                 foreach ($posts as $p) {

                     $p->post_type = $key;

-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

+                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type.'category', array('fields' => 'ids'));

 

                     if (empty($raw_cats)) {

                         $post_categories = get_post_meta($p->post_id, 'post_categories', true);

 

-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

-                            $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);

-                            foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {

+                        if (!empty($post_categories) && !empty($post_categories[$p->post_type.'category'])) {

+                            $post_categories[$p->post_type.'category'] = str_replace("d:", "", $post_categories[$p->post_type.'category']);

+                            foreach (explode(",", $post_categories[$p->post_type.'category']) as $cat_part) {

                                 if (is_numeric($cat_part)) {

-                                    $raw_cats[] = (int)$cat_part;

+                                    $raw_cats[] = (int) $cat_part;

                                 }

                             }

 

                         }

 

                         if (!empty($raw_cats)) {

-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

+                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type.'category');

 

                         }

 

@@ -1320,14 +1320,14 @@ 
                     if (empty($raw_cats)) {

                         $post_cats = '';

                     } else {

-                        $post_cats = ',' . implode(",", $raw_cats) . ',';

+                        $post_cats = ','.implode(",", $raw_cats).',';

                     }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

+                    $tablename = $plugin_prefix.$p->post_type.'_detail';

+                    $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET ".$p->post_type."category=%s WHERE post_id =%d", $post_cats, $p->post_id));

                 }

 

             }

-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+            $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";

 

         }

 

@@ -1335,7 +1335,7 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1388,15 +1388,15 @@ 
     if (!empty($ver_arr)) {

         foreach ($ver_arr as $key => $val) {

             if (delete_option($val)) {

-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

+                $output_str .= "<li>".$key.__(' Version: Deleted', 'geodirectory')."</li>";

             } else {

-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

+                $output_str .= "<li>".$key.__(' Version: Not Found', 'geodirectory')."</li>";

             }

 

         }

 

         if ($output_str) {

-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

+            $output_str .= "<li><strong>".__(' Upgrade/install scripts will run on next page reload.', 'geodirectory')."</strong></li>";

         }

 

     }

@@ -1433,43 +1433,43 @@ 
     $output_str = '';

 

     // check review locations

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

+        $output_str .= "<li>".__('Review locations missing or broken', 'geodirectory')."</li>";

         $is_error_during_diagnose = true;

 

         if ($fix) {

             if (geodir_fix_review_location()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Review locations fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Review locations fix failed', 'geodirectory')."</strong></li>";

             }

         }

 

     } else {

-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Review locations ok', 'geodirectory')."</li>";

     }

 

     // check review content

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_content IS NULL")) {

+        $output_str .= "<li>".__('Review content missing or broken', 'geodirectory')."</li>";

         $is_error_during_diagnose = true;

 

         if ($fix) {

             if (geodir_fix_review_content()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Review content fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Review content fix failed', 'geodirectory')."</strong></li>";

             }

         }

 

     } else {

-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Review content ok', 'geodirectory')."</li>";

     }

 

 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1533,7 +1533,7 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1567,7 +1567,7 @@ 
     else {

         $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)

             )

         );

@@ -1613,18 +1613,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_home_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('GD Home page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('GD Home page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: GD Home page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: GD Home page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1638,18 +1638,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_add_listing_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Add Listing page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Add Listing page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Add Listing page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Add Listing page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1664,18 +1664,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_preview_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Listing Preview page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Listing Preview page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Listing Preview page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Listing Preview page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1689,18 +1689,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_success_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Listing Success page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Listing Success page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Listing Success page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Listing Success page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1714,18 +1714,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_info_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Info page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Info page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Info page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Info page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1739,18 +1739,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_login_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Login page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Login page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Login page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Login page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1764,18 +1764,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_location_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Location page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Location page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Location page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Location page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1784,13 +1784,13 @@ 
     /* Diagnose Location Page Ends */

     ////////////////////////////////

 

-    $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );

+    $page_chk_arr = array('output_str'=>$output_str, 'is_error_during_diagnose'=>$is_error_during_diagnose);

     /**

      * This action is called at the end of the GD Tools page check function.

      *

      * @since 1.5.2

      */

-    $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);

+    $page_chk_arr = apply_filters('geodir_diagnose_default_pages', $page_chk_arr);

 

     $output_str = $page_chk_arr['output_str'];

     $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

@@ -1800,7 +1800,7 @@ 
             flush_rewrite_rules();

         }

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1828,10 +1828,10 @@ 
     $fix_button_txt = '';

 

     if ($is_error_during_diagnose) {

-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

+        $output_str .= "<li>".__('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory').' '.geodir_plugin_path().'/db-language.php'."</li>";

 		$info_div_class = "geodir_problem_info";

     } else {

-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Load custom fields in to file for translation: ok', 'geodirectory')."</li>";

 		$info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

     }

@@ -1873,17 +1873,17 @@ 
     global $wpdb, $wp_query, $plugin_prefix;

 

     if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

+        $table = $plugin_prefix.$wp_query->query_vars['post_type'].'_detail';

 

-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

+        $join = $clauses['join'].' INNER JOIN '.$table.' AS gd_posts ON (gd_posts.post_id = '.$wpdb->posts.'.ID)';

         $clauses['join'] = $join;

 

-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

+        $fields = $clauses['fields'] != '' ? $clauses['fields'].', ' : '';

         $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

         $clauses['fields'] = $fields;

 

         $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

-        $orderby = 'gd_expire ' . $order;

+        $orderby = 'gd_expire '.$order;

         $clauses['orderby'] = $orderby;

     }

     return $clauses;

@@ -1926,7 +1926,7 @@ 
         global $current_user;

         $upload_dir = wp_upload_dir();

 

-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

+        $file = $upload_dir['path'].'/temp_'.$current_user->data->ID.'/geodir_tmp.csv';

         $handle = fopen($file, 'w');

 

         fwrite($handle, $input);

@@ -1971,7 +1971,7 @@ 
     $uploads_dir = $uploads['path'];

     $image_name_arr = explode('/', $filename);

     $filename = end($image_name_arr);

-    $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+    $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;

     $return = array();

     $return['file'] = $uploadedFile;

     $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

@@ -1988,8 +1988,8 @@ 
 

                 if (($handle = fopen($target_path, "r")) !== FALSE) {

                     while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

-                        if(is_array($data) && !empty($data)) {

-                            $file[] = '"' . implode('","', $data) . '"';

+                        if (is_array($data) && !empty($data)) {

+                            $file[] = '"'.implode('","', $data).'"';

                         }

                     }

                     fclose($handle);

@@ -2106,10 +2106,10 @@ 
                     $tag_arr = explode(',', $post_tags);

                 }

 

-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

+                $table = $plugin_prefix.$buffer[5].'_detail'; // check table in database

 

                 $error = '';

-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

+                if ($wpdb->get_var("SHOW TABLES LIKE '".$table."'") != $table) {

                     $invalid_post_type++;

                     continue;

                 }

@@ -2135,7 +2135,7 @@ 
                             if ($buffer[$c] != '0' && $buffer[$c] != '') {

                                 $submitdata = date('Y-m-d');

 

-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

+                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata."+".addslashes($buffer[$c])." days"));

                             } else {

                                 $gd_post_info['expire_date'] = 'Never';

                             }

@@ -2163,7 +2163,7 @@ 
 						

 						// Post status

 						if ($customKeyarray[$c] == 'post_status') {

-                            $post_status = sanitize_key( $buffer[$c] );

+                            $post_status = sanitize_key($buffer[$c]);

                         }

                     }

 

@@ -2181,8 +2181,8 @@ 
 					

 					// Default post status

 					$default_status = 'publish';

-					$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;

 

                     $my_post['post_title'] = $post_title;

                     $my_post['post_content'] = $post_desc;

@@ -2226,7 +2226,7 @@ 
                     $payment_info = array();

                     $package_info = array();

 

-                    $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);

+                    $package_info = (array) geodir_post_package_info($package_info, '', $buffer[5]);

                     $package_id = '';

                     if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {

                         $package_id = $gd_post_info['package_id'];

@@ -2236,7 +2236,7 @@ 
                         $payment_info['package_id'] = $package_info['pid'];

 

                         if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {

-                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));

+                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['alive_days']." days"));

                         } else {

                             $payment_info['expire_date'] = 'Never';

                         }

@@ -2248,7 +2248,7 @@ 
 

                     $post_type = get_post_type($last_postid);

 

-                    $table = $plugin_prefix . $post_type . '_detail';

+                    $table = $plugin_prefix.$post_type.'_detail';

 

                     geodir_save_post_info($last_postid, $gd_post_info);

 

@@ -2269,7 +2269,7 @@ 
                             $attachment['post_id'] = $last_postid;

                             $attachment['title'] = $img_name_arr[0];

                             $attachment['content'] = '';

-                            $attachment['file'] = $sub_dir . '/' . $image_name;

+                            $attachment['file'] = $sub_dir.'/'.$image_name;

                             $attachment['mime_type'] = $uploaded_file_type;

                             $attachment['menu_order'] = $menu_order;

                             $attachment['is_featured'] = 0;

@@ -2278,15 +2278,15 @@ 
 

                             foreach ($attachment as $key => $val) {

                                 if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                    $attachment_set .= $key." = '".$val."', ";

                             }

                             $attachment_set = trim($attachment_set, ", ");

 

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

 

                             if ($menu_order == 1) {

                                 $post_type = get_post_type($last_postid);

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

+                                $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($sub_dir.'/'.$image_name, $last_postid)));

                             }

                             $menu_order++;

                         }

@@ -2327,11 +2327,11 @@ 
 }

 

 // Add the tab in left sidebar menu fro import & export page.

-add_filter( 'geodir_settings_tabs_array', 'geodir_import_export_tab', 94 );

+add_filter('geodir_settings_tabs_array', 'geodir_import_export_tab', 94);

 

 // Handle ajax request for import/export.

-add_action( 'wp_ajax_geodir_import_export', 'geodir_ajax_import_export' );

-add_action( 'wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export' );

+add_action('wp_ajax_geodir_import_export', 'geodir_ajax_import_export');

+add_action('wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export');

 

 

 /**

@@ -2342,40 +2342,40 @@ 
  * @param $post_id int $post_id The post ID of the post being saved.

  * @param $post object $post The post object of the post being saved.

  */

-function geodir_update_location_prefix($post_id,$post){

-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

-        update_option('geodir_location_prefix',$post->post_name);

+function geodir_update_location_prefix($post_id, $post) {

+    if ($post->post_type == 'page' && $post->post_name && $post_id == get_option('geodir_location_page')) {

+        update_option('geodir_location_prefix', $post->post_name);

     }

 

 }

 

-add_action('save_post', 'geodir_update_location_prefix',10,2);

+add_action('save_post', 'geodir_update_location_prefix', 10, 2);

 

-add_action( 'wp_ajax_geodir_ga_callback', 'geodir_ga_callback' );

+add_action('wp_ajax_geodir_ga_callback', 'geodir_ga_callback');

 

-function geodir_ga_callback(){

+function geodir_ga_callback() {

 

-if(isset($_REQUEST['code']) && $_REQUEST['code']) {

+if (isset($_REQUEST['code']) && $_REQUEST['code']) {

     $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

     $code = "code=".$_REQUEST['code'];

     $grant_type = "&grant_type=authorization_code";

-    $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+    $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";

     $client_id = "&client_id=".get_option('geodir_ga_client_id');

     $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

 

-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;

+    $auth_url = $oAuthURL.$code.$redirect_uri.$grant_type.$client_id.$client_secret;

 

     $response = wp_remote_post($auth_url, array('timeout' => 15));

 

     //print_r($response);

 

-    $error_msg =  __('Something went wrong','geodirectory');

-    if(!empty($response['response']['code']) && $response['response']['code']==200){

+    $error_msg = __('Something went wrong', 'geodirectory');

+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {

 

         $parts = json_decode($response['body']);

         //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+        if (!isset($parts->access_token)) {echo $error_msg." - #1"; exit; }

+        else {

 

             update_option('gd_ga_access_token', $parts->access_token);

             update_option('gd_ga_refresh_token', $parts->refresh_token);

@@ -2384,18 +2384,18 @@ 
 

 

     }

-    elseif(!empty($response['response']['code'])) {

+    elseif (!empty($response['response']['code'])) {

         $parts = json_decode($response['body']);

 

-        if(isset($parts->error)){

-            echo $parts->error.": ".$parts->error_description;exit;

-        }else{

-            echo $error_msg." - #2";exit;

+        if (isset($parts->error)) {

+            echo $parts->error.": ".$parts->error_description; exit;

+        } else {

+            echo $error_msg." - #2"; exit;

         }

 

-    }else{

+    } else {

 

-        echo $error_msg." - #3";exit;

+        echo $error_msg." - #3"; exit;

 

     }

 }

@@ -2417,7 +2417,7 @@ 
 function geodir_uninstall_settings($general_settings) {

     $settings   = array();

     $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));

-    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));

+    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory'));

     

     $plugins    = get_plugins();

     $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());

@@ -2429,7 +2429,7 @@ 
             if (in_array($plugin_name, $un_plugins)) {

                 $settings[] = array(

                     'type' => 'checkbox',

-                    'id' => 'geodir_un_' . $plugin_name,

+                    'id' => 'geodir_un_'.$plugin_name,

                     'name' => $data['Name'],

                     'desc' => __('Remove all data when deleted?', 'geodirectory'),

                     'std' => '0'

@@ -2463,7 +2463,7 @@ 
  * @since 1.6.9

  */

 function geodir_uninstall_settings_desc() {

-    echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';

+    echo '<p class="gd-un-settings-desc">'.__('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory').'</p>';

 }

 add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');

 

@@ -2527,12 +2527,12 @@ 
 

 

     if ($delete) {

-            $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";

+            $output_str .= "<li><strong>".__('Table dropped, refresh page to reinstall.', 'geodirectory')."</strong></li>";

         ob_start();

         geodir_diagnose_version_clear();

         ob_end_clean();

-    }else{

-        $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";

+    } else {

+        $output_str .= "<li><strong>".__('Something went wrong.', 'geodirectory')."</strong></li>";

     }

 

     if ($is_error_during_diagnose) {

@@ -2557,9 +2557,9 @@ 
  * @param object $row The post|taxonomy object.

  * @return array Filtered actions.

  */

-function geodir_disable_quick_edit( $actions = array(), $row = null ) {

-    if ( isset( $actions['inline hide-if-no-js'] ) ) {

-        unset( $actions['inline hide-if-no-js'] );

+function geodir_disable_quick_edit($actions = array(), $row = null) {

+    if (isset($actions['inline hide-if-no-js'])) {

+        unset($actions['inline hide-if-no-js']);

     }

 

     return $actions;

@@ -2578,26 +2578,26 @@ 
 function geodir_check_quick_edit() {

     global $pagenow, $current_screen, $gd_cpt_screen;

 

-    if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {

-        if ( empty( $gd_cpt_screen ) ) {

-            if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {

+    if (($pagenow == 'edit.php' || $pagenow == 'edit-tags.php') && !empty($current_screen->post_type)) {

+        if (empty($gd_cpt_screen)) {

+            if (in_array($current_screen->post_type, geodir_get_posttypes())) {

                 $gd_cpt_screen = 'y';

             } else {

                 $gd_cpt_screen = 'n';

             }

         }

 

-        if ( $gd_cpt_screen == 'y' ) {

-            if ( $pagenow == 'edit.php' ) {

-                add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 );

-                add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 );

-            } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {

-                add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 );

+        if ($gd_cpt_screen == 'y') {

+            if ($pagenow == 'edit.php') {

+                add_filter('post_row_actions', 'geodir_disable_quick_edit', 10, 2);

+                add_filter('page_row_actions', 'geodir_disable_quick_edit', 10, 2);

+            } elseif ($pagenow == 'edit-tags.php' && !empty($current_screen->taxonomy)) {

+                add_filter($current_screen->taxonomy.'_row_actions', 'geodir_disable_quick_edit', 10, 2);

             }

         }

     }

 }

-add_action( 'admin_head', 'geodir_check_quick_edit', 10 );

+add_action('admin_head', 'geodir_check_quick_edit', 10);

 

 /**

  * Filter the bulk actions for GD CPT.

@@ -2608,9 +2608,9 @@ 
  * @param array $actions An array of the available bulk actions.

  * @return array Filtered bulk actions.

  */

-function geodir_filter_bulk_actions( $actions ) {

-    if ( isset( $actions['edit'] ) ) {

-        unset( $actions['edit'] );

+function geodir_filter_bulk_actions($actions) {

+    if (isset($actions['edit'])) {

+        unset($actions['edit']);

     }

     

     return $actions;

uninstall.php

Indentation +5 added lines, -5 removed lines

@@ -10,21 +10,21 @@
 
 // Exit if accessed directly.
 if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
-    exit;
+	exit;
 }
 
 global $wpdb;
 
 if (get_option('geodir_un_geodirectory')) {
-    $wpdb->hide_errors();
+	$wpdb->hide_errors();
     
-    /*
+	/*
     if (!defined('GEODIRECTORY_VERSION')) {
         // Load plugin file.
         include_once('geodirectory.php');
     }
     */
 
-    // Delete default data.
-    delete_option('geodir_default_data_installed');
+	// Delete default data.
+	delete_option('geodir_default_data_installed');
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
  */
 
 // Exit if accessed directly.
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
+if (!defined('WP_UNINSTALL_PLUGIN')) {
     exit;
 }