GeoDirectory / geodirectory

upgrade.php

Spacing +59 added lines, -59 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.

      *

@@ -51,9 +51,9 @@ 
     }

 

 

-    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);

 

 }

 

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

  * @package GeoDirectory

  */

-function geodir_upgrade_146(){

+function geodir_upgrade_146() {

     gd_convert_virtual_pages();

 }

 

@@ -98,7 +98,7 @@ 
  * @since 1.5.0

  * @package GeoDirectory

  */

-function geodir_upgrade_150(){

+function geodir_upgrade_150() {

     gd_fix_cpt_rewrite_slug();

 }

 

@@ -110,12 +110,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', '');

 

 }

 

@@ -126,7 +126,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'), '');

 }

@@ -137,7 +137,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'), '');

 }

 

@@ -147,7 +147,7 @@ 
  * @since 1.5.2

  * @package GeoDirectory

  */

-function geodir_upgrade_152(){

+function geodir_upgrade_152() {

     gd_fix_address_detail_table_limit();

 }

 

@@ -157,7 +157,7 @@ 
  * @since 1.6.6

  * @package GeoDirectory

  */

-function geodir_upgrade_166(){

+function geodir_upgrade_166() {

     gd_convert_custom_field_display();

 }

 

@@ -191,7 +191,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'");

 }

 

 /**

@@ -204,7 +204,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'");

 }

 

 /**

@@ -218,7 +218,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;

@@ -243,7 +243,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;

@@ -267,7 +267,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) {

@@ -282,49 +282,49 @@ 
 }

 

 

-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; }

 

 

 

-    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 = '';

             }

 

@@ -332,7 +332,7 @@ 
 

         }

 

-        update_option('gd_convert_custom_field_display',1);

+        update_option('gd_convert_custom_field_display', 1);

     }

 }

 

@@ -709,7 +709,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

 }

 

 

@@ -720,61 +720,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);

     }

 

 }

@@ -793,13 +793,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;

@@ -807,8 +807,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);

         }

 

 

@@ -834,9 +834,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());

             }

         }

     }

geodirectory-functions/general_functions.php

Spacing +1371 added lines, -1371 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,10 +27,10 @@ 
  */

 function geodir_plugin_url() {

 

-	if ( is_ssl() ) :

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

+	if (is_ssl()) :

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

 	else :

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

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

 	endif;

 }

 

@@ -45,10 +45,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__)));

 	}

 }

 

@@ -63,10 +63,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;

 		}

 	}

@@ -88,8 +88,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);

 }

 

 /**

@@ -105,8 +105,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);

 }

 

 

@@ -124,35 +124,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;

 }

@@ -169,18 +169,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');

 	}

 }

 

@@ -194,11 +194,11 @@ 
  */

 function geodir_curPageURL() {

 	$pageURL = 'http';

-	if ( isset( $_SERVER["HTTPS"] ) && $_SERVER["HTTPS"] == "on" ) {

+	if (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {

 		$pageURL .= "s";

 	}

 	$pageURL .= "://";

-	$pageURL .= $_SERVER["SERVER_NAME"] . $_SERVER["REQUEST_URI"];

+	$pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"];

 

 	/**

 	 * Filter the current page URL returned by function geodir_curPageURL().

@@ -207,7 +207,7 @@ 
 	 *

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

 	 */

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

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

 }

 

 

@@ -223,12 +223,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;

 }

@@ -242,13 +242,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')

 	);

 }

 

@@ -261,11 +261,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')

 	);

 }

 

@@ -284,112 +284,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;

@@ -414,28 +414,28 @@ 
  *

  * @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 ( get_option( 'geodir_set_as_home' ) ) {

+			if (get_option('geodir_set_as_home')) {

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

 			}

-			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()

@@ -444,26 +444,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;

@@ -471,20 +471,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;

 					}

@@ -493,20 +493,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;

@@ -530,14 +530,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 .

 	 *

@@ -548,13 +548,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)

 		);

 

 		/**

@@ -564,9 +564,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.

 			 *

@@ -574,11 +574,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'));

 

 		}

 

@@ -602,7 +602,7 @@ 
 */

 

 

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

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

 	/**

 	 * Creates random string.

 	 *

@@ -612,21 +612,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.

 	 *

@@ -637,9 +637,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;

@@ -671,7 +671,7 @@ 
 }

 

 

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

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

 	/**

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

 	 *

@@ -684,17 +684,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;

@@ -703,7 +703,7 @@ 
 }

 

 

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

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

 	/**

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

 	 *

@@ -722,83 +722,83 @@ 
 	 * @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 );

-

-		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' );

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

-			$subject       = get_option( 'geodir_forgot_password_subject' );

-			$message       = get_option( 'geodir_forgot_password_content' );

+		$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');

+		} 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_name = geodir_get_client_name( $post_author_id );

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

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

+		$post_author_name = geodir_get_client_name($post_author_id);

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

 

-		if ( $fromEmail == '' ) {

-			$fromEmail = get_option( 'site_email' );

+		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#]',

@@ -838,7 +838,7 @@ 
 			$post_author_name,

 			$current_date

 		);

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

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

 

 		$search_array  = array(

 			'[#listing_link#]',

@@ -874,12 +874,12 @@ 
 			$post_author_name,

 			$current_date

 		);

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

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

 

-		$headers = 'MIME-Version: 1.0' . "\r\n";

-		$headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";

-		$headers .= "Reply-To: " . $fromEmail . "\r\n";

-		$headers .= 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>' . "\r\n";

+		$headers = 'MIME-Version: 1.0'."\r\n";

+		$headers .= 'Content-type: text/html; charset=UTF-8'."\r\n";

+		$headers .= "Reply-To: ".$fromEmail."\r\n";

+		$headers .= 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>'."\r\n";

 

 		$to = $toEmail;

 

@@ -901,7 +901,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.

 		 *

@@ -920,7 +920,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.

 		 *

@@ -939,7 +939,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.

 		 *

@@ -958,34 +958,34 @@ 
 		 * @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 == 'post_submit' ) {

-			$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') {

+			$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#]',

@@ -1017,7 +1017,7 @@ 
 				$user_login,

 				$user_login

 			);

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

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

 

 			$search_array  = array(

 				'[#listing_link#]',

@@ -1045,40 +1045,40 @@ 
 				$user_login,

 				$user_login

 			);

-			$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 ) {

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

+		if ($admin_bcc === true) {

+			$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);

 			}

 		}

 

@@ -1094,27 +1094,27 @@ 
  */

 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>';

 }

 

 

@@ -1136,9 +1136,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">';

@@ -1147,162 +1147,162 @@ 
 		 *

 		 * @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 . '">' . __( ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>';

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

+			$breadcrumb .= $separator.'<a href="'.$listing_link.'">'.__(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 = 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 = ucfirst($gd_location_link_text);

 

 						$location_term_actual_country = '';

 						$location_term_actual_region  = '';

 						$location_term_actual_city    = '';

-						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 );

+						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 {

 							$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 .= $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 .= $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;

 							}

 

@@ -1312,76 +1312,76 @@ 
                             }

                             */

 

-							$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')) {

 			$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'           => 'gd_place'

-			), false );

+			), false);

 

 			/**

 			 * Filter author page link.

@@ -1391,16 +1391,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.

@@ -1411,61 +1411,61 @@ 
 				 * @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 . '">' . __( ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>';

-				$breadcrumb .= $separator . ucfirst( __( 'My', 'geodirectory' ) . ' ' . $_REQUEST['list'] );

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

+				$breadcrumb .= $separator.ucfirst(__('My', 'geodirectory').' '.$_REQUEST['list']);

 			} else {

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

+				$breadcrumb .= $separator.__(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>';

@@ -1478,13 +1478,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.

 	 *

@@ -1496,12 +1496,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;

 			}

 

@@ -1520,23 +1520,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;

 			}

@@ -1547,58 +1547,58 @@ 
 

 	// 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());

 	}

 

-	$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;

@@ -1612,12 +1612,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';

 	}

 

 	/**

@@ -1627,7 +1627,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);

 }

 

 /**

@@ -1640,8 +1640,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;

@@ -1660,17 +1660,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.

 	 *

@@ -1683,67 +1683,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#]',

@@ -1759,7 +1759,7 @@ 
 			'[#site_name#]',

 			'[#transaction_details#]'

 		);

-		$replace_array  = array(

+		$replace_array = array(

 			$display_name,

 			$listingLink,

 			$post_date,

@@ -1774,11 +1774,11 @@ 
 			$fromEmailName,

 			$transaction_details

 		);

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

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

-		$headers        = 'MIME-Version: 1.0' . "\r\n";

-		$headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";

-		$headers .= 'From: ' . $fromEmailName . ' <' . $fromEmail . '>' . "\r\n";

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

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

+		$headers        = 'MIME-Version: 1.0'."\r\n";

+		$headers .= 'Content-type: text/html; charset=UTF-8'."\r\n";

+		$headers .= 'From: '.$fromEmailName.' <'.$fromEmail.'>'."\r\n";

 

 		$to      = $fromEmail;

 		$message = $client_message;

@@ -1796,7 +1796,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.

 		 *

@@ -1809,7 +1809,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.

 		 *

@@ -1822,7 +1822,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.

 		 *

@@ -1835,27 +1835,27 @@ 
 		 * @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);

 		}

 	}

 }

 

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

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

 	/**

 	 * @todo    could be a duplicate of geodir_sendEmail.

 	 *

@@ -1873,40 +1873,40 @@ 
 	 * @param string $post_id       The post ID.

 	 * @param string $user_id       The user ID.

 	 */

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

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

 		$login_details = '';

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

-			$subject = stripslashes( __( get_option( 'email_friend_subject' ), 'geodirectory' ) );

-			$message = stripslashes( __( get_option( 'email_friend_content' ), 'geodirectory' ) );

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

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

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

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

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

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

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

+			$subject = stripslashes(__(get_option('email_friend_subject'), 'geodirectory'));

+			$message = stripslashes(__(get_option('email_friend_content'), 'geodirectory'));

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

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

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

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

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

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

 			$login_details = $to_message;

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

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

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

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

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

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

 			$login_details = $to_message;

 		}

-		$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 );

-		$post_info         = get_post( $post_id );

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

+		$productlink       = get_permalink($post_id);

+		$post_info         = get_post($post_id);

+		$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>';

-		if ( $fromEmail == '' ) {

-			$fromEmail = get_option( 'site_email' );

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

+		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#]',

@@ -1932,7 +1932,7 @@ 
 			$login_details,

 			$toEmailName

 		);

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

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

 

 		$search_array  = array(

 			'[#listing_link#]',

@@ -1954,64 +1954,64 @@ 
 			$to_subject,

 			$toEmailName

 		);

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

-		$headers       = 'MIME-Version: 1.0' . "\r\n";

-		$headers .= 'Content-type: text/html; charset=UTF-8' . "\r\n";

-		$headers .= "Reply-To: " . $fromEmail . "\r\n";

-		$headers .= 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>' . "\r\n";

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

+		$headers       = 'MIME-Version: 1.0'."\r\n";

+		$headers .= 'Content-type: text/html; charset=UTF-8'."\r\n";

+		$headers .= "Reply-To: ".$fromEmail."\r\n";

+		$headers .= 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>'."\r\n";

 

 		$to = $toEmail;

 

-		$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);

 		}

 

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

 		$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];

 		}

-		$adminEmail = get_bloginfo( 'admin_email' );

+		$adminEmail = get_bloginfo('admin_email');

 		$to         = $adminEmail;

 

-		if ( $message_type == 'registration' && get_option( 'bcc_new_user' ) ) {

+		if ($message_type == 'registration' && get_option('bcc_new_user')) {

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

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

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

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

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

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

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

 		}

 

-		if ( $admin_bcc === true ) {

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

-			if ( ! $sent ) {

-				if ( is_array( $to ) ) {

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

+		if ($admin_bcc === true) {

+			$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);

 			}

 		}

 

@@ -2033,12 +2033,12 @@ 
  *

  * @return array Category IDs.

  */

-function gd_lang_object_ids( $ids_array, $type ) {

-	if ( function_exists( 'icl_object_id' ) ) {

+function gd_lang_object_ids($ids_array, $type) {

+	if (function_exists('icl_object_id')) {

 		$res = array();

-		foreach ( $ids_array as $id ) {

-			$xlat = icl_object_id( $id, $type, false );

-			if ( ! is_null( $xlat ) ) {

+		foreach ($ids_array as $id) {

+			$xlat = icl_object_id($id, $type, false);

+			if (!is_null($xlat)) {

 				$res[] = $xlat;

 			}

 		}

@@ -2062,20 +2062,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;

 				}

 			}

@@ -2083,14 +2083,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

 

 

 /**

@@ -2106,7 +2106,7 @@ 
 	 *

 	 * @since 1.0.0

 	 */

-	return apply_filters( 'geodir_map_zoom_level', array(

+	return apply_filters('geodir_map_zoom_level', array(

 		1,

 		2,

 		3,

@@ -2126,7 +2126,7 @@ 
 		17,

 		18,

 		19

-	) );

+	));

 

 }

 

@@ -2139,12 +2139,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);

 	}

 }

 

@@ -2158,10 +2158,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;

@@ -2175,7 +2175,7 @@ 
  * @return bool Returns true when sitepress multilingual CMS active. else returns false.

  */

 function geodir_wpml_multilingual_status() {

-	if ( function_exists( 'icl_object_id' ) ) {

+	if (function_exists('icl_object_id')) {

 		return true;

 	}

 

@@ -2193,19 +2193,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;

 			}

 		}

 	}

@@ -2222,15 +2222,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();

 			}

 		}

@@ -2249,41 +2249,41 @@ 
  *

  * @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, ";

+			$orderby = $table.".is_featured ASC, ";

 			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:

-			$orderby = $wpdb->posts . ".post_title ASC, ";

+			$orderby = $wpdb->posts.".post_title ASC, ";

 			break;

 	}

 

@@ -2305,15 +2305,15 @@ 
  *

  * @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';

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

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

 

-	$fields = $wpdb->posts . ".*, " . $table . ".*";

+	$fields = $wpdb->posts.".*, ".$table.".*";

 	/**

 	 * Filter widget listing fields string part that is being used for query.

 	 *

@@ -2323,17 +2323,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 ( function_exists( 'icl_object_id' ) ) {

+	if (function_exists('icl_object_id')) {

 		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";

 		}

 	}

 

@@ -2347,15 +2347,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 ( function_exists( 'icl_object_id' ) ) {

-		if ( $lang_code ) {

+	if (function_exists('icl_object_id')) {

+		if ($lang_code) {

 			$where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' ";

 		}

 	}

@@ -2368,8 +2368,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 ";

 	/**

@@ -2380,15 +2380,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(" . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . "

-			" . $join . "

+	if ($count_only) {

+		$sql  = "SELECT COUNT(".$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.

 		 *

@@ -2398,11 +2398,11 @@ 
 		 * @param string $table     Table name.

 		 * @param string $post_type Post type.

 		 */

-		$orderby = apply_filters( 'geodir_filter_widget_listings_orderby', $orderby, $table, $post_type );

-		$orderby .= $wpdb->posts . ".post_title ASC";

-		$orderby = $orderby != '' ? " ORDER BY " . $orderby : '';

+		$orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);

+		$orderby .= $wpdb->posts.".post_title ASC";

+		$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.

 		 *

@@ -2411,26 +2411,26 @@ 
 		 * @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 : "";

 

-		$sql  = "SELECT SQL_CALC_FOUND_ROWS " . $fields . " FROM " . $wpdb->posts . "

-			" . $join . "

-			" . $where . "

-			" . $groupby . "

-			" . $orderby . "

+		$sql = "SELECT SQL_CALC_FOUND_ROWS ".$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;

 }

@@ -2447,11 +2447,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;

 	}

 

@@ -2470,24 +2470,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'];

 		}

 	}

@@ -2507,49 +2507,49 @@ 
  *

  * @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['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'];

 			}

 		}

@@ -2570,11 +2570,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;

 	}

 

@@ -2593,15 +2593,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'];

 	}

 

@@ -2619,12 +2619,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;

 	}

 

@@ -2637,7 +2637,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;

 }

@@ -2653,12 +2653,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;

 	}

 

@@ -2671,7 +2671,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;

 }

@@ -2688,8 +2688,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;

 	}

 

@@ -2698,13 +2698,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;

@@ -2719,14 +2719,14 @@ 
  *

  * @param int $number Comments number.

  */

-function geodir_comments_number( $number ) {

+function geodir_comments_number($number) {

 

-	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');

 	}

 	echo $output;

 }

@@ -2741,18 +2741,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;

@@ -2772,18 +2772,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.

@@ -2796,20 +2796,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);

 

 

 /**

@@ -2826,93 +2826,93 @@ 
  *                                          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;

-	if ( ! empty( $gd_post_type ) ) {

+	$category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15;

+	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] : '';

 	}

 

 	$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);

 	}

 

-	$terms   = get_terms( $taxonomy );

+	$terms   = get_terms($taxonomy);

 	$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 ) ) {

-		foreach ( $a_terms as $b_key => $b_val ) {

-			$b_terms[ $b_key ] = geodir_sort_terms( $b_val, 'count' );

+	if (!empty($a_terms)) {

+		foreach ($a_terms as $b_key => $b_val) {

+			$b_terms[$b_key] = geodir_sort_terms($b_val, 'count');

 		}

 

-		$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 ) {

+		if (count($b_terms) > 1) {

 			$tax_change_output .= "<select data-limit='$category_limit' 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>";

+			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 );

+					geodir_helper_cat_list_output($terms, $category_limit);

 

 					echo '</ul>';

 					?>

 				</div>

 				<?php

 				$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

@@ -2931,25 +2931,25 @@ 
  * @param array $terms                      An array of term objects.

  * @param int $category_limit               Number of categories to display by default.

  */

-function geodir_helper_cat_list_output( $terms, $category_limit ) {

+function geodir_helper_cat_list_output($terms, $category_limit) {

 	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';

 		$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.

 		 *

@@ -2959,11 +2959,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>';

 	}

 }

@@ -2978,14 +2978,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.

 	 *

@@ -2993,7 +2993,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.

 	 *

@@ -3001,7 +3001,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.

 	 *

@@ -3009,7 +3009,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.

 	 *

@@ -3017,7 +3017,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.

 	 *

@@ -3025,7 +3025,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.

 	 *

@@ -3033,7 +3033,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.

 	 *

@@ -3041,7 +3041,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.

 	 *

@@ -3049,7 +3049,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.

 	 *

@@ -3057,7 +3057,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.

 	 *

@@ -3065,7 +3065,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.

 	 *

@@ -3073,7 +3073,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.

 	 *

@@ -3081,7 +3081,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.

 	 *

@@ -3089,10 +3089,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 () {

@@ -3107,23 +3107,23 @@ 
 				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 */ ?>

 			});

 

 			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) {

@@ -3131,7 +3131,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>

@@ -3142,62 +3142,62 @@ 
 		'post_type'      => $post_type,

 		'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.

 					 *

@@ -3208,12 +3208,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 . '<img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:200px;margin:0 auto;" /></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.'<img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:200px;margin:0 auto;" /></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++;

 			}

 		}

 		?>

@@ -3222,7 +3222,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>

@@ -3230,7 +3230,7 @@ 
 		</div>

 		<?php

 		$GLOBALS['post'] = $current_post;

-		setup_postdata( $current_post );

+		setup_postdata($current_post);

 	}

 	echo $after_widget;

 }

@@ -3246,46 +3246,46 @@ 
  * @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( 'widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 

 	echo $before_widget;

-	echo $before_title . $title . $after_title;

+	echo $before_title.$title.$after_title;

 

-	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"';

 						}

 

@@ -3298,22 +3298,22 @@ 
 						 * @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 );

+						$add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);

 

-						$addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>';

+						$addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(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

 

@@ -3321,23 +3321,23 @@ 
 

 		}

 		// 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;

-					$post_type_link = geodir_getlink( $author_link, array(

+					$post_type_link = geodir_getlink($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"';

 					}

 					/**

@@ -3349,20 +3349,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 . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>';

+					$favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(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>

@@ -3371,19 +3371,19 @@ 
 		}

 

 

-		$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_link = geodir_getlink( $author_link, array( 'stype' => $key ), false );

+					$listing_link = geodir_getlink($author_link, array('stype' => $key), false);

 

 					$selected = '';

-					if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {

+					if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {

 						$selected = 'selected="selected"';

 					}

 

@@ -3396,20 +3396,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 . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>';

+					$listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(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>

@@ -3425,7 +3425,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>';

 

 		/**

@@ -3433,7 +3433,7 @@ 
 		 *

 		 * @since 1.6.6

 		 */

-		do_action( 'geodir_after_loginwidget_form_logged_in' );

+		do_action('geodir_after_loginwidget_form_logged_in');

 

 

 	} else {

@@ -3448,18 +3448,18 @@ 
 		<form name="loginform" class="loginform1"

 		      action="<?php echo geodir_login_url(); ?>"

 		      method="post">

-			<div class="geodir_form_row"><input placeholder="<?php _e( 'Email', 'geodirectory' ); ?>" name="log"

+			<div class="geodir_form_row"><input placeholder="<?php _e('Email', 'geodirectory'); ?>" 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="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"/>

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

 					 */

 					?>

-					<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

@@ -3482,7 +3482,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

@@ -3491,7 +3491,7 @@ 
 		 *

 		 * @since 1.6.6

 		 */

-		do_action( 'geodir_after_loginwidget_form_logged_out' );

+		do_action('geodir_after_loginwidget_form_logged_out');

 	}

 

 	echo $after_widget;

@@ -3513,16 +3513,16 @@ 
  *                                         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);

 

 	echo $before_widget;

 

 	/** 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.

 	 *

@@ -3530,7 +3530,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.

 	 *

@@ -3538,7 +3538,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.

 	 *

@@ -3546,7 +3546,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.

 	 *

@@ -3554,7 +3554,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.

 	 *

@@ -3562,7 +3562,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.

 	 *

@@ -3570,7 +3570,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.

 	 *

@@ -3578,25 +3578,25 @@ 
 	 *

 	 * @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);

 

-	if ( isset( $instance['character_count'] ) ) {

+	if (isset($instance['character_count'])) {

 		/**

 		 * Filter the widget's excerpt character count.

 		 *

@@ -3604,37 +3604,37 @@ 
 		 *

 		 * @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' ) {

-		$title .= ' ' . __( get_post_type_plural_label( $post_type ), 'geodirectory' );

+	if (empty($title) || $title == 'All') {

+		$title .= ' '.__(get_post_type_plural_label($post_type), 'geodirectory');

 	}

 

 	$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;

 			}

 		}

@@ -3642,37 +3642,37 @@ 
 		$location_url[] = $city;

 	}

 

-	$location_url  = implode( '/', $location_url );

+	$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 ( 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 = '';

 	}

 

@@ -3684,34 +3684,34 @@ 
 		'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;

 	}

-	$with_no_results = ! empty( $instance['without_no_results'] ) ? false : true;

+	$with_no_results = !empty($instance['without_no_results']) ? false : true;

 

-	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 ( function_exists( 'icl_object_id' ) ) {

-			$category = gd_lang_object_ids( $category, $category_taxonomy[0] );

+		if (function_exists('icl_object_id')) {

+			$category = gd_lang_object_ids($category, $category_taxonomy[0]);

 		}

 		######### WPML #########

 

@@ -3721,14 +3721,14 @@ 
 			'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 ( ! empty( $widget_listings ) || $with_no_results ) {

+	if (!empty($widget_listings) || $with_no_results) {

 		?>

 		<div class="geodir_locations geodir_location_listing">

 

@@ -3738,11 +3738,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

 			/**

@@ -3750,10 +3750,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 {

@@ -3765,8 +3765,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.

 				 *

@@ -3774,7 +3774,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;

@@ -3789,13 +3789,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;

@@ -3826,12 +3826,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.

@@ -3843,9 +3843,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;

 }

@@ -3863,7 +3863,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.

 	 *

@@ -3873,78 +3873,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 {

@@ -3960,39 +3960,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);

 }

 

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

@@ -4009,11 +4009,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;

 		}

@@ -4030,8 +4030,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;

 }

@@ -4046,8 +4046,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;

 }

@@ -4063,12 +4063,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);

 	}

 }

 

@@ -4086,7 +4086,7 @@ 
  *

  * @return bool

  */

-function geodir_sort_by_count( $a, $b ) {

+function geodir_sort_by_count($a, $b) {

 	return $a['count'] < $b['count'];

 }

 

@@ -4101,7 +4101,7 @@ 
  *

  * @return bool

  */

-function geodir_sort_by_count_obj( $a, $b ) {

+function geodir_sort_by_count_obj($a, $b) {

 	return $a->count < $b->count;

 }

 

@@ -4116,7 +4116,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;

 }

 

@@ -4133,35 +4133,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());

 		}

 	}

 }

@@ -4178,19 +4178,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.

 

@@ -4203,9 +4203,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";

@@ -4222,20 +4222,20 @@ 
 	$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 );

-				$contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";

+	if (!empty($contents_strings)) {

+		foreach ($contents_strings as $string) {

+			if (is_scalar($string) && $string != '') {

+				$string = str_replace("'", "\'", $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.

 

@@ -4255,45 +4255,45 @@ 
  *

  * @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 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 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->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'];

 						}

 					}

@@ -4303,48 +4303,48 @@ 
 	}

 

 	// 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, 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, 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->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;

 }

@@ -4366,7 +4366,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',

@@ -4434,18 +4434,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);

 		}

 	}

 

@@ -4453,19 +4453,19 @@ 
 }

 

 

-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) {

 

 	global $wp;

 	$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

 	 *

@@ -4475,105 +4475,105 @@ 
 	 * @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_titles = array();

-	if ( 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_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');

 		}

 	}

 	$location_single = '';

-	$gd_country      = ( isset( $wp->query_vars['gd_country'] ) && $wp->query_vars['gd_country'] != '' ) ? $wp->query_vars['gd_country'] : '';

-	$gd_region       = ( isset( $wp->query_vars['gd_region'] ) && $wp->query_vars['gd_region'] != '' ) ? $wp->query_vars['gd_region'] : '';

-	$gd_city         = ( isset( $wp->query_vars['gd_city'] ) && $wp->query_vars['gd_city'] != '' ) ? $wp->query_vars['gd_city'] : '';

+	$gd_country      = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

+	$gd_region       = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

+	$gd_city         = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

 

 	$gd_country_actual = $gd_region_actual = $gd_city_actual = '';

 

-	if ( function_exists( 'get_actual_location_name' ) ) {

-		$gd_country_actual = $gd_country != '' ? get_actual_location_name( 'country', $gd_country, true ) : $gd_country;

-		$gd_region_actual  = $gd_region != '' ? get_actual_location_name( 'region', $gd_region ) : $gd_region;

-		$gd_city_actual    = $gd_city != '' ? get_actual_location_name( 'city', $gd_city ) : $gd_city;

+	if (function_exists('get_actual_location_name')) {

+		$gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

+		$gd_region_actual  = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

+		$gd_city_actual    = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

 	}

 

-	if ( $gd_city != '' ) {

-		if ( $gd_city_actual != '' ) {

+	if ($gd_city != '') {

+		if ($gd_city_actual != '') {

 			$gd_city = $gd_city_actual;

 		} else {

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

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

-			$gd_city = __( geodir_ucwords( $gd_city ), 'geodirectory' );

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

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

+			$gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

 		}

 		$location_single = $gd_city;

 

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

-		if ( $gd_region_actual != '' ) {

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

+		if ($gd_region_actual != '') {

 			$gd_region = $gd_region_actual;

 		} else {

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

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

-			$gd_region = __( geodir_ucwords( $gd_region ), 'geodirectory' );

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

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

+			$gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

 		}

 

 		$location_single = $gd_region;

-	} else if ( $gd_country != '' ) {

-		if ( $gd_country_actual != '' ) {

+	} else if ($gd_country != '') {

+		if ($gd_country_actual != '') {

 			$gd_country = $gd_country_actual;

 		} else {

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

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

-			$gd_country = __( geodir_ucwords( $gd_country ), 'geodirectory' );

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

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

+			$gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

 		}

 

 		$location_single = $gd_country;

 	}

 

-	if ( ! empty( $location_array ) ) {

+	if (!empty($location_array)) {

 

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

-		$location_array       = array_reverse( $location_array );

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

+		$location_array       = array_reverse($location_array);

 

-		foreach ( $location_array as $location_type => $location ) {

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

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

+		foreach ($location_array as $location_type => $location) {

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

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

 

-			$location_name = geodir_ucwords( $gd_location_link_text );

-			$location_name = __( $location_name, 'geodirectory' );

+			$location_name = geodir_ucwords($gd_location_link_text);

+			$location_name = __($location_name, 'geodirectory');

 

-			if ( $actual_location_name ) {

-				$location_type = strpos( $location_type, 'gd_' ) === 0 ? substr( $location_type, 3 ) : $location_type;

-				$location_name = get_actual_location_name( $location_type, $location, true );

+			if ($actual_location_name) {

+				$location_type = strpos($location_type, 'gd_') === 0 ? substr($location_type, 3) : $location_type;

+				$location_name = get_actual_location_name($location_type, $location, true);

 			}

 

 			$location_titles[] = $location_name;

 		}

-		if ( ! empty( $location_titles ) ) {

-			$location_titles = array_unique( $location_titles );

+		if (!empty($location_titles)) {

+			$location_titles = array_unique($location_titles);

 		}

 	}

 

 

-	if ( ! empty( $location_titles ) ) {

-		$vars['%%location%%'] = implode( ", ", $location_titles );

+	if (!empty($location_titles)) {

+		$vars['%%location%%'] = implode(", ", $location_titles);

 	}

 

 

-	if ( ! empty( $location_titles ) ) {

-		$vars['%%in_location%%'] = __( 'in ', 'geodirectory' ) . implode( ", ", $location_titles );

+	if (!empty($location_titles)) {

+		$vars['%%in_location%%'] = __('in ', 'geodirectory').implode(", ", $location_titles);

 	}

 

 

-	if ( $location_single ) {

-		$vars['%%in_location_single%%'] = __( 'in', 'geodirectory' ) . ' ' . $location_single;

+	if ($location_single) {

+		$vars['%%in_location_single%%'] = __('in', 'geodirectory').' '.$location_single;

 	}

 

 

-	if ( $location_single ) {

+	if ($location_single) {

 		$vars['%%location_single%%'] = $location_single;

 	}

 

@@ -4586,13 +4586,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.

@@ -4634,14 +4634,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.

 		 *

@@ -4650,100 +4650,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

 	 *

@@ -4755,166 +4755,166 @@ 
 	 * @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);

 	$location_titles = array();

-	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');

 		}

 	}

 	$location_single = '';

-	$gd_country      = ( isset( $wp->query_vars['gd_country'] ) && $wp->query_vars['gd_country'] != '' ) ? $wp->query_vars['gd_country'] : '';

-	$gd_region       = ( isset( $wp->query_vars['gd_region'] ) && $wp->query_vars['gd_region'] != '' ) ? $wp->query_vars['gd_region'] : '';

-	$gd_city         = ( isset( $wp->query_vars['gd_city'] ) && $wp->query_vars['gd_city'] != '' ) ? $wp->query_vars['gd_city'] : '';

+	$gd_country      = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

+	$gd_region       = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

+	$gd_city         = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

 

 	$gd_country_actual = $gd_region_actual = $gd_city_actual = '';

 

-	if ( function_exists( 'get_actual_location_name' ) ) {

-		$gd_country_actual = $gd_country != '' ? get_actual_location_name( 'country', $gd_country, true ) : $gd_country;

-		$gd_region_actual  = $gd_region != '' ? get_actual_location_name( 'region', $gd_region ) : $gd_region;

-		$gd_city_actual    = $gd_city != '' ? get_actual_location_name( 'city', $gd_city ) : $gd_city;

+	if (function_exists('get_actual_location_name')) {

+		$gd_country_actual = $gd_country != '' ? get_actual_location_name('country', $gd_country, true) : $gd_country;

+		$gd_region_actual  = $gd_region != '' ? get_actual_location_name('region', $gd_region) : $gd_region;

+		$gd_city_actual    = $gd_city != '' ? get_actual_location_name('city', $gd_city) : $gd_city;

 	}

 

-	if ( $gd_city != '' ) {

-		if ( $gd_city_actual != '' ) {

+	if ($gd_city != '') {

+		if ($gd_city_actual != '') {

 			$gd_city = $gd_city_actual;

 		} else {

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

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

-			$gd_city = __( geodir_ucwords( $gd_city ), 'geodirectory' );

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

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

+			$gd_city = __(geodir_ucwords($gd_city), 'geodirectory');

 		}

 		$location_single = $gd_city;

 

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

-		if ( $gd_region_actual != '' ) {

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

+		if ($gd_region_actual != '') {

 			$gd_region = $gd_region_actual;

 		} else {

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

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

-			$gd_region = __( geodir_ucwords( $gd_region ), 'geodirectory' );

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

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

+			$gd_region = __(geodir_ucwords($gd_region), 'geodirectory');

 		}

 

 		$location_single = $gd_region;

-	} else if ( $gd_country != '' ) {

-		if ( $gd_country_actual != '' ) {

+	} else if ($gd_country != '') {

+		if ($gd_country_actual != '') {

 			$gd_country = $gd_country_actual;

 		} else {

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

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

-			$gd_country = __( geodir_ucwords( $gd_country ), 'geodirectory' );

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

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

+			$gd_country = __(geodir_ucwords($gd_country), 'geodirectory');

 		}

 

 		$location_single = $gd_country;

 	}

 

-	if ( ! empty( $location_array ) ) {

+	if (!empty($location_array)) {

 

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

-		$location_array       = array_reverse( $location_array );

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

+		$location_array       = array_reverse($location_array);

 

-		foreach ( $location_array as $location_type => $location ) {

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

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

+		foreach ($location_array as $location_type => $location) {

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

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

 

-			$location_name = geodir_ucwords( $gd_location_link_text );

-			$location_name = __( $location_name, 'geodirectory' );

+			$location_name = geodir_ucwords($gd_location_link_text);

+			$location_name = __($location_name, 'geodirectory');

 

-			if ( $actual_location_name ) {

-				$location_type = strpos( $location_type, 'gd_' ) === 0 ? substr( $location_type, 3 ) : $location_type;

-				$location_name = get_actual_location_name( $location_type, $location, true );

+			if ($actual_location_name) {

+				$location_type = strpos($location_type, 'gd_') === 0 ? substr($location_type, 3) : $location_type;

+				$location_name = get_actual_location_name($location_type, $location, true);

 			}

 

 			$location_titles[] = $location_name;

 		}

-		if ( ! empty( $location_titles ) ) {

-			$location_titles = array_unique( $location_titles );

+		if (!empty($location_titles)) {

+			$location_titles = array_unique($location_titles);

 		}

 	}

 

 

-	if ( strpos( $title, '%%location%%' ) !== false ) {

+	if (strpos($title, '%%location%%') !== false) {

 		$location = '';

-		if ( $location_titles ) {

-			$location = implode( ", ", $location_titles );

+		if ($location_titles) {

+			$location = implode(", ", $location_titles);

 		}

-		$title = str_replace( "%%location%%", $location, $title );

+		$title = str_replace("%%location%%", $location, $title);

 	}

 

-	if ( strpos( $title, '%%in_location%%' ) !== false ) {

+	if (strpos($title, '%%in_location%%') !== false) {

 		$location = '';

-		if ( $location_titles ) {

-			$location = __( 'in ', 'geodirectory' ) . implode( ", ", $location_titles );

+		if ($location_titles) {

+			$location = __('in ', 'geodirectory').implode(", ", $location_titles);

 		}

-		$title = str_replace( "%%in_location%%", $location, $title );

+		$title = str_replace("%%in_location%%", $location, $title);

 	}

 

-	if ( strpos( $title, '%%in_location_single%%' ) !== false ) {

-		if ( $location_single ) {

-			$location_single = __( 'in', 'geodirectory' ) . ' ' . $location_single;

+	if (strpos($title, '%%in_location_single%%') !== false) {

+		if ($location_single) {

+			$location_single = __('in', 'geodirectory').' '.$location_single;

 		}

-		$title = str_replace( "%%in_location_single%%", $location_single, $title );

+		$title = str_replace("%%in_location_single%%", $location_single, $title);

 	}

 

-	if ( strpos( $title, '%%location_single%%' ) !== false ) {

-		$title = str_replace( "%%location_single%%", $location_single, $title );

+	if (strpos($title, '%%location_single%%') !== false) {

+		$title = str_replace("%%location_single%%", $location_single, $title);

 	}

 

 

-	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.

@@ -4928,7 +4928,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);

 }

 

 /**

@@ -4941,82 +4941,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;

 }

@@ -5031,27 +5031,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']);

 			}

 		}

 	}

@@ -5069,33 +5069,33 @@ 
  * @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 ) {

-	if ( ! $update ) {

+function geodir_on_wp_insert_post($post_ID, $post, $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() ) {

-			$from_email   = get_option( 'site_email' );

+		if ($user_id == $author_id && !is_super_admin()) {

+			$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;

@@ -5107,9 +5107,9 @@ 
 			 * @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 );

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

 

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

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

 		}

 	}

 }

@@ -5124,14 +5124,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;

@@ -5148,8 +5148,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;

 	}

 

@@ -5167,8 +5167,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;

 	}

 

@@ -5188,36 +5188,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;

@@ -5238,14 +5238,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 {

 			/**

@@ -5256,7 +5256,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);

 		}

 	}

 

@@ -5273,12 +5273,12 @@ 
  *

  * @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' );
\ No newline at end of file
+add_filter('post_class', 'geodir_remove_hentry');
\ No newline at end of file

geodirectory-functions/custom_fields_output_functions.php

Spacing +298 added lines, -298 removed lines

@@ -19,21 +19,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_checkbox($html,$location,$cf,$p=''){
+function geodir_cf_checkbox($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_{$location}")){
+    if (has_filter("geodir_custom_field_output_checkbox_{$location}")) {
         /**
          * Filter the checkbox html by location.
          *
@@ -41,11 +41,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_checkbox_{$html_var}")) {
         /**
          * Filter the checkbox html by individual custom field.
          *
@@ -54,11 +54,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_checkbox_{$location}_{$html_var}")) {
         /**
          * Filter the checkbox html by location and individual custom field.
          *
@@ -66,18 +66,18 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if ( (int) $post->{$html_var} == 1 ):
+        if ((int) $post->{$html_var} == 1):
 
-            if ( $post->{$html_var} == '1' ):
-                $html_val = __( 'Yes', 'geodirectory' );
+            if ($post->{$html_var} == '1'):
+                $html_val = __('Yes', 'geodirectory');
             else:
-                $html_val = __( 'No', 'geodirectory' );
+                $html_val = __('No', 'geodirectory');
             endif;
 
             $field_icon = geodir_field_icon_proccess($cf);
@@ -90,16 +90,16 @@ 
                 $field_icon = '';
             }
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-checkbox" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$html_val.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_checkbox','geodir_cf_checkbox',10,3);
+add_filter('geodir_custom_field_output_checkbox', 'geodir_cf_checkbox', 10, 3);
 
 
 /**
@@ -112,21 +112,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_fieldset($html,$location,$cf,$p=''){
+function geodir_cf_fieldset($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_{$location}")){
+    if (has_filter("geodir_custom_field_output_fieldset_{$location}")) {
         /**
          * Filter the fieldset html by location.
          *
@@ -134,11 +134,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_fieldset_{$html_var}")) {
         /**
          * Filter the fieldset html by individual custom field.
          *
@@ -147,11 +147,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_fieldset_{$location}_{$html_var}")) {
         /**
          * Filter the fieldset html by location and individual custom field.
          *
@@ -159,19 +159,19 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $field_set_start;
         $fieldset_class = 'fieldset-'.sanitize_title_with_dashes($cf['site_title']);
 
         if ($field_set_start == 1) {
-            echo '</div><div class="geodir-company_info field-group ' . $cf['htmlvar_name'] . '"><h2 class="'.$fieldset_class.'">' . __($cf['site_title'], 'geodirectory') . '</h2>';
+            echo '</div><div class="geodir-company_info field-group '.$cf['htmlvar_name'].'"><h2 class="'.$fieldset_class.'">'.__($cf['site_title'], 'geodirectory').'</h2>';
         } else {
-            echo '<h2 class="'.$fieldset_class.'">' . __($cf['site_title'], 'geodirectory') . '</h2>';
+            echo '<h2 class="'.$fieldset_class.'">'.__($cf['site_title'], 'geodirectory').'</h2>';
             $field_set_start = 1;
         }
 
@@ -179,7 +179,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_fieldset','geodir_cf_fieldset',10,3);
+add_filter('geodir_custom_field_output_fieldset', 'geodir_cf_fieldset', 10, 3);
 
 
 /**
@@ -192,21 +192,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_url($html,$location,$cf,$p=''){
+function geodir_cf_url($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_url_{$location}")){
+    if (has_filter("geodir_custom_field_output_url_{$location}")) {
         /**
          * Filter the url html by location.
          *
@@ -214,11 +214,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_url_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_url_{$html_var}")) {
         /**
          * Filter the url html by individual custom field.
          *
@@ -227,11 +227,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_url_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_url_{$location}_{$html_var}")) {
         /**
          * Filter the url html by location and individual custom field.
          *
@@ -239,11 +239,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -270,7 +270,7 @@ 
 
             $website = !empty($a_url['url']) ? $a_url['url'] : '';
             $title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
-            if(!empty($cf['default_value'])){$title = $cf['default_value'];}
+            if (!empty($cf['default_value'])) {$title = $cf['default_value']; }
             $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
 
 
@@ -286,7 +286,7 @@ 
              * @param string $website Website URL.
              * @param int $post->ID Post ID.
              */
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'"><span class="geodir-i-website" style="'.$field_icon.'">'.$field_icon_af.'<a href="'.$website.'" target="_blank" '.$rel.' ><strong>'.apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID).'</strong></a></span></div>';
 
         endif;
 
@@ -294,7 +294,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_url','geodir_cf_url',10,3);
+add_filter('geodir_custom_field_output_url', 'geodir_cf_url', 10, 3);
 
 
 /**
@@ -307,21 +307,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_phone($html,$location,$cf,$p=''){
+function geodir_cf_phone($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_phone_{$location}")){
+    if (has_filter("geodir_custom_field_output_phone_{$location}")) {
         /**
          * Filter the phone html by location.
          *
@@ -329,11 +329,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_phone_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_phone_{$html_var}")) {
         /**
          * Filter the phone html by individual custom field.
          *
@@ -342,11 +342,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_phone_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_phone_{$location}_{$html_var}")) {
         /**
          * Filter the phone html by location and individual custom field.
          *
@@ -354,11 +354,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -373,9 +373,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
-                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-contact" style="'.$field_icon.'">'.$field_icon_af.
+                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
+            $html .= '</span><a href="tel:'.preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}).'">'.$post->{$cf['htmlvar_name']}.'</a></div>';
 
         endif;
 
@@ -383,7 +383,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_phone','geodir_cf_phone',10,3);
+add_filter('geodir_custom_field_output_phone', 'geodir_cf_phone', 10, 3);
 
 
 /**
@@ -396,21 +396,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_time($html,$location,$cf,$p=''){
+function geodir_cf_time($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_time_{$location}")){
+    if (has_filter("geodir_custom_field_output_time_{$location}")) {
         /**
          * Filter the time html by location.
          *
@@ -418,11 +418,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_time_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_time_{$html_var}")) {
         /**
          * Filter the time html by individual custom field.
          *
@@ -431,11 +431,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_time_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_time_{$location}_{$html_var}")) {
         /**
          * Filter the time html by location and individual custom field.
          *
@@ -443,11 +443,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -467,9 +467,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span>' . $value . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-time" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
+            $html .= '</span>'.$value.'</div>';
 
         endif;
 
@@ -477,7 +477,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_time','geodir_cf_time',10,3);
+add_filter('geodir_custom_field_output_time', 'geodir_cf_time', 10, 3);
 
 
 /**
@@ -490,21 +490,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_datepicker($html,$location,$cf,$p=''){
+function geodir_cf_datepicker($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_{$location}")){
+    if (has_filter("geodir_custom_field_output_datepicker_{$location}")) {
         /**
          * Filter the datepicker html by location.
          *
@@ -512,11 +512,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_datepicker_{$html_var}")) {
         /**
          * Filter the datepicker html by individual custom field.
          *
@@ -525,11 +525,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_datepicker_{$location}_{$html_var}")) {
         /**
          * Filter the datepicker html by location and individual custom field.
          *
@@ -537,11 +537,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -552,21 +552,21 @@ 
             }
             // check if we need to change the format or not
             $date_format_len = strlen(str_replace(' ', '', $date_format));
-            if($date_format_len>5){// if greater then 4 then it's the old style format.
+            if ($date_format_len > 5) {// if greater then 4 then it's the old style format.
 
-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-                $replace = array('d','j','l','m','n','F','Y');//PHP date format
+                $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
+                $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
 
                 $date_format = str_replace($search, $replace, $date_format);
 
-                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
-            }else{
+                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y') ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
+            } else {
                 $post_htmlvar_value = $post->{$cf['htmlvar_name']};
             }
 
-            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
+            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']} != "0000-00-00") {
                 $value = date_i18n($date_format, strtotime($post_htmlvar_value));
-            }else{
+            } else {
                 return '';
             }
 
@@ -583,9 +583,9 @@ 
 
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $value . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-datepicker" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$value.'</div>';
 
         endif;
 
@@ -593,7 +593,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_datepicker','geodir_cf_datepicker',10,3);
+add_filter('geodir_custom_field_output_datepicker', 'geodir_cf_datepicker', 10, 3);
 
 
 /**
@@ -606,21 +606,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_text($html,$location,$cf,$p=''){
+function geodir_cf_text($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_text_{$location}")){
+    if (has_filter("geodir_custom_field_output_text_{$location}")) {
         /**
          * Filter the text html by location.
          *
@@ -628,11 +628,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_text_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_text_{$html_var}")) {
         /**
          * Filter the text html by individual custom field.
          *
@@ -641,11 +641,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_text_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_text_{$location}_{$html_var}")) {
         /**
          * Filter the text html by location and individual custom field.
          *
@@ -653,13 +653,13 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
 
             $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
@@ -674,9 +674,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $post->{$cf['htmlvar_name']} . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="'.$class.'" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$post->{$cf['htmlvar_name']}.'</div>';
 
         endif;
 
@@ -684,7 +684,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text','geodir_cf_text',10,3);
+add_filter('geodir_custom_field_output_text', 'geodir_cf_text', 10, 3);
 
 
 /**
@@ -697,21 +697,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_radio($html,$location,$cf,$p=''){
+function geodir_cf_radio($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_radio_{$location}")){
+    if (has_filter("geodir_custom_field_output_radio_{$location}")) {
         /**
          * Filter the radio html by location.
          *
@@ -719,11 +719,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_radio_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_radio_{$html_var}")) {
         /**
          * Filter the radio html by individual custom field.
          *
@@ -732,11 +732,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_radio_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_radio_{$location}_{$html_var}")) {
         /**
          * Filter the radio html by location and individual custom field.
          *
@@ -744,11 +744,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         $html_val = __($post->{$cf['htmlvar_name']}, 'geodirectory');
         if ($post->{$cf['htmlvar_name']} != ''):
@@ -782,16 +782,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-radio" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$html_val.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_radio','geodir_cf_radio',10,3);
+add_filter('geodir_custom_field_output_radio', 'geodir_cf_radio', 10, 3);
 
 
 /**
@@ -804,21 +804,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_select($html,$location,$cf,$p=''){
+function geodir_cf_select($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_select_{$location}")){
+    if (has_filter("geodir_custom_field_output_select_{$location}")) {
         /**
          * Filter the select html by location.
          *
@@ -826,11 +826,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_select_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_select_{$html_var}")) {
         /**
          * Filter the select html by individual custom field.
          *
@@ -839,11 +839,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_select_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_select_{$location}_{$html_var}")) {
         /**
          * Filter the select html by location and individual custom field.
          *
@@ -851,11 +851,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
             $field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
@@ -883,16 +883,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $field_value . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$field_value.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_select','geodir_cf_select',10,3);
+add_filter('geodir_custom_field_output_select', 'geodir_cf_select', 10, 3);
 
 
 /**
@@ -905,21 +905,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_multiselect($html,$location,$cf,$p=''){
+function geodir_cf_multiselect($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_{$location}")){
+    if (has_filter("geodir_custom_field_output_multiselect_{$location}")) {
         /**
          * Filter the multiselect html by location.
          *
@@ -927,11 +927,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_multiselect_{$html_var}")) {
         /**
          * Filter the multiselect html by individual custom field.
          *
@@ -940,11 +940,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_multiselect_{$location}_{$html_var}")) {
         /**
          * Filter the multiselect html by location and individual custom field.
          *
@@ -952,11 +952,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
 
         if (!empty($post->{$cf['htmlvar_name']})):
@@ -991,15 +991,15 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
             $html .= '</span>';
 
             if (count($option_values) > 1) {
                 $html .= '<ul>';
 
                 foreach ($option_values as $val) {
-                    $html .= '<li>' . $val . '</li>';
+                    $html .= '<li>'.$val.'</li>';
                 }
 
                 $html .= '</ul>';
@@ -1014,7 +1014,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
+add_filter('geodir_custom_field_output_multiselect', 'geodir_cf_multiselect', 10, 3);
 
 
 /**
@@ -1027,21 +1027,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_email($html,$location,$cf,$p=''){
+function geodir_cf_email($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_email_{$location}")){
+    if (has_filter("geodir_custom_field_output_email_{$location}")) {
         /**
          * Filter the email html by location.
          *
@@ -1049,11 +1049,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_email_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_email_{$html_var}")) {
         /**
          * Filter the email html by individual custom field.
          *
@@ -1062,11 +1062,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_email_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_email_{$location}_{$html_var}")) {
         /**
          * Filter the email html by location and individual custom field.
          *
@@ -1074,11 +1074,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $preview;
         if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
@@ -1094,7 +1094,7 @@ 
             if (!$preview) {
                 $b_send_inquiry = 'b_send_inquiry';
                 $b_sendtofriend = 'b_sendtofriend';
-                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
+                $html = '<input type="hidden" name="geodir_popup_post_id" value="'.$post->ID.'" /><div class="geodir_display_popup_forms"></div>';
             }
 
             $field_icon = geodir_field_icon_proccess($cf);
@@ -1108,26 +1108,26 @@ 
             }
 
 
-            $html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+            $html .= '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;
             $seperator = '';
             if ($post->{$cf['htmlvar_name']}) {
-                $html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+                $html .= '<a href="javascript:void(0);" class="'.$b_send_inquiry.'" >'.SEND_INQUIRY.'</a>';
                 $seperator = ' | ';
             }
 
             if (isset($package_info->sendtofriend) && $package_info->sendtofriend) {
-                $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
+                $html .= $seperator.'<a href="javascript:void(0);" class="'.$b_sendtofriend.'">'.SEND_TO_FRIEND.'</a>';
             }
 
             $html .= '</span></div>';
 
 
             if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
+                $html .= '<p class="sucess_msg">'.SEND_INQUIRY_SUCCESS.'</p>';
             } elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';
+                $html .= '<p class="sucess_msg">'.SEND_FRIEND_SUCCESS.'</p>';
             } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
-                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
+                $html .= '<p class="error_msg_fix">'.WRONG_CAPTCH_MSG.'</p>';
             }
 
             /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
@@ -1147,11 +1147,11 @@ 
                 }
 
 
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+                $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
                 $html .= '</span><span class="geodir-email-address-output">';
                 $email = $post->{$cf['htmlvar_name']} ;
-                if($e_split = explode('@',$email)){
+                if ($e_split = explode('@', $email)) {
                     /**
                      * Filter email custom field name output.
                      *
@@ -1160,10 +1160,10 @@ 
                      * @param string $email The email string being output.
                      * @param array $cf Custom field variables array.
                      */
-                    $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
-                    $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
-                }else{
-                    $html .=  $email;
+                    $email_name = apply_filters('geodir_email_field_name_output', $email, $cf);
+                    $html .= "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
+                } else {
+                    $html .= $email;
                 }
                 $html .= '</span></div>';
             }
@@ -1174,7 +1174,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_email','geodir_cf_email',10,3);
+add_filter('geodir_custom_field_output_email', 'geodir_cf_email', 10, 3);
 
 
 /**
@@ -1187,21 +1187,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_file($html,$location,$cf,$p=''){
+function geodir_cf_file($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_file_{$location}")){
+    if (has_filter("geodir_custom_field_output_file_{$location}")) {
         /**
          * Filter the file html by location.
          *
@@ -1209,11 +1209,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_file_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_file_{$html_var}")) {
         /**
          * Filter the file html by individual custom field.
          *
@@ -1222,11 +1222,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_file_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_file_{$location}_{$html_var}")) {
         /**
          * Filter the file html by location and individual custom field.
          *
@@ -1234,11 +1234,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})):
 
@@ -1246,7 +1246,7 @@ 
             if (!empty($files)):
 
                 $extra_fields = !empty($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : NULL;
-                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
+                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';
 
                 $file_paths = '';
                 foreach ($files as $file) {
@@ -1283,9 +1283,9 @@ 
                             //$file_paths .= '<img src="'.$file.'"  />';	
                             $file_paths .= '</div>';
                         } else {
-                            $ext_path = '_' . $html_var . '_';
+                            $ext_path = '_'.$html_var.'_';
                             $filename = explode($ext_path, $filename);
-                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
+                            $file_paths .= '<a href="'.$file.'" target="_blank">'.$filename[count($filename) - 1].'</a>';
                         }
                     }
                 }
@@ -1300,11 +1300,11 @@ 
                     $field_icon = '';
                 }
 
-                $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+                $html = '<div class="geodir_more_info  '.$cf['css_class'].' geodir-custom-file-box '.$cf['htmlvar_name'].'"><div class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
                 $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
                 $html .= '</span>';
-                $html .= $file_paths . '</div></div>';
+                $html .= $file_paths.'</div></div>';
 
             endif;
         endif;
@@ -1313,7 +1313,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_file','geodir_cf_file',10,3);
+add_filter('geodir_custom_field_output_file', 'geodir_cf_file', 10, 3);
 
 
 
@@ -1327,21 +1327,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_textarea($html,$location,$cf,$p=''){
+function geodir_cf_textarea($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_{$location}")){
+    if (has_filter("geodir_custom_field_output_textarea_{$location}")) {
         /**
          * Filter the textarea html by location.
          *
@@ -1349,11 +1349,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_textarea_{$html_var}")) {
         /**
          * Filter the textarea html by individual custom field.
          *
@@ -1362,11 +1362,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_textarea_{$location}_{$html_var}")) {
         /**
          * Filter the textarea html by location and individual custom field.
          *
@@ -1374,11 +1374,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})) {
 
@@ -1393,9 +1393,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.wpautop($post->{$cf['htmlvar_name']}).'</div>';
 
         }
 
@@ -1403,7 +1403,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_textarea','geodir_cf_textarea',10,3);
+add_filter('geodir_custom_field_output_textarea', 'geodir_cf_textarea', 10, 3);
 
 
 
@@ -1417,21 +1417,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_html($html,$location,$cf,$p=''){
+function geodir_cf_html($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_html_{$location}")){
+    if (has_filter("geodir_custom_field_output_html_{$location}")) {
         /**
          * Filter the html html by location.
          *
@@ -1439,11 +1439,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_html_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_html_{$html_var}")) {
         /**
          * Filter the html html by individual custom field.
          *
@@ -1452,11 +1452,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_html_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_html_{$location}_{$html_var}")) {
         /**
          * Filter the html html by location and individual custom field.
          *
@@ -1464,11 +1464,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})) {
 
@@ -1482,9 +1482,9 @@ 
                 $field_icon = '';
             }
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.wpautop($post->{$cf['htmlvar_name']}).'</div>';
 
         }
 
@@ -1492,7 +1492,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_html','geodir_cf_html',10,3);
+add_filter('geodir_custom_field_output_html', 'geodir_cf_html', 10, 3);
 
 
 
@@ -1506,21 +1506,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_taxonomy($html,$location,$cf,$p=''){
+function geodir_cf_taxonomy($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_{$location}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_{$location}")) {
         /**
          * Filter the taxonomy html by location.
          *
@@ -1528,11 +1528,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_{$html_var}")) {
         /**
          * Filter the taxonomy html by individual custom field.
          *
@@ -1541,11 +1541,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_{$location}_{$html_var}")) {
         /**
          * Filter the taxonomy html by location and individual custom field.
          *
@@ -1553,14 +1553,14 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
-            $post_taxonomy = $post->post_type . 'category';
+        if ($html_var == $post->post_type.'category' && !empty($post->{$html_var})) {
+            $post_taxonomy = $post->post_type.'category';
             $field_value = $post->{$html_var};
             $links = array();
             $terms = array();
@@ -1578,7 +1578,7 @@ 
                     if ($term != '') {
                         $term = get_term_by('id', $term, $html_var);
                         if (is_object($term)) {
-                            $links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
+                            $links[] = "<a href='".esc_attr(get_term_link($term, $post_taxonomy))."'>".$term->name."</a>";
                             $terms[] = $term;
                         }
                     }
@@ -1592,7 +1592,7 @@ 
                     $terms = $termsOrdered;
                 }
             }
-            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
+            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object) $terms) : '';
 
             if ($html_value != '') {
                 $field_icon = geodir_field_icon_proccess($cf);
@@ -1605,9 +1605,9 @@ 
                     $field_icon = '';
                 }
 
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span> ' . $html_value . '</div>';
+                $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$html_var.'" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="'.$field_icon.'">'.$field_icon_af;
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+                $html .= '</span> '.$html_value.'</div>';
             }
         }
 
@@ -1615,7 +1615,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_taxonomy','geodir_cf_taxonomy',10,3);
+add_filter('geodir_custom_field_output_taxonomy', 'geodir_cf_taxonomy', 10, 3);
 
 
 /**
@@ -1628,21 +1628,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_address($html,$location,$cf,$p=''){
+function geodir_cf_address($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_address_{$location}")){
+    if (has_filter("geodir_custom_field_output_address_{$location}")) {
         /**
          * Filter the address html by location.
          *
@@ -1650,11 +1650,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_address_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_address_{$html_var}")) {
         /**
          * Filter the address html by individual custom field.
          *
@@ -1663,11 +1663,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_address_{$location}_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_address_{$location}_{$html_var}")) {
         /**
          * Filter the address html by location and individual custom field.
          *
@@ -1675,14 +1675,14 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_{$location}_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_{$location}_{$html_var}", $html, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $preview;
-        $html_var = $cf['htmlvar_name'] . '_address';
+        $html_var = $cf['htmlvar_name'].'_address';
 
         if ($cf['extra_fields']) {
 
@@ -1745,10 +1745,10 @@ 
 
         if ($post->{$html_var}) {
 
-            $field_icon = geodir_field_icon_proccess( $cf );
-            if ( strpos( $field_icon, 'http' ) !== false ) {
+            $field_icon = geodir_field_icon_proccess($cf);
+            if (strpos($field_icon, 'http') !== false) {
                 $field_icon_af = '';
-            } elseif ( $field_icon == '' ) {
+            } elseif ($field_icon == '') {
                 $field_icon_af = '<i class="fa fa-home"></i>';
             } else {
                 $field_icon_af = $field_icon;
@@ -1757,26 +1757,26 @@ 
             
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"  itemscope itemtype="http://schema.org/PostalAddress">';
-            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"  itemscope itemtype="http://schema.org/PostalAddress">';
+            $html .= '<span class="geodir-i-location" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
             $html .= '</span>';
 
 
-            if ( $post->post_address ) {
-                $html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
+            if ($post->post_address) {
+                $html .= '<span itemprop="streetAddress">'.$post->post_address.'</span><br>';
             }
-            if ($show_city_in_address && $post->post_city ) {
-                $html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
+            if ($show_city_in_address && $post->post_city) {
+                $html .= '<span itemprop="addressLocality">'.$post->post_city.'</span><br>';
             }
-            if ($show_region_in_address && $post->post_region ) {
-                $html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
+            if ($show_region_in_address && $post->post_region) {
+                $html .= '<span itemprop="addressRegion">'.$post->post_region.'</span><br>';
             }
-            if ($show_zip_in_address && $post->post_zip ) {
-                $html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
+            if ($show_zip_in_address && $post->post_zip) {
+                $html .= '<span itemprop="postalCode">'.$post->post_zip.'</span><br>';
             }
-            if ($show_country_in_address && $post->post_country ) {
-                $html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
+            if ($show_country_in_address && $post->post_country) {
+                $html .= '<span itemprop="addressCountry">'.__($post->post_country, 'geodirectory').'</span><br>';
             }
             $html .= '</div>';
 
@@ -1787,4 +1787,4 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_address','geodir_cf_address',10,3);
\ No newline at end of file
+add_filter('geodir_custom_field_output_address', 'geodir_cf_address', 10, 3);
\ No newline at end of file

geodirectory-functions/custom_fields_functions.php

Spacing +389 added lines, -389 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)

         )

     );

@@ -169,7 +169,7 @@ 
         $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;

@@ -203,14 +203,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)));

                 }

 

                 /**

@@ -224,18 +224,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'];

@@ -380,12 +380,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 = '';

@@ -426,9 +426,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 = '';

@@ -440,15 +440,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);

@@ -457,12 +457,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);

@@ -470,9 +470,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);

 

                                 }

 

@@ -482,36 +482,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);

@@ -519,24 +519,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);

@@ -544,128 +544,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);

                                 }

 

                             }

@@ -681,30 +681,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']))

@@ -721,9 +721,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'];

@@ -737,24 +737,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;

@@ -770,7 +770,7 @@ 
 

                     $wpdb->prepare(

 

-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                        "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -803,7 +803,7 @@ 
 					for_admin_use = %s

 					where id = %d",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $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, $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)

                     )

 

                 );

@@ -813,7 +813,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)

@@ -822,7 +822,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)));

 

 

                 /**

@@ -842,7 +842,7 @@ 
                         $data_type = '';

 

                         if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

+                            $prefix = $htmlvar_name.'_';

                         }

                         $old_prefix = $old_html_variable;

 

@@ -850,109 +850,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( 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 . "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( 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 . "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);

                             }

                         }

@@ -962,8 +962,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'";

                         }

 

@@ -996,7 +996,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'])) {

@@ -1004,9 +1004,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);

@@ -1021,9 +1021,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."'"; }*/

 

@@ -1038,9 +1038,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) {

@@ -1053,9 +1053,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) {

@@ -1067,22 +1067,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."'";

                             }

                         }

 

@@ -1104,7 +1104,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,

@@ -1136,7 +1136,7 @@ 
 					validation_msg = %s,

 					for_admin_use = %s ",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $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, $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)

 

                     )

 

@@ -1148,7 +1148,7 @@ 
 

             }

 

-            return (int)$lastid;

+            return (int) $lastid;

 

 

         } else {

@@ -1181,7 +1181,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)

@@ -1237,7 +1237,7 @@ 
         $value = '';

 

         /* 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;

         }

@@ -1271,22 +1271,22 @@ 
          * @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);

 

         if ($type == 'fieldset') {

-            $fieldset_id = (int)$val['id'];

-            $fieldset_field_class = 'gd-fieldset-' . $fieldset_id;

+            $fieldset_id = (int) $val['id'];

+            $fieldset_field_class = 'gd-fieldset-'.$fieldset_id;

             ?>

-            <h5 id="geodir_fieldset_<?php echo $fieldset_id;?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id;?>"><?php echo $site_title;?>

-                <?php if ($admin_desc != '') echo '<small>( ' . $admin_desc . ' )</small>';?></h5>

+            <h5 id="geodir_fieldset_<?php echo $fieldset_id; ?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id; ?>"><?php echo $site_title; ?>

+                <?php if ($admin_desc != '') echo '<small>( '.$admin_desc.' )</small>'; ?></h5>

             <?php

         } else if ($type == 'address') {

-            $prefix = $name . '_';

+            $prefix = $name.'_';

 

-            ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');

-            ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');

+            ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix.' address');

+            ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix.' zip/post code ');

             ($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');

-            ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');

+            ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix.' mapview');

 

             $address = '';

             $zip = '';

@@ -1297,21 +1297,21 @@ 
 

             if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

                 $post = $gd_ses_listing;

-                $address = $post[$prefix . 'address'];

-                $zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';

-                $lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';

-                $lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';

-                $mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';

-                $mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';

+                $address = $post[$prefix.'address'];

+                $zip = isset($post[$prefix.'zip']) ? $post[$prefix.'zip'] : '';

+                $lat = isset($post[$prefix.'latitude']) ? $post[$prefix.'latitude'] : '';

+                $lng = isset($post[$prefix.'longitude']) ? $post[$prefix.'longitude'] : '';

+                $mapview = isset($post[$prefix.'mapview']) ? $post[$prefix.'mapview'] : '';

+                $mapzoom = isset($post[$prefix.'mapzoom']) ? $post[$prefix.'mapzoom'] : '';

             } else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {

-                $post_info = (array)$post_info;

-

-                $address = $post_info[$prefix . 'address'];

-                $zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';

-                $lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';

-                $lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';

-                $mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';

-                $mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';

+                $post_info = (array) $post_info;

+

+                $address = $post_info[$prefix.'address'];

+                $zip = isset($post_info[$prefix.'zip']) ? $post_info[$prefix.'zip'] : '';

+                $lat = isset($post_info[$prefix.'latitude']) ? $post_info[$prefix.'latitude'] : '';

+                $lng = isset($post_info[$prefix.'longitude']) ? $post_info[$prefix.'longitude'] : '';

+                $mapview = isset($post_info[$prefix.'mapview']) ? $post_info[$prefix.'mapview'] : '';

+                $mapzoom = isset($post_info[$prefix.'mapzoom']) ? $post_info[$prefix.'mapzoom'] : '';

             }

 

             $location = geodir_get_default_location();

@@ -1348,16 +1348,16 @@ 
 

             ?>

 

-            <div id="geodir_<?php echo $prefix . 'address';?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="geodir_<?php echo $prefix.'address'; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php _e($address_title, 'geodirectory'); ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input type="text" field_type="<?php echo $type;?>" name="<?php echo $prefix . 'address';?>"

-                       id="<?php echo $prefix . 'address';?>" class="geodir_textfield"

+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'address'; ?>"

+                       id="<?php echo $prefix.'address'; ?>" class="geodir_textfield"

                        value="<?php echo esc_attr(stripslashes($address)); ?>"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1377,14 +1377,14 @@ 
 

             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>

 

-                <div id="geodir_<?php echo $prefix . 'zip'; ?>_row"

-                     class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                <div id="geodir_<?php echo $prefix.'zip'; ?>_row"

+                     class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                     <label>

                         <?php _e($zip_title, 'geodirectory'); ?>

                         <?php /*if($is_required) echo '<span>*</span>';*/ ?>

                     </label>

-                    <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'zip'; ?>"

-                           id="<?php echo $prefix . 'zip'; ?>" class="geodir_textfield autofill"

+                    <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'zip'; ?>"

+                           id="<?php echo $prefix.'zip'; ?>" class="geodir_textfield autofill"

                            value="<?php echo esc_attr(stripslashes($zip)); ?>"/>

                     <?php /*if($is_required) {?>

 					<span class="geodir_message_error"><?php echo _e($required_msg,'geodirectory');?></span>

@@ -1394,14 +1394,14 @@ 
 

             <?php if (isset($extra_fields['show_map']) && $extra_fields['show_map']) { ?>

 

-                <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                <div id="geodir_<?php echo $prefix.'map'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                     <?php

                     /**

                      * Contains add listing page map functions.

                      *

                      * @since 1.0.0

                      */

-                    include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");

+                    include(geodir_plugin_path()."/geodirectory-functions/map-functions/map_on_add_listing_page.php");

                     if ($lat_lng_blank) {

                         $lat = '';

                         $lng = '';

@@ -1412,14 +1412,14 @@ 
                 <?php

                 /* show lat lng */

                 $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>

-                <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                <div id="geodir_<?php echo $prefix.'latitude'; ?>_row"

+                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LAT; ?>

                         <?php if ($is_required) echo '<span>*</span>'; ?>

                     </label>

-                    <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'latitude'; ?>"

-                           id="<?php echo $prefix . 'latitude'; ?>" class="geodir_textfield"

+                    <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'latitude'; ?>"

+                           id="<?php echo $prefix.'latitude'; ?>" class="geodir_textfield"

                            value="<?php echo esc_attr(stripslashes($lat)); ?>" size="25"/>

                     <span class="geodir_message_note"><?php echo GET_LATITUDE_MSG; ?></span>

                     <?php if ($is_required) { ?>

@@ -1427,14 +1427,14 @@ 
                     <?php } ?>

                 </div>

 

-                <div id="geodir_<?php echo $prefix . 'longitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                <div id="geodir_<?php echo $prefix.'longitude'; ?>_row"

+                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LNG; ?>

                         <?php if ($is_required) echo '<span>*</span>'; ?>

                     </label>

-                    <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'longitude'; ?>"

-                           id="<?php echo $prefix . 'longitude'; ?>" class="geodir_textfield"

+                    <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'longitude'; ?>"

+                           id="<?php echo $prefix.'longitude'; ?>" class="geodir_textfield"

                            value="<?php echo esc_attr(stripslashes($lng)); ?>" size="25"/>

                     <span class="geodir_message_note"><?php echo GET_LOGNGITUDE_MSG; ?></span>

                     <?php if ($is_required) { ?>

@@ -1444,32 +1444,32 @@ 
             <?php } ?>

 

             <?php if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) { ?>

-                <div id="geodir_<?php echo $prefix . 'mapview'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                <div id="geodir_<?php echo $prefix.'mapview'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                     <label><?php _e($mapview_title, 'geodirectory'); ?></label>

 

 

                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"

                                                             class="gd-checkbox"

-                                                            name="<?php echo $prefix . 'mapview'; ?>"

-                                                            id="<?php echo $prefix . 'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {

+                                                            name="<?php echo $prefix.'mapview'; ?>"

+                                                            id="<?php echo $prefix.'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {

                             echo 'checked="checked"';

                         } ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>

                     <span class="geodir_user_define"> <input field_type="<?php echo $type; ?>" type="radio"

                                                              class="gd-checkbox"

-                                                             name="<?php echo $prefix . 'mapview'; ?>"

+                                                             name="<?php echo $prefix.'mapview'; ?>"

                                                              id="map_view1" <?php if ($mapview == 'SATELLITE') {

                             echo 'checked="checked"';

                         } ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>

 

                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"

                                                             class="gd-checkbox"

-                                                            name="<?php echo $prefix . 'mapview'; ?>"

+                                                            name="<?php echo $prefix.'mapview'; ?>"

                                                             id="map_view2" <?php if ($mapview == 'HYBRID') {

                             echo 'checked="checked"';

                         } ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>

 					<span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"

                                                             class="gd-checkbox"

-                                                            name="<?php echo $prefix . 'mapview'; ?>"

+                                                            name="<?php echo $prefix.'mapview'; ?>"

                                                             id="map_view3" <?php if ($mapview == 'TERRAIN') {

                             echo 'checked="checked"';

                         } ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>

@@ -1481,35 +1481,35 @@ 
             <?php if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) { ?>

                 <input type="hidden" value="<?php if (isset($mapzoom)) {

                     echo esc_attr($mapzoom);

-                } ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>

+                } ?>" name="<?php echo $prefix.'mapzoom'; ?>" id="<?php echo $prefix.'mapzoom'; ?>"/>

             <?php }?>

         <?php } elseif ($type == 'text') {

 

             //number and float validation $validation_pattern

-            if(isset($val['data_type']) && $val['data_type']=='INT'){$type = 'number';}

-            elseif(isset($val['data_type']) && $val['data_type']=='FLOAT'){$type = 'float';}

+            if (isset($val['data_type']) && $val['data_type'] == 'INT') {$type = 'number'; }

+            elseif (isset($val['data_type']) && $val['data_type'] == 'FLOAT') {$type = 'float'; }

             //print_r($val);

             //validation

-            if(isset($val['validation_pattern']) && $val['validation_pattern']){

+            if (isset($val['validation_pattern']) && $val['validation_pattern']) {

                 $validation = 'pattern="'.$val['validation_pattern'].'"';

-            }else{$validation='';}

+            } else {$validation = ''; }

 

             // validation message

-            if(isset($val['validation_msg']) && $val['validation_msg']){

+            if (isset($val['validation_msg']) && $val['validation_msg']) {

                 $validation_msg = 'title="'.$val['validation_msg'].'"';

-            }else{$validation_msg='';}

+            } else {$validation_msg = ''; }

             ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="<?php echo $type;?>" class="geodir_textfield" <?php echo $validation;echo $validation_msg;?> />

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="<?php echo $type; ?>" class="geodir_textfield" <?php echo $validation; echo $validation_msg; ?> />

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1520,16 +1520,16 @@ 
                 $value = '';

             }?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="email" class="geodir_textfield"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="email" class="geodir_textfield"/>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1540,16 +1540,16 @@ 
                 $value = '';

             } ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="tel" class="geodir_textfield"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="tel" class="geodir_textfield"/>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1560,31 +1560,31 @@ 
                 $value = '';

             }?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="url" class="geodir_textfield"

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="url" class="geodir_textfield"

                        oninvalid="setCustomValidity('<?php _e('Please enter a valid URL including http://', 'geodirectory'); ?>')"

                        onchange="try{setCustomValidity('')}catch(e){}"

                 />

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

             </div>

 

         <?php } elseif ($type == 'radio') { ?>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

                 <?php if ($option_values) {

                     $option_values = geodir_string_values_to_options($option_values, true);

@@ -1593,14 +1593,14 @@ 
                         foreach ($option_values as $option_value) {

                             if (empty($option_value['optgroup'])) {

                                 ?>

-                                <span class="gd-radios"><input name="<?php echo $name;?>" id="<?php echo $name;?>" <?php checked($value, $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $type;?>" type="radio" /><?php echo $option_value['label']; ?></span>

+                                <span class="gd-radios"><input name="<?php echo $name; ?>" id="<?php echo $name; ?>" <?php checked($value, $option_value['value']); ?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $type; ?>" type="radio" /><?php echo $option_value['label']; ?></span>

                                 <?php

                             }

                         }

                     }

                 }

                 ?>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1608,22 +1608,22 @@ 
 

         <?php } elseif ($type == 'checkbox') { ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

                 <?php if ($value != '1') {

                     $value = '0';

                 }?>

-                <input type="hidden" name="<?php echo $name;?>" id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>"/>

+                <input type="hidden" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($value); ?>"/>

                 <input  <?php if ($value == '1') {

                     echo 'checked="checked"';

-                }?>  value="1" class="gd-checkbox" field_type="<?php echo $type;?>" type="checkbox"

-                     onchange="if(this.checked){jQuery('#<?php echo $name;?>').val('1');} else{ jQuery('#<?php echo $name;?>').val('0');}"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                }?>  value="1" class="gd-checkbox" field_type="<?php echo $type; ?>" type="checkbox"

+                     onchange="if(this.checked){jQuery('#<?php echo $name; ?>').val('1');} else{ jQuery('#<?php echo $name; ?>').val('0');}"/>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1632,44 +1632,44 @@ 
         <?php } elseif ($type == 'textarea') {

             ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label><?php

 

 

                 if (is_array($extra_fields) && in_array('1', $extra_fields)) {

 

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

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

 

-                <div class="editor" field_id="<?php echo $name;?>" field_type="editor">

+                <div class="editor" field_id="<?php echo $name; ?>" field_type="editor">

                     <?php wp_editor(stripslashes($value), $name, $editor_settings); ?>

                     </div><?php

 

                 } else {

 

-                    ?><textarea field_type="<?php echo $type;?>" class="geodir_textarea" name="<?php echo $name;?>"

-                                id="<?php echo $name;?>"><?php echo stripslashes($value);?></textarea><?php

+                    ?><textarea field_type="<?php echo $type; ?>" class="geodir_textarea" name="<?php echo $name; ?>"

+                                id="<?php echo $name; ?>"><?php echo stripslashes($value); ?></textarea><?php

 

                 }?>

 

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

             </div>

 

         <?php } elseif ($type == 'select') { ?>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

                 <?php

                 $option_values_arr = geodir_string_values_to_options($option_values, true);

@@ -1679,22 +1679,22 @@ 
                         if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {

                             $option_label = isset($option_row['label']) ? $option_row['label'] : '';

 

-                            $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';

+                            $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="'.esc_attr($option_label).'">' : '</optgroup>';

                         } else {

                             $option_label = isset($option_row['label']) ? $option_row['label'] : '';

                             $option_value = isset($option_row['value']) ? $option_row['value'] : '';

                             $selected = $option_value == $value ? 'selected="selected"' : '';

 

-                            $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';

+                            $select_options .= '<option value="'.esc_attr($option_value).'" '.$selected.'>'.$option_label.'</option>';

                         }

                     }

                 }

                 ?>

-                <select field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

+                <select field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

                         class="geodir_textfield textfield_x chosen_select"

-                        data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;';?>"

-                        option-ajaxchosen="false"><?php echo $select_options;?></select>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                        data-placeholder="<?php echo __('Choose', 'geodirectory').' '.$site_title.'&hellip;'; ?>"

+                        option-ajaxchosen="false"><?php echo $select_options; ?></select>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1708,7 +1708,7 @@ 
             }

             ?>

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

@@ -1734,9 +1734,9 @@ 
                                     $option_label = isset($option_row['label']) ? $option_row['label'] : '';

 

                                     if ($multi_display == 'select') {

-                                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';

+                                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="'.esc_attr($option_label).'">' : '</optgroup>';

                                     } else {

-                                        $select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';

+                                        $select_options .= $option_row['optgroup'] == 'start' ? '<li>'.$option_label.'</li>' : '';

                                     }

                                 } else {

                                     $option_label = isset($option_row['label']) ? $option_row['label'] : '';

@@ -1761,9 +1761,9 @@ 
                                     }

 

                                     if ($multi_display == 'select') {

-                                        $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';

+                                        $select_options .= '<option value="'.esc_attr($option_value).'" '.$selected.'>'.$option_label.'</option>';

                                     } else {

-                                        $select_options .= '<li><input name="' . $name . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';

+                                        $select_options .= '<li><input name="'.$name.'[]" '.$checked.' value="'.esc_attr($option_value).'" class="gd-'.$multi_display.'" field_type="'.$multi_display.'" type="'.$multi_display.'" />&nbsp;'.$option_label.' </li>';

                                     }

                                 }

                             }

@@ -1782,7 +1782,7 @@ 
             ?>

 

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

@@ -1807,23 +1807,23 @@ 
                 $extra_fields['date_format'] = 'yy-mm-dd';

 

             $date_format = $extra_fields['date_format'];

-            $jquery_date_format  = $date_format;

+            $jquery_date_format = $date_format;

 

 

             // check if we need to change the format or not

             $date_format_len = strlen(str_replace(' ', '', $date_format));

-            if($date_format_len>5){// if greater then 5 then it's the old style format.

+            if ($date_format_len > 5) {// if greater then 5 then it's the old style format.

 

-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

-                $replace = array('d','j','l','m','n','F','Y');//PHP date format

+                $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format

+                $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format

 

                 $date_format = str_replace($search, $replace, $date_format);

-            }else{

-                $jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );

+            } else {

+                $jquery_date_format = geodir_date_format_php_to_jqueryui($jquery_date_format);

             }

 

-            if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty

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

+            if ($value == '0000-00-00') {$value = ''; }//if date not set, then mark it empty

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

                 $time = strtotime($value);

                 $value = date_i18n($date_format, $time);

             }

@@ -1833,37 +1833,37 @@ 
 

                 jQuery(function () {

 

-                    jQuery("#<?php echo $name;?>").datepicker({changeMonth: true, changeYear: true <?php

+                    jQuery("#<?php echo $name; ?>").datepicker({changeMonth: true, changeYear: true <?php

                         /**

                          * Used to add extra option to datepicker per custom field.

                          *

                          * @since 1.5.7

                          * @param string $name The custom field name.

                          */

-                        echo apply_filters("gd_datepicker_extra_{$name}",'');?>});

+                        echo apply_filters("gd_datepicker_extra_{$name}", ''); ?>});

 

-                    jQuery("#<?php echo $name;?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format;?>');

+                    jQuery("#<?php echo $name; ?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format; ?>');

 

-                    <?php if(!empty($value)){?>

-                    jQuery("#<?php echo $name;?>").datepicker("setDate", "<?php echo $value;?>");

+                    <?php if (!empty($value)) {?>

+                    jQuery("#<?php echo $name; ?>").datepicker("setDate", "<?php echo $value; ?>");

                     <?php } ?>

 

                 });

 

             </script>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

 

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1877,25 +1877,25 @@ 
             <script type="text/javascript">

                 jQuery(document).ready(function () {

 

-                    jQuery('#<?php echo $name;?>').timepicker({

+                    jQuery('#<?php echo $name; ?>').timepicker({

                         showPeriod: true,

                         showLeadingZero: true,

                         showPeriod: true,

                     });

                 });

             </script>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input readonly="readonly" field_type="<?php echo $type;?>" name="<?php echo $name;?>"

-                       id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>

+                <input readonly="readonly" field_type="<?php echo $type; ?>" name="<?php echo $name; ?>"

+                       id="<?php echo $name; ?>" value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1905,15 +1905,15 @@ 
             if ($value == $val['default']) {

                 $value = '';

             } ?>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

 

-                <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">

+                <div id="<?php echo $name; ?>" class="geodir_taxonomy_field" style="float:left; width:70%;">

                     <?php

                     global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;

 

@@ -1925,7 +1925,7 @@ 
 

                         $package_info = array();

 

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

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

 

                         if (!empty($package_info)) {

 

@@ -1954,7 +1954,7 @@ 
 

                         $catadd_limit = $wpdb->get_var(

                             $wpdb->prepare(

-                                "SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",

+                                "SELECT cat_limit FROM ".GEODIR_PRICE_TABLE." WHERE pid = %d",

                                 array($package_id)

                             )

                         );

@@ -1970,13 +1970,13 @@ 
                         $required_limit_msg = '';

                         if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {

 

-                            $required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');

+                            $required_limit_msg = __('Only select', 'geodirectory').' '.$catadd_limit.__(' categories for this package.', 'geodirectory');

 

                         } else {

                             $required_limit_msg = $required_msg;

                         }

 

-                        echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';

+                        echo '<input type="hidden" cat_limit="'.$catadd_limit.'" id="cat_limit" value="'.esc_attr($required_limit_msg).'" name="cat_limit['.$name.']"  />';

 

 

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

@@ -1986,11 +1986,11 @@ 
                             if ($cat_display == 'multiselect')

                                 $multiple = 'multiple="multiple"';

 

-                            echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';

+                            echo '<select id="'.$name.'" '.$multiple.' type="'.$name.'" name="post_category['.$name.'][]" alt="'.$name.'" field_type="'.$cat_display.'" class="geodir_textfield textfield_x chosen_select" data-placeholder="'.__('Select Category', 'geodirectory').'">';

 

 

                             if ($cat_display == 'select')

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

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

 

                         }

 

@@ -2008,7 +2008,7 @@ 
                     ?>

                 </div>

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -2050,8 +2050,8 @@ 
                     $file_totImg = count($curImages);

             }

 

-            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

-            $display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';

+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? implode(",", $extra_fields['gd_file_types']) : '';

+            $display_file_types = $allowed_file_types != '' ? '.'.implode(", .", $extra_fields['gd_file_types']) : '';

 

             ?>

             <?php /*?> <h5 class="geodir-form_title"> <?php echo $site_title; ?>

@@ -2061,13 +2061,13 @@ 
 			</h5>   <?php */

             ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

 

                 <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">

                     <label

                         style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');

-                        echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>

+                        echo $site_title; ?><?php if ($is_required) echo '<span>*</span>'; ?></label>

                     <input class="geodir-custom-file-upload" field_type="file" type="hidden"

                            name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"

                            value="<?php echo esc_attr($file_value); ?>"/>

@@ -2075,7 +2075,7 @@ 
                            id="<?php echo $file_id; ?>image_limit" value="<?php echo $file_image_limit; ?>"/>

                     <?php if ($allowed_file_types != '') { ?>

                         <input type="hidden" name="<?php echo $file_id; ?>_allowed_types"

-                               id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types);?>"/>

+                               id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types); ?>"/>

                     <?php } ?>

                     <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"

                            value="<?php if (isset($file_totImg)) {

@@ -2091,10 +2091,10 @@ 
                             <?php /*?><h4><?php _e('Drop files to upload');?></h4><br/><?php */

                             ?>

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

-                                   value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory') ); ?>"

+                                   value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory')); ?>"

                                    class="geodir_button" style="margin-top:10px;"/>

                             <span class="ajaxnonceplu"

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

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

                             <?php if ($file_width && $file_height): ?>

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

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

@@ -2114,7 +2114,7 @@ 
 

                     </div>

                 </div>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?> <?php echo ( $display_file_types != '' ? __('Allowed file types:', 'geodirectory') . ' ' . $display_file_types : '' );?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?> <?php echo ($display_file_types != '' ? __('Allowed file types:', 'geodirectory').' '.$display_file_types : ''); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -2133,7 +2133,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);

 

     }

 

@@ -2159,7 +2159,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)

             )

         );

@@ -2174,14 +2174,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'];

     }

 

@@ -2242,11 +2242,11 @@ 
                  * @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();

 

-                if ($fields_location == 'detail' && isset($type['show_as_tab']) && (int)$type['show_as_tab'] == 1 && in_array($type['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

+                if ($fields_location == 'detail' && isset($type['show_as_tab']) && (int) $type['show_as_tab'] == 1 && in_array($type['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

                     continue;

                 }

 

@@ -2372,7 +2372,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);

@@ -2391,13 +2391,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];

@@ -2423,24 +2423,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))

@@ -2448,7 +2448,7 @@ 
                     }

 

                     if (!empty($uploaded_file))

-                        $file_urls = $geodir_uploadurl . '/' . $new_name;

+                        $file_urls = $geodir_uploadurl.'/'.$new_name;

 

                 } else {

                     $file_urls = $post_image[$m];

@@ -2462,8 +2462,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;

             }

         }

 

@@ -2515,9 +2515,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;

     }

 

@@ -2532,20 +2532,20 @@ 
         // check ajax noonce

         $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 orinetation 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);

         }

 

@@ -2575,9 +2575,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;

@@ -2601,9 +2601,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;

@@ -2621,12 +2621,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);

@@ -2658,7 +2658,7 @@ 
 

             $custom_fields = $wpdb->get_results(

                 $wpdb->prepare(

-                    "select post_type,data_type,field_type,site_title,htmlvar_name 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 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'

             );

@@ -2775,7 +2775,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)

@@ -2857,14 +2857,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)));

 

         }

 

@@ -2875,7 +2875,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,

@@ -2906,7 +2906,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,

@@ -2932,7 +2932,7 @@ 
         }

 

 

-        return (int)$lastid;

+        return (int) $lastid;

 

     }

 }

@@ -2955,7 +2955,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;

 

@@ -2983,7 +2983,7 @@ 
         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;

@@ -3020,41 +3020,41 @@ 
         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);

 

         ?>

-        <li class="text" id="licontainer_<?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;?>')">

+        <li class="text" id="licontainer_<?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

 

-                $nonce = wp_create_nonce('custom_fields_' . $result_str);

+                $nonce = wp_create_nonce('custom_fields_'.$result_str);

                 ?>

 

-                <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"></div>

 

                 <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; ?>"/>

 

 

                 <table class="widefat post fixed" border="0" style="width:100%;">

@@ -3078,7 +3078,7 @@ 
                                        } ?>" style="width:45%;"/>

 

                                 <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"';

                                 } ?>/><span><?php _e('Set as default sort.', 'geodirectory'); ?></span>

 

@@ -3101,7 +3101,7 @@ 
                                            echo esc_attr($field_info->desc_title);

                                        } ?>" style="width:45%;"/>

                                 <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"';

                                 } ?>/><span><?php _e('Set as default sort.', 'geodirectory'); ?></span>

                                 <br/>

@@ -3136,42 +3136,42 @@ 
                     <?php } ?>

 

                     <tr>

-                        <td><strong><?php _e('Is active :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Is active :', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <select name="is_active" id="is_active">

                                 <option

                                     value="1" <?php if (isset($field_info->is_active) && $field_info->is_active == '1') {

                                     echo 'selected="selected"';

-                                }?>><?php _e('Yes', 'geodirectory');?></option>

+                                }?>><?php _e('Yes', 'geodirectory'); ?></option>

                                 <option

                                     value="0" <?php if (isset($field_info->is_active) && $field_info->is_active == '0') {

                                     echo 'selected="selected"';

-                                }?>><?php _e('No', 'geodirectory');?></option>

+                                }?>><?php _e('No', 'geodirectory'); ?></option>

                             </select>

                             <br/>

-                            <span><?php _e('Select yes or no. If no is selected then the field will not be displayed anywhere.', 'geodirectory');?></span>

+                            <span><?php _e('Select yes or no. If no is selected then the field will not be displayed anywhere.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

-                        <td><strong><?php _e('Display order :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Display order :', 'geodirectory'); ?></strong></td>

                         <td align="left"><input type="text" 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"/>

                             <br/>

-                            <span><?php _e('Enter the display order of this field in backend. e.g. 5', 'geodirectory');?></span>

+                            <span><?php _e('Enter the display order of this field in backend. e.g. 5', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

                         <td>&nbsp;</td>

                         <td align="left">

-                            <input type="button" class="button" name="save" id="save" value="<?php esc_attr_e('Save', 'geodirectory');?>"

-                                   onclick="save_sort_field('<?php echo $result_str;?>')"/>

+                            <input type="button" class="button" name="save" id="save" value="<?php esc_attr_e('Save', 'geodirectory'); ?>"

+                                   onclick="save_sort_field('<?php echo $result_str; ?>')"/>

 

-                            <a href="javascript:void(0)"><input type="button" name="delete" value="<?php esc_attr_e('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 esc_attr_e('Delete', 'geodirectory'); ?>"

+                                                                onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                                                                 class="button_n"/></a>

 

                         </td>

@@ -3206,7 +3206,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;

geodirectory-functions/custom_field_html.php

Spacing +94 added lines, -94 removed lines

@@ -24,7 +24,7 @@ 
 

 $field_info = stripslashes_deep($field_info); // strip slashes from labels

 

-$nonce = wp_create_nonce('custom_fields_' . $result_str);

+$nonce = wp_create_nonce('custom_fields_'.$result_str);

 

 $field_admin_title = '';

 if (isset($field_info->admin_title))

@@ -51,7 +51,7 @@ 
          ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">

         <?php

 

-        $nonce = wp_create_nonce('custom_fields_' . $result_str);

+        $nonce = wp_create_nonce('custom_fields_'.$result_str);

         ?>

 

         <?php if ($default): ?>

@@ -65,12 +65,12 @@ 
             ?>

 

             <b style="cursor:pointer;"

-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory') . ' ' . $field_admin_title);?></b>

+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Fieldset:', 'geodirectory').' '.$field_admin_title); ?></b>

         <?php

         } else {

             ?>

             <b style="cursor:pointer;"

-               onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' ' . $field_admin_title . ' (' . $field_type . ')');?></b>

+               onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory').' '.$field_admin_title.' ('.$field_type.')'); ?></b>

         <?php

         }

         ?>

@@ -92,10 +92,10 @@ 
         } ?>"/>

         <input type="hidden" name="is_active" id="is_active" value="1"/>

 

-        <input type="hidden" name="is_default" value="<?php echo $field_info->is_default;?>" /><?php // show in sidebar value?>

-        <input type="hidden" name="show_on_listing" value="<?php echo $field_info->show_on_listing;?>" />

-        <input type="hidden" name="show_on_detail" value="<?php echo $field_info->show_on_listing;?>" />

-        <input type="hidden" name="show_as_tab" value="<?php echo $field_info->show_as_tab;?>" />

+        <input type="hidden" name="is_default" value="<?php echo $field_info->is_default; ?>" /><?php // show in sidebar value?>

+        <input type="hidden" name="show_on_listing" value="<?php echo $field_info->show_on_listing; ?>" />

+        <input type="hidden" name="show_on_detail" value="<?php echo $field_info->show_on_listing; ?>" />

+        <input type="hidden" name="show_as_tab" value="<?php echo $field_info->show_as_tab; ?>" />

 

         <ul class="widefat post fixed" border="0" style="width:100%;">

             <?php if ($field_type != 'text' || $default) { ?>

@@ -192,13 +192,13 @@ 
                 ?>

 

                 <li>

-                    <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory');?>

+                    <label for="htmlvar_name" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('HTML variable name :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

                             <?php _e('This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.', 'geodirectory'); ?>

                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

-                        <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory');?>"

+                        <input type="text" name="htmlvar_name" id="htmlvar_name" pattern="[a-zA-Z0-9]+" title="<?php _e('Must not contain spaces or special characters', 'geodirectory'); ?>"

                                value="<?php if (isset($field_info->htmlvar_name)) {

                                    echo preg_replace('/geodir_/', '', $field_info->htmlvar_name, 1);

                                }?>" <?php if ($default) {

@@ -230,17 +230,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 (isset($field_info->is_active) && $field_info->is_active == '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 ((isset($field_info->is_active) && $field_info->is_active == '0') || !isset($field_info->is_active)) {

                             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>

             </li>

@@ -254,17 +254,17 @@ 
                     </label>

                     <div class="gd-cf-input-wrap gd-switch">

 

-                        <input type="radio" id="for_admin_use_yes<?php echo $radio_id;?>" name="for_admin_use" class="gdri-enabled"  value="1"

+                        <input type="radio" id="for_admin_use_yes<?php echo $radio_id; ?>" name="for_admin_use" class="gdri-enabled"  value="1"

                             <?php if (isset($for_admin_use) && $for_admin_use == '1') {

                                 echo 'checked';

                             } ?>/>

-                        <label for="for_admin_use_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                        <label for="for_admin_use_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                        <input type="radio" id="for_admin_use_no<?php echo $radio_id;?>" name="for_admin_use" class="gdri-disabled" value="0"

+                        <input type="radio" id="for_admin_use_no<?php echo $radio_id; ?>" name="for_admin_use" class="gdri-disabled" value="0"

                             <?php if ((isset($for_admin_use) && $for_admin_use == '0') || !isset($for_admin_use)) {

                                 echo 'checked';

                             } ?>/>

-                        <label for="for_admin_use_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                        <label for="for_admin_use_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

                 </li>

@@ -276,7 +276,7 @@ 
 				$default_value = isset($field_info->default_value) ? $field_info->default_value : '';

 			?>

 			<li>

-				<label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory');?>

+				<label for="default_value" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default value :', 'geodirectory'); ?>

                     <div class="gdcf-tooltip">

                         <?php

                         if ($field_type == 'checkbox') {

@@ -293,12 +293,12 @@ 
 				<?php if ($field_type == 'checkbox') { ?>

 				<select name="default_value" id="default_value">

 					<option value=""><?php _e('Unchecked', 'geodirectory'); ?></option>

-					<option value="1" <?php selected(true, (int)$default_value === 1);?>><?php _e('Checked', 'geodirectory'); ?></option>

+					<option value="1" <?php selected(true, (int) $default_value === 1); ?>><?php _e('Checked', 'geodirectory'); ?></option>

 				</select>

 				<?php } else if ($field_type == 'email') { ?>

-				<input type="email" name="default_value" placeholder="<?php _e('info@mysite.com', 'geodirectory') ;?>" id="default_value" value="<?php echo esc_attr($default_value);?>" /><br/>

+				<input type="email" name="default_value" placeholder="<?php _e('info@mysite.com', 'geodirectory'); ?>" id="default_value" value="<?php echo esc_attr($default_value); ?>" /><br/>

 				<?php } else { ?>

-				<input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($default_value);?>" /><br/>

+				<input type="text" name="default_value" id="default_value" value="<?php echo esc_attr($default_value); ?>" /><br/>

 				<?php } ?>

 				</div>

 			</li>

@@ -342,7 +342,7 @@ 
                      * @param array $show_in_locations The array of locations and descriptions.

                      * @param object $field_info The field being displayed info.

                      */

-                    $show_in_locations = apply_filters('geodir_show_in_locations',$show_in_locations,$field_info);

+                    $show_in_locations = apply_filters('geodir_show_in_locations', $show_in_locations, $field_info);

 

 

                     // remove some locations for some field types

@@ -350,11 +350,11 @@ 
                     // don't show new tab option for some types

 

                     if (in_array($field_type, array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

-                    }else{

+                    } else {

                         unset($show_in_locations['[owntab]']);

                     }

 

-                    if(!$display_on_listing){

+                    if (!$display_on_listing) {

                         unset($show_in_locations['[listings]']);

                     }

 

@@ -368,17 +368,17 @@ 
                             option-ajaxchosen="false">

                         <?php

 

-                        $show_in_values = explode(',',$field_info->show_in);

+                        $show_in_values = explode(',', $field_info->show_in);

 

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

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

                             $selected = '';

 

-                            if(is_array($show_in_values) && in_array($key,$show_in_values ) ){

+                            if (is_array($show_in_values) && in_array($key, $show_in_values)) {

                                 $selected = 'selected';

                             }

 

                             ?>

-                            <option  value="<?php echo $key;?>" <?php echo $selected;?>><?php echo $val;?></option>

+                            <option  value="<?php echo $key; ?>" <?php echo $selected; ?>><?php echo $val; ?></option>

                         <?php

                         }

                         ?>

@@ -472,24 +472,24 @@ 
 

                     <div class="gd-cf-input-wrap gd-switch">

 

-                        <input type="radio" id="is_required_yes<?php echo $radio_id;?>" name="is_required" class="gdri-enabled"  value="1"

+                        <input type="radio" id="is_required_yes<?php echo $radio_id; ?>" name="is_required" class="gdri-enabled"  value="1"

                             <?php if (isset($field_info->is_required) && $field_info->is_required == '1') {

                                 echo 'checked';

                             } ?>/>

-                        <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                        <label onclick="show_hide_radio(this,'show','cf-is-required-msg');" for="is_required_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                        <input type="radio" id="is_required_no<?php echo $radio_id;?>" name="is_required" class="gdri-disabled" value="0"

+                        <input type="radio" id="is_required_no<?php echo $radio_id; ?>" name="is_required" class="gdri-disabled" value="0"

                             <?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {

                                 echo 'checked';

                             } ?>/>

-                        <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                        <label onclick="show_hide_radio(this,'hide','cf-is-required-msg');" for="is_required_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                     </div>

 

                 </li>

             

 

-            <li class="cf-is-required-msg"<?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'";}?>>

+            <li class="cf-is-required-msg"<?php if ((isset($field_info->is_required) && $field_info->is_required == '0') || !isset($field_info->is_required)) {echo "style='display:none;'"; }?>>

                 <label for="required_msg" class="gd-cf-tooltip-wrap">

                     <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Required message:', 'geodirectory'); ?>

                     <div class="gdcf-tooltip">

@@ -505,7 +505,7 @@ 
             </li>

             <?php } ?>

 

-            <?php if ($field_type == 'text'){ ?>

+            <?php if ($field_type == 'text') { ?>

             <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'); ?>

@@ -558,7 +558,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>

@@ -569,7 +569,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">

@@ -577,19 +577,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>

@@ -614,32 +614,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">

@@ -657,7 +657,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">

@@ -672,22 +672,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>

@@ -696,22 +696,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>

@@ -721,7 +721,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">

@@ -735,22 +735,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>

@@ -766,7 +766,7 @@ 
                             <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">

@@ -774,13 +774,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/>

@@ -793,11 +793,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>

@@ -827,7 +827,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;">

@@ -847,16 +847,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(esc_attr($extra['date_format'])==$format){

+                                    if (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>

@@ -876,16 +876,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 } ?>

@@ -907,7 +907,7 @@ 
                     <label for="field_icon" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Upload icon :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

-                            <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory');?>

+                            <?php _e('Upload icon using media and enter its url path, or enter <a href="http://fortawesome.github.io/Font-Awesome/icons/" target="_blank" >font awesome </a>class eg:"fa fa-home"', 'geodirectory'); ?>

                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

@@ -922,7 +922,7 @@ 
                     <label for="css_class" class="gd-cf-tooltip-wrap">

                         <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Css class :', 'geodirectory'); ?>

                         <div class="gdcf-tooltip">

-                            <?php _e('Enter custom css class for field custom style.', 'geodirectory');?>

+                            <?php _e('Enter custom css class for field custom style.', 'geodirectory'); ?>

                         </div>

                     </label>

                     <div class="gd-cf-input-wrap">

@@ -967,23 +967,23 @@ 
                         <label for="cat_sort" class="gd-cf-tooltip-wrap">

                             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Include this field in sorting options :', 'geodirectory'); ?>

                             <div class="gdcf-tooltip">

-                                <?php _e('Lets you use this filed as a sorting option, set from sorting options above.', 'geodirectory');?>

+                                <?php _e('Lets you use this filed as a sorting option, set from sorting options above.', 'geodirectory'); ?>

                             </div>

                         </label>

 

                         <div class="gd-cf-input-wrap gd-switch">

 

-                            <input type="radio" id="cat_sort_yes<?php echo $radio_id;?>" name="cat_sort" class="gdri-enabled"  value="1"

+                            <input type="radio" id="cat_sort_yes<?php echo $radio_id; ?>" name="cat_sort" class="gdri-enabled"  value="1"

                                 <?php if (isset($field_info->cat_sort) && $field_info->cat_sort == '1') {

                                     echo 'checked';

                                 } ?>/>

-                            <label for="cat_sort_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                            <label for="cat_sort_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                            <input type="radio" id="cat_sort_no<?php echo $radio_id;?>" name="cat_sort" class="gdri-disabled" value="0"

+                            <input type="radio" id="cat_sort_no<?php echo $radio_id; ?>" name="cat_sort" class="gdri-disabled" value="0"

                                 <?php if ((isset($field_info->cat_sort) && !$field_info->cat_sort) || !isset($field_info->cat_sort)) {

                                     echo 'checked';

                                 } ?>/>

-                            <label for="cat_sort_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                            <label for="cat_sort_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                         </div>

                     </li>

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

                      * @param object $field_info The current fields info.

                      */

-                    do_action('geodir_advance_custom_fields', $field_info);?>

+                    do_action('geodir_advance_custom_fields', $field_info); ?>

 

                  

                 <?php endswitch; ?>

@@ -1009,10 +1009,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_field('<?php echo esc_attr($result_str); ?>')"/>

                     <?php if (!$default): ?>

-                        <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"

+                        <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"

                                                             onclick="delete_field('<?php echo esc_attr($result_str); ?>', '<?php echo $nonce; ?>')"

                                                             class="button"/></a>

                     <?php endif; ?>

geodirectory_template_tags.php

Spacing +65 added lines, -65 removed lines

@@ -38,21 +38,21 @@ 
     $is_detail_page = false;

     $geodir_map_name = geodir_map_name();

 

-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

+    if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) {

         $is_detail_page = true;

     }

 

     wp_enqueue_script('jquery');

 

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

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

     wp_enqueue_script('geodirectory-script');

 

     $geodir_vars_data = array(

         'siteurl' => get_option('siteurl'),

         'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),

+        'geodir_lazy_load' => get_option('geodir_lazy_load', 1),

         'geodir_ajax_url' => geodir_get_ajax_url(),

-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

+        'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),

         'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue

     );

 

@@ -73,24 +73,24 @@ 
      *

      * }

      */

-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

+    $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);

 

     wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

 

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

-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

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

+    if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }

 

-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url().'/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodirectory-lightbox-jquery');

 

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

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

     if ($is_detail_page) {

         wp_enqueue_script('geodirectory-jquery-simplemodal');

     }

 

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

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

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

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

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

         /**

          * Filter the variables that are added to the end of the google maps script call.

          *

@@ -100,40 +100,40 @@ 
          * @param string $var The string to filter, default is empty string.

          */

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

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

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

     }

     

     if ($geodir_map_name == 'osm') {

         // Leaflet OpenStreetMap

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

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

         wp_enqueue_style('geodirectory-leaflet-style');

             

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

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

         wp_enqueue_script('geodirectory-leaflet-script');

         

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

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

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

     }

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

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

     

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

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

     wp_enqueue_script('geodirectory-goMap-script');

 

 

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

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

     wp_enqueue_script('chosen');

 

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

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

     wp_enqueue_script('geodirectory-choose-ajax');

 

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

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

 

     if (is_page() && geodir_is_page('add-listing')) {

         // SCRIPT FOR UPLOAD

         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

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

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

         wp_enqueue_script('geodirectory-plupload-script');

         // SCRIPT FOR UPLOAD END

 

@@ -180,27 +180,27 @@ 
 

         wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

 

-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

+        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation.min.js#asyncload');

     } // End if for add place page

 

-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url().'/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     if ($is_detail_page) {

 		wp_enqueue_script('geodirectory-post-custom-js');

 	}

 

     // font awesome rating script

 	if (get_option('geodir_reviewrating_enable_font_awesome')) {

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

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

 		wp_enqueue_script('geodir-barrating-js');

 	} else { // default rating script

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

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

 		wp_enqueue_script('geodir-jRating-js');

 	}

 

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

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

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

 

-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('google-geometa', geodir_plugin_url().'/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('google-geometa');

 }

 

@@ -215,7 +215,7 @@ 
  */

 function geodir_header_scripts()

 {

-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

+    echo '<style>'.stripslashes(get_option('geodir_coustem_css')).'</style>';

     echo stripslashes(get_option('geodir_header_scripts'));

 }

 

@@ -246,7 +246,7 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

+    if (strpos($url, '#asyncload') === false)

         return $url;

     else if (is_admin())

         return str_replace('#asyncload', '', $url);

@@ -264,12 +264,12 @@ 
 function geodir_templates_styles()

 {

 

-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

+    wp_register_style('geodir-core-scss', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

     wp_enqueue_style('geodir-core-scss');

-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

+    wp_register_style('geodir-core-scss-footer', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

 

-    if(is_rtl()){

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

+    if (is_rtl()) {

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

     wp_enqueue_style('geodirectory-frontend-rtl-style');

     }

 

@@ -343,18 +343,18 @@ 
                 $term_id = get_queried_object_id();

                 $taxonomy = get_query_var('taxonomy');

 

-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

-                    $term = get_term($term_id, $post_type . 'category');

+                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type.'category') {

+                    $term = get_term($term_id, $post_type.'category');

                 }

             }

             

-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

+            if (geodir_is_page('search') && !empty($_REQUEST['s'.$post_type.'category'])) {

+                $taxonomy_search = $_REQUEST['s'.$post_type.'category'];

                 

                 if (!is_array($taxonomy_search)) {

-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');

-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');

+                    $term = get_term((int) $taxonomy_search, $post_type.'category');

+                } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

+                    $term = get_term((int) $taxonomy_search[0], $post_type.'category');

                 }

             }

             

@@ -366,7 +366,7 @@ 
         if ($max_page > 1 || $always_show) {            

             // Extra pagination info

             $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;

+            $start_no = ($paged - 1) * $posts_per_page + 1;

             $end_no = min($paged * $posts_per_page, $numposts);

 

             if ($geodir_pagination_more_info != '') {

@@ -376,7 +376,7 @@ 
                 } else {

                     $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

                 }

-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

+                $pagination_info = '<div class="gd-pagination-details">'.$pegination_desc.'</div>';

                 /**

                  * Adds an extra pagination info above/under pagination.

                  *

@@ -392,15 +392,15 @@ 
                 $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

                 

                 if ($geodir_pagination_more_info == 'before') {

-                    $before = $before . $pagination_info;

+                    $before = $before.$pagination_info;

                 } else if ($geodir_pagination_more_info == 'after') {

-                    $after = $pagination_info . $after;

+                    $after = $pagination_info.$after;

                 }

             }

             

             echo "$before <div class='Navi gd-navi'>";

             if ($paged >= ($pages_to_show - 1)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link()).'">&laquo;</a>';

             }

             previous_posts_link($prelabel);

             for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

@@ -408,13 +408,13 @@ 
                     if ($i == $paged) {

                         echo "<strong class='on'>$i</strong>";

                     } else {

-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

+                        echo ' <a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($i)).'">'.$i.'</a> ';

                     }

                 }

             }

             next_posts_link($nxtlabel, $max_page);

             if (($paged + $half_pages_to_show) < ($max_page)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)).'">&raquo;</a>';

             }

             echo "</div> $after";

         }

@@ -452,7 +452,7 @@ 
         jQuery(function ($) {

             $("#distance_slider").slider({

                 range: true,

-                values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],

+                values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],

                 min: 0,

                 max: <?php echo $dist; ?>,

                 step: <?php echo $dist_dif; ?>,

@@ -517,7 +517,7 @@ 
 

 

     <script type="text/javascript">

-        var default_location = '<?php if($search_location = geodir_get_default_location())  echo $search_location->city ;?>';

+        var default_location = '<?php if ($search_location = geodir_get_default_location())  echo $search_location->city; ?>';

         var latlng;

         var address;

         var dist = 0;

@@ -530,7 +530,7 @@ 
 				var $form = jQuery(this).closest('form');

 				

 				if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();

-				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);

+				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);

 				

 				// Disable location based search for disabled location post type.

 				if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {

@@ -544,7 +544,7 @@ 
 					}

 				}

 				

-				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) {

+				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) {

 					geodir_setsearch($form);

 				} else {

 					jQuery(".snear", $form).val('');

@@ -563,7 +563,7 @@ 
         });

         

 		function geodir_setsearch($form) {

-			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location);

+			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location);

 			geocodeAddress($form);

 		}

 

@@ -582,15 +582,15 @@ 
             // Call the geocode function

             Sgeocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;

 

-            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

-                if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

+            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

+                if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

                     jQuery(".snear", $form).val('');

                 }

                 jQuery($form).submit();

             } else {

                 var address = jQuery(".snear", $form).val();

 

-                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {

+                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {

                     initialise2();

                 } else {

                     <?php

@@ -603,12 +603,12 @@ 
                     $near_add2 = apply_filters('geodir_search_near_addition', '');

                     ?>

                     if (window.gdMaps === 'google') {

-                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},

+                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", '.$near_add.'"' : '').$near_add2; ?>},

                             function (results, status) {

                                 if (status == google.maps.GeocoderStatus.OK) {

                                     updateSearchPosition(results[0].geometry.location, $form);

                                 } else {

-                                    alert("<?php esc_attr_e('Search was not successful for the following reason:', 'geodirectory');?>" + status);

+                                    alert("<?php esc_attr_e('Search was not successful for the following reason:', 'geodirectory'); ?>" + status);

                                 }

                             });

                     } else if (window.gdMaps === 'osm') {

@@ -617,7 +617,7 @@ 
                                 if (typeof geo !== 'undefined' && geo.lat && geo.lon) {

                                     updateSearchPosition(geo, $form);

                                 } else {

-                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory');?>");

+                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory'); ?>");

                                 }

                             });

                     } else {

@@ -663,19 +663,19 @@ 
             var msg;

             switch (err.code) {

                 case err.UNKNOWN_ERROR:

-                    msg = "<?php _e('Unable to find your location','geodirectory');?>";

+                    msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";

                     break;

                 case err.PERMISSION_DENINED:

-                    msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";

+                    msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";

                     break;

                 case err.POSITION_UNAVAILABLE:

-                    msg = "<?php _e('Your location is currently unknown','geodirectory');?>";

+                    msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";

                     break;

                 case err.BREAK:

-                    msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";

+                    msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";

                     break;

                 default:

-                    msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";

+                    msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";

             }

             jQuery('#info').html(msg);

         }

@@ -714,7 +714,7 @@ 
              * @param object $post The post object.

              * @param string $link The link to the post.

              */

-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

+            $return = apply_filters('geodir_featured_badge_on_image', '<a href="'.$link.'"><span class="geodir_featured_img">&nbsp;</span></a>', $post, $link);

             break;

         case 'new' :

             /**

@@ -724,7 +724,7 @@ 
              * @param object $post The post object.

              * @param string $link The link to the post.

              */

-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

+            $return = apply_filters('geodir_new_badge_on_image', '<a href="'.$link.'"><span class="geodir_new_listing">&nbsp;</span></a>', $post, $link);

             break;

 

     }