GeoDirectory / geodirectory

geodirectory-admin/admin_dummy_data_functions.php

Indentation +228 added lines, -228 removed lines

@@ -19,149 +19,149 @@ 
  * @global string $dummy_image_path The dummy image path.
  */
 function geodir_dummy_data_taxonomies($post_type,$category_array) {
-    global $wpdb, $dummy_image_path;
+	global $wpdb, $dummy_image_path;
 
 
 
-    $last_catid = '';
+	$last_catid = '';
 
-    $uploads = wp_upload_dir(); // Array of key => value pairs
+	$uploads = wp_upload_dir(); // Array of key => value pairs
 
-    for ($i = 0; $i < count($category_array); $i++) {
-        $parent_catid = 0;
-        if (is_array($category_array[$i])) {
-            $cat_name_arr = $category_array[$i];
-            for ($j = 0; $j < count($cat_name_arr); $j++) {
-                $catname = $cat_name_arr[$j];
+	for ($i = 0; $i < count($category_array); $i++) {
+		$parent_catid = 0;
+		if (is_array($category_array[$i])) {
+			$cat_name_arr = $category_array[$i];
+			for ($j = 0; $j < count($cat_name_arr); $j++) {
+				$catname = $cat_name_arr[$j];
 
-                if (!term_exists($catname, $post_type.'category')) {
-                    $last_catid = wp_insert_term($catname, $post_type.'category', $args = array('parent' => $parent_catid));
+				if (!term_exists($catname, $post_type.'category')) {
+					$last_catid = wp_insert_term($catname, $post_type.'category', $args = array('parent' => $parent_catid));
 
-                    if ($j == 0) {
-                        $parent_catid = $last_catid;
-                    }
+					if ($j == 0) {
+						$parent_catid = $last_catid;
+					}
 
 
-                    if (geodir_dummy_folder_exists())
-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
-                    else
-                        $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
+					if (geodir_dummy_folder_exists())
+						$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+					else
+						$dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
 
-                    $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
+					$dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
-                    $catname = str_replace(' ', '_', $catname);
-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
+					$catname = str_replace(' ', '_', $catname);
+					$uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
 
-                    if (empty($uploaded['error'])) {
-                        $new_path = $uploaded['file'];
-                        $new_url = $uploaded['url'];
-                    }
+					if (empty($uploaded['error'])) {
+						$new_path = $uploaded['file'];
+						$new_url = $uploaded['url'];
+					}
 
-                    $wp_filetype = wp_check_filetype(basename($new_path), null);
-
-                    $attachment = array(
-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),
-                        'post_mime_type' => $wp_filetype['type'],
-                        'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
-                        'post_content' => '',
-                        'post_status' => 'inherit'
-                    );
-                    $attach_id = wp_insert_attachment($attachment, $new_path);
-
-                    // you must first include the image.php file
-                    // for the function wp_generate_attachment_metadata() to work
-                    require_once(ABSPATH . 'wp-admin/includes/image.php');
-                    $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
-                    wp_update_attachment_metadata($attach_id, $attach_data);
-
-                    if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
-                        update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), $post_type);
-                    }
-                }
-            }
+					$wp_filetype = wp_check_filetype(basename($new_path), null);
 
-        } else {
-            $catname = $category_array[$i];
+					$attachment = array(
+						'guid' => $uploads['baseurl'] . '/' . basename($new_path),
+						'post_mime_type' => $wp_filetype['type'],
+						'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
+						'post_content' => '',
+						'post_status' => 'inherit'
+					);
+					$attach_id = wp_insert_attachment($attachment, $new_path);
 
-            if (!term_exists($catname, $post_type.'category')) {
-                $last_catid = wp_insert_term($catname, $post_type.'category');
+					// you must first include the image.php file
+					// for the function wp_generate_attachment_metadata() to work
+					require_once(ABSPATH . 'wp-admin/includes/image.php');
+					$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
+					wp_update_attachment_metadata($attach_id, $attach_data);
 
-                if (geodir_dummy_folder_exists())
-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
-                else
-                    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
+					if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
+						update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), $post_type);
+					}
+				}
+			}
 
-                $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
+		} else {
+			$catname = $category_array[$i];
 
-                $catname = str_replace(' ', '_', $catname);
-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
+			if (!term_exists($catname, $post_type.'category')) {
+				$last_catid = wp_insert_term($catname, $post_type.'category');
 
-                if (empty($uploaded['error'])) {
-                    $new_path = $uploaded['file'];
-                    $new_url = $uploaded['url'];
-                }
+				if (geodir_dummy_folder_exists())
+					$dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+				else
+					$dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
 
-                $wp_filetype = wp_check_filetype(basename($new_path), null);
+				$dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
-                $attachment = array(
-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),
-                    'post_mime_type' => $wp_filetype['type'],
-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
-                    'post_content' => '',
-                    'post_status' => 'inherit'
-                );
+				$catname = str_replace(' ', '_', $catname);
+				$uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
 
-                $attach_id = wp_insert_attachment($attachment, $new_path);
+				if (empty($uploaded['error'])) {
+					$new_path = $uploaded['file'];
+					$new_url = $uploaded['url'];
+				}
 
+				$wp_filetype = wp_check_filetype(basename($new_path), null);
 
-                // you must first include the image.php file
-                // for the function wp_generate_attachment_metadata() to work
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
-                $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
-                wp_update_attachment_metadata($attach_id, $attach_data);
+				$attachment = array(
+					'guid' => $uploads['baseurl'] . '/' . basename($new_path),
+					'post_mime_type' => $wp_filetype['type'],
+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
+					'post_content' => '',
+					'post_status' => 'inherit'
+				);
+
+				$attach_id = wp_insert_attachment($attachment, $new_path);
 
-                if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
-                    update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), $post_type);
-                }
-            }
-        }
 
-    }
+				// you must first include the image.php file
+				// for the function wp_generate_attachment_metadata() to work
+				require_once(ABSPATH . 'wp-admin/includes/image.php');
+				$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
+				wp_update_attachment_metadata($attach_id, $attach_data);
+
+				if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, $post_type)) {
+					update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), $post_type);
+				}
+			}
+		}
+
+	}
 }
 
 
 function geodir_dummy_data_types(){
-    return array(
-        'standard_places' => array(
-            'name'=>__('Default','geodirectory'),
-            'count'=> 30
-        ),
-        'property_sale' => array(
-            'name'=>__('Property for sale','geodirectory'),
-            'count'=> 10
-        ),
-        'property_rent' => array(
-            'name'=>__('Property for rent','geodirectory'),
-            'count'=> 10
-        )
-    );
+	return array(
+		'standard_places' => array(
+			'name'=>__('Default','geodirectory'),
+			'count'=> 30
+		),
+		'property_sale' => array(
+			'name'=>__('Property for sale','geodirectory'),
+			'count'=> 10
+		),
+		'property_rent' => array(
+			'name'=>__('Property for rent','geodirectory'),
+			'count'=> 10
+		)
+	);
 }
 
 
 function geodir_create_dummy_fields($fields)
 {
     
-    /**
-     * Filter the array of default custom fields DB table data.
-     *
-     * @since 1.0.0
-     * @param string $fields The default custom fields as an array.
-     */
-    $fields = apply_filters('geodir_before_dummy_custom_fields_saved', $fields);
-    foreach ($fields as $field_index => $field) {
-        geodir_custom_field_save($field);
-
-    }
+	/**
+	 * Filter the array of default custom fields DB table data.
+	 *
+	 * @since 1.0.0
+	 * @param string $fields The default custom fields as an array.
+	 */
+	$fields = apply_filters('geodir_before_dummy_custom_fields_saved', $fields);
+	foreach ($fields as $field_index => $field) {
+		geodir_custom_field_save($field);
+
+	}
 }
 
 /**
@@ -174,20 +174,20 @@ 
  */
 function geodir_delete_dummy_posts($post_type,$data_type)
 {
-    global $wpdb, $plugin_prefix;
+	global $wpdb, $plugin_prefix;
 
 
-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'");
+	$post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'");
 
 
-    foreach ($post_ids as $post_ids_obj) {
-        wp_delete_post($post_ids_obj->post_id);
-    }
+	foreach ($post_ids as $post_ids_obj) {
+		wp_delete_post($post_ids_obj->post_id);
+	}
 
-    //double check posts are deleted
-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'");
+	//double check posts are deleted
+	$wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'");
 
-    update_option($post_type.'_dummy_data_type','');
+	update_option($post_type.'_dummy_data_type','');
 }
 
 /**
@@ -201,78 +201,78 @@ 
 function geodir_insert_dummy_posts($post_type,$data_type,$item_index)
 {
 
-    ini_set('max_execution_time', 999999); //300 seconds = 5 minutes
-    $data_types = geodir_dummy_data_types();
-
-    $total_count = 0;
-    global $dummy_post_index;
-    $dummy_post_index = $item_index;
-    foreach( $data_types as $key=>$val){
-        if($key==$data_type){
-            $total_count = $val['count'];
-            if($key=='standard_places'){
-                /**
-                 * Contains dummy post content.
-                 *
-                 * @since 1.0.0
-                 * @package GeoDirectory
-                 */
-                include_once( 'dummy-data/standard_places.php' );
-            }elseif($key=='property_sale'){
-                /**
-                 * Contains dummy property for sale post content.
-                 *
-                 * @since 1.6.11
-                 * @package GeoDirectory
-                 */
-                include_once( 'dummy-data/property_sale.php' );
-            }elseif($key=='property_rent'){
-                /**
-                 * Contains dummy property for sale post content.
-                 *
-                 * @since 1.6.11
-                 * @package GeoDirectory
-                 */
-                include_once( 'dummy-data/property_rent.php' );
-            }
-
-        }
-
-        do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index);
-    }
-
-
-
-    // delete image cache on last entry
-    if($total_count == $item_index){
-        delete_transient( 'cached_dummy_images' );
-        flush_rewrite_rules();
-    }
+	ini_set('max_execution_time', 999999); //300 seconds = 5 minutes
+	$data_types = geodir_dummy_data_types();
+
+	$total_count = 0;
+	global $dummy_post_index;
+	$dummy_post_index = $item_index;
+	foreach( $data_types as $key=>$val){
+		if($key==$data_type){
+			$total_count = $val['count'];
+			if($key=='standard_places'){
+				/**
+				 * Contains dummy post content.
+				 *
+				 * @since 1.0.0
+				 * @package GeoDirectory
+				 */
+				include_once( 'dummy-data/standard_places.php' );
+			}elseif($key=='property_sale'){
+				/**
+				 * Contains dummy property for sale post content.
+				 *
+				 * @since 1.6.11
+				 * @package GeoDirectory
+				 */
+				include_once( 'dummy-data/property_sale.php' );
+			}elseif($key=='property_rent'){
+				/**
+				 * Contains dummy property for sale post content.
+				 *
+				 * @since 1.6.11
+				 * @package GeoDirectory
+				 */
+				include_once( 'dummy-data/property_rent.php' );
+			}
+
+		}
+
+		do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index);
+	}
+
+
+
+	// delete image cache on last entry
+	if($total_count == $item_index){
+		delete_transient( 'cached_dummy_images' );
+		flush_rewrite_rules();
+	}
 
 
 }
 
 
 if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {
-    /**
-     * GeoDirectory dummy data installation.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     * @global object $wpdb WordPress Database object.
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
-     * @param string $post_type The post type.
-     */
-    function geodir_autoinstall_admin_header($post_type = 'gd_place')
-    {
-
-        global $wpdb, $plugin_prefix;
-
-        if (!geodir_is_default_location_set()) {
-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
-        } else {
-
-            ?>
+	/**
+	 * GeoDirectory dummy data installation.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 * @global object $wpdb WordPress Database object.
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
+	 * @param string $post_type The post type.
+	 */
+	function geodir_autoinstall_admin_header($post_type = 'gd_place')
+	{
+
+		global $wpdb, $plugin_prefix;
+
+		if (!geodir_is_default_location_set()) {
+			echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
+		} else {
+
+			?>
             <table class="form-table gd-dummy-table">
                 <tbody>
                 <tr>
@@ -283,74 +283,74 @@ 
 
                 <?php
 
-                $cpts = geodir_get_posttypes('array');
+				$cpts = geodir_get_posttypes('array');
 
-                $data_types = geodir_dummy_data_types();
+				$data_types = geodir_dummy_data_types();
 
-                $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');
+				$nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');
 
-                foreach($cpts as $post_type=>$cpt){
+				foreach($cpts as $post_type=>$cpt){
 
-                    $data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type);
+					$data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type);
 
 
-                    $set_dt = get_option($post_type.'_dummy_data_type');
+					$set_dt = get_option($post_type.'_dummy_data_type');
 
-                    geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
+					geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
 
-                    $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");
+					$post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");
 
-                    echo "<tr>";
-                    echo "<td><strong>".$cpt['labels']['name']."</strong></td>";
+					echo "<tr>";
+					echo "<td><strong>".$cpt['labels']['name']."</strong></td>";
 
 
-                    $select_disabled = $post_counts > 0 ? 'disabled' : '';
-                    echo "<td>";
-                    echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>";
-                    foreach($data_types_for as $key=>$val){
-                        $selected = ($key==$set_dt) ? "selected='selected'" : '';
-                        echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>";
-                    }
-                    echo "</select>";
-
-                    $select_display = $post_counts > 0 ? 'display:none;' : '';
-                    echo "<select id='".$post_type."_data_type_count' style='$select_display' >";
-                    $x = 1;
-                    while($x <= $val['count']){
-                        $selected = ($x==$val['count']) ? "selected='selected'" : '';
-                        echo "<option $selected value='$x'>".$x."</option>";
-                        $x++;
-                    }
-                    echo "</select>";
-                    echo "</td>";
+					$select_disabled = $post_counts > 0 ? 'disabled' : '';
+					echo "<td>";
+					echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>";
+					foreach($data_types_for as $key=>$val){
+						$selected = ($key==$set_dt) ? "selected='selected'" : '';
+						echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>";
+					}
+					echo "</select>";
 
+					$select_display = $post_counts > 0 ? 'display:none;' : '';
+					echo "<select id='".$post_type."_data_type_count' style='$select_display' >";
+					$x = 1;
+					while($x <= $val['count']){
+						$selected = ($x==$val['count']) ? "selected='selected'" : '';
+						echo "<option $selected value='$x'>".$x."</option>";
+						$x++;
+					}
+					echo "</select>";
+					echo "</td>";
 
 
 
 
-                    if($post_counts > 0){
-                        echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
-                    }else{
-                        echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
-                    }
 
-                    echo "</tr>";
-                    //print_r($cpt);
-                }
+					if($post_counts > 0){
+						echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
+					}else{
+						echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
+					}
+
+					echo "</tr>";
+					//print_r($cpt);
+				}
 
-                ?>
+				?>
                 </tbody>
             </table>
             <?php
 
 
-            $default_location = geodir_get_default_location();
-            $city = isset($default_location->city) ? $default_location->city : '';
-            $region = isset($default_location->region) ? $default_location->region : '';
-            $country = isset($default_location->country) ? $default_location->country : '';
-            $city_latitude = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
-            $city_longitude = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
-            ?>
+			$default_location = geodir_get_default_location();
+			$city = isset($default_location->city) ? $default_location->city : '';
+			$region = isset($default_location->region) ? $default_location->region : '';
+			$country = isset($default_location->country) ? $default_location->country : '';
+			$city_latitude = isset($default_location->city_latitude) ? $default_location->city_latitude : '';
+			$city_longitude = isset($default_location->city_longitude) ? $default_location->city_longitude : '';
+			?>
             <script type="text/javascript">
 
                 function geodir_dummy_set_count(data,cpt){
@@ -560,7 +560,7 @@ 
                 }
             </script>
             <?php
-        }
-    }
+		}
+	}
 }
 

Spacing +58 added lines, -58 removed lines

@@ -18,7 +18,7 @@ 
  * @global object $wpdb WordPress Database object.
  * @global string $dummy_image_path The dummy image path.
  */
-function geodir_dummy_data_taxonomies($post_type,$category_array) {
+function geodir_dummy_data_taxonomies($post_type, $category_array) {
     global $wpdb, $dummy_image_path;
 
 
@@ -43,14 +43,14 @@ 
 
 
                     if (geodir_dummy_folder_exists())
-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+                        $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";
                     else
                         $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
 
                     $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
                     $catname = str_replace(' ', '_', $catname);
-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
+                    $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");
 
                     if (empty($uploaded['error'])) {
                         $new_path = $uploaded['file'];
@@ -60,7 +60,7 @@ 
                     $wp_filetype = wp_check_filetype(basename($new_path), null);
 
                     $attachment = array(
-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),
+                        'guid' => $uploads['baseurl'].'/'.basename($new_path),
                         'post_mime_type' => $wp_filetype['type'],
                         'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
                         'post_content' => '',
@@ -70,7 +70,7 @@ 
 
                     // you must first include the image.php file
                     // for the function wp_generate_attachment_metadata() to work
-                    require_once(ABSPATH . 'wp-admin/includes/image.php');
+                    require_once(ABSPATH.'wp-admin/includes/image.php');
                     $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
                     wp_update_attachment_metadata($attach_id, $attach_data);
 
@@ -87,14 +87,14 @@ 
                 $last_catid = wp_insert_term($catname, $post_type.'category');
 
                 if (geodir_dummy_folder_exists())
-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+                    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";
                 else
                     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
 
                 $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
                 $catname = str_replace(' ', '_', $catname);
-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");
+                $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");
 
                 if (empty($uploaded['error'])) {
                     $new_path = $uploaded['file'];
@@ -104,7 +104,7 @@ 
                 $wp_filetype = wp_check_filetype(basename($new_path), null);
 
                 $attachment = array(
-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),
+                    'guid' => $uploads['baseurl'].'/'.basename($new_path),
                     'post_mime_type' => $wp_filetype['type'],
                     'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),
                     'post_content' => '',
@@ -116,7 +116,7 @@ 
 
                 // you must first include the image.php file
                 // for the function wp_generate_attachment_metadata() to work
-                require_once(ABSPATH . 'wp-admin/includes/image.php');
+                require_once(ABSPATH.'wp-admin/includes/image.php');
                 $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);
                 wp_update_attachment_metadata($attach_id, $attach_data);
 
@@ -130,18 +130,18 @@ 
 }
 
 
-function geodir_dummy_data_types(){
+function geodir_dummy_data_types() {
     return array(
         'standard_places' => array(
-            'name'=>__('Default','geodirectory'),
+            'name'=>__('Default', 'geodirectory'),
             'count'=> 30
         ),
         'property_sale' => array(
-            'name'=>__('Property for sale','geodirectory'),
+            'name'=>__('Property for sale', 'geodirectory'),
             'count'=> 10
         ),
         'property_rent' => array(
-            'name'=>__('Property for rent','geodirectory'),
+            'name'=>__('Property for rent', 'geodirectory'),
             'count'=> 10
         )
     );
@@ -172,12 +172,12 @@ 
  * @global object $wpdb WordPress Database object.
  * @global string $plugin_prefix Geodirectory plugin table prefix.
  */
-function geodir_delete_dummy_posts($post_type,$data_type)
+function geodir_delete_dummy_posts($post_type, $data_type)
 {
     global $wpdb, $plugin_prefix;
 
 
-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . $post_type."_detail WHERE post_dummy='1'");
+    $post_ids = $wpdb->get_results("SELECT post_id FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");
 
 
     foreach ($post_ids as $post_ids_obj) {
@@ -185,9 +185,9 @@ 
     }
 
     //double check posts are deleted
-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . $post_type. "_detail WHERE post_dummy='1'");
+    $wpdb->get_results("DELETE FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");
 
-    update_option($post_type.'_dummy_data_type','');
+    update_option($post_type.'_dummy_data_type', '');
 }
 
 /**
@@ -198,7 +198,7 @@ 
  * @global object $wpdb WordPress Database object.
  * @global object $current_user Current user object.
  */
-function geodir_insert_dummy_posts($post_type,$data_type,$item_index)
+function geodir_insert_dummy_posts($post_type, $data_type, $item_index)
 {
 
     ini_set('max_execution_time', 999999); //300 seconds = 5 minutes
@@ -207,45 +207,45 @@ 
     $total_count = 0;
     global $dummy_post_index;
     $dummy_post_index = $item_index;
-    foreach( $data_types as $key=>$val){
-        if($key==$data_type){
+    foreach ($data_types as $key=>$val) {
+        if ($key == $data_type) {
             $total_count = $val['count'];
-            if($key=='standard_places'){
+            if ($key == 'standard_places') {
                 /**
                  * Contains dummy post content.
                  *
                  * @since 1.0.0
                  * @package GeoDirectory
                  */
-                include_once( 'dummy-data/standard_places.php' );
-            }elseif($key=='property_sale'){
+                include_once('dummy-data/standard_places.php');
+            }elseif ($key == 'property_sale') {
                 /**
                  * Contains dummy property for sale post content.
                  *
                  * @since 1.6.11
                  * @package GeoDirectory
                  */
-                include_once( 'dummy-data/property_sale.php' );
-            }elseif($key=='property_rent'){
+                include_once('dummy-data/property_sale.php');
+            }elseif ($key == 'property_rent') {
                 /**
                  * Contains dummy property for sale post content.
                  *
                  * @since 1.6.11
                  * @package GeoDirectory
                  */
-                include_once( 'dummy-data/property_rent.php' );
+                include_once('dummy-data/property_rent.php');
             }
 
         }
 
-        do_action('geodir_insert_dummy_data_loop',$post_type,$data_type,$item_index);
+        do_action('geodir_insert_dummy_data_loop', $post_type, $data_type, $item_index);
     }
 
 
 
     // delete image cache on last entry
-    if($total_count == $item_index){
-        delete_transient( 'cached_dummy_images' );
+    if ($total_count == $item_index) {
+        delete_transient('cached_dummy_images');
         flush_rewrite_rules();
     }
 
@@ -253,7 +253,7 @@ 
 }
 
 
-if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {
+if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined('GD_TESTING_MODE'))) {
     /**
      * GeoDirectory dummy data installation.
      *
@@ -269,16 +269,16 @@ 
         global $wpdb, $plugin_prefix;
 
         if (!geodir_is_default_location_set()) {
-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';
+            echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';
         } else {
 
             ?>
             <table class="form-table gd-dummy-table">
                 <tbody>
                 <tr>
-                    <td><strong><?php _e('CPT','geodirectory');?></strong></td>
-                    <td><strong><?php _e('Data Type','geodirectory');?></strong></td>
-                    <td><strong><?php _e('Action','geodirectory');?></strong></td>
+                    <td><strong><?php _e('CPT', 'geodirectory'); ?></strong></td>
+                    <td><strong><?php _e('Data Type', 'geodirectory'); ?></strong></td>
+                    <td><strong><?php _e('Action', 'geodirectory'); ?></strong></td>
                 </tr>
 
                 <?php
@@ -289,16 +289,16 @@ 
 
                 $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');
 
-                foreach($cpts as $post_type=>$cpt){
+                foreach ($cpts as $post_type=>$cpt) {
 
-                    $data_types_for = apply_filters('geodir_dummy_date_types_for',$data_types,$post_type);
+                    $data_types_for = apply_filters('geodir_dummy_date_types_for', $data_types, $post_type);
 
 
                     $set_dt = get_option($post_type.'_dummy_data_type');
 
-                    geodir_add_column_if_not_exist($plugin_prefix . $post_type. "_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
+                    geodir_add_column_if_not_exist($plugin_prefix.$post_type."_detail", 'post_dummy', "enum( '1', '0' ) NULL DEFAULT '0'");
 
-                    $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");
+                    $post_counts = $wpdb->get_var("SELECT count(post_id) FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");
 
                     echo "<tr>";
                     echo "<td><strong>".$cpt['labels']['name']."</strong></td>";
@@ -307,8 +307,8 @@ 
                     $select_disabled = $post_counts > 0 ? 'disabled' : '';
                     echo "<td>";
                     echo "<select id='".$post_type."_data_type' onchange='geodir_dummy_set_count(this,\"$post_type\");' $select_disabled>";
-                    foreach($data_types_for as $key=>$val){
-                        $selected = ($key==$set_dt) ? "selected='selected'" : '';
+                    foreach ($data_types_for as $key=>$val) {
+                        $selected = ($key == $set_dt) ? "selected='selected'" : '';
                         echo "<option $selected value='$key' data-count='".$val['count']."'>".$val['name']."</option>";
                     }
                     echo "</select>";
@@ -316,8 +316,8 @@ 
                     $select_display = $post_counts > 0 ? 'display:none;' : '';
                     echo "<select id='".$post_type."_data_type_count' style='$select_display' >";
                     $x = 1;
-                    while($x <= $val['count']){
-                        $selected = ($x==$val['count']) ? "selected='selected'" : '';
+                    while ($x <= $val['count']) {
+                        $selected = ($x == $val['count']) ? "selected='selected'" : '';
                         echo "<option $selected value='$x'>".$x."</option>";
                         $x++;
                     }
@@ -328,10 +328,10 @@ 
 
 
 
-                    if($post_counts > 0){
-                        echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
-                    }else{
-                        echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
+                    if ($post_counts > 0) {
+                        echo '<td><input type="button" value="'.__('Remove data', 'geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\''.$nonce.'\',\''.$post_type.'\'); return false;" ></td>';
+                    } else {
+                        echo '<td><input type="button" value="'.__('Insert data', 'geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\''.$nonce.'\',\''.$post_type.'\'); return false;" ></td>';
                     }
 
                     echo "</tr>";
@@ -367,7 +367,7 @@ 
 
                 }
                 var geocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;
-                var CITY_ADDRESS = '<?php echo addslashes( $city . ',' . $region . ',' . $country );?>';
+                var CITY_ADDRESS = '<?php echo addslashes($city.','.$region.','.$country); ?>';
                 var bound_lat_lng;
                 var latlng = ['<?php echo $city_latitude; ?>', <?php echo $city_longitude; ?>];
                 var lat = <?php echo $city_latitude; ?>;
@@ -397,7 +397,7 @@ 
                                     return x.replace(" ", '');
                                 }); // remove spaces from lat/lon
                             } else {
-                                alert("<?php _e('Geocode was not successful for the following reason:','geodirectory');?> " + status);
+                                alert("<?php _e('Geocode was not successful for the following reason:', 'geodirectory'); ?> " + status);
                             }
                         });
                 } else if (window.gdMaps == 'osm') {
@@ -422,7 +422,7 @@ 
                     var total_dummy_post_count = jQuery('#sub_' + active_tab).find('.selected_sample_data').val();
 
                     if (id == 'geodir_dummy_delete') {
-                        if (confirm('<?php _e('Are you sure you want to delete dummy data?' , 'geodirectory'); ?>')) {
+                        if (confirm('<?php _e('Are you sure you want to delete dummy data?', 'geodirectory'); ?>')) {
                             jQuery('#sub_' + active_tab).find('.geodir_auto_install').hide();
                             jQuery('#sub_' + active_tab).find('.geodir_show_progress').show();
                             jQuery.post('<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=' + id + '&posttype=' + posttype + '&_wpnonce=' + nonce,
@@ -443,7 +443,7 @@ 
                         var post_url = '<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=' + id + '&posttype=' + posttype + '&insert_dummy_post_index=' + dummy_post_index + '&city_bound_lat1=' + bound_lat_lng[0] + '&city_bound_lng1=' + bound_lat_lng[1] + '&city_bound_lat2=' + bound_lat_lng[2] + '&city_bound_lng2=' + bound_lat_lng[3] + '&_wpnonce=' + nonce;
 
                         jQuery.post( post_url, function (data) {
-                            jQuery(obj).closest('form').find('.dummy_post_inserted').html('<?php _e('Dummy post(s) inserted:','geodirectory');?> ' + dummy_post_index + ' <?php _e('of' ,'geodirectory'); ?> ' + total_dummy_post_count + '');
+                            jQuery(obj).closest('form').find('.dummy_post_inserted').html('<?php _e('Dummy post(s) inserted:', 'geodirectory'); ?> ' + dummy_post_index + ' <?php _e('of', 'geodirectory'); ?> ' + total_dummy_post_count + '');
 
                             dummy_post_index++;
 
@@ -458,7 +458,7 @@ 
 
 
                 function gdRemoveDummyData(obj, nonce, posttype){
-                    if (confirm('<?php _e('Are you sure you want to delete dummy data?' , 'geodirectory'); ?>')) {
+                    if (confirm('<?php _e('Are you sure you want to delete dummy data?', 'geodirectory'); ?>')) {
                         jQuery(obj).prop('disabled', true);
                         jQuery('.gd-dummy-data-results-' + posttype).remove();
                         jQuery('<tr class="gd-dummy-data-results gd-dummy-data-results-' + posttype + '" >'+
@@ -473,14 +473,14 @@ 
 
                         jQuery('.gd_progressbar_'+posttype).progressbar({value: 0});
 
-                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Removing data...', 'geodirlocation'));?>');
+                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Removing data...', 'geodirlocation')); ?>');
 
 
                         jQuery.post('<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=geodir_dummy_delete&posttype=' + posttype + '&_wpnonce=' + nonce,
                             function (data) {
-                                gd_progressbar('.gd_progressbar_container_'+posttype, 100, '<i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation'));?>');
+                                gd_progressbar('.gd_progressbar_container_'+posttype, 100, '<i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation')); ?>');
                                 jQuery(obj).removeClass('gd-remove-data');
-                                jQuery(obj).val('<?php _e('Insert data','geodirectory');?>');
+                                jQuery(obj).val('<?php _e('Insert data', 'geodirectory'); ?>');
                                 jQuery(obj).prop('disabled', false);
                                 jQuery('#'+posttype+'_data_type_count').show();
                                 jQuery('#'+posttype+'_data_type').prop('disabled', false);
@@ -523,7 +523,7 @@ 
 
                         jQuery('.gd_progressbar_'+posttype).progressbar({value: 0});
 
-                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '0% (0 / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Creating categories and custom fields...', 'geodirlocation'));?>');
+                        gd_progressbar('.gd_progressbar_container_'+posttype, 0, '0% (0 / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Creating categories and custom fields...', 'geodirlocation')); ?>');
                     }
 
                     if (!(typeof bound_lat_lng == 'object' && bound_lat_lng.length == 4)) {
@@ -543,15 +543,15 @@ 
                             percentage = percentage > 100 ? 100 : percentage;
 
 
-                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Inserting data...', 'geodirlocation'));?>');
+                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Inserting data...', 'geodirlocation')); ?>');
 
                             gdInstallDummyData(obj, nonce, posttype,insertedCount);
                         }
                         else {
                             percentage = 100;
-                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation'));?>');
+                            gd_progressbar('.gd_progressbar_container_'+posttype, percentage, percentage + '% ('+insertedCount+' / ' + dateTypeCount + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirlocation')); ?>');
                             jQuery(obj).addClass('gd-remove-data');
-                            jQuery(obj).val('<?php _e('Remove data','geodirectory');?>');
+                            jQuery(obj).val('<?php _e('Remove data', 'geodirectory'); ?>');
                             jQuery(obj).prop('disabled', false);
 
                         }

Braces +13 added lines, -11 removed lines

@@ -42,10 +42,11 @@ 
                     }
 
 
-                    if (geodir_dummy_folder_exists())
-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
-                    else
-                        $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
+                    if (geodir_dummy_folder_exists()) {
+                                            $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+                    } else {
+                                            $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
+                    }
 
                     $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
@@ -86,10 +87,11 @@ 
             if (!term_exists($catname, $post_type.'category')) {
                 $last_catid = wp_insert_term($catname, $post_type.'category');
 
-                if (geodir_dummy_folder_exists())
-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
-                else
-                    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
+                if (geodir_dummy_folder_exists()) {
+                                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+                } else {
+                                    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
+                }
 
                 $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);
 
@@ -218,7 +220,7 @@ 
                  * @package GeoDirectory
                  */
                 include_once( 'dummy-data/standard_places.php' );
-            }elseif($key=='property_sale'){
+            } elseif($key=='property_sale'){
                 /**
                  * Contains dummy property for sale post content.
                  *
@@ -226,7 +228,7 @@ 
                  * @package GeoDirectory
                  */
                 include_once( 'dummy-data/property_sale.php' );
-            }elseif($key=='property_rent'){
+            } elseif($key=='property_rent'){
                 /**
                  * Contains dummy property for sale post content.
                  *
@@ -330,7 +332,7 @@ 
 
                     if($post_counts > 0){
                         echo '<td><input type="button" value="'.__('Remove data','geodirectory').'" class="button-primary geodir_dummy_button gd-remove-data" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
-                    }else{
+                    } else{
                         echo '<td><input type="button" value="'.__('Insert data','geodirectory').'" class="button-primary geodir_dummy_button" onclick="gdInstallDummyData(this,\'' . $nonce . '\',\'' . $post_type . '\'); return false;" ></td>';
                     }
 

geodirectory-admin/admin_functions.php

Indentation +2775 added lines, -2775 removed lines

@@ -13,125 +13,125 @@ 
  * @package GeoDirectory

  */

 function geodir_deactivation() {

-    // Update installed variable

-    update_option("geodir_installed", 0);

+	// Update installed variable

+	update_option("geodir_installed", 0);

 

-    // Remove rewrite rules and then recreate rewrite rules.

-    flush_rewrite_rules();

+	// Remove rewrite rules and then recreate rewrite rules.

+	flush_rewrite_rules();

 }

 

 if (!function_exists('geodir_admin_styles')) {

-    /**

-     * Enqueue Admin Styles.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_styles() {

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

-        wp_enqueue_style('geodirectory-admin-css');

+	/**

+	 * Enqueue Admin Styles.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_styles() {

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

+		wp_enqueue_style('geodirectory-admin-css');

 

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

-        wp_enqueue_style('geodirectory-frontend-style');

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

+		wp_enqueue_style('geodirectory-frontend-style');

 

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

-        wp_enqueue_style('geodir-chosen-style');

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

+		wp_enqueue_style('geodir-chosen-style');

 

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

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

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

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

 

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

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

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

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

 

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

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

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

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

 

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

-        wp_enqueue_style('geodirectory-pluplodar-css');

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

+		wp_enqueue_style('geodirectory-pluplodar-css');

 

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

-        wp_enqueue_style('geodir-rating-style');

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

+		wp_enqueue_style('geodir-rating-style');

 

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

-        wp_enqueue_style('geodir-rtl-style');

-    }

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

+		wp_enqueue_style('geodir-rtl-style');

+	}

 }

 

 if (!function_exists('geodir_admin_styles_req')) {

-    /**

-     * Loads stylesheets from CDN.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_styles_req()

-    {

+	/**

+	 * Loads stylesheets from CDN.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_styles_req()

+	{

 

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

-        wp_enqueue_style('font-awesome');

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

+		wp_enqueue_style('font-awesome');

 

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

-        wp_enqueue_script('geodirectory-admin');

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

+		wp_enqueue_script('geodirectory-admin');

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_scripts')) {

-    /**

-     * Enqueue Admin Scripts.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_scripts()

-    {

-        $geodir_map_name = geodir_map_name();

+	/**

+	 * Enqueue Admin Scripts.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_scripts()

+	{

+		$geodir_map_name = geodir_map_name();

         

-        wp_enqueue_script('jquery');

+		wp_enqueue_script('jquery');

 

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

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

 

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

-        wp_enqueue_script('chosen');

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

+		wp_enqueue_script('chosen');

 

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

-        wp_enqueue_script('geodirectory-choose-ajax');

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

+		wp_enqueue_script('geodirectory-choose-ajax');

 

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

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

-        }

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

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

+		}

 

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

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

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

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

 

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

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

 

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

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

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

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

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

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

-        }

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

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

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

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

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

+			wp_enqueue_script('geodirectory-googlemap-script', 'https://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_enqueue_style('geodirectory-leaflet-style');

+		if ($geodir_map_name == 'osm') {

+			// Leaflet OpenStreetMap

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

+			wp_enqueue_style('geodirectory-leaflet-style');

                 

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

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

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

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

             

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

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

-        }

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

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

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

+		}

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

         

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

-        wp_enqueue_script('geodirectory-goMap-script');

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

+		wp_enqueue_script('geodirectory-goMap-script');

 

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

-        wp_enqueue_script('geodirectory-goMap-script');

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

+		wp_enqueue_script('geodirectory-goMap-script');

 

 		// font awesome rating script

 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

@@ -142,167 +142,167 @@ 
 			wp_enqueue_script('geodir-jRating-js');

 		}

 

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

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

-

-

-        // SCRIPT FOR UPLOAD

-        wp_enqueue_script('plupload-all');

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

-

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

-        wp_enqueue_script('geodirectory-plupload-script');

-

-        // SCRIPT FOR UPLOAD END

-

-

-        // place js config array for plupload

-        $plupload_init = array(

-            'runtimes' => 'html5,silverlight,flash,html4',

-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

-            'container' => 'plupload-upload-ui', // will be adjusted per uploader

-            'drop_element' => 'dropbox', // will be adjusted per uploader

-            'file_data_name' => 'async-upload', // will be adjusted per uploader

-            'multiple_queues' => true,

-            'max_file_size' => geodir_max_upload_size(),

-            'url' => admin_url('admin-ajax.php'),

-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

-            'multipart' => true,

-            'urlstream_upload' => true,

-            'multi_selection' => false, // will be added per uploader

-            // additional post data to send to our ajax hook

-            'multipart_params' => array(

-                '_ajax_nonce' => "", // will be added per uploader

-                'action' => 'plupload_action', // the ajax action name

-                'imgid' => 0 // will be added per uploader

-            )

-        );

-        $base_plupload_config = json_encode($plupload_init);

-

-

-        $thumb_img_arr = array();

-

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

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

-

-        $totImg = '';

-        $image_limit = '';

-        if (!empty($thumb_img_arr)) {

-            $totImg = count($thumb_img_arr);

-        }

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

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

+

+

+		// SCRIPT FOR UPLOAD

+		wp_enqueue_script('plupload-all');

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

+

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

+		wp_enqueue_script('geodirectory-plupload-script');

+

+		// SCRIPT FOR UPLOAD END

+

+

+		// place js config array for plupload

+		$plupload_init = array(

+			'runtimes' => 'html5,silverlight,flash,html4',

+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

+			'container' => 'plupload-upload-ui', // will be adjusted per uploader

+			'drop_element' => 'dropbox', // will be adjusted per uploader

+			'file_data_name' => 'async-upload', // will be adjusted per uploader

+			'multiple_queues' => true,

+			'max_file_size' => geodir_max_upload_size(),

+			'url' => admin_url('admin-ajax.php'),

+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

+			'multipart' => true,

+			'urlstream_upload' => true,

+			'multi_selection' => false, // will be added per uploader

+			// additional post data to send to our ajax hook

+			'multipart_params' => array(

+				'_ajax_nonce' => "", // will be added per uploader

+				'action' => 'plupload_action', // the ajax action name

+				'imgid' => 0 // will be added per uploader

+			)

+		);

+		$base_plupload_config = json_encode($plupload_init);

+

+

+		$thumb_img_arr = array();

+

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

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

+

+		$totImg = '';

+		$image_limit = '';

+		if (!empty($thumb_img_arr)) {

+			$totImg = count($thumb_img_arr);

+		}

 

-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

-            'totalImg' => $totImg,

-            'image_limit' => $image_limit,

-            'upload_img_size' => geodir_max_upload_size());

+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

+			'totalImg' => $totImg,

+			'image_limit' => $image_limit,

+			'upload_img_size' => geodir_max_upload_size());

 

-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

 

-        $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));

-        wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

+		$ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));

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

 

 

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

-        wp_enqueue_script('geodirectory-admin-script');

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

+		wp_enqueue_script('geodirectory-admin-script');

 

-        wp_enqueue_style('farbtastic');

-        wp_enqueue_script('farbtastic');

+		wp_enqueue_style('farbtastic');

+		wp_enqueue_script('farbtastic');

 

-        $screen = get_current_screen();

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

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

-        }

+		$screen = get_current_screen();

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

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

+		}

 

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

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

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

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

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_menu')) {

-    /**

-     * Admin Menus

-     *

-     * Sets up the admin menus in wordpress.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global array $menu Menu array.

-     * @global object $geodirectory GeoDirectory plugin object.

-     */

-    function geodir_admin_menu()

-    {

-        global $menu, $geodirectory;

+	/**

+	 * Admin Menus

+	 *

+	 * Sets up the admin menus in wordpress.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global array $menu Menu array.

+	 * @global object $geodirectory GeoDirectory plugin object.

+	 */

+	function geodir_admin_menu()

+	{

+		global $menu, $geodirectory;

 

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

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

 

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

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

 

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_menu_order')) {

-    /**

-     * Order admin menus.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $menu_order Menu order array.

-     * @return array Modified menu order array.

-     */

-    function geodir_admin_menu_order($menu_order)

-    {

-

-        // Initialize our custom order array

-        $geodir_menu_order = array();

-

-        // Get the index of our custom separator

-        $geodir_separator = array_search('separator-geodirectory', $menu_order);

-

-        // Get index of posttype menu

-        $post_types = geodir_get_posttypes();

-

-        // Loop through menu order and do some rearranging

-        foreach ($menu_order as $index => $item) :

-

-            if ((('geodirectory') == $item)) :

-                $geodir_menu_order[] = 'separator-geodirectory';

-                if (!empty($post_types)) {

-                    foreach ($post_types as $post_type) {

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

-                    }

-                }

-                $geodir_menu_order[] = $item;

+	/**

+	 * Order admin menus.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $menu_order Menu order array.

+	 * @return array Modified menu order array.

+	 */

+	function geodir_admin_menu_order($menu_order)

+	{

 

-                unset($menu_order[$geodir_separator]);

-            //unset( $menu_order[$geodir_places] );

-            elseif (!in_array($item, array('separator-geodirectory'))) :

-                $geodir_menu_order[] = $item;

-            endif;

+		// Initialize our custom order array

+		$geodir_menu_order = array();

 

-        endforeach;

+		// Get the index of our custom separator

+		$geodir_separator = array_search('separator-geodirectory', $menu_order);

 

-        // Return order

-        return $geodir_menu_order;

-    }

+		// Get index of posttype menu

+		$post_types = geodir_get_posttypes();

+

+		// Loop through menu order and do some rearranging

+		foreach ($menu_order as $index => $item) :

+

+			if ((('geodirectory') == $item)) :

+				$geodir_menu_order[] = 'separator-geodirectory';

+				if (!empty($post_types)) {

+					foreach ($post_types as $post_type) {

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

+					}

+				}

+				$geodir_menu_order[] = $item;

+

+				unset($menu_order[$geodir_separator]);

+			//unset( $menu_order[$geodir_places] );

+			elseif (!in_array($item, array('separator-geodirectory'))) :

+				$geodir_menu_order[] = $item;

+			endif;

+

+		endforeach;

+

+		// Return order

+		return $geodir_menu_order;

+	}

 }

 

 if (!function_exists('geodir_admin_custom_menu_order')) {

-    /**

-     * Enables custom menu order.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return bool

-     */

-    function geodir_admin_custom_menu_order()

-    {

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

-        return true;

-    }

+	/**

+	 * Enables custom menu order.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return bool

+	 */

+	function geodir_admin_custom_menu_order()

+	{

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

+		return true;

+	}

 }

 

 /**

@@ -313,51 +313,51 @@ 
  */

 function geodir_before_admin_panel()

 {

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

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

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

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

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

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

                 </div>';

 

-    }

+	}

 

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

-        switch ($_REQUEST['msg']) {

-            case 'success':

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

-                flush_rewrite_rules(false);

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

+		switch ($_REQUEST['msg']) {

+			case 'success':

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

+				flush_rewrite_rules(false);

 

-                break;

+				break;

 			case 'fail':

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

 				

 				if ($gderr == 21)

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

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

 				else

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

-                break;

-        }

-    }

+				break;

+		}

+	}

 

-    $geodir_load_map = get_option('geodir_load_map');

-    $need_map_key = false;

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

-        $need_map_key = true;

-    }

+	$geodir_load_map = get_option('geodir_load_map');

+	$need_map_key = false;

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

+		$need_map_key = true;

+	}

 

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

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

-    }

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

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

+	}

 

-    if (!geodir_is_default_location_set()) {

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

+	if (!geodir_is_default_location_set()) {

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

 

-    }

+	}

 

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

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

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

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

 

-    }

+	}

 

 

 

@@ -374,19 +374,19 @@ 
  */

 function geodir_handle_option_form_submit($current_tab)

 {

-    global $geodir_settings;

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

-        /**

-         * Contains settings array for current tab.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

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

-    }

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

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

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

+	global $geodir_settings;

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

+		/**

+		 * Contains settings array for current tab.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

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

+	}

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

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

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

 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -398,38 +398,38 @@ 
 		 */

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

 		

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

-            geodir_update_options($geodir_settings[$current_tab]);

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

+			geodir_update_options($geodir_settings[$current_tab]);

 

-        /**

-         * Called after GeoDirectory options settings are updated.

-         *

-         * @since 1.0.0

-         * @param array $geodir_settings The array of GeoDirectory settings.

-         * @see 'geodir_before_update_options'

-         */

-        do_action('geodir_update_options', $geodir_settings);

+		/**

+		 * Called after GeoDirectory options settings are updated.

+		 *

+		 * @since 1.0.0

+		 * @param array $geodir_settings The array of GeoDirectory settings.

+		 * @see 'geodir_before_update_options'

+		 */

+		do_action('geodir_update_options', $geodir_settings);

 

-        /**

-         * Called after GeoDirectory options settings are updated.

-         *

-         * Provides tab specific settings.

-         *

-         * @since 1.0.0

-         * @param string $current_tab The current settings tab name.

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

-         */

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

+		/**

+		 * Called after GeoDirectory options settings are updated.

+		 *

+		 * Provides tab specific settings.

+		 *

+		 * @since 1.0.0

+		 * @param string $current_tab The current settings tab name.

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

+		 */

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

 

-        flush_rewrite_rules(false);

+		flush_rewrite_rules(false);

 

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

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

 

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

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

 

-        wp_redirect($redirect_url);

-        exit();

-    endif;

+		wp_redirect($redirect_url);

+		exit();

+	endif;

 

 

 }

@@ -447,144 +447,144 @@ 
  * @return bool Returns true if saved.

  */

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

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

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

 

-    foreach ($options as $value) {

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

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

+	foreach ($options as $value) {

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

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

 

 

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

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

 

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

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

-            } else {

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

-            }

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

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

+			} else {

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

+			}

 

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

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

 

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

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

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

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

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

-                else :

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

-                endif;

-            } else {

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

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

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

-            }

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

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

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

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

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

+				else :

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

+				endif;

+			} else {

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

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

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

+			}

 

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

-            $post_types = array();

-            $categories = array();

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

+			$post_types = array();

+			$categories = array();

 

-            if (!empty($_POST['home_map_post_types'])) :

-                foreach ($_POST['home_map_post_types'] as $post_type) :

-                    $post_types[] = $post_type;

-                endforeach;

-            endif;

+			if (!empty($_POST['home_map_post_types'])) :

+				foreach ($_POST['home_map_post_types'] as $post_type) :

+					$post_types[] = $post_type;

+				endforeach;

+			endif;

 

-            update_option('geodir_exclude_post_type_on_map', $post_types);

+			update_option('geodir_exclude_post_type_on_map', $post_types);

 

-            if (!empty($_POST['post_category'])) :

-                foreach ($_POST['post_category'] as $texonomy => $cat_arr) :

-                    $categories[$texonomy] = array();

-                    foreach ($cat_arr as $category) :

-                        $categories[$texonomy][] = $category;

-                    endforeach;

-                    $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();

-                endforeach;

-            endif;

-            update_option('geodir_exclude_cat_on_map', $categories);

-            update_option('geodir_exclude_cat_on_map_upgrade', 1);

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

+			if (!empty($_POST['post_category'])) :

+				foreach ($_POST['post_category'] as $texonomy => $cat_arr) :

+					$categories[$texonomy] = array();

+					foreach ($cat_arr as $category) :

+						$categories[$texonomy][] = $category;

+					endforeach;

+					$categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();

+				endforeach;

+			endif;

+			update_option('geodir_exclude_cat_on_map', $categories);

+			update_option('geodir_exclude_cat_on_map_upgrade', 1);

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

 

 

-            if (!empty($_POST['geodir_default_map_language'])):

-                update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);

-            endif;

+			if (!empty($_POST['geodir_default_map_language'])):

+				update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);

+			endif;

 

 

-            if (!empty($_POST['geodir_default_map_search_pt'])):

-                update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);

-            endif;

+			if (!empty($_POST['geodir_default_map_search_pt'])):

+				update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);

+			endif;

 

 

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

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

 

 

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

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

 

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

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

-                    $noimg_name = end($image_name_arr);

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

-                    if (file_exists($img_path))

-                        unlink($img_path);

-                }

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

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

+					$noimg_name = end($image_name_arr);

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

+					if (file_exists($img_path))

+						unlink($img_path);

+				}

 

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

-            }

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

+			}

 

-            $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';

-            $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';

-

-            if (!empty($filename)):

-                $ext = pathinfo($filename, PATHINFO_EXTENSION);

-                $uplaods = array();

-

-                foreach ($uploadedfile as $key => $uplaod):

-                    if ($key == 'name'):

-                        $uplaods[$key] = $filename;

-                    else :

-                        $uplaods[$key] = $uplaod;

-                    endif;

-                endforeach;

-

-                $uploads = wp_upload_dir();

-

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

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

-                    $noimg_name = end($image_name_arr);

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

-                    if (file_exists($img_path))

-                        unlink($img_path);

-                }

+			$uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';

+			$filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';

+

+			if (!empty($filename)):

+				$ext = pathinfo($filename, PATHINFO_EXTENSION);

+				$uplaods = array();

+

+				foreach ($uploadedfile as $key => $uplaod):

+					if ($key == 'name'):

+						$uplaods[$key] = $filename;

+					else :

+						$uplaods[$key] = $uplaod;

+					endif;

+				endforeach;

+

+				$uploads = wp_upload_dir();

+

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

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

+					$noimg_name = end($image_name_arr);

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

+					if (file_exists($img_path))

+						unlink($img_path);

+				}

 

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

-                $movefile = wp_handle_upload($uplaods, $upload_overrides);

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

+				$movefile = wp_handle_upload($uplaods, $upload_overrides);

 

-                update_option($value['id'], $movefile['url']);

+				update_option($value['id'], $movefile['url']);

 

-            endif;

+			endif;

 

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

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

-            endif;

+			if (!get_option($value['id']) && isset($value['value'])):

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

+			endif;

 

 

-        else :

-            // same menu setting per theme.

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

-                $theme = wp_get_theme();

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

-            }

+		else :

+			// same menu setting per theme.

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

+				$theme = wp_get_theme();

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

+			}

 

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

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

-            } else {

-                delete_option($value['id']);

-            }

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

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

+			} else {

+				delete_option($value['id']);

+			}

 

-        endif;

-    }

-    if ($dummy)

-        $_POST = array();

-    return true;

+		endif;

+	}

+	if ($dummy)

+		$_POST = array();

+	return true;

 

 }

 

@@ -633,33 +633,33 @@ 
 function places_custom_fields_tab($tabs)

 {

 

-    $geodir_post_types = get_option('geodir_post_types');

+	$geodir_post_types = get_option('geodir_post_types');

 

-    if (!empty($geodir_post_types)) {

+	if (!empty($geodir_post_types)) {

 

-        foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):

+		foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):

 

-            $listing_slug = $geodir_posttype_info['labels']['singular_name'];

+			$listing_slug = $geodir_posttype_info['labels']['singular_name'];

 

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

-                'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

-                'subtabs' => array(

-                    array('subtab' => 'custom_fields',

-                        'label' => __('Custom Fields', 'geodirectory'),

-                        'request' => array('listing_type' => $geodir_post_type)),

-                    array('subtab' => 'sorting_options',

-                        'label' => __('Sorting Options', 'geodirectory'),

-                        'request' => array('listing_type' => $geodir_post_type)),

-                ),

-                'tab_index' => 9,

-                'request' => array('listing_type' => $geodir_post_type)

-            );

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

+				'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

+				'subtabs' => array(

+					array('subtab' => 'custom_fields',

+						'label' => __('Custom Fields', 'geodirectory'),

+						'request' => array('listing_type' => $geodir_post_type)),

+					array('subtab' => 'sorting_options',

+						'label' => __('Sorting Options', 'geodirectory'),

+						'request' => array('listing_type' => $geodir_post_type)),

+				),

+				'tab_index' => 9,

+				'request' => array('listing_type' => $geodir_post_type)

+			);

 

-        endforeach;

+		endforeach;

 

-    }

+	}

 

-    return $tabs;

+	return $tabs;

 }

 

 

@@ -675,9 +675,9 @@ 
  */

 function geodir_tools_setting_tab($tabs)

 {

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

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

-    return $tabs;

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

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

+	return $tabs;

 }

 

 /**

@@ -692,8 +692,8 @@ 
  */

 function geodir_compatibility_setting_tab($tabs)

 {

-    $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));

-    return $tabs;

+	$tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));

+	return $tabs;

 }

 

 

@@ -709,144 +709,144 @@ 
  */

 function geodir_extend_geodirectory_setting_tab($tabs)

 {

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

-    return $tabs;

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

+	return $tabs;

 }

 

 

 if (!function_exists('geodir_edit_post_columns')) {

-    /**

-     * Modify admin post listing page columns.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $columns The column array.

-     * @return array Altered column array.

-     */

-    function geodir_edit_post_columns($columns)

-    {

-

-        $new_columns = array('location' => __('Location (ID)', 'geodirectory'),

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

-

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

-        {

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

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

-        }

+	/**

+	 * Modify admin post listing page columns.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $columns The column array.

+	 * @return array Altered column array.

+	 */

+	function geodir_edit_post_columns($columns)

+	{

+

+		$new_columns = array('location' => __('Location (ID)', 'geodirectory'),

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

 

-        $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));

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

+		{

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

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

+		}

 

-        $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));

+		$columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));

 

-        return $columns;

-    }

+		$columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));

+

+		return $columns;

+	}

 }

 

 

 if (!function_exists('geodir_manage_post_columns')) {

-    /**

-     * Adds content to our custom post listing page columns.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post WordPress Post object.

-     * @param string $column The column name.

-     * @param int $post_id The post ID.

-     */

-    function geodir_manage_post_columns($column, $post_id)

-    {

-        global $post, $wpdb;

-

-        switch ($column):

-            /* If displaying the 'city' column. */

-            case 'location' :

-                $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);

-                $location = geodir_get_location($location_id);

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

-                if (empty($location)) {

-                    _e('Unknown', 'geodirectory');

-                } else {

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

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

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

-                }

-                break;

-

-            /* If displaying the 'expire' column. */

-            case 'expire' :

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

-                $d1 = $expire_date; // get expire_date

-                $d2 = date('Y-m-d'); // get current date

-                $state = __('days left', 'geodirectory');

-                $date_diff_text = '';

-                $expire_class = 'expire_left';

-                if ($expire_date != 'Never') {

-                    if (strtotime($d1) < strtotime($d2)) {

-                        $state = __('days overdue', 'geodirectory');

-                        $expire_class = 'expire_over';

-                    }

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

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

-                }

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

-                if (empty($expire_date))

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

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

-                else

-                    echo $expire_date . $date_diff_text;

-                break;

-

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

-            case 'categorys' :

-

-                /* Get the categorys for the post. */

-

-

-                $terms = wp_get_object_terms($post_id, get_object_taxonomies($post));

-

-                /* If terms were found. */

-                if (!empty($terms)) {

-                    $out = array();

-                    /* Loop through each term, linking to the 'edit posts' page for the specific term. */

-                    foreach ($terms as $term) {

-                        if (!strstr($term->taxonomy, 'tag')) {

-                            $out[] = sprintf('<a href="%s">%s</a>',

-                                esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),

-                                esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))

-                            );

-                        }

-                    }

-                    /* Join the terms, separating them with a comma. */

-                    echo(join(', ', $out));

-                } /* If no terms were found, output a default message. */

-                else {

-                    _e('No Categories', 'geodirectory');

-                }

-                break;

+	/**

+	 * Adds content to our custom post listing page columns.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post WordPress Post object.

+	 * @param string $column The column name.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_manage_post_columns($column, $post_id)

+	{

+		global $post, $wpdb;

+

+		switch ($column):

+			/* If displaying the 'city' column. */

+			case 'location' :

+				$location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);

+				$location = geodir_get_location($location_id);

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

+				if (empty($location)) {

+					_e('Unknown', 'geodirectory');

+				} else {

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

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

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

+				}

+				break;

+

+			/* If displaying the 'expire' column. */

+			case 'expire' :

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

+				$d1 = $expire_date; // get expire_date

+				$d2 = date('Y-m-d'); // get current date

+				$state = __('days left', 'geodirectory');

+				$date_diff_text = '';

+				$expire_class = 'expire_left';

+				if ($expire_date != 'Never') {

+					if (strtotime($d1) < strtotime($d2)) {

+						$state = __('days overdue', 'geodirectory');

+						$expire_class = 'expire_over';

+					}

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

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

+				}

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

+				if (empty($expire_date))

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

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

+				else

+					echo $expire_date . $date_diff_text;

+				break;

 

-        endswitch;

-    }

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

+			case 'categorys' :

+

+				/* Get the categorys for the post. */

+

+

+				$terms = wp_get_object_terms($post_id, get_object_taxonomies($post));

+

+				/* If terms were found. */

+				if (!empty($terms)) {

+					$out = array();

+					/* Loop through each term, linking to the 'edit posts' page for the specific term. */

+					foreach ($terms as $term) {

+						if (!strstr($term->taxonomy, 'tag')) {

+							$out[] = sprintf('<a href="%s">%s</a>',

+								esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),

+								esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))

+							);

+						}

+					}

+					/* Join the terms, separating them with a comma. */

+					echo(join(', ', $out));

+				} /* If no terms were found, output a default message. */

+				else {

+					_e('No Categories', 'geodirectory');

+				}

+				break;

+

+		endswitch;

+	}

 }

 

 

 if (!function_exists('geodir_post_sortable_columns')) {

-    /**

-     * Makes admin post listing page columns sortable.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $columns The column array.

-     * @return array Altered column array.

-     */

-    function geodir_post_sortable_columns($columns)

-    {

-

-        $columns['expire'] = 'expire';

-

-        return $columns;

-    }

+	/**

+	 * Makes admin post listing page columns sortable.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $columns The column array.

+	 * @return array Altered column array.

+	 */

+	function geodir_post_sortable_columns($columns)

+	{

+

+		$columns['expire'] = 'expire';

+

+		return $columns;

+	}

 }

 

 /**

@@ -860,32 +860,32 @@ 
  * @param int $post_id The post ID.

  */

 function geodir_post_information_save($post_id, $post) {

-    global $wpdb, $current_user;

+	global $wpdb, $current_user;

 

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

-        return;

-    }

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

+		return;

+	}

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

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

-        return;

+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

+		return;

 

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

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

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

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

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

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

 

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

-            return;

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

+			return;

 

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

-            return;

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

+			return;

 

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

-            return;

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

+			return;

 

-        geodir_save_listing($_REQUEST);

-    }

+		geodir_save_listing($_REQUEST);

+	}

 }

 

 /**

@@ -901,102 +901,102 @@ 
  */

 function geodir_admin_fields($options)

 {

-    global $geodirectory;

-

-    $first_title = true;

-    $tab_id = '';

-    $i = 0;

-    foreach ($options as $value) :

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

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

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

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

-        $desc = '';

-        switch ($value['type']) :

-            case 'dummy_installer':

-                $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';

-                geodir_autoinstall_admin_header($post_type);

-                break;

-            case 'title':

-

-                if ($i == 0) {

-                    echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';

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

-                }

+	global $geodirectory;

+

+	$first_title = true;

+	$tab_id = '';

+	$i = 0;

+	foreach ($options as $value) :

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

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

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

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

+		$desc = '';

+		switch ($value['type']) :

+			case 'dummy_installer':

+				$post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';

+				geodir_autoinstall_admin_header($post_type);

+				break;

+			case 'title':

+

+				if ($i == 0) {

+					echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';

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

+				}

 

-                $i++;

+				$i++;

 

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

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

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

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

 

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

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

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

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

 

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

-                    if ($first_title === true) {

-                        $first_title = false;

-                    } else {

-                        echo '</div>';

-                    }

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

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

+					if ($first_title === true) {

+						$first_title = false;

+					} else {

+						echo '</div>';

+					}

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

 

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

-                }

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

+				}

 

-                /**

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

-                 *

-                 * The action is called dynamically geodir_settings_$value['id'].

-                 *

-                 * @since 1.0.0

-                 */

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

-                break;

-

-            case 'no_tabs':

-

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

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

-

-                break;

-

-            case 'sectionstart':

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

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

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

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

-                /**

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

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_start.

-                 *

-                 * @since 1.0.0

-                 */

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

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

-

-                break;

-            case 'sectionend':

-                /**

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

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_end.

-                 *

-                 * @since 1.0.0

-                 */

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

-                echo '</table>';

-                /**

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

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_end.

-                 *

-                 * @since 1.0.0

-                 */

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

-                break;

-            case 'text':

-                ?>

+				/**

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

+				 *

+				 * The action is called dynamically geodir_settings_$value['id'].

+				 *

+				 * @since 1.0.0

+				 */

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

+				break;

+

+			case 'no_tabs':

+

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

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

+

+				break;

+

+			case 'sectionstart':

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

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

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

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

+				/**

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

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_start.

+				 *

+				 * @since 1.0.0

+				 */

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

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

+

+				break;

+			case 'sectionend':

+				/**

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

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_end.

+				 *

+				 * @since 1.0.0

+				 */

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

+				echo '</table>';

+				/**

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

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_end.

+				 *

+				 * @since 1.0.0

+				 */

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

+				break;

+			case 'text':

+				?>

                 <tr valign="top">

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

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

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

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

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

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

-                                           } else {

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

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

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

+										   } else {

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

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

                 </tr><?php

-                break;

+				break;

 

-            case 'password':

-                ?>

+			case 'password':

+				?>

                 <tr valign="top">

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

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

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

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

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

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

-                                           } else {

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

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

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

+										   } else {

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

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

                 </tr><?php

-                break;

+				break;

 

-            case 'html_content':

-                ?>

+			case 'html_content':

+				?>

                 <tr valign="top">

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

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

                 </tr><?php

-                break;

+				break;

 

-            case 'color' :

-                ?>

+			case 'color' :

+				?>

                 <tr valign="top">

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

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

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

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

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

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

-                                           } else {

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

-                                           } ?>" class="colorpick"/> <span

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

+										   } else {

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

+										   } ?>" class="colorpick"/> <span

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

 

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

                          style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div>

                 </td>

                 </tr><?php

-                break;

-            case 'image_width' :

-                ?>

+				break;

+			case 'image_width' :

+				?>

                 <tr valign="top">

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

                 <td class="forminp">

@@ -1079,11 +1079,11 @@ 
 

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

                 </tr><?php

-                break;

-            case 'select':

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

-                $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value;

-                ?>

+				break;

+			case 'select':

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

+				$option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value;

+				?>

                 <tr valign="top">

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

                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -1092,33 +1092,33 @@ 
                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"

                                             option-ajaxchosen="false">

                         <?php

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

-                            $geodir_select_value = '';

-                            if ($option_value != '') {

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

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

-                            } else {

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

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

-                            }

-                            ?>

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

+							$geodir_select_value = '';

+							if ($option_value != '') {

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

+									$geodir_select_value = ' selected="selected" ';

+							} else {

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

+									$geodir_select_value = ' selected="selected" ';

+							}

+							?>

                             <option

                                 value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo ucfirst($val) ?></option>

                         <?php

-                        }

-                        ?>

+						}

+						?>

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

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'multiselect':

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

-                if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {

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

-                }

-                $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values;

-                ?>

+			case 'multiselect':

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

+				if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {

+				   $option_values = $value['std'];

+				}

+				$option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values;

+				?>

                 <tr valign="top">

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

                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"

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

                                             option-ajaxchosen="false">

                         <?php

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

-                            if (strpos($key, 'optgroup_start-') === 0) {

-                                ?><optgroup label="<?php echo ucfirst($val); ?>"><?php

-                            } else if (strpos($key, 'optgroup_end-') === 0) {

-                                ?></optgroup><?php

-                            } else {

-                                ?>

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

+							if (strpos($key, 'optgroup_start-') === 0) {

+								?><optgroup label="<?php echo ucfirst($val); ?>"><?php

+							} else if (strpos($key, 'optgroup_end-') === 0) {

+								?></optgroup><?php

+							} else {

+								?>

                                 <option

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

                             <?php

-                            }

-                        }

-                        ?>

+							}

+						}

+						?>

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

                 </td>

                 </tr><?php

-                break;

-            case 'file':

-                ?>

+				break;

+			case 'file':

+				?>

                 <tr valign="top">

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

                 <td class="forminp">

@@ -1166,87 +1166,87 @@ 
                     <?php } ?>

                 </td>

                 </tr><?php

-                break;

-            case 'map_default_settings' :

-                ?>

+				break;

+			case 'map_default_settings' :

+				?>

 

                 <tr valign="top">

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

                     <td width="60%">

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

                             <?php

-                            $arr_map_langages = array(

-                                'ar' => __('ARABIC', 'geodirectory'),

-                                'eu' => __('BASQUE', 'geodirectory'),

-                                'bg' => __('BULGARIAN', 'geodirectory'),

-                                'bn' => __('BENGALI', 'geodirectory'),

-                                'ca' => __('CATALAN', 'geodirectory'),

-                                'cs' => __('CZECH', 'geodirectory'),

-                                'da' => __('DANISH', 'geodirectory'),

-                                'de' => __('GERMAN', 'geodirectory'),

-                                'el' => __('GREEK', 'geodirectory'),

-                                'en' => __('ENGLISH', 'geodirectory'),

-                                'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),

-                                'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),

-                                'es' => __('SPANISH', 'geodirectory'),

-                                'eu' => __('BASQUE', 'geodirectory'),

-                                'fa' => __('FARSI', 'geodirectory'),

-                                'fi' => __('FINNISH', 'geodirectory'),

-                                'fil' => __('FILIPINO', 'geodirectory'),

-                                'fr' => __('FRENCH', 'geodirectory'),

-                                'gl' => __('GALICIAN', 'geodirectory'),

-                                'gu' => __('GUJARATI', 'geodirectory'),

-                                'hi' => __('HINDI', 'geodirectory'),

-                                'hr' => __('CROATIAN', 'geodirectory'),

-                                'hu' => __('HUNGARIAN', 'geodirectory'),

-                                'id' => __('INDONESIAN', 'geodirectory'),

-                                'it' => __('ITALIAN', 'geodirectory'),

-                                'iw' => __('HEBREW', 'geodirectory'),

-                                'ja' => __('JAPANESE', 'geodirectory'),

-                                'kn' => __('KANNADA', 'geodirectory'),

-                                'ko' => __('KOREAN', 'geodirectory'),

-                                'lt' => __('LITHUANIAN', 'geodirectory'),

-                                'lv' => __('LATVIAN', 'geodirectory'),

-                                'ml' => __('MALAYALAM', 'geodirectory'),

-                                'mr' => __('MARATHI', 'geodirectory'),

-                                'nl' => __('DUTCH', 'geodirectory'),

-                                'no' => __('NORWEGIAN', 'geodirectory'),

-                                'pl' => __('POLISH', 'geodirectory'),

-                                'pt' => __('PORTUGUESE', 'geodirectory'),

-                                'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),

-                                'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),

-                                'ro' => __('ROMANIAN', 'geodirectory'),

-                                'ru' => __('RUSSIAN', 'geodirectory'),

-                                'ru' => __('RUSSIAN', 'geodirectory'),

-                                'sk' => __('SLOVAK', 'geodirectory'),

-                                'sl' => __('SLOVENIAN', 'geodirectory'),

-                                'sr' => __('SERBIAN', 'geodirectory'),

-                                'sv' => __('	SWEDISH', 'geodirectory'),

-                                'tl' => __('TAGALOG', 'geodirectory'),

-                                'ta' => __('TAMIL', 'geodirectory'),

-                                'te' => __('TELUGU', 'geodirectory'),

-                                'th' => __('THAI', 'geodirectory'),

-                                'tr' => __('TURKISH', 'geodirectory'),

-                                'uk' => __('UKRAINIAN', 'geodirectory'),

-                                'vi' => __('VIETNAMESE', 'geodirectory'),

-                                'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),

-                                'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

-                            );

-                            $geodir_default_map_language = get_option('geodir_default_map_language');

-                            if (empty($geodir_default_map_language))

-                                $geodir_default_map_language = 'en';

-                            foreach ($arr_map_langages as $language_key => $language_txt) {

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

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

-                                else

-                                    $geodir_default_language_selected = '';

-

-                                ?>

+							$arr_map_langages = array(

+								'ar' => __('ARABIC', 'geodirectory'),

+								'eu' => __('BASQUE', 'geodirectory'),

+								'bg' => __('BULGARIAN', 'geodirectory'),

+								'bn' => __('BENGALI', 'geodirectory'),

+								'ca' => __('CATALAN', 'geodirectory'),

+								'cs' => __('CZECH', 'geodirectory'),

+								'da' => __('DANISH', 'geodirectory'),

+								'de' => __('GERMAN', 'geodirectory'),

+								'el' => __('GREEK', 'geodirectory'),

+								'en' => __('ENGLISH', 'geodirectory'),

+								'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),

+								'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),

+								'es' => __('SPANISH', 'geodirectory'),

+								'eu' => __('BASQUE', 'geodirectory'),

+								'fa' => __('FARSI', 'geodirectory'),

+								'fi' => __('FINNISH', 'geodirectory'),

+								'fil' => __('FILIPINO', 'geodirectory'),

+								'fr' => __('FRENCH', 'geodirectory'),

+								'gl' => __('GALICIAN', 'geodirectory'),

+								'gu' => __('GUJARATI', 'geodirectory'),

+								'hi' => __('HINDI', 'geodirectory'),

+								'hr' => __('CROATIAN', 'geodirectory'),

+								'hu' => __('HUNGARIAN', 'geodirectory'),

+								'id' => __('INDONESIAN', 'geodirectory'),

+								'it' => __('ITALIAN', 'geodirectory'),

+								'iw' => __('HEBREW', 'geodirectory'),

+								'ja' => __('JAPANESE', 'geodirectory'),

+								'kn' => __('KANNADA', 'geodirectory'),

+								'ko' => __('KOREAN', 'geodirectory'),

+								'lt' => __('LITHUANIAN', 'geodirectory'),

+								'lv' => __('LATVIAN', 'geodirectory'),

+								'ml' => __('MALAYALAM', 'geodirectory'),

+								'mr' => __('MARATHI', 'geodirectory'),

+								'nl' => __('DUTCH', 'geodirectory'),

+								'no' => __('NORWEGIAN', 'geodirectory'),

+								'pl' => __('POLISH', 'geodirectory'),

+								'pt' => __('PORTUGUESE', 'geodirectory'),

+								'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),

+								'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),

+								'ro' => __('ROMANIAN', 'geodirectory'),

+								'ru' => __('RUSSIAN', 'geodirectory'),

+								'ru' => __('RUSSIAN', 'geodirectory'),

+								'sk' => __('SLOVAK', 'geodirectory'),

+								'sl' => __('SLOVENIAN', 'geodirectory'),

+								'sr' => __('SERBIAN', 'geodirectory'),

+								'sv' => __('	SWEDISH', 'geodirectory'),

+								'tl' => __('TAGALOG', 'geodirectory'),

+								'ta' => __('TAMIL', 'geodirectory'),

+								'te' => __('TELUGU', 'geodirectory'),

+								'th' => __('THAI', 'geodirectory'),

+								'tr' => __('TURKISH', 'geodirectory'),

+								'uk' => __('UKRAINIAN', 'geodirectory'),

+								'vi' => __('VIETNAMESE', 'geodirectory'),

+								'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),

+								'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

+							);

+							$geodir_default_map_language = get_option('geodir_default_map_language');

+							if (empty($geodir_default_map_language))

+								$geodir_default_map_language = 'en';

+							foreach ($arr_map_langages as $language_key => $language_txt) {

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

+									$geodir_default_language_selected = "selected='selected'";

+								else

+									$geodir_default_language_selected = '';

+

+								?>

                                 <option

                                     value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option>

 

                             <?php }

-                            ?>

+							?>

                         </select>

                     </td>

                 </tr>

@@ -1257,46 +1257,46 @@ 
                     <td width="60%">

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

                             <?php

-                            $post_types = geodir_get_posttypes('array');

-                            $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-                            if (empty($geodir_default_map_search_pt))

-                                $geodir_default_map_search_pt = 'gd_place';

-                            if (is_array($post_types)) {

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

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

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

-                                    else

-                                        $geodir_search_pt_selected = '';

-

-                                    ?>

+							$post_types = geodir_get_posttypes('array');

+							$geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

+							if (empty($geodir_default_map_search_pt))

+								$geodir_default_map_search_pt = 'gd_place';

+							if (is_array($post_types)) {

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

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

+										$geodir_search_pt_selected = "selected='selected'";

+									else

+										$geodir_search_pt_selected = '';

+

+									?>

                                     <option

                                         value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo $post_types_obj['labels']['singular_name']; ?></option>

 

                                 <?php }

 

-                            }

+							}

 

-                            ?>

+							?>

                         </select>

                     </td>

                 </tr>

 

                 <?php

-                break;

+				break;

 

-            case 'map':

-                ?>

+			case 'map':

+				?>

                 <tr valign="top">

                     <td class="forminp">

                         <?php

-                        global $post_cat, $cat_display;

-                        $post_types = geodir_get_posttypes('object');

-                        $cat_display = 'checkbox';

-                        $gd_post_types = get_option('geodir_exclude_post_type_on_map');

-                        $gd_cats = get_option('geodir_exclude_cat_on_map');

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

-                        $count = 1;

-                        ?>

+						global $post_cat, $cat_display;

+						$post_types = geodir_get_posttypes('object');

+						$cat_display = 'checkbox';

+						$gd_post_types = get_option('geodir_exclude_post_type_on_map');

+						$gd_cats = get_option('geodir_exclude_cat_on_map');

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

+						$count = 1;

+						?>

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

                             <thead>

                             <tr>

@@ -1305,18 +1305,18 @@ 
                                 <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th>

                             </tr>

                             <?php

-                            $gd_categs = $gd_cats;

-                            foreach ($post_types as $key => $post_types_obj) :

-                                $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';

-                                $gd_taxonomy = geodir_get_taxonomies($key);

-                                if ($gd_cats_upgrade) {

-                                    $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : '';

-                                    $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();

-                                    $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array();

-                                }

-                                $post_cat = implode(',', $gd_cats);

-                                $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);

-                                ?>

+							$gd_categs = $gd_cats;

+							foreach ($post_types as $key => $post_types_obj) :

+								$checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';

+								$gd_taxonomy = geodir_get_taxonomies($key);

+								if ($gd_cats_upgrade) {

+									$gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : '';

+									$gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();

+									$gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array();

+								}

+								$post_cat = implode(',', $gd_cats);

+								$gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);

+								?>

                                 <tr>

                                     <td valign="top" width="5%"><?php echo $count; ?></td>

                                     <td valign="top" width="25%" id="td_post_types"><input type="checkbox"

@@ -1337,19 +1337,19 @@ 
                     </td>

                 </tr>

                 <?php

-                break;

+				break;

 

-            case 'checkbox' :

+			case 'checkbox' :

 

-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :

-                    ?>

+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :

+					?>

                     <tr valign="top">

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

                     <td class="forminp">

                 <?php

-                endif;

+				endif;

 

-                ?>

+				?>

                 <fieldset>

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

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

@@ -1359,49 +1359,49 @@ 
                 </fieldset>

                 <?php

 

-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :

-                    ?>

+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :

+					?>

                     </td>

                     </tr>

                 <?php

-                endif;

+				endif;

 

-                break;

+				break;

 

-            case 'radio' :

+			case 'radio' :

 

-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :

-                    ?>

+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :

+					?>

                     <tr valign="top">

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

                     <td class="forminp">

                 <?php

-                endif;

+				endif;

 

-                ?>

+				?>

                 <fieldset>

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

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

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

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

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

-                            echo 'checked="checked"';

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

+							echo 'checked="checked"';

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

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

                 </fieldset>

                 <?php

 

-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :

-                    ?>

+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :

+					?>

                     </td>

                     </tr>

                 <?php

-                endif;

+				endif;

 

-                break;

+				break;

 

-            case 'textarea':

-                ?>

+			case 'textarea':

+				?>

                 <tr valign="top">

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

                 <td class="forminp">

@@ -1414,30 +1414,30 @@ 
 

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'editor':

-                ?>

+			case 'editor':

+				?>

                 <tr valign="top">

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

                 <td class="forminp"><?php

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

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

-                    else

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

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

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

+					else

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

 

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

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

 

-                    wp_editor($content, esc_attr($value['id']), $editor_settings);

+					wp_editor($content, esc_attr($value['id']), $editor_settings);

 

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

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

 

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'single_select_page' :

-                // WPML

+			case 'single_select_page' :

+				// WPML

 				$switch_lang = false;

 				$disabled = '';

 				if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

@@ -1455,18 +1455,18 @@ 
 				//

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

 

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

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

-                    'sort_column' => 'menu_order',

-                    'sort_order' => 'ASC',

-                    'show_option_none' => ' ',

-                    'class' => $value['class'],

-                    'echo' => false,

-                    'selected' => $page_setting);

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

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

+					'sort_column' => 'menu_order',

+					'sort_order' => 'ASC',

+					'show_option_none' => ' ',

+					'class' => $value['class'],

+					'echo' => false,

+					'selected' => $page_setting);

 

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

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

 

-                ?>

+				?>

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

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

                 <td class="forminp">

@@ -1477,17 +1477,17 @@ 
 				if ($switch_lang) {

 					$sitepress->switch_lang($switch_lang, true);

 				}

-                break;

-            case 'single_select_country' :

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

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

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

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

-                else :

-                    $country = $country_setting;

-                    $state = '*';

-                endif;

-                ?>

+				break;

+			case 'single_select_country' :

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

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

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

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

+				else :

+					$country = $country_setting;

+					$state = '*';

+				endif;

+				?>

                 <tr valign="top">

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

                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -1498,12 +1498,12 @@ 
                     </select> <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-                break;

-            case 'multi_select_countries' :

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

-                asort($countries);

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

-                ?>

+				break;

+			case 'multi_select_countries' :

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

+				asort($countries);

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

+				?>

                 <tr valign="top">

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

                 <td class="forminp">

@@ -1511,22 +1511,22 @@ 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"

                             title="Country" class="chosen_select">

                         <?php

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

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

-                        endforeach;

-                        ?>

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

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

+						endforeach;

+						?>

                     </select>

                 </td>

                 </tr>

 

                 <?php

 

-                break;

+				break;

 

-            case 'google_analytics' :

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

-                if(get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret') ) {

-                    ?>

+			case 'google_analytics' :

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

+				if(get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret') ) {

+					?>

                     <tr valign="top">

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

                         <td class="forminp">

@@ -1534,19 +1534,19 @@ 
 

                             <?php

 

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

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

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

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

-                            $response_type = "&response_type=code";

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

-                            $access_type = "&access_type=offline";

-                            $approval_prompt = "&approval_prompt=force";

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

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

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

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

+							$response_type = "&response_type=code";

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

+							$access_type = "&access_type=offline";

+							$approval_prompt = "&approval_prompt=force";

 

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

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

 

 

-                            ?>

+							?>

                             <script>

                                 function gd_ga_popup() {

                                     var win = window.open("<?php echo $auth_url;?>", "Google Analytics", "");

@@ -1561,47 +1561,47 @@ 
                             </script>

 

                             <?php

-                            if (get_option('gd_ga_refresh_token')) {

-                                ?>

+							if (get_option('gd_ga_refresh_token')) {

+								?>

                                 <span class="button-primary"

                                       onclick="gd_ga_popup();"><?php _e('Re-authorize', 'geodirectory'); ?></span>

                                 <span

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

                             <?php

-                            } else {

-                                ?>

+							} else {

+								?>

                                 <span class="button-primary"

                                       onclick="gd_ga_popup();"><?php _e('Authorize', 'geodirectory');?></span>

                             <?php

-                            }

-                            ?>

+							}

+							?>

                         </td>

                     </tr>

 

                 <?php

-                }

+				}

 

-                break;

+				break;

 

-            case 'field_seperator' :

+			case 'field_seperator' :

 

-                ?>

+				?>

                 <tr valign="top">

                     <td colspan="2" class="forminp geodir_line_seperator"></td>

                 </tr>

                 <?php

 

-                break;

+				break;

 

-        endswitch;

+		endswitch;

 

-    endforeach;

+	endforeach;

 

-    if ($first_title === false) {

-        echo "</div>";

-    }

+	if ($first_title === false) {

+		echo "</div>";

+	}

 

-    ?>

+	?>

 

     <script type="text/javascript">

 

@@ -1661,33 +1661,33 @@ 
  */

 function geodir_post_info_setting()

 {

-    global $post, $post_id;

-

-    $post_type = get_post_type();

-

-    $package_info = array();

-

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

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');

-    echo '<div id="geodir_wrapper">';

-    /**

-     * Called before the GD custom fields are output in the wp-admin area.

-     *

-     * @since 1.0.0

-     * @see 'geodir_after_default_field_in_meta_box'

-     */

-    do_action('geodir_before_default_field_in_meta_box');

-    //geodir_get_custom_fields_html($package_info->pid,'default',$post_type);

-    // to display all fields in one information box

-    geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);

-    /**

-     * Called after the GD custom fields are output in the wp-admin area.

-     *

-     * @since 1.0.0

-     * @see 'geodir_before_default_field_in_meta_box'

-     */

-    do_action('geodir_after_default_field_in_meta_box');

-    echo '</div>';

+	global $post, $post_id;

+

+	$post_type = get_post_type();

+

+	$package_info = array();

+

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

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');

+	echo '<div id="geodir_wrapper">';

+	/**

+	 * Called before the GD custom fields are output in the wp-admin area.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_after_default_field_in_meta_box'

+	 */

+	do_action('geodir_before_default_field_in_meta_box');

+	//geodir_get_custom_fields_html($package_info->pid,'default',$post_type);

+	// to display all fields in one information box

+	geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);

+	/**

+	 * Called after the GD custom fields are output in the wp-admin area.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_before_default_field_in_meta_box'

+	 */

+	do_action('geodir_after_default_field_in_meta_box');

+	echo '</div>';

 }

 

 /**

@@ -1700,18 +1700,18 @@ 
  */

 function geodir_post_addinfo_setting()

 {

-    global $post, $post_id;

+	global $post, $post_id;

 

-    $post_type = get_post_type();

+	$post_type = get_post_type();

 

-    $package_info = array();

+	$package_info = array();

 

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

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

 

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');

-    echo '<div id="geodir_wrapper">';

-    geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);

-    echo '</div>';

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');

+	echo '<div id="geodir_wrapper">';

+	geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);

+	echo '</div>';

 

 }

 

@@ -1725,60 +1725,60 @@ 
  */

 function geodir_post_attachments()

 {

-    global $post, $post_id;

+	global $post, $post_id;

 

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

 

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

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

-        geodir_show_featured_image($post_id, 'thumbnail');

-    }

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

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

+		geodir_show_featured_image($post_id, 'thumbnail');

+	}

 

-    $image_limit = 0;

+	$image_limit = 0;

 

-    ?>

+	?>

 

 

     <h5 class="form_title">

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

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

-        } ?>

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

+		} ?>

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

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

-        } ?>

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

+		} ?>

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

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

-        } ?>

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

+		} ?>

     </h5>

 

 

     <?php

 

-    $curImages = geodir_get_images($post_id);

-    $place_img_array = array();

+	$curImages = geodir_get_images($post_id);

+	$place_img_array = array();

 

-    if (!empty($curImages)):

-        foreach ($curImages as $p_img):

-            $place_img_array[] = $p_img->src;

-        endforeach;

-    endif;

+	if (!empty($curImages)):

+		foreach ($curImages as $p_img):

+			$place_img_array[] = $p_img->src;

+		endforeach;

+	endif;

 

-    if (!empty($place_img_array))

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

+	if (!empty($place_img_array))

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

 

 

-    // adjust values here

-    $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

+	// adjust values here

+	$id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

 

-    $svalue = $curImages; // this will be initial value of the above form field. Image urls.

+	$svalue = $curImages; // this will be initial value of the above form field. Image urls.

 

-    $multiple = true; // allow multiple files upload

+	$multiple = true; // allow multiple files upload

 

-    $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

+	$width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

-    $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

+	$height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

 

-    ?>

+	?>

 

     <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;">

         <input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $svalue; ?>"/>

@@ -1820,13 +1820,13 @@ 
  */

 function geodir_action_post_updated($post_ID, $post_after, $post_before)

 {

-    $post_type = get_post_type($post_ID);

+	$post_type = get_post_type($post_ID);

 

-    if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

-        if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {

-            geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);

-        }

-    }

+	if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

+		if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {

+			geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);

+		}

+	}

 }

 

 /**

@@ -1841,39 +1841,39 @@ 
  */

 function geodir_notification_add_bcc_option($settings)

 {

-    if (!empty($settings)) {

-        $new_settings = array();

-        foreach ($settings as $setting) {

-            if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {

-                $geodir_bcc_listing_published_yes = array(

-                    'name' => __('Listing published', 'geodirectory'),

-                    'desc' => __('Yes', 'geodirectory'),

-                    'id' => 'geodir_bcc_listing_published',

-                    'std' => 'yes',

-                    'type' => 'radio',

-                    'value' => '1',

-                    'radiogroup' => 'start'

-                );

-

-                $geodir_bcc_listing_published_no = array(

-                    'name' => __('Listing published', 'geodirectory'),

-                    'desc' => __('No', 'geodirectory'),

-                    'id' => 'geodir_bcc_listing_published',

-                    'std' => 'yes',

-                    'type' => 'radio',

-                    'value' => '0',

-                    'radiogroup' => 'end'

-                );

-

-                $new_settings[] = $geodir_bcc_listing_published_yes;

-                $new_settings[] = $geodir_bcc_listing_published_no;

-            }

-            $new_settings[] = $setting;

-        }

-        $settings = $new_settings;

-    }

+	if (!empty($settings)) {

+		$new_settings = array();

+		foreach ($settings as $setting) {

+			if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {

+				$geodir_bcc_listing_published_yes = array(

+					'name' => __('Listing published', 'geodirectory'),

+					'desc' => __('Yes', 'geodirectory'),

+					'id' => 'geodir_bcc_listing_published',

+					'std' => 'yes',

+					'type' => 'radio',

+					'value' => '1',

+					'radiogroup' => 'start'

+				);

+

+				$geodir_bcc_listing_published_no = array(

+					'name' => __('Listing published', 'geodirectory'),

+					'desc' => __('No', 'geodirectory'),

+					'id' => 'geodir_bcc_listing_published',

+					'std' => 'yes',

+					'type' => 'radio',

+					'value' => '0',

+					'radiogroup' => 'end'

+				);

+

+				$new_settings[] = $geodir_bcc_listing_published_yes;

+				$new_settings[] = $geodir_bcc_listing_published_no;

+			}

+			$new_settings[] = $setting;

+		}

+		$settings = $new_settings;

+	}

 

-    return $settings;

+	return $settings;

 }

 

 

@@ -1888,19 +1888,19 @@ 
  */

 function get_gd_theme_compat_callback()

 {

-    global $wpdb;

-    $themes = get_option('gd_theme_compats');

-

-    if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {

-        if (isset($_POST['export'])) {

-            echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));

-        } else {

-            echo json_encode($themes[$_POST['theme']]);

-        }

+	global $wpdb;

+	$themes = get_option('gd_theme_compats');

 

-    }

+	if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {

+		if (isset($_POST['export'])) {

+			echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));

+		} else {

+			echo json_encode($themes[$_POST['theme']]);

+		}

 

-    die();

+	}

+

+	die();

 }

 

 add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback');

@@ -1914,20 +1914,20 @@ 
  */

 function get_gd_theme_compat_import_callback()

 {

-    global $wpdb;

-    $themes = get_option('gd_theme_compats');

-    if (isset($_POST['theme']) && !empty($_POST['theme'])) {

-        $json = json_decode(stripslashes($_POST['theme']), true);

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

-            $key = sanitize_text_field(key($json));

-            $themes[$key] = $json[$key];

-            update_option('gd_theme_compats', $themes);

-            echo $key;

-            die();

-        }

-    }

-    echo '0';

-    die();

+	global $wpdb;

+	$themes = get_option('gd_theme_compats');

+	if (isset($_POST['theme']) && !empty($_POST['theme'])) {

+		$json = json_decode(stripslashes($_POST['theme']), true);

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

+			$key = sanitize_text_field(key($json));

+			$themes[$key] = $json[$key];

+			update_option('gd_theme_compats', $themes);

+			echo $key;

+			die();

+		}

+	}

+	echo '0';

+	die();

 }

 

 

@@ -1940,39 +1940,39 @@ 
  */

 function gd_set_theme_compat()

 {

-    global $wpdb;

-    $theme = wp_get_theme();

+	global $wpdb;

+	$theme = wp_get_theme();

 

-    if ($theme->parent()) {

-        $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

-    } else {

-        $theme_name = str_replace(" ", "_", $theme->get('Name'));

-    }

+	if ($theme->parent()) {

+		$theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

+	} else {

+		$theme_name = str_replace(" ", "_", $theme->get('Name'));

+	}

 

-    $theme_compats = get_option('gd_theme_compats');

-    $current_compat = get_option('gd_theme_compat');

-    $current_compat = str_replace("_custom", "", $current_compat);

+	$theme_compats = get_option('gd_theme_compats');

+	$current_compat = get_option('gd_theme_compat');

+	$current_compat = str_replace("_custom", "", $current_compat);

 

-    if ($current_compat == $theme_name && strpos("_custom", get_option('gd_theme_compat')) !== false) {

-        return;

-    }// if already running correct compat then bail

+	if ($current_compat == $theme_name && strpos("_custom", get_option('gd_theme_compat')) !== false) {

+		return;

+	}// if already running correct compat then bail

 

-    if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it

-        update_option('gd_theme_compat', $theme_name);

-        update_option('theme_compatibility_setting', $theme_compats[$theme_name]);

+	if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it

+		update_option('gd_theme_compat', $theme_name);

+		update_option('theme_compatibility_setting', $theme_compats[$theme_name]);

 

-        // if there are default options to set then set them

-        if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {

+		// if there are default options to set then set them

+		if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {

 

-            foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {

-                update_option($key, $val);

-            }

-        }

+			foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {

+				update_option($key, $val);

+			}

+		}

 

-    } else {

-        update_option('gd_theme_compat', '');

-        update_option('theme_compatibility_setting', '');

-    }

+	} else {

+		update_option('gd_theme_compat', '');

+		update_option('theme_compatibility_setting', '');

+	}

 

 

 }

@@ -1987,9 +1987,9 @@ 
  */

 function gd_check_avada_compat()

 {

-    if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {

-        add_action('admin_notices', 'gd_avada_compat_warning');

-    }

+	if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {

+		add_action('admin_notices', 'gd_avada_compat_warning');

+	}

 }

 

 

@@ -2002,22 +2002,22 @@ 
 function gd_avada_compat_warning()

 {

 

-    /*

+	/*

     $msg_type = error

     $msg_type = updated fade

     $msg_type = update-nag

     */

 

-    $plugin = 'avada-nag';

-    $timestamp = 'avada-nag1234';

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

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

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

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

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

-    echo "</div>";

+	$plugin = 'avada-nag';

+	$timestamp = 'avada-nag1234';

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

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

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

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

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

+	echo "</div>";

 

-    ?>

+	?>

     <script>

         function gdRemoveANotification($plugin, $timestamp) {

 

@@ -2085,10 +2085,10 @@ 
  */

 function geodir_avada_remove_notification()

 {

-    update_option('avada_nag', TRUE);

+	update_option('avada_nag', TRUE);

 

-    // Always die in functions echoing ajax content

-    die();

+	// Always die in functions echoing ajax content

+	die();

 }

 

 

@@ -2110,9 +2110,9 @@ 
 	global $post, $typenow, $current_screen;

 	

 	$post_type = NULL;

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

+	if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

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

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

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

 		$post_type = $post->post_type;

 	elseif ($typenow)

 		$post_type = $typenow;

@@ -2147,7 +2147,7 @@ 
 		// Don't allow same slug url for listing and location

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

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

-        	wp_redirect($redirect_url);

+			wp_redirect($redirect_url);

 			exit;

 		}

 		

@@ -2177,10 +2177,10 @@ 
  * @package GeoDirectory

  */

 function geodir_hide_admin_preview_button() {

-    global $post_type;

-    $post_types = geodir_get_posttypes();

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

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

+	global $post_type;

+	$post_types = geodir_get_posttypes();

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

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

 }

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

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

@@ -2195,7 +2195,7 @@ 
  */

 function geodir_import_export_tab( $tabs ) {

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

-    return $tabs;

+	return $tabs;

 }

 

 /**

@@ -2210,26 +2210,26 @@ 
 function geodir_import_export_page() {

 	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

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

-    /**

-     * Filter sample category data csv file url.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

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

-     */

+	/**

+	 * Filter sample category data csv file url.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

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

+	 */

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

 	

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

-    /**

-     * Filter sample post data csv file url.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

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

-     */

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

+	/**

+	 * Filter sample post data csv file url.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

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

+	 */

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

 	

 	$gd_posttypes = geodir_get_posttypes( 'array' );

 	

@@ -2252,14 +2252,14 @@ 
 	$gd_chunksize_options[100000] = 100000;

 	 

 	 /**

-     * Filter max entries per export csv file.

-     *

-     * @since 1.5.6

-     * @package GeoDirectory

-     *

-     * @param string $gd_chunksize_options Entries options.

-     */

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

+	  * Filter max entries per export csv file.

+	  *

+	  * @since 1.5.6

+	  * @package GeoDirectory

+	  *

+	  * @param string $gd_chunksize_options Entries options.

+	  */

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

 	

 	$gd_chunksize_option = '';

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

@@ -2275,12 +2275,12 @@ 
   <div class="gd-content-heading">

 

   <?php

-    ini_set('max_execution_time', 999999);

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

-    ini_restore('max_execution_time');

+	ini_set('max_execution_time', 999999);

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

+	ini_restore('max_execution_time');

 

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

-        ?>

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

+		?>

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

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

         <div class="postbox">

@@ -2453,7 +2453,7 @@ 
 						 * Called just after the sample CSV download link.

 						 *

 						 * @since 1.0.0

-                         * @package GeoDirectory

+						 * @package GeoDirectory

 						 */

 						do_action('geodir_sample_cats_csv_download_link');

 						?>

@@ -2538,11 +2538,11 @@ 
 	 *

 	 * Called after the last setting on the GD > Import & Export page.

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

 	 *

 	 * @param array $gd_posttypes GD post types.

-     * @param array $gd_chunksize_options File chunk size options.

-     * @param string $nonce Wordpress security token for GD import & export.

+	 * @param array $gd_chunksize_options File chunk size options.

+	 * @param string $nonce Wordpress security token for GD import & export.

 	 */

 	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

 	?>

@@ -3229,44 +3229,44 @@ 
 function geodir_init_filesystem()

 {

 

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

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

-    }

-    $access_type = get_filesystem_method();

-    if ($access_type === 'direct') {

-        /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

-

-        /* initialize the API */

-        if (!WP_Filesystem($creds)) {

-            /* any problems and we exit */

-            //return '@@@3';

-            return false;

-        }

-

-        global $wp_filesystem;

-        return $wp_filesystem;

-        /* do our file manipulations below */

-    } elseif (defined('FTP_USER')) {

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

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

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

+	}

+	$access_type = get_filesystem_method();

+	if ($access_type === 'direct') {

+		/* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+

+		/* initialize the API */

+		if (!WP_Filesystem($creds)) {

+			/* any problems and we exit */

+			//return '@@@3';

+			return false;

+		}

 

-        /* initialize the API */

-        if (!WP_Filesystem($creds)) {

-            /* any problems and we exit */

-            //return '@@@33';

-            return false;

-        }

+		global $wp_filesystem;

+		return $wp_filesystem;

+		/* do our file manipulations below */

+	} elseif (defined('FTP_USER')) {

+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+

+		/* initialize the API */

+		if (!WP_Filesystem($creds)) {

+			/* any problems and we exit */

+			//return '@@@33';

+			return false;

+		}

 

-        global $wp_filesystem;

-        //return '@@@1';

-        return $wp_filesystem;

+		global $wp_filesystem;

+		//return '@@@1';

+		return $wp_filesystem;

 

-    } else {

-        //return '@@@2';

-        /* don't have direct write access. Prompt user with our notice */

-        add_action('admin_notice', 'geodir_filesystem_notice');

-        return false;

-    }

+	} else {

+		//return '@@@2';

+		/* don't have direct write access. Prompt user with our notice */

+		add_action('admin_notice', 'geodir_filesystem_notice');

+		return false;

+	}

 

 }

 

@@ -3284,10 +3284,10 @@ 
  */

 function geodir_filesystem_notice()

 {   if ( defined( 'DOING_AJAX' ) ){return;}

-    $access_type = get_filesystem_method();

-    if ($access_type === 'direct') {

-    } elseif (!defined('FTP_USER')) {

-        ?>

+	$access_type = get_filesystem_method();

+	if ($access_type === 'direct') {

+	} elseif (!defined('FTP_USER')) {

+		?>

         <div class="error">

             <p><?php _e('GeoDirectory does not have access to your filesystem, thing like import/export will not work. Please define your details in wp-config.php as explained here', 'geodirectory'); ?>

                 <a target="_blank" href="http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants">http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants</a>

@@ -3313,1251 +3313,1251 @@ 
  * @return string Json data.

  */

 function geodir_ajax_import_export() {

-    global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;

+	global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;

     

-    error_reporting(0);

+	error_reporting(0);

 

-    // try to set higher limits for import

-    $max_input_time = ini_get('max_input_time');

-    $max_execution_time = ini_get('max_execution_time');

-    $memory_limit= ini_get('memory_limit');

+	// try to set higher limits for import

+	$max_input_time = ini_get('max_input_time');

+	$max_execution_time = ini_get('max_execution_time');

+	$memory_limit= ini_get('memory_limit');

 

-    if(!$max_input_time || $max_input_time<3000){

-        ini_set('max_input_time', 3000);

-    }

+	if(!$max_input_time || $max_input_time<3000){

+		ini_set('max_input_time', 3000);

+	}

 

-    if(!$max_execution_time || $max_execution_time<3000){

-        ini_set('max_execution_time', 3000);

-    }

+	if(!$max_execution_time || $max_execution_time<3000){

+		ini_set('max_execution_time', 3000);

+	}

 

-    if($memory_limit && str_replace('M','',$memory_limit)){

-        if(str_replace('M','',$memory_limit)<256){

-            ini_set('memory_limit', '256M');

-        }

-    }

+	if($memory_limit && str_replace('M','',$memory_limit)){

+		if(str_replace('M','',$memory_limit)<256){

+			ini_set('memory_limit', '256M');

+		}

+	}

 

-    $json = array();

+	$json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

-    }

+	if ( !current_user_can( 'manage_options' ) ) {

+		wp_send_json( $json );

+	}

 

-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+	$task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

+	$nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

+	$stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

-    }

+	if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

+		wp_send_json( $json );

+	}

 

-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

-    $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+	$post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

+	$chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+	$chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

+	$chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

 

-    $wp_filesystem = geodir_init_filesystem();

-    if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

-    }

+	$wp_filesystem = geodir_init_filesystem();

+	if (!$wp_filesystem) {

+		$json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

+		wp_send_json( $json );

+	}

 

-    if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

-        wp_send_json( $json );

-    }

+	if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

+		$json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

+		wp_send_json( $json );

+	}

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

-        }

-    }

+	$csv_file_dir = geodir_path_import_export( false );

+	if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

+		if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

+			$json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

+			wp_send_json( $json );

+		}

+	}

     

-    $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

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

-

-    switch ( $task ) {

-        case 'export_posts': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

+	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

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

+

+	switch ( $task ) {

+		case 'export_posts': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

                 

-                $sitepress->switch_lang('all', true);

-            }

-            // WPML

-            if ( $post_type == 'gd_event' ) {

-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

-            }

-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+				$sitepress->switch_lang('all', true);

+			}

+			// WPML

+			if ( $post_type == 'gd_event' ) {

+				add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+			}

+			$filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

             

-            $file_name = $post_type . '_' . date( 'dmyHi' );

-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

-            }

-            $posts_count = geodir_get_posts_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

+			$file_name = $post_type . '_' . date( 'dmyHi' );

+			if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

+				$file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

+			}

+			$posts_count = geodir_get_posts_count( $post_type );

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

             

-            $chunk_file_paths = array();

+			$chunk_file_paths = array();

 

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

-                $json['total'] = $posts_count;

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-                gd_die();

-            } else if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$json['total'] = $posts_count;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+				gd_die();

+			} else if ( isset( $_REQUEST['_st'] ) ) {

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-                gd_die();

-            } else {

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $total_posts = $posts_count;

-                    if ($chunk_per_page > $total_posts) {

-                        $chunk_per_page = $total_posts;

-                    }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

+				$json['percentage'] = $percentage;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+				gd_die();

+			} else {

+				if ( !$posts_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$total_posts = $posts_count;

+					if ($chunk_per_page > $total_posts) {

+						$chunk_per_page = $total_posts;

+					}

+					$chunk_total_pages = ceil( $total_posts / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    if ($per_page > $chunk_per_page) {

-                        $per_page = $chunk_per_page;

-                    }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					if ($per_page > $chunk_per_page) {

+						$per_page = $chunk_per_page;

+					}

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+					}

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $posts_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        if ($j > 1) {

-                            $json['total'] = $posts_count;

-                            $json['files'] = array();

-                        } else {

-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-                        }

-                    }

-                }

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_cats': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $posts_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						if ($j > 1) {

+							$json['total'] = $posts_count;

+							$json['files'] = array();

+						} else {

+							$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+						}

+					}

+				}

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_cats': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

                 

-                $sitepress->switch_lang('all', true);

-            }

-            // WPML

-            $file_name = $post_type . 'category_' . date( 'dmyHi' );

+				$sitepress->switch_lang('all', true);

+			}

+			// WPML

+			$file_name = $post_type . 'category_' . date( 'dmyHi' );

             

-            $terms_count = geodir_get_terms_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

+			$terms_count = geodir_get_terms_count( $post_type );

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

             

-            $chunk_file_paths = array();

+			$chunk_file_paths = array();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-            } else {

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $total_terms = $terms_count;

-                    if ($chunk_per_page > $terms_count) {

-                        $chunk_per_page = $terms_count;

-                    }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

+				$json['percentage'] = $percentage;

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			} else {

+				if ( !$terms_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$total_terms = $terms_count;

+					if ($chunk_per_page > $terms_count) {

+						$chunk_per_page = $terms_count;

+					}

+					$chunk_total_pages = ceil( $total_terms / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    if ($per_page > $chunk_per_page) {

-                        $per_page = $chunk_per_page;

-                    }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					if ($per_page > $chunk_per_page) {

+						$per_page = $chunk_per_page;

+					}

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $terms_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-                    }

-                }

-                // WPML

-                if ($is_wpml) {

-                    $sitepress->switch_lang($active_lang, true);

-                }

-                // WPML

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_locations': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $terms_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+					}

+				}

+				// WPML

+				if ($is_wpml) {

+					$sitepress->switch_lang($active_lang, true);

+				}

+				// WPML

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_locations': {

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_name = 'gd_locations_' . date( 'dmyHi' );

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+			$items_count = (int)geodir_location_imex_count_locations();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                wp_send_json( $json );

-            } else {

-                $chunk_file_paths = array();

+				$json['percentage'] = $percentage;

+				wp_send_json( $json );

+			} else {

+				$chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+				if ( !$items_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$chunk_per_page = min( $chunk_per_page, $items_count );

+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					$per_page = min( $per_page, $chunk_per_page );

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $items_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

-                    }

-                }

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_hoods': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $items_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+					}

+				}

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_hoods': {

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

             

-            $items_count = (int)geodir_location_imex_count_neighbourhoods();

+			$items_count = (int)geodir_location_imex_count_neighbourhoods();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

-                $json['percentage'] = $percentage;

-                wp_send_json( $json );

-            } else {

-                $chunk_file_paths = array();

+				$json['percentage'] = $percentage;

+				wp_send_json( $json );

+			} else {

+				$chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+				if ( !$items_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$chunk_per_page = min( $chunk_per_page, $items_count );

+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					$per_page = min( $per_page, $chunk_per_page );

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $items_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

-                    }

-                }

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'prepare_import':

-        case 'import_cat':

-        case 'import_post':

-        case 'import_loc':

-        case 'import_hood': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

-            }

-            // WPML

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $items_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+					}

+				}

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'prepare_import':

+		case 'import_cat':

+		case 'import_post':

+		case 'import_loc':

+		case 'import_hood': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

+			}

+			// WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+			ini_set( 'auto_detect_line_endings', true );

             

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

-            $uploads_subdir = $uploads['subdir'];

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

+			$uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+			$csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

+			$import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

+			$csv_file_arr = explode( '/', $csv_file );

+			$csv_filename = end( $csv_file_arr );

+			$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

             

-            $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

-            $file = array();

+			$json['file'] = $csv_file;

+			$json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+			$file = array();

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+			if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

+				$wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

                 

-                if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

-                    $json['error'] = NULL;

-                    $json['rows'] = 0;

+				if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

+					$json['error'] = NULL;

+					$json['rows'] = 0;

                     

-                    $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

-                    setlocale(LC_ALL, 'en_US.UTF-8');

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

-                                $file[] = $data;

-                            }

-                        }

-                        fclose($handle);

-                    }

-                    setlocale(LC_ALL, $lc_all);

+					$lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

+					setlocale(LC_ALL, 'en_US.UTF-8');

+					if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

+						while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

+							if ( !empty( $data ) ) {

+								$file[] = $data;

+							}

+						}

+						fclose($handle);

+					}

+					setlocale(LC_ALL, $lc_all);

 

-                    $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

+					$json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

                     

-                    if (!$json['rows'] > 0) {

-                        $json['error'] = __('No data found in csv file.', 'geodirectory');

-                    }

-                } else {

-                    wp_send_json( $json );

-                }

-            } else {

-                wp_send_json( $json );

-            }

+					if (!$json['rows'] > 0) {

+						$json['error'] = __('No data found in csv file.', 'geodirectory');

+					}

+				} else {

+					wp_send_json( $json );

+				}

+			} else {

+				wp_send_json( $json );

+			}

             

-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

-                wp_send_json( $json );

-            }

+			if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

+				wp_send_json( $json );

+			}

             

-            $total = $json['rows'];

-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

+			$total = $json['rows'];

+			$limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

+			$processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

             

-            $count = $limit;

+			$count = $limit;

             

-            if ($count < $total) {

-                $count = $processed + $count;

-                if ($count > $total) {

-                    $count = $total;

-                }

-            } else {

-                $count = $total;

-            }

+			if ($count < $total) {

+				$count = $processed + $count;

+				if ($count > $total) {

+					$count = $total;

+				}

+			} else {

+				$count = $total;

+			}

             

-            $created = 0;

-            $updated = 0;

-            $skipped = 0;

-            $invalid = 0;

-            $invalid_addr = 0;

-            $images = 0;

+			$created = 0;

+			$updated = 0;

+			$skipped = 0;

+			$invalid = 0;

+			$invalid_addr = 0;

+			$images = 0;

             

-            $gd_post_info = array();

-            $countpost = 0;

+			$gd_post_info = array();

+			$countpost = 0;

             

-            $post_types = geodir_get_posttypes();

+			$post_types = geodir_get_posttypes();

 

-            if ( $task == 'import_cat' ) {

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+			if ( $task == 'import_cat' ) {

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

-                        exit;

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = CSV_INVAILD_FILE;

+						wp_send_json( $json );

+						exit;

+					}

                     

-                    $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');

+					$gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');

                     

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            //$row = array_map( 'utf8_encode', $row );

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							//$row = array_map( 'utf8_encode', $row );

                             

-                            $cat_id = '';

-                            $cat_name = '';

-                            $cat_slug = '';

-                            $cat_posttype = '';

-                            $cat_parent = '';

-                            $cat_description = '';

-                            $cat_schema = '';

-                            $cat_top_description = '';

-                            $cat_image = '';

-                            $cat_icon = '';

-                            $cat_language = '';

-                            $cat_id_original = '';

+							$cat_id = '';

+							$cat_name = '';

+							$cat_slug = '';

+							$cat_posttype = '';

+							$cat_parent = '';

+							$cat_description = '';

+							$cat_schema = '';

+							$cat_top_description = '';

+							$cat_image = '';

+							$cat_icon = '';

+							$cat_language = '';

+							$cat_id_original = '';

                             

-                            $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

-                                } else if ( $column == 'cat_name' ) {

-                                    $cat_name = $row[$c];

-                                } else if ( $column == 'cat_slug' ) {

-                                    $cat_slug = $row[$c];

-                                } else if ( $column == 'cat_posttype' ) {

-                                    $cat_posttype = $row[$c];

-                                } else if ( $column == 'cat_parent' ) {

-                                    $cat_parent = trim($row[$c]);

-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {

-                                    $cat_schema = $row[$c];

-                                } else if ( $column == 'cat_description' ) {

-                                    $cat_description = $row[$c];

-                                } else if ( $column == 'cat_top_description' ) {

-                                    $cat_top_description = $row[$c];

-                                } else if ( $column == 'cat_image' ) {

-                                    $cat_image = $row[$c];

-                                } else if ( $column == 'cat_icon' ) {

-                                    $cat_icon = $row[$c];

-                                }

-                                // WPML

-                                if ( $is_wpml ) {

-                                    if ( $column == 'cat_language' ) {

-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );

-                                    } else if ( $column == 'cat_id_original' ) {

-                                        $cat_id_original = (int)$row[$c];

-                                    }

-                                }

-                                // WPML

-                                $c++;

-                            }

+							$c = 0;

+							foreach ($columns as $column ) {

+								if ( $column == 'cat_id' ) {

+									$cat_id = (int)$row[$c];

+								} else if ( $column == 'cat_name' ) {

+									$cat_name = $row[$c];

+								} else if ( $column == 'cat_slug' ) {

+									$cat_slug = $row[$c];

+								} else if ( $column == 'cat_posttype' ) {

+									$cat_posttype = $row[$c];

+								} else if ( $column == 'cat_parent' ) {

+									$cat_parent = trim($row[$c]);

+								} else if ( $column == 'cat_schema' && $row[$c] != '' ) {

+									$cat_schema = $row[$c];

+								} else if ( $column == 'cat_description' ) {

+									$cat_description = $row[$c];

+								} else if ( $column == 'cat_top_description' ) {

+									$cat_top_description = $row[$c];

+								} else if ( $column == 'cat_image' ) {

+									$cat_image = $row[$c];

+								} else if ( $column == 'cat_icon' ) {

+									$cat_icon = $row[$c];

+								}

+								// WPML

+								if ( $is_wpml ) {

+									if ( $column == 'cat_language' ) {

+										$cat_language = geodir_strtolower( trim( $row[$c] ) );

+									} else if ( $column == 'cat_id_original' ) {

+										$cat_id_original = (int)$row[$c];

+									}

+								}

+								// WPML

+								$c++;

+							}

                             

-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+							if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

                                 

-                                $invalid++;

-                                continue;

-                            }

+								$invalid++;

+								continue;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $cat_language != '') {

-                                $sitepress->switch_lang($cat_language, true);

-                            }

-                            // WPML

+							// WPML

+							if ($is_wpml && $cat_language != '') {

+								$sitepress->switch_lang($cat_language, true);

+							}

+							// WPML

                                                         

-                            $term_data = array();

-                            $term_data['name'] = $cat_name;

-                            $term_data['slug'] = $cat_slug;

-                            $term_data['description'] = $cat_description;

-                            $term_data['cat_schema'] = $cat_schema;

-                            $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+							$term_data = array();

+							$term_data['name'] = $cat_name;

+							$term_data['slug'] = $cat_slug;

+							$term_data['description'] = $cat_description;

+							$term_data['cat_schema'] = $cat_schema;

+							$term_data['top_description'] = $cat_top_description;

+							$term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

+							$term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

                             

-                            //$term_data = array_map( 'utf8_encode', $term_data );

+							//$term_data = array_map( 'utf8_encode', $term_data );

                             

-                            $taxonomy = $cat_posttype . 'category';

+							$taxonomy = $cat_posttype . 'category';

                             

-                            $term_data['taxonomy'] = $taxonomy;

+							$term_data['taxonomy'] = $taxonomy;

 

-                            $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

-                                $term_parent = '';

+							$term_parent_id = 0;

+							if ($cat_parent != "" || (int)$cat_parent > 0) {

+								$term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

-                                    //

-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

-                                    //

-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

-                                    //

-                                } else {

-                                    $term_parent_data = array();

-                                    $term_parent_data['name'] = $cat_parent;

-                                    //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

-                                    $term_parent_data['taxonomy'] = $taxonomy;

+								if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+									//

+								} else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+									//

+								} else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+									//

+								} else {

+									$term_parent_data = array();

+									$term_parent_data['name'] = $cat_parent;

+									//$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

+									$term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

-                                }

+									$term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+								}

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

-                                }

-                            }

-                            $term_data['parent'] = (int)$term_parent_id;

+								if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

+									$term_parent_id = (int)$term_parent->term_id;

+								}

+							}

+							$term_data['parent'] = (int)$term_parent_id;

 

-                            $term_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-                                    $term_data['term_id'] = $term['term_id'];

+							$term_id = NULL;

+							if ( $import_choice == 'update' ) {

+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+									$term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-                                    $term_data['term_id'] = $term['term_id'];

+									if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+									$term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-                                    $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-                                    $skipped++;

-                                } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                            }

+									if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								} else {

+									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								}

+							} else if ( $import_choice == 'skip' ) {

+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+									$skipped++;

+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+									$skipped++;

+								} else {

+									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+							}

                             

-                            if ( $term_id ) {

-                                // WPML

-                                if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

-                                    $wpml_element_type = 'tax_' . $taxonomy;

-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

-

-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

+							if ( $term_id ) {

+								// WPML

+								if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

+									$wpml_element_type = 'tax_' . $taxonomy;

+									$source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

+

+									$trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

                                     

-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

-                                }

-                                // WPML

+									$sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

+								}

+								// WPML

                                 

-                                if ( isset( $term_data['top_description'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

-                                }

+								if ( isset( $term_data['top_description'] ) ) {

+									update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

+								}

                                 

-                                if ( isset( $term_data['cat_schema'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

-                                }

+								if ( isset( $term_data['cat_schema'] ) ) {

+									update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+								}

             

-                                $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+								$attachment = false;

+								if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

+									$cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

+									$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

-                                        $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

-                                    }

-                                }

+									if ( basename($cat_image) != $term_data['image'] ) {

+										$attachment = true;

+										update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+									}

+								}

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+								if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

+									$cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

+									$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

                                         

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

-                                        $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

-                                    }

-                                }

+									if ( basename($cat_icon) != $term_data['icon'] ) {

+										$attachment = true;

+										update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+									}

+								}

                                 

-                                if ( $attachment ) {

-                                    $images++;

-                                }

-                            }

+								if ( $attachment ) {

+									$images++;

+								}

+							}

                             

-                            // WPML

-                            if ($is_wpml && $cat_language != '') {

-                                $sitepress->switch_lang($active_lang, true);

-                            }

-                            // WPML

-                        }

-                    }

-                }

+							// WPML

+							if ($is_wpml && $cat_language != '') {

+								$sitepress->switch_lang($active_lang, true);

+							}

+							// WPML

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-                exit;

-            } else if ( $task == 'import_post' ) {

-                //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

-

-                //remove_all_actions('publish_post');

-                //remove_all_actions('transition_post_status');

-                //remove_all_actions('publish_future_post');

-

-                if (!empty($file)) {

-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

-                    $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

-                    $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+				wp_send_json( $json );

+				exit;

+			} else if ( $task == 'import_post' ) {

+				//run some stuff to make the import quicker

+				wp_defer_term_counting( true );

+				wp_defer_comment_counting( true );

+				$wpdb->query( 'SET autocommit = 0;' );

+

+				//remove_all_actions('publish_post');

+				//remove_all_actions('transition_post_status');

+				//remove_all_actions('publish_future_post');

+

+				if (!empty($file)) {

+					$is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+					$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

+					$default_status = 'publish';

+					$current_date = date_i18n( 'Y-m-d', time() );

                     

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

-                        exit;

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = CSV_INVAILD_FILE;

+						wp_send_json( $json );

+						exit;

+					}

 

-                    $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

-                    $processed_actual = 0;

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

-                        $gd_post = array();

+					$gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

+					$wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

+					$processed_actual = 0;

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

+						$gd_post = array();

                         

-                        if (isset($file[$index])) {

-                            $processed_actual++;

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+						if (isset($file[$index])) {

+							$processed_actual++;

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							//$row = array_map( 'utf8_encode', $row );

+							$row = array_map( 'addslashes_gpc', $row );

                             

-                            $post_id = '';

-                            $post_title = '';

-                            $post_author = '';

-                            $post_content = '';

-                            $post_category_arr = array();

-                            $default_category = '';

-                            $post_tags = array();

-                            $post_type = '';

-                            $post_status = '';

-                            $geodir_video = '';

-                            $post_address = '';

-                            $post_city = '';

-                            $post_region = '';

-                            $post_country = '';

-                            $post_zip = '';

-                            $post_latitude = '';

-                            $post_longitude = '';

-                            $post_neighbourhood = '';

-                            $neighbourhood_latitude = '';

-                            $neighbourhood_longitude = '';

-                            $geodir_timing = '';

-                            $geodir_contact = '';

-                            $geodir_email = '';

-                            $geodir_website = '';

-                            $geodir_twitter = '';

-                            $geodir_facebook = '';

-                            $geodir_twitter = '';

-                            $post_images = array();

+							$post_id = '';

+							$post_title = '';

+							$post_author = '';

+							$post_content = '';

+							$post_category_arr = array();

+							$default_category = '';

+							$post_tags = array();

+							$post_type = '';

+							$post_status = '';

+							$geodir_video = '';

+							$post_address = '';

+							$post_city = '';

+							$post_region = '';

+							$post_country = '';

+							$post_zip = '';

+							$post_latitude = '';

+							$post_longitude = '';

+							$post_neighbourhood = '';

+							$neighbourhood_latitude = '';

+							$neighbourhood_longitude = '';

+							$geodir_timing = '';

+							$geodir_contact = '';

+							$geodir_email = '';

+							$geodir_website = '';

+							$geodir_twitter = '';

+							$geodir_facebook = '';

+							$geodir_twitter = '';

+							$post_images = array();

                             

-                            $expire_date = 'Never';

+							$expire_date = 'Never';

                             

-                            $language = '';

-                            $original_post_id = '';

+							$language = '';

+							$original_post_id = '';

                             

-                            $c = 0;

-                            foreach ($columns as $column ) {

-                                $gd_post[$column] = $row[$c];

+							$c = 0;

+							foreach ($columns as $column ) {

+								$gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

-                                    $post_id = $row[$c];

-                                } else if ( $column == 'post_title' ) {

-                                    $post_title = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_author' ) {

-                                    $post_author = $row[$c];

-                                } else if ( $column == 'post_content' ) {

-                                    $post_content = $row[$c];

-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {

-                                    $post_category_arr = explode( ',', $row[$c] );

-                                } else if ( $column == 'default_category' ) {

-                                    $default_category = wp_kses_normalize_entities($row[$c]);

-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {

-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );

-                                } else if ( $column == 'post_type' ) {

-                                    $post_type = $row[$c];

-                                } else if ( $column == 'post_status' ) {

-                                    $post_status = sanitize_key( $row[$c] );

-                                } else if ( $column == 'is_featured' ) {

-                                    $is_featured = (int)$row[$c];

-                                } else if ( $column == 'geodir_video' ) {

-                                    $geodir_video = $row[$c];

-                                } else if ( $column == 'post_address' ) {

-                                    $post_address = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_city' ) {

-                                    $post_city = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_region' ) {

-                                    $post_region = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_country' ) {

-                                    $post_country = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_zip' ) {

-                                    $post_zip = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_latitude' ) {

-                                    $post_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_longitude' ) {

-                                    $post_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_neighbourhood' ) {

-                                    $post_neighbourhood = sanitize_text_field($row[$c]);

-                                    unset($gd_post[$column]);

-                                } else if ( $column == 'neighbourhood_latitude' ) {

-                                    $neighbourhood_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'neighbourhood_longitude' ) {

-                                    $neighbourhood_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_timing' ) {

-                                    $geodir_timing = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_contact' ) {

-                                    $geodir_contact = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_email' ) {

-                                    $geodir_email = sanitize_email($row[$c]);

-                                } else if ( $column == 'geodir_website' ) {

-                                    $geodir_website = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_twitter' ) {

-                                    $geodir_twitter = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_facebook' ) {

-                                    $geodir_facebook = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

-                                    $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

-                                    $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

-                                }

-                                // WPML

-                                if ($is_wpml) {

-                                    if ($column == 'language') {

-                                        $language = geodir_strtolower(trim($row[$c]));

-                                    } else if ($column == 'original_post_id') {

-                                        $original_post_id = (int)$row[$c];

-                                    }

-                                }

-                                // WPML

-                                $c++;

-                            }

-                            // listing claimed or not

-                            if ($is_claim_active && isset($gd_post['claimed'])) {

-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

-                            }

+								if ( $column == 'post_id' ) {

+									$post_id = $row[$c];

+								} else if ( $column == 'post_title' ) {

+									$post_title = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_author' ) {

+									$post_author = $row[$c];

+								} else if ( $column == 'post_content' ) {

+									$post_content = $row[$c];

+								} else if ( $column == 'post_category' && $row[$c] != '' ) {

+									$post_category_arr = explode( ',', $row[$c] );

+								} else if ( $column == 'default_category' ) {

+									$default_category = wp_kses_normalize_entities($row[$c]);

+								} else if ( $column == 'post_tags' && $row[$c] != '' ) {

+									$post_tags = explode( ',', sanitize_text_field($row[$c]) );

+								} else if ( $column == 'post_type' ) {

+									$post_type = $row[$c];

+								} else if ( $column == 'post_status' ) {

+									$post_status = sanitize_key( $row[$c] );

+								} else if ( $column == 'is_featured' ) {

+									$is_featured = (int)$row[$c];

+								} else if ( $column == 'geodir_video' ) {

+									$geodir_video = $row[$c];

+								} else if ( $column == 'post_address' ) {

+									$post_address = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_city' ) {

+									$post_city = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_region' ) {

+									$post_region = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_country' ) {

+									$post_country = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_zip' ) {

+									$post_zip = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_latitude' ) {

+									$post_latitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_longitude' ) {

+									$post_longitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'post_neighbourhood' ) {

+									$post_neighbourhood = sanitize_text_field($row[$c]);

+									unset($gd_post[$column]);

+								} else if ( $column == 'neighbourhood_latitude' ) {

+									$neighbourhood_latitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'neighbourhood_longitude' ) {

+									$neighbourhood_longitude = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_timing' ) {

+									$geodir_timing = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_contact' ) {

+									$geodir_contact = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_email' ) {

+									$geodir_email = sanitize_email($row[$c]);

+								} else if ( $column == 'geodir_website' ) {

+									$geodir_website = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_twitter' ) {

+									$geodir_twitter = sanitize_text_field($row[$c]);

+								} else if ( $column == 'geodir_facebook' ) {

+									$geodir_facebook = sanitize_text_field($row[$c]);

+								} else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

+									$post_images[] = $row[$c];

+								} else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

+									$expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

+								} else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

+									$row[$c] = str_replace('/', '-', $row[$c]);

+									$expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

+								}

+								// WPML

+								if ($is_wpml) {

+									if ($column == 'language') {

+										$language = geodir_strtolower(trim($row[$c]));

+									} else if ($column == 'original_post_id') {

+										$original_post_id = (int)$row[$c];

+									}

+								}

+								// WPML

+								$c++;

+							}

+							// listing claimed or not

+							if ($is_claim_active && isset($gd_post['claimed'])) {

+								$gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $language != '') {

-                                $sitepress->switch_lang($language, true);

-                            }

-                            // WPML

+							// WPML

+							if ($is_wpml && $language != '') {

+								$sitepress->switch_lang($language, true);

+							}

+							// WPML

 

-                            $gd_post['IMAGE'] = $post_images;

+							$gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+							$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

+							$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

                                                                                                                 

-                            $valid = true;

+							$valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

-                                $invalid++;

-                                $valid = false;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

-                            }

+							if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+								$invalid++;

+								$valid = false;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+							}

                             

-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-                            if ( $location_allowed ) {

-                                $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

-                                    $invalid_addr++;

-                                    $valid = false;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

-                                        $invalid_addr++;

-                                        $valid = false;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                    } else {

-                                        if (!$location_manager) {

-                                            $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

-                                        }

-                                    }

-                                }

-                            }

+							$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+							if ( $location_allowed ) {

+								$location_result = geodir_get_default_location();

+								if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+									$invalid_addr++;

+									$valid = false;

+									geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+								} else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

+									if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+										$invalid_addr++;

+										$valid = false;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+									} else {

+										if (!$location_manager) {

+											$gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

+										}

+									}

+								}

+							}

                             

-                            if ( !$valid ) {

-                                continue;

-                            }

+							if ( !$valid ) {

+								continue;

+							}

 

-                            $cat_taxonomy = $post_type . 'category';

-                            $tags_taxonomy = $post_type . '_tags';

+							$cat_taxonomy = $post_type . 'category';

+							$tags_taxonomy = $post_type . '_tags';

                             

-                            if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

-                                $post_category_arr = array_merge(array($default_category), $post_category_arr);

-                            }

+							if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

+								$post_category_arr = array_merge(array($default_category), $post_category_arr);

+							}

 

-                            $post_category = array();

-                            $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+							$post_category = array();

+							$default_category_id = NULL;

+							if ( !empty( $post_category_arr ) ) {

+								foreach ( $post_category_arr as $value ) {

+									$category_name = wp_kses_normalize_entities( trim( $value ) );

                                     

-                                    if ( $category_name != '' ) {

-                                        $term_category = array();

+									if ( $category_name != '' ) {

+										$term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

-                                            $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

-                                            $term_category = $term;

-                                        } else {

-                                            $term_data = array();

-                                            $term_data['name'] = $category_name;

-                                            $term_data['taxonomy'] = $cat_taxonomy;

+										if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+											$term_category = $term;

+										} else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+											$term_category = $term;

+										} else {

+											$term_data = array();

+											$term_data['name'] = $category_name;

+											$term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

-                                            }

-                                        }

+											$term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

+											if ( $term_id ) {

+												$term_category = get_term( $term_id, $cat_taxonomy );

+											}

+										}

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

-                                            $post_category[] = intval($term_category->term_id);

+										if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+											$post_category[] = intval($term_category->term_id);

                                             

-                                            if ($category_name == $default_category) {

-                                                $default_category_id = intval($term_category->term_id);

-                                            }

-                                        }

-                                    }

-                                }

-                            }

+											if ($category_name == $default_category) {

+												$default_category_id = intval($term_category->term_id);

+											}

+										}

+									}

+								}

+							}

 

-                            $save_post = array();

-                            $save_post['post_title'] = $post_title;

-                            $save_post['post_content'] = $post_content;

-                            $save_post['post_type'] = $post_type;

-                            $save_post['post_author'] = $post_author;

-                            $save_post['post_status'] = $post_status;

-                            $save_post['post_category'] = $post_category;

-                            $save_post['post_tags'] = $post_tags;

-

-                            $saved_post_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

+							$save_post = array();

+							$save_post['post_title'] = $post_title;

+							$save_post['post_content'] = $post_content;

+							$save_post['post_type'] = $post_type;

+							$save_post['post_author'] = $post_author;

+							$save_post['post_status'] = $post_status;

+							$save_post['post_category'] = $post_category;

+							$save_post['post_tags'] = $post_tags;

+

+							$saved_post_id = NULL;

+							if ( $import_choice == 'update' ) {

+								$gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

                                 

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

-                                    $save_post['ID'] = $post_id;

+								if ( $post_id > 0 && get_post( $post_id ) ) {

+									$save_post['ID'] = $post_id;

                                     

-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $saved_post_id = $post_id;

-                                            $updated++;

-                                        }

-                                    }

-                                } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $created++;

-                                        }

-                                    }

-                                }

+									if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+											$saved_post_id = 0;

+										} else {

+											$saved_post_id = $post_id;

+											$updated++;

+										}

+									}

+								} else {

+									if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+											$saved_post_id = 0;

+										} else {

+											$created++;

+										}

+									}

+								}

                                 

-                                if ( !$saved_post_id > 0 ) {

-                                    $invalid++;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

-                                }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

-                                    $skipped++;	

-                                } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $invalid++;

+								if ( !$saved_post_id > 0 ) {

+									$invalid++;

+									geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

+								}

+							} else if ( $import_choice == 'skip' ) {

+								if ( $post_id > 0 && get_post( $post_id ) ) {

+									$skipped++;	

+								} else {

+									if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$invalid++;

                                             

-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $created++;

-                                        }

-                                    } else {

-                                        $invalid++;

+											geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

+											$saved_post_id = 0;

+										} else {

+											$created++;

+										}

+									} else {

+										$invalid++;

                                         

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+									}

+								}

+							} else {

+								$invalid++;

                                 

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

-                            }

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+							}

 

-                            if ( (int)$saved_post_id > 0 ) {

-                                // WPML

-                                if ($is_wpml && $original_post_id > 0 && $language != '') {

-                                    $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

+							if ( (int)$saved_post_id > 0 ) {

+								// WPML

+								if ($is_wpml && $original_post_id > 0 && $language != '') {

+									$wpml_post_type = 'post_' . $post_type;

+									$source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+									$trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

-                                }

-                                // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+									$sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+								}

+								// WPML

+								$gd_post_info = geodir_get_post_info( $saved_post_id );

                                 

-                                $gd_post['post_id'] = $saved_post_id;

-                                $gd_post['ID'] = $saved_post_id;

-                                $gd_post['post_tags'] = $post_tags;

-                                $gd_post['post_title'] = $post_title;

-                                $gd_post['post_status'] = $post_status;

-                                $gd_post['submit_time'] = time();

-                                $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

+								$gd_post['post_id'] = $saved_post_id;

+								$gd_post['ID'] = $saved_post_id;

+								$gd_post['post_tags'] = $post_tags;

+								$gd_post['post_title'] = $post_title;

+								$gd_post['post_status'] = $post_status;

+								$gd_post['submit_time'] = time();

+								$gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

                                                     

-                                // post location

-                                $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

-                                    $gd_post['post_neighbourhood'] = '';

+								// post location

+								$post_location_id = 0;

+								if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+									$gd_post['post_neighbourhood'] = '';

                                     

-                                    $post_location_info = array(

-                                                                'city' => $post_city,

-                                                                'region' => $post_region,

-                                                                'country' => $post_country,

-                                                                'geo_lat' => $post_latitude,

-                                                                'geo_lng' => $post_longitude

-                                                            );

-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

-                                        $post_location_id = $location_id;

-                                    }

+									$post_location_info = array(

+																'city' => $post_city,

+																'region' => $post_region,

+																'country' => $post_country,

+																'geo_lat' => $post_latitude,

+																'geo_lng' => $post_longitude

+															);

+									if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+										$post_location_id = $location_id;

+									}

                                     

-                                    if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {

-                                        $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id);

+									if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {

+										$neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id);

 

-                                        $hood_data = array();

-                                        $hood_data['hood_location_id'] = $post_location_id;

-                                        $hood_data['hood_name'] = $post_neighbourhood;

+										$hood_data = array();

+										$hood_data['hood_location_id'] = $post_location_id;

+										$hood_data['hood_name'] = $post_neighbourhood;

                                         

-                                        if (!empty($neighbourhood_info)) {

-                                            $hood_data['hood_id'] = $neighbourhood_info->hood_id;

-                                            $hood_data['hood_slug'] = $neighbourhood_info->hood_slug;

+										if (!empty($neighbourhood_info)) {

+											$hood_data['hood_id'] = $neighbourhood_info->hood_id;

+											$hood_data['hood_slug'] = $neighbourhood_info->hood_slug;

                                             

-                                            if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

-                                                $neighbourhood_latitude = $neighbourhood_info->hood_latitude;

-                                                $neighbourhood_longitude = $neighbourhood_info->hood_longitude;

-                                            }

-                                        }

+											if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

+												$neighbourhood_latitude = $neighbourhood_info->hood_latitude;

+												$neighbourhood_longitude = $neighbourhood_info->hood_longitude;

+											}

+										}

                                         

-                                        if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

-                                            $neighbourhood_latitude = $neighbourhood_info->hood_latitude;

-                                            $neighbourhood_longitude = $neighbourhood_info->hood_longitude;

-                                        }

+										if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

+											$neighbourhood_latitude = $neighbourhood_info->hood_latitude;

+											$neighbourhood_longitude = $neighbourhood_info->hood_longitude;

+										}

                                         

-                                        $hood_data['hood_latitude'] = $post_latitude;

-                                        $hood_data['hood_longitude'] = $post_longitude;

+										$hood_data['hood_latitude'] = $post_latitude;

+										$hood_data['hood_longitude'] = $post_longitude;

 

-                                        $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data);

-                                        if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {

-                                            $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug;

-                                        }

-                                    }

-                                }

-                                $gd_post['post_location_id'] = $post_location_id;

+										$neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data);

+										if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {

+											$gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug;

+										}

+									}

+								}

+								$gd_post['post_location_id'] = $post_location_id;

                                 

-                                // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

-                                if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

-                                    $package_id = $gd_post_info->package_id;

-                                }

+								// post package info

+								$package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+								if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

+									$package_id = $gd_post_info->package_id;

+								}

                                 

-                                $package_info = array();

-                                if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+								$package_info = array();

+								if ($package_id && function_exists('geodir_get_package_info_by_id')) {

+									$package_info = (array)geodir_get_package_info_by_id($package_id);

                                     

-                                    if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

-                                        $package_info = array();

-                                    }

-                                }

+									if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

+										$package_info = array();

+									}

+								}

                                 

-                                if (empty($package_info)) {

-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

-                                }

+								if (empty($package_info)) {

+									$package_info = (array)geodir_post_package_info( array(), '', $post_type );

+								}

                                  

-                                if (!empty($package_info))	 {

-                                    $package_id = $package_info['pid'];

+								if (!empty($package_info))	 {

+									$package_id = $package_info['pid'];

                                     

-                                    if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

-                                        $gd_post['expire_date'] = $expire_date;

-                                    } else {

-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

-                                            $gd_post['alive_days'] = (int)$package_info['days'];

-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

-                                        } else {

-                                            $gd_post['expire_date'] = 'Never';

-                                        }

-                                    }

+									if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

+										$gd_post['expire_date'] = $expire_date;

+									} else {

+										if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

+											$gd_post['alive_days'] = (int)$package_info['days'];

+											$gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

+										} else {

+											$gd_post['expire_date'] = 'Never';

+										}

+									}

                                     

-                                    $gd_post['package_id'] = $package_id;

-                                }

+									$gd_post['package_id'] = $package_id;

+								}

 

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

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

                                 

-                                if ($post_type == 'gd_event') {

-                                    $gd_post = geodir_imex_process_event_data($gd_post);

-                                }

+								if ($post_type == 'gd_event') {

+									$gd_post = geodir_imex_process_event_data($gd_post);

+								}

                                 

-                                if (isset($gd_post['post_id'])) {

-                                    unset($gd_post['post_id']);

-                                }

+								if (isset($gd_post['post_id'])) {

+									unset($gd_post['post_id']);

+								}

 

-                                // Export franchise fields

-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

-                                if ($is_franchise_active) {

-                                    if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

-                                        $gd_franchise_lock = array();

+								// Export franchise fields

+								$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+								if ($is_franchise_active) {

+									if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

+										$gd_franchise_lock = array();

                                         

-                                        if ( isset( $gd_post['gd_franchise_lock'] ) ) {

-                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

-                                            $gd_franchise_lock = trim( $gd_franchise_lock );

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

-                                        }

+										if ( isset( $gd_post['gd_franchise_lock'] ) ) {

+											$gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

+											$gd_franchise_lock = trim( $gd_franchise_lock );

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

+										}

                                         

-                                        update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

-                                        update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

-                                    } else {

-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

-                                        }

-                                    }

-                                }

+										update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

+										update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

+									} else {

+										if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

+											geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

+										}

+									}

+								}

                                 

-                                if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

-                                    if ($default_category_id) {

-                                        $save_post['post_default_category'] = $default_category_id;

-                                        $gd_post['default_category'] = $default_category_id;

-                                    }

-                                    $gd_post[$cat_taxonomy] = $save_post['post_category'];

-                                }

+								if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

+									$save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

+									if ($default_category_id) {

+										$save_post['post_default_category'] = $default_category_id;

+										$gd_post['default_category'] = $default_category_id;

+									}

+									$gd_post[$cat_taxonomy] = $save_post['post_category'];

+								}

                                 

-                                // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

-                                // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+								// Save post info

+								geodir_save_post_info( $saved_post_id, $gd_post );

+								// post taxonomies

+								if ( !empty( $save_post['post_category'] ) ) {

+									wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

-                                    if ($default_category_id) {

-                                        $post_default_category = $default_category_id;

-                                    }

-                                    $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

-                                    $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

+									$post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+									if ($default_category_id) {

+										$post_default_category = $default_category_id;

+									}

+									$post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

+									$save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

+									$post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

                                     

-                                    if ($post_category_str != '' && $post_default_category) {

-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

-                                    }

+									if ($post_category_str != '' && $post_default_category) {

+										$post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

+									}

                                     

-                                    $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

+									$post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

-                                }

+									geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+								}

 

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

-                                }

+								if ( !empty( $save_post['post_tags'] ) ) {

+									wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+								}

 

-                                // Post images

-                                if ( !empty( $post_images ) ) {

-                                    $post_images = array_unique($post_images);

+								// Post images

+								if ( !empty( $post_images ) ) {

+									$post_images = array_unique($post_images);

                                     

-                                    $old_post_images_arr = array();

-                                    $saved_post_images_arr = array();

+									$old_post_images_arr = array();

+									$saved_post_images_arr = array();

                                     

-                                    $order = 1;

+									$order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

-                                    if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

-                                            if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

-                                                $old_post_images_arr[] = $old_post_image->file;

-                                            }

-                                        }

-                                    }

+									$old_post_images = geodir_get_images( $saved_post_id );

+									if (!empty($old_post_images)) {

+										foreach( $old_post_images as $old_post_image ) {

+											if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

+												$old_post_images_arr[] = $old_post_image->file;

+											}

+										}

+									}

 

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

-                                        $saved_post_images_arr[] = $image_name;

+									foreach ( $post_images as $post_image ) {

+										$image_name = basename( $post_image );

+										$saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

-                                            continue; // Skip if image already exists.

-                                        }

+										if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+											continue; // Skip if image already exists.

+										}

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

+										$image_name_parts = explode( '.', $image_name );

+										array_pop( $image_name_parts );

+										$proper_image_name = implode( '.', $image_name_parts );

                                         

-                                        $arr_file_type = wp_check_filetype( $image_name );

+										$arr_file_type = wp_check_filetype( $image_name );

                                         

-                                        if ( !empty( $arr_file_type ) ) {

-                                            $uploaded_file_type = $arr_file_type['type'];

+										if ( !empty( $arr_file_type ) ) {

+											$uploaded_file_type = $arr_file_type['type'];

                                             

-                                            $attachment = array();

-                                            $attachment['post_id'] = $saved_post_id;

-                                            $attachment['title'] = $proper_image_name;

-                                            $attachment['content'] = '';

-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;

-                                            $attachment['mime_type'] = $uploaded_file_type;

-                                            $attachment['menu_order'] = $order;

-                                            $attachment['is_featured'] = 0;

-

-                                            $attachment_set = '';

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

-                                                if ( $val != '' ) {

-                                                    $attachment_set .= $key . " = '" . $val . "', ";

-                                                }

-                                            }

-                                            $attachment_set = trim( $attachment_set, ", " );

+											$attachment = array();

+											$attachment['post_id'] = $saved_post_id;

+											$attachment['title'] = $proper_image_name;

+											$attachment['content'] = '';

+											$attachment['file'] = $uploads_subdir . '/' . $image_name;

+											$attachment['mime_type'] = $uploaded_file_type;

+											$attachment['menu_order'] = $order;

+											$attachment['is_featured'] = 0;

+

+											$attachment_set = '';

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

+												if ( $val != '' ) {

+													$attachment_set .= $key . " = '" . $val . "', ";

+												}

+											}

+											$attachment_set = trim( $attachment_set, ", " );

                                                                                         

-                                            // Add new attachment

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+											// Add new attachment

+											$wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

                                                                                         

-                                            $order++;

-                                        }

-                                    }

+											$order++;

+										}

+									}

 

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

-                                    // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

+									$saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+									// Remove previous attachment

+									$wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

                                     

-                                    if ( !empty( $saved_post_images_arr ) ) {

-                                        geodir_set_wp_featured_image($saved_post_id);

-                                        /*

+									if ( !empty( $saved_post_images_arr ) ) {

+										geodir_set_wp_featured_image($saved_post_id);

+										/*

                                         $menu_order = 1;

                                         

                                         foreach ( $saved_post_images_arr as $img_name ) {

@@ -4570,281 +4570,281 @@ 
                                             }

                                             $menu_order++;

                                         }*/

-                                    }

+									}

                                     

-                                    if ( $order > 1 ) {

-                                        $images++;

-                                    }

-                                }

+									if ( $order > 1 ) {

+										$images++;

+									}

+								}

 

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

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

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

+								do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

                                 

-                                if (isset($is_featured)) {

-                                    geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

-                                }

-                                if (isset($gd_post['expire_date'])) {

-                                    geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

-                                }

-                            }

+								if (isset($is_featured)) {

+									geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

+								}

+								if (isset($gd_post['expire_date'])) {

+									geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

+								}

+							}

                             

-                            // WPML

-                            if ($is_wpml && $language != '') {

-                                $sitepress->switch_lang($active_lang, true);

-                            }

-                            // WPML

-                        }

-                    }

-                }

+							// WPML

+							if ($is_wpml && $language != '') {

+								$sitepress->switch_lang($active_lang, true);

+							}

+							// WPML

+						}

+					}

+				}

 

-                //undo some stuff to make the import quicker

-                wp_defer_term_counting( false );

-                wp_defer_comment_counting( false );

-                $wpdb->query( 'COMMIT;' );

-                $wpdb->query( 'SET autocommit = 1;' );

-

-                $json = array();

-                $json['processed'] = $processed_actual;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['invalid_addr'] = $invalid_addr;

-                $json['images'] = $images;

+				//undo some stuff to make the import quicker

+				wp_defer_term_counting( false );

+				wp_defer_comment_counting( false );

+				$wpdb->query( 'COMMIT;' );

+				$wpdb->query( 'SET autocommit = 1;' );

+

+				$json = array();

+				$json['processed'] = $processed_actual;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['invalid_addr'] = $invalid_addr;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-                exit;

-            } else if ( $task == 'import_loc' ) {

-                global $gd_post_types;

-                $gd_post_types = $post_types;

+				wp_send_json( $json );

+				exit;

+			} else if ( $task == 'import_loc' ) {

+				global $gd_post_types;

+				$gd_post_types = $post_types;

                 

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

+						wp_send_json( $json );

+					}

                     

-                    $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					$gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

+					$gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            $data = array();

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							$data = array();

                             

-                            foreach ($columns as $c => $column ) {

-                                if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {

-                                    $data[$column] = $row[$c];

-                                }

-                            }

+							foreach ($columns as $c => $column ) {

+								if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {

+									$data[$column] = $row[$c];

+								}

+							}

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                continue;

-                            }

+							if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+								continue;

+							}

                             

-                            $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

+							$data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

-                            if ( $import_choice == 'update' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

+							if ( $import_choice == 'update' ) {

+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+									$data['location_id'] = (int)$location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    }

+									if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									}

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $skipped++;

-                                } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                            }

-                        }

-                    }

-                }

+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								} else {

+									if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								}

+							} elseif ( $import_choice == 'skip' ) {

+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+									$skipped++;

+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+									$skipped++;

+								} else {

+									if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+							}

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-            } else if ( $task == 'import_hood' ) {               

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+				wp_send_json( $json );

+			} else if ( $task == 'import_hood' ) {               

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

+						wp_send_json( $json );

+					}

                     

-                    $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

-                    $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

-                    for ($i = 1; $i <= $limit; $i++) {

-                        $index = $processed + $i;

+					$gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

+					$gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

+					for ($i = 1; $i <= $limit; $i++) {

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            $data = array();

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							$data = array();

                             

-                            foreach ($columns as $c => $column) {

-                                if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {

-                                    $data[$column] = sanitize_text_field($row[$c]);

-                                }

-                            }

+							foreach ($columns as $c => $column) {

+								if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {

+									$data[$column] = sanitize_text_field($row[$c]);

+								}

+							}

 

-                            if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                continue;

-                            }

+							if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+								continue;

+							}

                             

-                            $location_info = array();

-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);

-                            } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

-                                $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

-                            }

+							$location_info = array();

+							if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

+								$location_info = geodir_get_location_by_id('', (int)$data['location_id']);

+							} else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

+								$location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

+							}

 

-                            if (empty($location_info)) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                continue;

-                            }

+							if (empty($location_info)) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+								continue;

+							}

                             

-                            $location_id = $location_info->location_id;

+							$location_id = $location_info->location_id;

 

-                            $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0;

+							$data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0;

                             

-                            $hood_data = array();

-                            $hood_data['hood_name'] = $data['neighbourhood_name'];

-                            $hood_data['hood_slug'] = $data['neighbourhood_slug'];

-                            $hood_data['hood_latitude'] = $data['latitude'];

-                            $hood_data['hood_longitude'] = $data['longitude'];

-                            $hood_data['hood_location_id'] = $location_id;

+							$hood_data = array();

+							$hood_data['hood_name'] = $data['neighbourhood_name'];

+							$hood_data['hood_slug'] = $data['neighbourhood_slug'];

+							$hood_data['hood_latitude'] = $data['latitude'];

+							$hood_data['hood_longitude'] = $data['longitude'];

+							$hood_data['hood_location_id'] = $location_id;

                                     

-                            if ( $import_choice == 'update' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];

+							if ( $import_choice == 'update' ) {

+								if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+									$hood_data['hood_id'] = (int)$data['neighbourhood_id'];

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

+									$hood_data['hood_id'] = (int)$neighbourhood->hood_id;

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                } else {

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $skipped++;

-                                } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $skipped++;

-                                } else {

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								} else {

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								}

+							} elseif ( $import_choice == 'skip' ) {

+								if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+									$skipped++;

+								} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

+									$skipped++;

+								} else {

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                            }

-                        }

-                    }

-                }

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+							}

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

+				$json['created'] = $created;

+				$json['updated'] = $updated;

+				$json['skipped'] = $skipped;

+				$json['invalid'] = $invalid;

+				$json['images'] = $images;

                 

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'import_finish':{

-            /**

-             * Run an action when an import finishes.

-             *

-             * This action can be used to fire functions after an import ends.

-             *

-             * @since 1.5.3

-             * @package GeoDirectory

-             */

-            do_action('geodir_import_finished');

-        }

-        break;

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'import_finish':{

+			/**

+			 * Run an action when an import finishes.

+			 *

+			 * This action can be used to fire functions after an import ends.

+			 *

+			 * @since 1.5.3

+			 * @package GeoDirectory

+			 */

+			do_action('geodir_import_finished');

+		}

+		break;

 

-    }

-    echo '0';

-    gd_die();

+	}

+	echo '0';

+	gd_die();

 }

 

 /**

@@ -4888,12 +4888,12 @@ 
 		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

 	}

 	

-    if( !empty( $term ) ) {

+	if( !empty( $term ) ) {

 		$result = wp_insert_term( $term, $taxonomy, $args );

-        if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

-    }

+		if( !is_wp_error( $result ) ) {

+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

+	}

 	

 	return false;

 }

@@ -4939,16 +4939,16 @@ 
 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

 		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

 	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

 		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

-        }

+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		}

 	} else {

 		return geodir_imex_insert_term( $taxonomy, $term_data );

 	}

@@ -4970,47 +4970,47 @@ 
  * @return int Posts count.

  */

 function geodir_get_posts_count( $post_type ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( !post_type_exists( $post_type ) ) {

-        return 0;

-    }

+	if ( !post_type_exists( $post_type ) ) {

+		return 0;

+	}

         

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

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

 

-    // Skip listing with statuses trash, auto-draft etc...

-    $skip_statuses = geodir_imex_export_skip_statuses();

-    $where_statuses = '';

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

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-    }

+	// Skip listing with statuses trash, auto-draft etc...

+	$skip_statuses = geodir_imex_export_skip_statuses();

+	$where_statuses = '';

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

+		$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+	}

     

-    /**

-     * Filter the SQL where clause part to filter posts count in import/export.

-     *

-     * @since 1.6.4

-     * @package GeoDirectory

-     *

-     * @param string $where SQL where clause part.

-     */

-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

-

-    $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

-

-    $posts_count = (int)$wpdb->get_var( $query );

+	/**

+	 * Filter the SQL where clause part to filter posts count in import/export.

+	 *

+	 * @since 1.6.4

+	 * @package GeoDirectory

+	 *

+	 * @param string $where SQL where clause part.

+	 */

+	$where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

+

+	$query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

+

+	$posts_count = (int)$wpdb->get_var( $query );

     

-    /**

-     * Modify returned post counts for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param int $posts_count Post counts.

-     * @param string $post_type Post type.

-     */

-    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

-

-    return $posts_count;

+	/**

+	 * Modify returned post counts for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param int $posts_count Post counts.

+	 * @param string $post_type Post type.

+	 */

+	$posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

+

+	return $posts_count;

 }

 

 /**

@@ -5038,10 +5038,10 @@ 
 	

 	if ( !empty( $posts ) ) {

 		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

-        $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

-        $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

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

-        $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+		$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

+		$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

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

+		$is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

 		

 		$csv_row = array();

 		$csv_row[] = 'post_id';

@@ -5073,7 +5073,7 @@ 
 		}

 		$csv_row[] = 'post_status';

 		$csv_row[] = 'is_featured';

-        // Export claim listing field

+		// Export claim listing field

 		if ($is_claim_active) {

 			$csv_row[] = 'claimed';

 		}

@@ -5081,7 +5081,7 @@ 
 			$csv_row[] = 'package_id';

 			$csv_row[] = 'expire_date';

 		}

-        $csv_row[] = 'post_date';

+		$csv_row[] = 'post_date';

 		$csv_row[] = 'post_address';

 		$csv_row[] = 'post_city';

 		$csv_row[] = 'post_region';

@@ -5089,11 +5089,11 @@ 
 		$csv_row[] = 'post_zip';

 		$csv_row[] = 'post_latitude';

 		$csv_row[] = 'post_longitude';

-        if ($neighbourhood_active) {

-            $csv_row[] = 'post_neighbourhood';

-            $csv_row[] = 'neighbourhood_latitude';

-            $csv_row[] = 'neighbourhood_longitude';

-        }

+		if ($neighbourhood_active) {

+			$csv_row[] = 'post_neighbourhood';

+			$csv_row[] = 'neighbourhood_latitude';

+			$csv_row[] = 'neighbourhood_longitude';

+		}

 		$csv_row[] = 'geodir_timing';

 		$csv_row[] = 'geodir_contact';

 		$csv_row[] = 'geodir_email';

@@ -5125,21 +5125,21 @@ 
 			$csv_row[] = 'franchise';

 		}

         

-        /**

-         * Filter columns field names of gd export listings csv.

-         *

-         * @since 1.6.5

-         * @package GeoDirectory

-         *

-         * @param array $csv_row Column names being exported in csv.

-         * @param string $post_type The post type.

-         */

-        $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);

+		/**

+		 * Filter columns field names of gd export listings csv.

+		 *

+		 * @since 1.6.5

+		 * @package GeoDirectory

+		 *

+		 * @param array $csv_row Column names being exported in csv.

+		 * @param string $post_type The post type.

+		 */

+		$csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);

 		

 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

+		$xx=0;

 		foreach ( $posts as $post ) {$xx++;

 			$post_id = $post['ID'];

 			

@@ -5270,14 +5270,14 @@ 
 			}

 			$csv_row[] = $post_info['post_status']; // post_status

 			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

-            if ($is_claim_active) {

-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

-            }

+			if ($is_claim_active) {

+				$csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

+			}

 			if ($is_payment_plugin) {

 				$csv_row[] = (int)$post_info['package_id']; // package_id

 				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

 			}

-            $csv_row[] = $post_info['post_date']; // post_date

+			$csv_row[] = $post_info['post_date']; // post_date

 			$csv_row[] = $post_info['post_address']; // post_address

 			$csv_row[] = $post_info['post_city']; // post_city

 			$csv_row[] = $post_info['post_region']; // post_region

@@ -5285,21 +5285,21 @@ 
 			$csv_row[] = $post_info['post_zip']; // post_zip

 			$csv_row[] = $post_info['post_latitude']; // post_latitude

 			$csv_row[] = $post_info['post_longitude']; // post_longitude

-            if ($neighbourhood_active) {

-                $post_neighbourhood = '';

-                $neighbourhood_latitude = '';

-                $neighbourhood_longitude = '';

-                if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {

-                    if (!empty($hood_info)) {

-                        $post_neighbourhood = $hood_info->hood_name;

-                        $neighbourhood_latitude = $hood_info->hood_latitude;

-                        $neighbourhood_longitude = $hood_info->hood_longitude;

-                    }

-                }

-                $csv_row[] = $post_neighbourhood; // post_neighbourhood

-                $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude

-                $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude

-            }

+			if ($neighbourhood_active) {

+				$post_neighbourhood = '';

+				$neighbourhood_latitude = '';

+				$neighbourhood_longitude = '';

+				if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {

+					if (!empty($hood_info)) {

+						$post_neighbourhood = $hood_info->hood_name;

+						$neighbourhood_latitude = $hood_info->hood_latitude;

+						$neighbourhood_longitude = $hood_info->hood_longitude;

+					}

+				}

+				$csv_row[] = $post_neighbourhood; // post_neighbourhood

+				$csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude

+				$csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude

+			}

 			$csv_row[] = $post_info['geodir_timing']; // geodir_timing

 			$csv_row[] = $post_info['geodir_contact']; // geodir_contact

 			$csv_row[] = $post_info['geodir_email']; // geodir_email

@@ -5339,16 +5339,16 @@ 
 				$csv_row[] = (int)$franchise; // franchise id

 			}

             

-            /**

-             * Filter columns values of gd export listings csv file

-             *

-             * @since 1.6.5

-             * @package GeoDirectory

-             *

-             * @param array $csv_row Field values being exported in csv.

-             * @param array $post_info The post info.

-             */

-            $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

+			/**

+			 * Filter columns values of gd export listings csv file

+			 *

+			 * @since 1.6.5

+			 * @package GeoDirectory

+			 *

+			 * @param array $csv_row Field values being exported in csv.

+			 * @param array $post_info The post info.

+			 */

+			$csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

 			

 			for ( $c = 0; $c < $images_count; $c++ ) {

 				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

@@ -5381,64 +5381,64 @@ 
  * @return array Array of posts data.

  */

 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

-        return new stdClass;

+	if ( ! post_type_exists( $post_type ) )

+		return new stdClass;

         

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

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

 

-    $limit = '';

-    if ( $per_page > 0 && $page_no > 0 ) {

-        $offset = ( $page_no - 1 ) * $per_page;

+	$limit = '';

+	if ( $per_page > 0 && $page_no > 0 ) {

+		$offset = ( $page_no - 1 ) * $per_page;

         

-        if ( $offset > 0 ) {

-            $limit = " LIMIT " . $offset . "," . $per_page;

-        } else {

-            $limit = " LIMIT " . $per_page;

-        }

-    }

+		if ( $offset > 0 ) {

+			$limit = " LIMIT " . $offset . "," . $per_page;

+		} else {

+			$limit = " LIMIT " . $per_page;

+		}

+	}

 

-    // Skip listing with statuses trash, auto-draft etc...

-    $skip_statuses = geodir_imex_export_skip_statuses();

-    $where_statuses = '';

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

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-    }

+	// Skip listing with statuses trash, auto-draft etc...

+	$skip_statuses = geodir_imex_export_skip_statuses();

+	$where_statuses = '';

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

+		$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+	}

     

-    /**

-     * Filter the SQL where clause part to filter posts in import/export.

-     *

-     * @since 1.6.4

-     * @package GeoDirectory

-     *

-     * @param string $where SQL where clause part.

-     */

-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

-

-    $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

-    /**

-     * Modify returned posts SQL query for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param int $query The SQL query.

-     * @param string $post_type Post type.

-     */

-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

-    $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

-

-    /**

-     * Modify returned post results for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param object $results An object containing all post ids.

-     * @param string $post_type Post type.

-     */

-    return apply_filters( 'geodir_export_posts', $results, $post_type );

+	/**

+	 * Filter the SQL where clause part to filter posts in import/export.

+	 *

+	 * @since 1.6.4

+	 * @package GeoDirectory

+	 *

+	 * @param string $where SQL where clause part.

+	 */

+	$where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+

+	$query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

+	/**

+	 * Modify returned posts SQL query for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param int $query The SQL query.

+	 * @param string $post_type Post type.

+	 */

+	$query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

+	$results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

+

+	/**

+	 * Modify returned post results for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param object $results An object containing all post ids.

+	 * @param string $post_type Post type.

+	 */

+	return apply_filters( 'geodir_export_posts', $results, $post_type );

 }

 

 /**

@@ -5457,26 +5457,26 @@ 
  * @return string The SQL query.

  */

 function geodir_imex_get_events_query( $query, $post_type ) {

-    if ( $post_type == 'gd_event' ) {

-        global $wpdb, $plugin_prefix;

+	if ( $post_type == 'gd_event' ) {

+		global $wpdb, $plugin_prefix;

         

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

-        $schedule_table = EVENT_SCHEDULE;

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

+		$schedule_table = EVENT_SCHEDULE;

         

-        // Skip listing with statuses trash, auto-draft etc...

-        $skip_statuses = geodir_imex_export_skip_statuses();

-        $where_statuses = '';

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

-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-        }

+		// Skip listing with statuses trash, auto-draft etc...

+		$skip_statuses = geodir_imex_export_skip_statuses();

+		$where_statuses = '';

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

+			$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+		}

         

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

-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

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

+		$where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

 

-        $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

-    }

+		$query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

+	}

 

-    return $query;

+	return $query;

 }

 

 /**

@@ -5498,36 +5498,36 @@ 
  * @return int Total terms count.

  */

 function geodir_get_terms_count( $post_type ) {

-    $args = array( 'hide_empty' => 0 );

+	$args = array( 'hide_empty' => 0 );

 

-    remove_all_filters( 'get_terms' );

+	remove_all_filters( 'get_terms' );

 

-    $taxonomy = $post_type . 'category';

+	$taxonomy = $post_type . 'category';

 

-    // WPML

-    $is_wpml = geodir_is_wpml();

-    $active_lang = 'all';

-    if ( $is_wpml ) {

-        global $sitepress;

-        $active_lang = $sitepress->get_current_language();

+	// WPML

+	$is_wpml = geodir_is_wpml();

+	$active_lang = 'all';

+	if ( $is_wpml ) {

+		global $sitepress;

+		$active_lang = $sitepress->get_current_language();

         

-        if ( $active_lang != 'all' ) {

-            $sitepress->switch_lang( 'all', true );

-        }

-    }

-    // WPML

+		if ( $active_lang != 'all' ) {

+			$sitepress->switch_lang( 'all', true );

+		}

+	}

+	// WPML

             

-    $count_terms = wp_count_terms( $taxonomy, $args );

+	$count_terms = wp_count_terms( $taxonomy, $args );

 

-    // WPML

-    if ( $is_wpml && $active_lang !== 'all' ) {

-        global $sitepress;

-        $sitepress->switch_lang( $active_lang, true );

-    }

-    // WPML

-    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+	// WPML

+	if ( $is_wpml && $active_lang !== 'all' ) {

+		global $sitepress;

+		$sitepress->switch_lang( $active_lang, true );

+	}

+	// WPML

+	$count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

      

-    return $count_terms;

+	return $count_terms;

 }

 

 /**

@@ -5566,11 +5566,11 @@ 
 		$csv_row[] = 'cat_posttype';

 		$csv_row[] = 'cat_parent';

 		$csv_row[] = 'cat_schema';

-        // WPML

+		// WPML

 		$is_wpml = geodir_is_wpml();

 		if ($is_wpml) {

 			$csv_row[] = 'cat_language';

-            $csv_row[] = 'cat_id_original';

+			$csv_row[] = 'cat_id_original';

 		}

 		// WPML

 		$csv_row[] = 'cat_description';

@@ -5600,10 +5600,10 @@ 
 			$csv_row[] = $post_type;

 			$csv_row[] = $cat_parent;

 			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

-            // WPML

+			// WPML

 			if ($is_wpml) {

 				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

-                $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

+				$csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

 			}

 			// WPML

 			$csv_row[] = $term->description;

@@ -6199,43 +6199,43 @@ 
  * @param string $status Post status.

  */

 function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish') {

-    global $wpdb, $current_user;

-

-    $option_value = get_option($option);

-

-    if ($option_value > 0) :

-        if (get_post($option_value)) :

-            // Page exists

-            return;

-        endif;

-    endif;

-

-    $page_found = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

-            array($slug)

-        )

-    );

-

-    if ($page_found) :

-        // Page exists

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

-        return;

-    endif;

-

-    $page_data = array(

-        'post_status' => $status,

-        'post_type' => 'page',

-        'post_author' => $current_user->ID,

-        'post_name' => $slug,

-        'post_title' => $page_title,

-        'post_content' => $page_content,

-        'post_parent' => $post_parent,

-        'comment_status' => 'closed'

-    );

-    $page_id = wp_insert_post($page_data);

-

-    add_option($option, $page_id);

+	global $wpdb, $current_user;

+

+	$option_value = get_option($option);

+

+	if ($option_value > 0) :

+		if (get_post($option_value)) :

+			// Page exists

+			return;

+		endif;

+	endif;

+

+	$page_found = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+			array($slug)

+		)

+	);

+

+	if ($page_found) :

+		// Page exists

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

+		return;

+	endif;

+

+	$page_data = array(

+		'post_status' => $status,

+		'post_type' => 'page',

+		'post_author' => $current_user->ID,

+		'post_name' => $slug,

+		'post_title' => $page_title,

+		'post_content' => $page_content,

+		'post_parent' => $post_parent,

+		'comment_status' => 'closed'

+	);

+	$page_id = wp_insert_post($page_data);

+

+	add_option($option, $page_id);

 

 }

 

@@ -6266,9 +6266,9 @@ 
  * @package GeoDirectory

  */

 function geodir_admin_upgrade_notice() {

-    $class = "error";

-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

-    echo"<div class=\"$class\"> <p>$message</p></div>";

+	$class = "error";

+	$message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

+	echo"<div class=\"$class\"> <p>$message</p></div>";

 }

 

 /**

@@ -6281,18 +6281,18 @@ 
  */

 function geodire_admin_upgrade_notice( $plugin_data, $r )

 {

-    // readme contents

-    $args = array(

-        'timeout'     => 15,

-        'redirection' => 5

-    );

-    $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

-    $data       = wp_remote_get( $url, $args );

+	// readme contents

+	$args = array(

+		'timeout'     => 15,

+		'redirection' => 5

+	);

+	$url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

+	$data       = wp_remote_get( $url, $args );

 

-    if (!is_wp_error($data) && $data['response']['code'] == 200) {

+	if (!is_wp_error($data) && $data['response']['code'] == 200) {

 

-        geodir_in_plugin_update_message($data['body']);

-    }

+		geodir_in_plugin_update_message($data['body']);

+	}

 }

 

 

@@ -6300,28 +6300,28 @@ 
 * @param string $content http response body

 */

 function geodir_in_plugin_update_message($content) {

-    // Output Upgrade Notice

-    $matches        = null;

-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

-    $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

-

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

-

-

-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

-            $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

-            }

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

-        }

-        }

-    }

-    echo $upgrade_notice;

+	// Output Upgrade Notice

+	$matches        = null;

+	$regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

+	$upgrade_notice = '';

+	if ( preg_match( $regexp, $content, $matches ) ) {

+		if(empty($matches)){return;}

+

+		$version = trim( $matches[1] );

+		if($version && $version>GEODIRECTORY_VERSION){

+

+

+		$notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

+		if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

+			$upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

+			foreach ( $notices as $index => $line ) {

+				$upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+			}

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

+		}

+		}

+	}

+	echo $upgrade_notice;

 }

 

 /**

@@ -6354,19 +6354,19 @@ 
  * @param array Listing statuses to be skipped.

  */

 function geodir_imex_export_skip_statuses() {

-    $statuses = array( 'trash', 'auto-draft' );

+	$statuses = array( 'trash', 'auto-draft' );

     

-    /**

-     * Filter the statuses to skip during GD export listings.

-     *

-     * @since 1.6.0

-     * @package GeoDirectory

-     *

-     * @param array $statuses Listing statuses to be skipped.

-     */

-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

+	/**

+	 * Filter the statuses to skip during GD export listings.

+	 *

+	 * @since 1.6.0

+	 * @package GeoDirectory

+	 *

+	 * @param array $statuses Listing statuses to be skipped.

+	 */

+	$statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

      

-    return $statuses;

+	return $statuses;

 }

 

 /**

@@ -6378,15 +6378,15 @@ 
  * @since 1.6.3

  */

 function geodir_admin_dequeue_scripts() {

-    // EDD

-    if (wp_script_is('jquery-chosen', 'enqueued')) {

-        wp_dequeue_script('jquery-chosen');

-    }

+	// EDD

+	if (wp_script_is('jquery-chosen', 'enqueued')) {

+		wp_dequeue_script('jquery-chosen');

+	}

     

-    // Ultimate Addons for Visual Composer

-    if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {

-        wp_dequeue_script('ultimate-vc-backend-script');

-    }

+	// Ultimate Addons for Visual Composer

+	if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {

+		wp_dequeue_script('ultimate-vc-backend-script');

+	}

 }

 

 /**

@@ -6402,48 +6402,48 @@ 
  * @return string SQL where clause part.

  */

 function geodir_imex_get_filter_where($where = '', $post_type = '') {

-    global $wpdb;

+	global $wpdb;

     

-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+	$filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

     

-    if ( !empty( $filters ) ) {

-        foreach ( $filters as $field => $value ) {

-            switch ($field) {

-                case 'start_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

-                break;

-                case 'end_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

-                break;

-            }

-        }

-    }

+	if ( !empty( $filters ) ) {

+		foreach ( $filters as $field => $value ) {

+			switch ($field) {

+				case 'start_date':

+					$where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

+				break;

+				case 'end_date':

+					$where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

+				break;

+			}

+		}

+	}

     

-    return $where;

+	return $where;

 }

 add_filter('geodir_get_posts_count', 'geodir_imex_get_filter_where', 10, 2);

 add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);

 

 

 function geodir_fix_for_primer_theme(){

-    if(!defined( 'PRIMER_VERSION' )){return;}

-    global $pagenow;

+	if(!defined( 'PRIMER_VERSION' )){return;}

+	global $pagenow;

 

-    if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) )  ){

+	if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) )  ){

 

-        $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );

+		$post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );

 

-        $post_types = geodir_get_posttypes();

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

-            global $primer_customizer_layouts;

-            remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);

-        }

-    }

+		$post_types = geodir_get_posttypes();

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

+			global $primer_customizer_layouts;

+			remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);

+		}

+	}

 

 }

 

 if(is_admin()){

-    add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);  

+	add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);  

 }

 

 

Spacing +901 added lines, -901 removed lines

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

      */

     function geodir_admin_styles() {

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

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

         wp_enqueue_style('geodirectory-admin-css');

 

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

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

         wp_enqueue_style('geodirectory-frontend-style');

 

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

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

         wp_enqueue_style('geodir-chosen-style');

 

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

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

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

 

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

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

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

 

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

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

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

 

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

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

         wp_enqueue_style('geodirectory-pluplodar-css');

 

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

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

         wp_enqueue_style('geodir-rating-style');

 

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

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

         wp_enqueue_style('geodir-rtl-style');

     }

 }

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

         wp_enqueue_style('font-awesome');

 

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

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

         wp_enqueue_script('geodirectory-admin');

 

     }

@@ -89,60 +89,60 @@ 
         

         wp_enqueue_script('jquery');

 

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

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

 

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

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

         wp_enqueue_script('chosen');

 

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

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

         wp_enqueue_script('geodirectory-choose-ajax');

 

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

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

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

         }

 

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

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

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

 

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

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

 

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

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

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

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

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

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

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

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

+            wp_enqueue_script('geodirectory-googlemap-script', 'https://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-leaflet-script'), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), 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('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

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

         wp_enqueue_script('geodirectory-goMap-script');

 

 		// font awesome rating script

 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

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

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

 			wp_enqueue_script('geodir-barrating-js');

 		} else { // default rating script

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

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

 			wp_enqueue_script('geodir-jRating-js');

 		}

 

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

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

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

 

 

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

         wp_enqueue_script('jquery-ui-sortable');

 

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

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

         wp_enqueue_script('geodirectory-plupload-script');

 

         // SCRIPT FOR UPLOAD END

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

 

 

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

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

         wp_enqueue_script('geodirectory-admin-script');

 

         wp_enqueue_style('farbtastic');

@@ -212,10 +212,10 @@ 
 

         $screen = get_current_screen();

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

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

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

         }

 

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

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

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

 

     }

@@ -238,7 +238,7 @@ 
 

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

 

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

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

 

 

     }

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

                 if (!empty($post_types)) {

                     foreach ($post_types as $post_type) {

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

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

                     }

                 }

                 $geodir_menu_order[] = $item;

@@ -315,8 +315,8 @@ 
 {

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

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

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

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

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

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

                 </div>';

 

     }

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

         switch ($_REQUEST['msg']) {

             case 'success':

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

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

                 flush_rewrite_rules(false);

 

                 break;

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

 				

 				if ($gderr == 21)

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

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

 				else

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

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

                 break;

         }

     }

 

     $geodir_load_map = get_option('geodir_load_map');

     $need_map_key = false;

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

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

         $need_map_key = true;

     }

 

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

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

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

     }

 

     if (!geodir_is_default_location_set()) {

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

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

 

     }

 

     if (!function_exists('curl_init')) {

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

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

 

     }

 

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

 {

     global $geodir_settings;

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

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

         /**

          * Contains settings array for current tab.

          *

          * @since 1.0.0

          * @package GeoDirectory

          */

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

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

     }

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

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

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

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

 		

 		/**

 		 * Fires before updating geodirectory admin settings.

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

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

          */

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

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

 

         flush_rewrite_rules(false);

 

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

 

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

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

 

         wp_redirect($redirect_url);

         exit();

@@ -464,18 +464,18 @@ 
 

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

 

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

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

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

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

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

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

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

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

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

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

                 else :

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

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

                 endif;

             } else {

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

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

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

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

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

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

             }

 

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

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

 

 

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

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

 

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

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

                     $noimg_name = end($image_name_arr);

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

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

                     if (file_exists($img_path))

                         unlink($img_path);

                 }

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

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

                     $noimg_name = end($image_name_arr);

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

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

                     if (file_exists($img_path))

                         unlink($img_path);

                 }

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

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

                 $theme = wp_get_theme();

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

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

             }

 

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

@@ -641,8 +641,8 @@ 
 

             $listing_slug = $geodir_posttype_info['labels']['singular_name'];

 

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

-                'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

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

+                'label' => __(ucfirst($listing_slug).' Settings', 'geodirectory'),

                 'subtabs' => array(

                     array('subtab' => 'custom_fields',

                         'label' => __('Custom Fields', 'geodirectory'),

@@ -675,7 +675,7 @@ 
  */

 function geodir_tools_setting_tab($tabs)

 {

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

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

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

     return $tabs;

 }

@@ -709,7 +709,7 @@ 
  */

 function geodir_extend_geodirectory_setting_tab($tabs)

 {

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

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

     return $tabs;

 }

 

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

                 } else {

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

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

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

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

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

                 }

                 break;

 

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

                     }

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

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

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

                 }

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

                 if (empty($expire_date))

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

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

                 else

-                    echo $expire_date . $date_diff_text;

+                    echo $expire_date.$date_diff_text;

                 break;

 

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

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

     global $wpdb, $current_user;

 

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

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

         return;

     }

 

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

 

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

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

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

 

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

                     if ($first_title === true) {

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

                         echo '</div>';

                     }

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

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

 

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

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

                 }

 

                 /**

@@ -950,21 +950,21 @@ 
                  *

                  * @since 1.0.0

                  */

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

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

                 break;

 

             case 'no_tabs':

 

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

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

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

 

                 break;

 

             case 'sectionstart':

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

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

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

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

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

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

                 /**

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

                  *

@@ -972,8 +972,8 @@ 
                  *

                  * @since 1.0.0

                  */

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

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

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

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

 

                 break;

             case 'sectionend':

@@ -984,7 +984,7 @@ 
                  *

                  * @since 1.0.0

                  */

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

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

                 echo '</table>';

                 /**

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

@@ -993,7 +993,7 @@ 
                  *

                  * @since 1.0.0

                  */

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

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

                 break;

             case 'text':

                 ?>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 

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

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

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

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

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

 

                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input

                             name="<?php echo esc_attr($value['id']); ?>_crop"

                             id="<?php echo esc_attr($value['id']); ?>_crop"

-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>

+                            type="checkbox" <?php if (get_option($value['id'].'_crop') != '') checked(get_option($value['id'].'_crop'), 1); else checked(1); ?> /></label>

 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

@@ -1125,7 +1125,7 @@ 
                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"

-                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

+                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text']; ?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

@@ -1136,7 +1136,7 @@ 
                             } else {

                                 ?>

                                 <option

-                                    value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>><?php echo ucfirst($val) ?></option>

+                                    value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values))); ?>><?php echo ucfirst($val) ?></option>

                             <?php

                             }

                         }

@@ -1171,7 +1171,7 @@ 
                 ?>

 

                 <tr valign="top">

-                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>

+                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory'); ?></th>

                     <td width="60%">

                         <select name="geodir_default_map_language" style="width:60%">

                             <?php

@@ -1253,7 +1253,7 @@ 
 

                 <tr valign="top">

                     <th class="titledesc"

-                        width="40%"><?php _e('Default post type search on map', 'geodirectory');?></th>

+                        width="40%"><?php _e('Default post type search on map', 'geodirectory'); ?></th>

                     <td width="60%">

                         <select name="geodir_default_map_search_pt" style="width:60%">

                             <?php

@@ -1294,7 +1294,7 @@ 
                         $cat_display = 'checkbox';

                         $gd_post_types = get_option('geodir_exclude_post_type_on_map');

                         $gd_cats = get_option('geodir_exclude_cat_on_map');

-                        $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

+                        $gd_cats_upgrade = (int) get_option('geodir_exclude_cat_on_map_upgrade');

                         $count = 1;

                         ?>

                         <table width="70%" class="widefat">

@@ -1323,7 +1323,7 @@ 
                                                                                            name="home_map_post_types[]"

                                                                                            id="<?php echo esc_attr($value['id']); ?>"

                                                                                            value="<?php echo $key; ?>"

-                                                                                           class="map_post_type" <?php echo $checked;?> />

+                                                                                           class="map_post_type" <?php echo $checked; ?> />

                                         <?php echo $post_types_obj->labels->singular_name; ?></td>

                                     <td width="40%">

                                         <div class="home_map_category" style="overflow:auto;width:200px;height:100px;"

@@ -1381,12 +1381,12 @@ 
                 ?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

-                    <label for="<?php echo $value['id'];?>">

+                    <label for="<?php echo $value['id']; ?>">

                         <input name="<?php echo esc_attr($value['id']); ?>"

-                               id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

+                               id="<?php echo esc_attr($value['id'].$value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

                             echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+                        }elseif (get_option($value['id']) == '' && $value['std'] == $value['value']) {echo 'checked="checked"'; } ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

@@ -1406,9 +1406,9 @@ 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

                     <textarea

-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"

+                        <?php if (isset($value['args'])) echo $value['args'].' '; ?>name="<?php echo esc_attr($value['id']); ?>"

                         id="<?php echo esc_attr($value['id']); ?>"

-                        <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                        <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                         style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span

                         class="description"><?php echo $value['desc'] ?></span>

 

@@ -1453,7 +1453,7 @@ 
 					}

 				}

 				//

-				$page_setting = (int)get_option($value['id']);

+				$page_setting = (int) get_option($value['id']);

 

                 $args = array('name' => $value['id'],

                     'id' => $value['id'],

@@ -1470,7 +1470,7 @@ 
                 <tr valign="top" class="single_select_page">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

-                    <?php echo str_replace(' id=', " data-placeholder='" . __('Select a page...', 'geodirectory') . "' style='" . $value['css'] . "' class='" . $value['class'] . "' " . $disabled . " id=", wp_dropdown_pages($args)); ?>

+                    <?php echo str_replace(' id=', " data-placeholder='".__('Select a page...', 'geodirectory')."' style='".$value['css']."' class='".$value['class']."' ".$disabled." id=", wp_dropdown_pages($args)); ?>

                     <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

@@ -1479,7 +1479,7 @@ 
 				}

                 break;

             case 'single_select_country' :

-                $country_setting = (string)get_option($value['id']);

+                $country_setting = (string) get_option($value['id']);

                 if (strstr($country_setting, ':')) :

                     $country = current(explode(':', $country_setting));

                     $state = end(explode(':', $country_setting));

@@ -1502,7 +1502,7 @@ 
             case 'multi_select_countries' :

                 $countries = $geodirectory->countries->countries;

                 asort($countries);

-                $selections = (array)get_option($value['id']);

+                $selections = (array) get_option($value['id']);

                 ?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

@@ -1512,7 +1512,7 @@ 
                             title="Country" class="chosen_select">

                         <?php

                         if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+                            echo '<option value="'.$key.'" '.selected(in_array($key, $selections), true, false).'>'.$val.'</option>';

                         endforeach;

                         ?>

                     </select>

@@ -1524,8 +1524,8 @@ 
                 break;

 

             case 'google_analytics' :

-                $selections = (array)get_option($value['id']);

-                if(get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret') ) {

+                $selections = (array) get_option($value['id']);

+                if (get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret')) {

                     ?>

                     <tr valign="top">

                         <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

@@ -1536,20 +1536,20 @@ 
 

                             $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

                             $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

-                            $state = "&state=123";//any string

-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+                            $state = "&state=123"; //any string

+                            $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";

                             $response_type = "&response_type=code";

                             $client_id = "&client_id=".get_option('geodir_ga_client_id');

                             $access_type = "&access_type=offline";

                             $approval_prompt = "&approval_prompt=force";

 

-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

+                            $auth_url = $oAuthURL.$scope.$state.$redirect_uri.$response_type.$client_id.$access_type.$approval_prompt;

 

 

                             ?>

                             <script>

                                 function gd_ga_popup() {

-                                    var win = window.open("<?php echo $auth_url;?>", "Google Analytics", "");

+                                    var win = window.open("<?php echo $auth_url; ?>", "Google Analytics", "");

                                     var pollTimer = window.setInterval(function () {

                                         if (win.closed !== false) { // !== is required for compatibility with Opera

                                             window.clearInterval(pollTimer);

@@ -1571,7 +1571,7 @@ 
                             } else {

                                 ?>

                                 <span class="button-primary"

-                                      onclick="gd_ga_popup();"><?php _e('Authorize', 'geodirectory');?></span>

+                                      onclick="gd_ga_popup();"><?php _e('Authorize', 'geodirectory'); ?></span>

                             <?php

                             }

                             ?>

@@ -1642,9 +1642,9 @@ 
 

             <?php if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] != '') { ?>

             jQuery('.geodir_option_tabs').removeClass('gd-tab-active');

-            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').addClass('gd-tab-active');

+            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').addClass('gd-tab-active');

             jQuery('.gd-content-heading').hide();

-            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').show();

+            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').show();

             <?php } ?>

         });

     </script>

@@ -1730,7 +1730,7 @@ 
     wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

 

     if (geodir_get_featured_image($post_id, 'thumbnail')) {

-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

+        echo '<h4>'.__('Featured Image', 'geodirectory').'</h4>';

         geodir_show_featured_image($post_id, 'thumbnail');

     }

 

@@ -1741,13 +1741,13 @@ 
 

     <h5 class="form_title">

         <?php if ($image_limit != 0 && $image_limit == 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';

         } ?>

         <?php if ($image_limit != 0 && $image_limit > 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';

         } ?>

         <?php if ($image_limit == 0) {

-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';

         } ?>

     </h5>

 

@@ -1786,10 +1786,10 @@ 
         <div

             class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

             id="<?php echo $id; ?>plupload-upload-ui">

-            <h4><?php _e('Drop files to upload', 'geodirectory');?></h4>

+            <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4>

             <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                    value="<?php _e('Select Files', 'geodirectory'); ?>" class="button"/>

-            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span>

+            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span>

             <?php if ($width && $height): ?>

                 <span class="plupload-resize"></span>

                 <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span>

@@ -1801,7 +1801,7 @@ 
              id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">

         </div>

         <span

-            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory');?></span>

+            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory'); ?></span>

         <span id="<?php echo $id; ?>upload-error" style="display:none"></span>

     </div>

 

@@ -2011,9 +2011,9 @@ 
     $plugin = 'avada-nag';

     $timestamp = 'avada-nag1234';

     $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

-    echo '<div id="' . $timestamp . '"  class="error">';

-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

+    echo '<div id="'.$timestamp.'"  class="error">';

+    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\''.$plugin.'\',\''.$timestamp.'\');" ><i class="fa fa-times"></i></span>';

+    echo "<img class='gd-icon-noti' src='".plugin_dir_url('')."geodirectory/geodirectory-assets/images/favicon.ico' > ";

     echo "<p>$message</p>";

     echo "</div>";

 

@@ -2146,7 +2146,7 @@ 
 		

 		// Don't allow same slug url for listing and location

 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

-			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

+			$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab.'&msg=fail&gderr=21');

         	wp_redirect($redirect_url);

 			exit;

 		}

@@ -2158,7 +2158,7 @@ 
 			$default_language = $sitepress->get_default_language();

 			

 			if ($current_language != 'all' && $current_language != $default_language) {

-				$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab);

+				$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab);

 				wp_redirect($redirect_url);

 				exit;

 			}

@@ -2179,11 +2179,11 @@ 
 function geodir_hide_admin_preview_button() {

     global $post_type;

     $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

+    if (in_array($post_type, $post_types))

         echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

 }

-add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

-add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

+add_action('admin_head-post-new.php', 'geodir_hide_admin_preview_button');

+add_action('admin_head-post.php', 'geodir_hide_admin_preview_button');

 

 /**

  * Add the tab in left sidebar menu fro import & export page.

@@ -2193,8 +2193,8 @@ 
  *

  * @return array Array of tab data.

  */

-function geodir_import_export_tab( $tabs ) {

-	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

+function geodir_import_export_tab($tabs) {

+	$tabs['import_export'] = array('label' => __('Import & Export', 'geodirectory'));

     return $tabs;

 }

 

@@ -2208,8 +2208,8 @@ 
  * @return string Html content.

  */

 function geodir_import_export_page() {

-	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

-	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

+	$nonce = wp_create_nonce('geodir_import_export_nonce');

+	$gd_cats_sample_csv = geodir_plugin_url().'/geodirectory-assets/gd_sample_categories.csv';

     /**

      * Filter sample category data csv file url.

      *

@@ -2218,9 +2218,9 @@ 
      *

      * @param string $gd_cats_sample_csv Sample category data csv file url.

      */

-	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

+	$gd_cats_sample_csv = apply_filters('geodir_export_cats_sample_csv', $gd_cats_sample_csv);

 	

-	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

+	$gd_posts_sample_csv = geodir_plugin_url().'/geodirectory-assets/place_listing.csv';

     /**

      * Filter sample post data csv file url.

      *

@@ -2229,15 +2229,15 @@ 
      *

      * @param string $gd_posts_sample_csv Sample post data csv file url.

      */

-    $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

+    $gd_posts_sample_csv = apply_filters('geodir_export_posts_sample_csv', $gd_posts_sample_csv);

 	

-	$gd_posttypes = geodir_get_posttypes( 'array' );

+	$gd_posttypes = geodir_get_posttypes('array');

 	

 	$gd_posttypes_option = '';

-	foreach ( $gd_posttypes as $gd_posttype => $row ) {

-		$gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>';

+	foreach ($gd_posttypes as $gd_posttype => $row) {

+		$gd_posttypes_option .= '<option value="'.$gd_posttype.'" data-cats="'.(int) geodir_get_terms_count($gd_posttype).'" data-posts="'.(int) geodir_get_posts_count($gd_posttype).'">'.__($row['labels']['name'], 'geodirectory').'</option>';

 	}

-	wp_enqueue_script( 'jquery-ui-progressbar' );

+	wp_enqueue_script('jquery-ui-progressbar');

 	

 	$gd_chunksize_options = array();

 	$gd_chunksize_options[100] = 100;

@@ -2259,49 +2259,49 @@ 
      *

      * @param string $gd_chunksize_options Entries options.

      */

-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

+    $gd_chunksize_options = apply_filters('geodir_export_csv_chunksize_options', $gd_chunksize_options);

 	

 	$gd_chunksize_option = '';

 	foreach ($gd_chunksize_options as $value => $title) {

-		$gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>';

+		$gd_chunksize_option .= '<option value="'.$value.'" '.selected($value, 5000, false).'>'.$title.'</option>';

 	}

 	

 	$uploads = wp_upload_dir();

 ?>

 </form>

 <div class="inner_content_tab_main gd-import-export">

-  <h3><?php _e( 'GD Import & Export CSV', 'geodirectory' ) ;?></h3>

-  <span class="description"><?php _e( 'Import & export csv for GD listings & categories.', 'geodirectory' ) ;?></span>

+  <h3><?php _e('GD Import & Export CSV', 'geodirectory'); ?></h3>

+  <span class="description"><?php _e('Import & export csv for GD listings & categories.', 'geodirectory'); ?></span>

   <div class="gd-content-heading">

 

   <?php

     ini_set('max_execution_time', 999999);

-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );

+    $ini_max_execution_time_check = @ini_get('max_execution_time');

     ini_restore('max_execution_time');

 

-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

+    if ($ini_max_execution_time_check != 999999) { // only show these setting to the user if we can't change the ini setting

         ?>

 	<div id="gd_ie_reqs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div class="postbox">

-          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'PHP Requirements for GD Import & Export CSV', 'geodirectory' );?></span></h3>

+          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __('PHP Requirements for GD Import & Export CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

-            <span class="description"><?php echo __( 'Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory' );?></span>

+            <span class="description"><?php echo __('Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory'); ?></span>

 			<table class="form-table">

 				<thead>

 				  <tr>

-				  	<th><?php _e( 'PHP Settings', 'geodirectory' );?></th><th><?php _e( 'Current Value', 'geodirectory' );?></th><th><?php _e( 'Recommended Value', 'geodirectory' );?></th>

+				  	<th><?php _e('PHP Settings', 'geodirectory'); ?></th><th><?php _e('Current Value', 'geodirectory'); ?></th><th><?php _e('Recommended Value', 'geodirectory'); ?></th>

 				  </tr>

 				</thead>

 				<tbody>

 				  <tr>

-				  	<td>max_input_time</td><td><?php echo @ini_get( 'max_input_time' );?></td><td>3000</td>

+				  	<td>max_input_time</td><td><?php echo @ini_get('max_input_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>max_execution_time</td><td><?php  echo @ini_get( 'max_execution_time' );?></td><td>3000</td>

+				  	<td>max_execution_time</td><td><?php  echo @ini_get('max_execution_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>memory_limit</td><td><?php echo @ini_get( 'memory_limit' );?></td><td>256M</td>

+				  	<td>memory_limit</td><td><?php echo @ini_get('memory_limit'); ?></td><td>256M</td>

 				  </tr>

 				</tbody>

 		    </table>

@@ -2313,21 +2313,21 @@ 
 	<div id="gd_ie_imposts" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_im_posts" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Listings: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Import CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Listings: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Import CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e( 'Update listing if post with post_id already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e( 'Ignore listing if post with post_id already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e('Update listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e('Ignore listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_postplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_post_file" class="gd-imex-file gd_im_post_file" id="gd_im_post" onclick="jQuery('#gd_im_postplupload-browse-button').trigger('click');" />

-							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

-						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" />

+							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

+						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv; ?>" />

 							<?php

 							/**

 							 * Called just after the sample CSV download link.

@@ -2336,7 +2336,7 @@ 
 							 */

 							do_action('geodir_sample_csv_download_link');

 							?>

-							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_postpluploadan' ); ?>"></span>

+							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_postpluploadan'); ?>"></span>

 							<div class="filelist"></div>

 						</div>

 						<span id="gd_im_catupload-error" style="display:none"></span>

@@ -2354,7 +2354,7 @@ 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>

 						</div>

 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">

-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

 									id="gd-import-perc">0%</font> )

 								<div class="gd-fileprogress"></div>

@@ -2366,10 +2366,10 @@ 
                     	<div class="gd-imex-btns" style="display:none;">

                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>

                         	<input onclick="gd_imex_PrepareImport(this, 'post')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />

-                        	<input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>

-                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>

+                        	<input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>

+                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>

 							<div id="gd_process_data" style="display:none">

-								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>

+								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>

 							</div>

 						</div>

 					</td>

@@ -2383,30 +2383,30 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

 	  <div class="meta-box-sortables ui-sortable">

 		<div id="gd_ie_ex_posts" class="postbox gd-hndle-pbox">

-		  <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - Listings: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Export CSV', 'geodirectory' );?></span></h3>

+		  <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - Listings: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Export CSV', 'geodirectory'); ?></span></h3>

 		  <div class="inside">

 			<table class="form-table">

 			  <tbody>

 				<tr>

 				  <td class="fld"><label for="gd_post_type">

-					<?php _e( 'Post Type:', 'geodirectory' );?>

+					<?php _e('Post Type:', 'geodirectory'); ?>

 					</label></td>

 				  <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px">

-					  <?php echo $gd_posttypes_option;?>

+					  <?php echo $gd_posttypes_option; ?>

 					</select></td>

 				</tr>

 				<tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				</tr>

                 <tr class="gd-imex-dates">

-					<td class="fld"><label><?php _e( 'Published Date:', 'geodirectory' );?></label></td>

-					<td><label><span class="label-responsive"><?php _e( 'Start date:', 'geodirectory' );?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e( 'End date:', 'geodirectory' );?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>

+					<td class="fld"><label><?php _e('Published Date:', 'geodirectory'); ?></label></td>

+					<td><label><span class="label-responsive"><?php _e('Start date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e('End date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>

 				</tr>

 				<tr>

 				  <td class="fld" style="vertical-align:top"><label>

-					<?php _e( 'Progress:', 'geodirectory' );?>

+					<?php _e('Progress:', 'geodirectory'); ?>

 					</label></td>

 				  <td><div id='gd_progressbar_box'>

 					  <div id="gd_progressbar" class="gd_progressbar">

@@ -2414,13 +2414,13 @@ 
 					  </div>

 					</div>

 					<p style="display:inline-block">

-					  <?php _e( 'Elapsed Time:', 'geodirectory' );?>

+					  <?php _e('Elapsed Time:', 'geodirectory'); ?>

 					</p>

 					  

 					<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				</tr>

 				<tr class="gd-ie-actions">

-				  <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">

+				  <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">

 				  </td>

 				  <td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				</tr>

@@ -2433,21 +2433,21 @@ 
 	<div id="gd_ie_imcategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_imcats" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Import CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Import CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e( 'Update item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e( 'Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e('Update item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e('Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_catplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_cat_file" class="gd-imex-file gd_im_cat_file" id="gd_im_cat" onclick="jQuery('#gd_im_catplupload-browse-button').trigger('click');" />

-							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

-						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" />

+							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

+						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv; ?>" />

 						<?php

 						/**

 						 * Called just after the sample CSV download link.

@@ -2457,7 +2457,7 @@ 
 						 */

 						do_action('geodir_sample_cats_csv_download_link');

 						?>

-							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_catpluploadan' ); ?>"></span>

+							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_catpluploadan'); ?>"></span>

 							<div class="filelist"></div>

 						</div>

 						<span id="gd_im_catupload-error" style="display:none"></span>

@@ -2474,7 +2474,7 @@ 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>

 						</div>

 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">

-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

 									id="gd-import-perc">0%</font> )

 								<div class="gd-fileprogress"></div>

@@ -2486,10 +2486,10 @@ 
                     	<div class="gd-imex-btns" style="display:none;">

                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>

                         	<input onclick="gd_imex_PrepareImport(this, 'cat')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />

-                        	<input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>

-                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>

+                        	<input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>

+                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>

 							<div id="gd_process_data" style="display:none">

-								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>

+								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>

 							</div>

 						</div>

 					</td>

@@ -2503,26 +2503,26 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_ex_cats" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Export CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Export CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

-					<td class="fld"><label for="gd_post_type"><?php _e( 'Post Type:', 'geodirectory' );?></label></td>

-					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option;?></select></td>

+					<td class="fld"><label for="gd_post_type"><?php _e('Post Type:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option; ?></select></td>

 				  </tr>

 				   <tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				  </tr>

 				  <tr>

-					<td class="fld" style="vertical-align:top"><label><?php _e( 'Progress:', 'geodirectory' );?></label></td>

-					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e( 'Elapsed Time:', 'geodirectory' );?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

+					<td class="fld" style="vertical-align:top"><label><?php _e('Progress:', 'geodirectory'); ?></label></td>

+					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e('Elapsed Time:', 'geodirectory'); ?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				  </tr>

 				  <tr class="gd-ie-actions">

 					<td style="vertical-align:top">

-						<input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

+						<input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

 					</td>

 					<td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				  </tr>

@@ -2544,7 +2544,7 @@ 
      * @param array $gd_chunksize_options File chunk size options.

      * @param string $nonce Wordpress security token for GD import & export.

 	 */

-	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

+	do_action('geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce);

 	?>

   </div>

 </div>

@@ -2563,7 +2563,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce;?>',

+            data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce; ?>',

             dataType: 'json',

             cache: false,

             success: function(data) {

@@ -2615,7 +2615,7 @@ 
 

         jQuery(cont).find('.filelist .file').remove();

         

-        jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr( PLZ_SELECT_CSV_FILE );?></p>");

+        jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr(PLZ_SELECT_CSV_FILE); ?></p>");

         jQuery('#gd-import-msg', cont).show();

         

         return false;

@@ -2674,7 +2674,7 @@ 
     jQuery.ajax({

         url: ajaxurl,

         type: "POST",

-        data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce;?>',

+        data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce; ?>',

         dataType : 'json',

         cache: false,

         success: function (data) {

@@ -2863,27 +2863,27 @@ 
 

     var gdMsg = '<p></p>';

     if ( processed > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( 'Total %s item(s) found.', 'geodirectory' ), '%s' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('Total %s item(s) found.', 'geodirectory'), '%s')); ?></p>';

         msgParse = msgParse.replace("%s", processed);

         gdMsg += msgParse;

     }

 

     if ( updated > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) updated.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) updated.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", updated);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

     }

 

     if ( created > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) added.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) added.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", created);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

     }

 

     if ( skipped > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) ignored due to already exists.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) ignored due to already exists.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", skipped);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

@@ -2893,17 +2893,17 @@ 
         if (type=='loc') {

             invalid_addr = invalid;

         }

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", invalid_addr);

         msgParse = msgParse.replace("%d", total);

         gdMsg += msgParse;

     }

 

     if (invalid > 0 && type!='loc') {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory'), '%s', '%d')); ?></p>';

         

         if (type=='hood') {

-            msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ), '%s', '%d' ) );?></p>';

+            msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory'), '%s', '%d')); ?></p>';

         }

         msgParse = msgParse.replace("%s", invalid);

         msgParse = msgParse.replace("%d", total);

@@ -2911,7 +2911,7 @@ 
     }

 

     if (images > 0) {

-        gdMsg += '<p><?php echo addslashes( sprintf( CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'] ) );?></p>';

+        gdMsg += '<p><?php echo addslashes(sprintf(CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'])); ?></p>';

     }

     gdMsg += '<p></p>';

     jQuery('#gd-import-msg', cont).find('#message').removeClass('error').addClass('updated').html(gdMsg);

@@ -3075,9 +3075,9 @@ 
             if (typeof filters !== 'undefined' && filters && doFilter) {

                 getTotal = true;

                 attach += '&_c=1';

-                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Preparing...', 'geodirectory' ) );?>');

+                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Preparing...', 'geodirectory')); ?>');

             } else {

-                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

             }

             jQuery(el).find('#gd_timer').text('00:00:01');

             jQuery('#gd_ie_ex_files', el).html('');

@@ -3086,7 +3086,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page + attach,

+            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page + attach,

             dataType : 'json',

             cache: false,

             beforeSend: function (jqXHR, settings) {},

@@ -3111,11 +3111,11 @@ 
                         } else {

                             if (pages < page || pages == page) {

                                 window.clearInterval(timer_posts);

-                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

                             } else {

                                 var percentage = Math.round(((page * chunk_size) / total_posts) * 100);

                                 percentage = percentage > 100 ? 100 : percentage;

-                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

                             }

                             if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

                                 var obj_files = data.files;

@@ -3146,7 +3146,7 @@ 
 

     function gd_process_export_cats(el, post_type, total_cats, chunk_size, pages, page) {

         if (page < 2) {

-            gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+            gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

             jQuery(el).find('#gd_timer').text('00:00:01');

             jQuery('#gd_ie_ex_files', el).html('');

         }

@@ -3154,7 +3154,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page,

+            data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page,

             dataType : 'json',

             cache: false,

             beforeSend: function (jqXHR, settings) {},

@@ -3168,11 +3168,11 @@ 
                     } else {

                         if (pages < page || pages == page) {

                             window.clearInterval(timer_cats);

-                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

                         } else {

                             var percentage = Math.round(((page * chunk_size) / total_cats) * 100);

                             percentage = percentage > 100 ? 100 : percentage;

-                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e( 'Exporting...', 'geodirectory' );?>');

+                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e('Exporting...', 'geodirectory'); ?>');

                         }

                         if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

                             var obj_files = data.files;

@@ -3229,13 +3229,13 @@ 
 function geodir_init_filesystem()

 {

 

-    if(!function_exists('get_filesystem_method')){

+    if (!function_exists('get_filesystem_method')) {

         require_once(ABSPATH."/wp-admin/includes/file.php");

     }

     $access_type = get_filesystem_method();

     if ($access_type === 'direct') {

         /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());

 

         /* initialize the API */

         if (!WP_Filesystem($creds)) {

@@ -3248,7 +3248,7 @@ 
         return $wp_filesystem;

         /* do our file manipulations below */

     } elseif (defined('FTP_USER')) {

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());

 

         /* initialize the API */

         if (!WP_Filesystem($creds)) {

@@ -3283,7 +3283,7 @@ 
  * @package GeoDirectory

  */

 function geodir_filesystem_notice()

-{   if ( defined( 'DOING_AJAX' ) ){return;}

+{   if (defined('DOING_AJAX')) {return; }

     $access_type = get_filesystem_method();

     if ($access_type === 'direct') {

     } elseif (!defined('FTP_USER')) {

@@ -3320,64 +3320,64 @@ 
     // try to set higher limits for import

     $max_input_time = ini_get('max_input_time');

     $max_execution_time = ini_get('max_execution_time');

-    $memory_limit= ini_get('memory_limit');

+    $memory_limit = ini_get('memory_limit');

 

-    if(!$max_input_time || $max_input_time<3000){

+    if (!$max_input_time || $max_input_time < 3000) {

         ini_set('max_input_time', 3000);

     }

 

-    if(!$max_execution_time || $max_execution_time<3000){

+    if (!$max_execution_time || $max_execution_time < 3000) {

         ini_set('max_execution_time', 3000);

     }

 

-    if($memory_limit && str_replace('M','',$memory_limit)){

-        if(str_replace('M','',$memory_limit)<256){

+    if ($memory_limit && str_replace('M', '', $memory_limit)) {

+        if (str_replace('M', '', $memory_limit) < 256) {

             ini_set('memory_limit', '256M');

         }

     }

 

     $json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

+    if (!current_user_can('manage_options')) {

+        wp_send_json($json);

     }

 

-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+    $task = isset($_REQUEST['task']) ? $_REQUEST['task'] : NULL;

+    $nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : NULL;

+    $stat = isset($_REQUEST['_st']) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

+    if (!wp_verify_nonce($nonce, 'geodir_import_export_nonce')) {

+        wp_send_json($json);

     }

 

-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+    $post_type = isset($_REQUEST['_pt']) ? $_REQUEST['_pt'] : NULL;

+    $chunk_per_page = isset($_REQUEST['_n']) ? absint($_REQUEST['_n']) : NULL;

     $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+    $chunk_page_no = isset($_REQUEST['_p']) ? absint($_REQUEST['_p']) : 1;

 

     $wp_filesystem = geodir_init_filesystem();

     if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: Could not access filesystem.', 'geodirectory');

+        wp_send_json($json);

     }

 

     if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: '.$wp_filesystem->errors->get_error_message(), 'geodirectory');

+        wp_send_json($json);

     }

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

+    $csv_file_dir = geodir_path_import_export(false);

+    if (!$wp_filesystem->is_dir($csv_file_dir)) {

+        if (!$wp_filesystem->mkdir($csv_file_dir, FS_CHMOD_DIR)) {

+            $json['error'] = __('ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory');

+            wp_send_json($json);

         }

     }

     

     $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

     $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

 

-    switch ( $task ) {

+    switch ($task) {

         case 'export_posts': {

             // WPML

             $is_wpml = geodir_is_wpml();

@@ -3388,36 +3388,36 @@ 
                 $sitepress->switch_lang('all', true);

             }

             // WPML

-            if ( $post_type == 'gd_event' ) {

-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+            if ($post_type == 'gd_event') {

+                add_filter('geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2);

             }

-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+            $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;

             

-            $file_name = $post_type . '_' . date( 'dmyHi' );

-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

+            $file_name = $post_type.'_'.date('dmyHi');

+            if ($filters && isset($filters['start_date']) && isset($filters['end_date'])) {

+                $file_name = $post_type.'_'.date_i18n('dmy', strtotime($filters['start_date'])).'_'.date_i18n('dmy', strtotime($filters['end_date']));

             }

-            $posts_count = geodir_get_posts_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

+            $posts_count = geodir_get_posts_count($post_type);

+            $file_url_base = geodir_path_import_export().'/';

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/'.$post_type.'_'.$nonce.'.csv';

             

             $chunk_file_paths = array();

 

-            if ( isset( $_REQUEST['_c'] ) ) {

+            if (isset($_REQUEST['_c'])) {

                 $json['total'] = $posts_count;

                 // WPML

                 if ($is_wpml) {

                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 gd_die();

-            } else if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            } else if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($posts_count) > 0 && $line_count > 0 ? ceil($line_count / $posts_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

@@ -3425,45 +3425,45 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 gd_die();

             } else {

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$posts_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_posts = $posts_count;

                     if ($chunk_per_page > $total_posts) {

                         $chunk_per_page = $total_posts;

                     }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_posts / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+                    $chunk_save_posts = geodir_imex_get_posts($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_posts = array_slice($chunk_save_posts, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_posts, $clear);

                     }

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $posts_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

@@ -3471,7 +3471,7 @@ 
                             $json['total'] = $posts_count;

                             $json['files'] = array();

                         } else {

-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                            $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                         }

                     }

                 }

@@ -3480,7 +3480,7 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -3494,20 +3494,20 @@ 
                 $sitepress->switch_lang('all', true);

             }

             // WPML

-            $file_name = $post_type . 'category_' . date( 'dmyHi' );

+            $file_name = $post_type.'category_'.date('dmyHi');

             

-            $terms_count = geodir_get_terms_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

+            $terms_count = geodir_get_terms_count($post_type);

+            $file_url_base = geodir_path_import_export().'/';

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/'.$post_type.'category_'.$nonce.'.csv';

             

             $chunk_file_paths = array();

             

-            if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($terms_count) > 0 && $line_count > 0 ? ceil($line_count / $terms_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

@@ -3515,48 +3515,48 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$terms_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_terms = $terms_count;

                     if ($chunk_per_page > $terms_count) {

                         $chunk_per_page = $terms_count;

                     }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_terms / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+                    $chunk_save_terms = geodir_imex_get_terms($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_terms = array_slice($chunk_save_terms, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_terms, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $terms_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                        $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                     }

                 }

                 // WPML

@@ -3564,127 +3564,127 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_locations': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

+            $file_url_base = geodir_path_import_export().'/';

+            $file_name = 'gd_locations_'.date('dmyHi');

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/gd_locations_'.$nonce.'.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+            $items_count = (int) geodir_location_imex_count_locations();

             

-            if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_locations_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_hoods': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

+            $file_url_base = geodir_path_import_export().'/';

+            $file_name = 'gd_neighbourhoods_'.date('dmyHi');

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/gd_neighbourhoods_'.$nonce.'.csv';

             

-            $items_count = (int)geodir_location_imex_count_neighbourhoods();

+            $items_count = (int) geodir_location_imex_count_neighbourhoods();

             

-            if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_neighbourhoods_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -3701,25 +3701,25 @@ 
             }

             // WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+            ini_set('auto_detect_line_endings', true);

             

             $uploads = wp_upload_dir();

             $uploads_dir = $uploads['path'];

             $uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+            $csv_file = isset($_POST['_file']) ? $_POST['_file'] : NULL;

+            $import_choice = isset($_REQUEST['_ch']) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

+            $csv_file_arr = explode('/', $csv_file);

+            $csv_filename = end($csv_file_arr);

+            $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$csv_filename;

             

             $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+            $json['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

             $file = array();

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+            if ($csv_file && $wp_filesystem->is_file($target_path) && $wp_filesystem->exists($target_path)) {

+                $wp_filetype = wp_check_filetype_and_ext($target_path, $csv_filename);

                 

                 if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

                     $json['error'] = NULL;

@@ -3727,9 +3727,9 @@ 
                     

                     $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

                     setlocale(LC_ALL, 'en_US.UTF-8');

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

+                    if (($handle = fopen($target_path, "r")) !== FALSE) {

+                        while (($data = fgetcsv($handle, 100000, ",")) !== FALSE) {

+                            if (!empty($data)) {

                                 $file[] = $data;

                             }

                         }

@@ -3743,19 +3743,19 @@ 
                         $json['error'] = __('No data found in csv file.', 'geodirectory');

                     }

                 } else {

-                    wp_send_json( $json );

+                    wp_send_json($json);

                 }

             } else {

-                wp_send_json( $json );

+                wp_send_json($json);

             }

             

-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

-                wp_send_json( $json );

+            if ($task == 'prepare_import' || !empty($json['error'])) {

+                wp_send_json($json);

             }

             

             $total = $json['rows'];

-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

+            $limit = isset($_POST['limit']) ? (int) $_POST['limit'] : 1;

+            $processed = isset($_POST['processed']) ? (int) $_POST['processed'] : 0;

             

             $count = $limit;

             

@@ -3780,13 +3780,13 @@ 
             

             $post_types = geodir_get_posttypes();

 

-            if ( $task == 'import_cat' ) {

+            if ($task == 'import_cat') {

                 if (!empty($file)) {

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

                     

@@ -3797,7 +3797,7 @@ 
                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

                             

                             $cat_id = '';

@@ -3814,42 +3814,42 @@ 
                             $cat_id_original = '';

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

-                                } else if ( $column == 'cat_name' ) {

+                            foreach ($columns as $column) {

+                                if ($column == 'cat_id') {

+                                    $cat_id = (int) $row[$c];

+                                } else if ($column == 'cat_name') {

                                     $cat_name = $row[$c];

-                                } else if ( $column == 'cat_slug' ) {

+                                } else if ($column == 'cat_slug') {

                                     $cat_slug = $row[$c];

-                                } else if ( $column == 'cat_posttype' ) {

+                                } else if ($column == 'cat_posttype') {

                                     $cat_posttype = $row[$c];

-                                } else if ( $column == 'cat_parent' ) {

+                                } else if ($column == 'cat_parent') {

                                     $cat_parent = trim($row[$c]);

-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {

+                                } else if ($column == 'cat_schema' && $row[$c] != '') {

                                     $cat_schema = $row[$c];

-                                } else if ( $column == 'cat_description' ) {

+                                } else if ($column == 'cat_description') {

                                     $cat_description = $row[$c];

-                                } else if ( $column == 'cat_top_description' ) {

+                                } else if ($column == 'cat_top_description') {

                                     $cat_top_description = $row[$c];

-                                } else if ( $column == 'cat_image' ) {

+                                } else if ($column == 'cat_image') {

                                     $cat_image = $row[$c];

-                                } else if ( $column == 'cat_icon' ) {

+                                } else if ($column == 'cat_icon') {

                                     $cat_icon = $row[$c];

                                 }

                                 // WPML

-                                if ( $is_wpml ) {

-                                    if ( $column == 'cat_language' ) {

-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );

-                                    } else if ( $column == 'cat_id_original' ) {

-                                        $cat_id_original = (int)$row[$c];

+                                if ($is_wpml) {

+                                    if ($column == 'cat_language') {

+                                        $cat_language = geodir_strtolower(trim($row[$c]));

+                                    } else if ($column == 'cat_id_original') {

+                                        $cat_id_original = (int) $row[$c];

                                     }

                                 }

                                 // WPML

                                 $c++;

                             }

                             

-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+                            if ($cat_name == '' || !in_array($cat_posttype, $post_types)) {

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));

                                 

                                 $invalid++;

                                 continue;

@@ -3867,24 +3867,24 @@ 
                             $term_data['description'] = $cat_description;

                             $term_data['cat_schema'] = $cat_schema;

                             $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+                            $term_data['image'] = $cat_image != '' ? basename($cat_image) : '';

+                            $term_data['icon'] = $cat_icon != '' ? basename($cat_icon) : '';

                             

                             //$term_data = array_map( 'utf8_encode', $term_data );

                             

-                            $taxonomy = $cat_posttype . 'category';

+                            $taxonomy = $cat_posttype.'category';

                             

                             $term_data['taxonomy'] = $taxonomy;

 

                             $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

+                            if ($cat_parent != "" || (int) $cat_parent > 0) {

                                 $term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+                                if ($term_parent = get_term_by('name', $cat_parent, $taxonomy)) {

                                     //

-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+                                } else if ($term_parent = get_term_by('slug', $cat_parent, $taxonomy)) {

                                     //

-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+                                } else if ($term_parent = get_term_by('id', $cat_parent, $taxonomy)) {

                                     //

                                 } else {

                                     $term_parent_data = array();

@@ -3892,104 +3892,104 @@ 
                                     //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

                                     $term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+                                    $term_parent_id = (int) geodir_imex_insert_term($taxonomy, $term_parent_data);

                                 }

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

+                                if (!empty($term_parent) && !is_wp_error($term_parent)) {

+                                    $term_parent_id = (int) $term_parent->term_id;

                                 }

                             }

-                            $term_data['parent'] = (int)$term_parent_id;

+                            $term_data['parent'] = (int) $term_parent_id;

 

                             $term_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            if ($import_choice == 'update') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $skipped++;

                                 } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                             }

                             

-                            if ( $term_id ) {

+                            if ($term_id) {

                                 // WPML

                                 if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

-                                    $wpml_element_type = 'tax_' . $taxonomy;

-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

+                                    $wpml_element_type = 'tax_'.$taxonomy;

+                                    $source_language = geodir_get_language_for_element($cat_id_original, $wpml_element_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

+                                    $trid = $sitepress->get_element_trid($cat_id_original, $wpml_element_type);

                                     

-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

+                                    $sitepress->set_element_language_details($term_id, $wpml_element_type, $trid, $cat_language, $source_language);

                                 }

                                 // WPML

                                 

-                                if ( isset( $term_data['top_description'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

+                                if (isset($term_data['top_description'])) {

+                                    update_tax_meta($term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype);

                                 }

                                 

-                                if ( isset( $term_data['cat_schema'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+                                if (isset($term_data['cat_schema'])) {

+                                    update_tax_meta($term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype);

                                 }

             

                                 $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+                                if (isset($term_data['image']) && $term_data['image'] != '') {

+                                    $cat_image = geodir_get_default_catimage($term_id, $cat_posttype);

+                                    $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

+                                    if (basename($cat_image) != $term_data['image']) {

                                         $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+                                        update_tax_meta($term_id, 'ct_cat_default_img', array('id' => 'image', 'src' => $uploads['url'].'/'.$term_data['image']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+                                if (isset($term_data['icon']) && $term_data['icon'] != '') {

+                                    $cat_icon = get_tax_meta($term_id, 'ct_cat_icon', false, $cat_posttype);

+                                    $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

                                         

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

+                                    if (basename($cat_icon) != $term_data['icon']) {

                                         $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+                                        update_tax_meta($term_id, 'ct_cat_icon', array('id' => 'icon', 'src' => $uploads['url'].'/'.$term_data['icon']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( $attachment ) {

+                                if ($attachment) {

                                     $images++;

                                 }

                             }

@@ -4011,34 +4011,34 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_post' ) {

+            } else if ($task == 'import_post') {

                 //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

+                wp_defer_term_counting(true);

+                wp_defer_comment_counting(true);

+                $wpdb->query('SET autocommit = 0;');

 

                 //remove_all_actions('publish_post');

                 //remove_all_actions('transition_post_status');

                 //remove_all_actions('publish_future_post');

 

                 if (!empty($file)) {

-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+                    $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;

                     $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

                     $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+                    $current_date = date_i18n('Y-m-d', time());

                     

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

 

                     $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

+                    $wp_chars_error = __('(check & remove if any invalid characters used in data)', 'geodirectory');

                     $processed_actual = 0;

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

@@ -4047,9 +4047,9 @@ 
                         if (isset($file[$index])) {

                             $processed_actual++;

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+                            $row = array_map('addslashes_gpc', $row);

                             

                             $post_id = '';

                             $post_title = '';

@@ -4086,78 +4086,78 @@ 
                             $original_post_id = '';

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

+                            foreach ($columns as $column) {

                                 $gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

+                                if ($column == 'post_id') {

                                     $post_id = $row[$c];

-                                } else if ( $column == 'post_title' ) {

+                                } else if ($column == 'post_title') {

                                     $post_title = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_author' ) {

+                                } else if ($column == 'post_author') {

                                     $post_author = $row[$c];

-                                } else if ( $column == 'post_content' ) {

+                                } else if ($column == 'post_content') {

                                     $post_content = $row[$c];

-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {

-                                    $post_category_arr = explode( ',', $row[$c] );

-                                } else if ( $column == 'default_category' ) {

+                                } else if ($column == 'post_category' && $row[$c] != '') {

+                                    $post_category_arr = explode(',', $row[$c]);

+                                } else if ($column == 'default_category') {

                                     $default_category = wp_kses_normalize_entities($row[$c]);

-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {

-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );

-                                } else if ( $column == 'post_type' ) {

+                                } else if ($column == 'post_tags' && $row[$c] != '') {

+                                    $post_tags = explode(',', sanitize_text_field($row[$c]));

+                                } else if ($column == 'post_type') {

                                     $post_type = $row[$c];

-                                } else if ( $column == 'post_status' ) {

-                                    $post_status = sanitize_key( $row[$c] );

-                                } else if ( $column == 'is_featured' ) {

-                                    $is_featured = (int)$row[$c];

-                                } else if ( $column == 'geodir_video' ) {

+                                } else if ($column == 'post_status') {

+                                    $post_status = sanitize_key($row[$c]);

+                                } else if ($column == 'is_featured') {

+                                    $is_featured = (int) $row[$c];

+                                } else if ($column == 'geodir_video') {

                                     $geodir_video = $row[$c];

-                                } else if ( $column == 'post_address' ) {

+                                } else if ($column == 'post_address') {

                                     $post_address = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_city' ) {

+                                } else if ($column == 'post_city') {

                                     $post_city = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_region' ) {

+                                } else if ($column == 'post_region') {

                                     $post_region = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_country' ) {

+                                } else if ($column == 'post_country') {

                                     $post_country = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_zip' ) {

+                                } else if ($column == 'post_zip') {

                                     $post_zip = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_latitude' ) {

+                                } else if ($column == 'post_latitude') {

                                     $post_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_longitude' ) {

+                                } else if ($column == 'post_longitude') {

                                     $post_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_neighbourhood' ) {

+                                } else if ($column == 'post_neighbourhood') {

                                     $post_neighbourhood = sanitize_text_field($row[$c]);

                                     unset($gd_post[$column]);

-                                } else if ( $column == 'neighbourhood_latitude' ) {

+                                } else if ($column == 'neighbourhood_latitude') {

                                     $neighbourhood_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'neighbourhood_longitude' ) {

+                                } else if ($column == 'neighbourhood_longitude') {

                                     $neighbourhood_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_timing' ) {

+                                } else if ($column == 'geodir_timing') {

                                     $geodir_timing = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_contact' ) {

+                                } else if ($column == 'geodir_contact') {

                                     $geodir_contact = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_email' ) {

+                                } else if ($column == 'geodir_email') {

                                     $geodir_email = sanitize_email($row[$c]);

-                                } else if ( $column == 'geodir_website' ) {

+                                } else if ($column == 'geodir_website') {

                                     $geodir_website = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_twitter' ) {

+                                } else if ($column == 'geodir_twitter') {

                                     $geodir_twitter = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_facebook' ) {

+                                } else if ($column == 'geodir_facebook') {

                                     $geodir_facebook = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

+                                } else if ($column == 'IMAGE' && !empty($row[$c]) && $row[$c] != '') {

                                     $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

+                                } else if ($column == 'alive_days' && (int) $row[$c] > 0) {

+                                    $expire_date = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $row[$c].' days'));

+                                } else if ($column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never') {

                                     $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

+                                    $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));

                                 }

                                 // WPML

                                 if ($is_wpml) {

                                     if ($column == 'language') {

                                         $language = geodir_strtolower(trim($row[$c]));

                                     } else if ($column == 'original_post_id') {

-                                        $original_post_id = (int)$row[$c];

+                                        $original_post_id = (int) $row[$c];

                                     }

                                 }

                                 // WPML

@@ -4165,7 +4165,7 @@ 
                             }

                             // listing claimed or not

                             if ($is_claim_active && isset($gd_post['claimed'])) {

-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

+                                $gd_post['claimed'] = (int) $gd_post['claimed'] == 1 ? 1 : 0;

                             }

                             

                             // WPML

@@ -4176,43 +4176,43 @@ 
 

                             $gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+                            $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;

+                            $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;

                                                                                                                 

                             $valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+                            if ($post_title == '' || !in_array($post_type, $post_types)) {

                                 $invalid++;

                                 $valid = false;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));

                             }

                             

-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-                            if ( $location_allowed ) {

+                            $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

+                            if ($location_allowed) {

                                 $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+                                if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {

                                     $invalid_addr++;

                                     $valid = false;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));

+                                } else if (!empty($location_result) && $location_result->location_id == 0) {

+                                    if ((geodir_strtolower($post_city) != geodir_strtolower($location_result->city)) || (geodir_strtolower($post_region) != geodir_strtolower($location_result->region)) || (geodir_strtolower($post_country) != geodir_strtolower($location_result->country))) {

                                         $invalid_addr++;

                                         $valid = false;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));

                                     } else {

                                         if (!$location_manager) {

-                                            $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

+                                            $gd_post['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // Set the default location when location manager not activated.

                                         }

                                     }

                                 }

                             }

                             

-                            if ( !$valid ) {

+                            if (!$valid) {

                                 continue;

                             }

 

-                            $cat_taxonomy = $post_type . 'category';

-                            $tags_taxonomy = $post_type . '_tags';

+                            $cat_taxonomy = $post_type.'category';

+                            $tags_taxonomy = $post_type.'_tags';

                             

                             if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

                                 $post_category_arr = array_merge(array($default_category), $post_category_arr);

@@ -4220,29 +4220,29 @@ 
 

                             $post_category = array();

                             $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+                            if (!empty($post_category_arr)) {

+                                foreach ($post_category_arr as $value) {

+                                    $category_name = wp_kses_normalize_entities(trim($value));

                                     

-                                    if ( $category_name != '' ) {

+                                    if ($category_name != '') {

                                         $term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+                                        if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+                                        } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

                                         } else {

                                             $term_data = array();

                                             $term_data['name'] = $category_name;

                                             $term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

+                                            $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data);

+                                            if ($term_id) {

+                                                $term_category = get_term($term_id, $cat_taxonomy);

                                             }

                                         }

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+                                        if (!empty($term_category) && !is_wp_error($term_category)) {

                                             $post_category[] = intval($term_category->term_id);

                                             

                                             if ($category_name == $default_category) {

@@ -4263,15 +4263,15 @@ 
                             $save_post['post_tags'] = $post_tags;

 

                             $saved_post_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

+                            if ($import_choice == 'update') {

+                                $gd_wp_error = __('Unable to add listing, please check the listing data.', 'geodirectory');

                                 

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                                if ($post_id > 0 && get_post($post_id)) {

                                     $save_post['ID'] = $post_id;

                                     

-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+                                    if ($saved_post_id = wp_update_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;

                                             $saved_post_id = 0;

                                         } else {

                                             $saved_post_id = $post_id;

@@ -4279,9 +4279,9 @@ 
                                         }

                                     }

                                 } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;

                                             $saved_post_id = 0;

                                         } else {

                                             $created++;

@@ -4289,19 +4289,19 @@ 
                                     }

                                 }

                                 

-                                if ( !$saved_post_id > 0 ) {

+                                if (!$saved_post_id > 0) {

                                     $invalid++;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_wp_error);

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($post_id > 0 && get_post($post_id)) {

                                     $skipped++;	

                                 } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

                                             $invalid++;

                                             

-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

+                                            geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$saved_post_id->get_error_message().' '.$wp_chars_error);

                                             $saved_post_id = 0;

                                         } else {

                                             $created++;

@@ -4309,28 +4309,28 @@ 
                                     } else {

                                         $invalid++;

                                         

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);

                                     }

                                 }

                             } else {

                                 $invalid++;

                                 

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);

                             }

 

-                            if ( (int)$saved_post_id > 0 ) {

+                            if ((int) $saved_post_id > 0) {

                                 // WPML

                                 if ($is_wpml && $original_post_id > 0 && $language != '') {

-                                    $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+                                    $wpml_post_type = 'post_'.$post_type;

+                                    $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+                                    $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type);

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+                                    $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language);

                                 }

                                 // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+                                $gd_post_info = geodir_get_post_info($saved_post_id);

                                 

                                 $gd_post['post_id'] = $saved_post_id;

                                 $gd_post['ID'] = $saved_post_id;

@@ -4342,7 +4342,7 @@ 
                                                     

                                 // post location

                                 $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+                                if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {

                                     $gd_post['post_neighbourhood'] = '';

                                     

                                     $post_location_info = array(

@@ -4352,7 +4352,7 @@ 
                                                                 'geo_lat' => $post_latitude,

                                                                 'geo_lng' => $post_longitude

                                                             );

-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+                                    if ($location_id = (int) geodir_add_new_location($post_location_info)) {

                                         $post_location_id = $location_id;

                                     }

                                     

@@ -4390,14 +4390,14 @@ 
                                 $gd_post['post_location_id'] = $post_location_id;

                                 

                                 // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+                                $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0;

                                 if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

                                     $package_id = $gd_post_info->package_id;

                                 }

                                 

                                 $package_info = array();

                                 if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+                                    $package_info = (array) geodir_get_package_info_by_id($package_id);

                                     

                                     if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

                                         $package_info = array();

@@ -4405,18 +4405,18 @@ 
                                 }

                                 

                                 if (empty($package_info)) {

-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

+                                    $package_info = (array) geodir_post_package_info(array(), '', $post_type);

                                 }

                                  

-                                if (!empty($package_info))	 {

+                                if (!empty($package_info)) {

                                     $package_id = $package_info['pid'];

                                     

                                     if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

                                         $gd_post['expire_date'] = $expire_date;

                                     } else {

-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

-                                            $gd_post['alive_days'] = (int)$package_info['days'];

-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

+                                        if (isset($package_info['days']) && (int) $package_info['days'] > 0) {

+                                            $gd_post['alive_days'] = (int) $package_info['days'];

+                                            $gd_post['expire_date'] = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $package_info['days'].' days'));

                                         } else {

                                             $gd_post['expire_date'] = 'Never';

                                         }

@@ -4425,7 +4425,7 @@ 
                                     $gd_post['package_id'] = $package_id;

                                 }

 

-                                $table = $plugin_prefix . $post_type . '_detail';

+                                $table = $plugin_prefix.$post_type.'_detail';

                                 

                                 if ($post_type == 'gd_event') {

                                     $gd_post = geodir_imex_process_event_data($gd_post);

@@ -4436,28 +4436,28 @@ 
                                 }

 

                                 // Export franchise fields

-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+                                $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;

                                 if ($is_franchise_active) {

-                                    if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

+                                    if (isset($gd_post['gd_is_franchise']) && (int) $gd_post['gd_is_franchise'] == 1) {

                                         $gd_franchise_lock = array();

                                         

-                                        if ( isset( $gd_post['gd_franchise_lock'] ) ) {

-                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

-                                            $gd_franchise_lock = trim( $gd_franchise_lock );

-                                            $gd_franchise_lock = explode( ",", $gd_franchise_lock );

+                                        if (isset($gd_post['gd_franchise_lock'])) {

+                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock']);

+                                            $gd_franchise_lock = trim($gd_franchise_lock);

+                                            $gd_franchise_lock = explode(",", $gd_franchise_lock);

                                         }

                                         

-                                        update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

-                                        update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

+                                        update_post_meta($saved_post_id, 'gd_is_franchise', 1);

+                                        update_post_meta($saved_post_id, 'gd_franchise_lock', $gd_franchise_lock);

                                     } else {

-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

+                                        if (isset($gd_post['franchise']) && (int) $gd_post['franchise'] > 0 && geodir_franchise_check((int) $gd_post['franchise'])) {

+                                            geodir_save_post_meta($saved_post_id, 'franchise', (int) $gd_post['franchise']);

                                         }

                                     }

                                 }

                                 

                                 if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

+                                    $save_post['post_category'] = array_unique(array_map('intval', $save_post['post_category']));

                                     if ($default_category_id) {

                                         $save_post['post_default_category'] = $default_category_id;

                                         $gd_post['default_category'] = $default_category_id;

@@ -4466,34 +4466,34 @@ 
                                 }

                                 

                                 // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

+                                geodir_save_post_info($saved_post_id, $gd_post);

                                 // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+                                if (!empty($save_post['post_category'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy);

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+                                    $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : '';

                                     if ($default_category_id) {

                                         $post_default_category = $default_category_id;

                                     }

                                     $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

                                     $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

+                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']).',y:' : '';

                                     

                                     if ($post_category_str != '' && $post_default_category) {

-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

+                                        $post_category_str = str_replace($post_default_category.',y:', $post_default_category.',y,d:', $post_category_str);

                                     }

                                     

                                     $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+                                    geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str);

                                 }

 

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+                                if (!empty($save_post['post_tags'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy);

                                 }

 

                                 // Post images

-                                if ( !empty( $post_images ) ) {

+                                if (!empty($post_images)) {

                                     $post_images = array_unique($post_images);

                                     

                                     $old_post_images_arr = array();

@@ -4501,61 +4501,61 @@ 
                                     

                                     $order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

+                                    $old_post_images = geodir_get_images($saved_post_id);

                                     if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

+                                        foreach ($old_post_images as $old_post_image) {

                                             if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

                                                 $old_post_images_arr[] = $old_post_image->file;

                                             }

                                         }

                                     }

 

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

+                                    foreach ($post_images as $post_image) {

+                                        $image_name = basename($post_image);

                                         $saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+                                        if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {

                                             continue; // Skip if image already exists.

                                         }

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

+                                        $image_name_parts = explode('.', $image_name);

+                                        array_pop($image_name_parts);

+                                        $proper_image_name = implode('.', $image_name_parts);

                                         

-                                        $arr_file_type = wp_check_filetype( $image_name );

+                                        $arr_file_type = wp_check_filetype($image_name);

                                         

-                                        if ( !empty( $arr_file_type ) ) {

+                                        if (!empty($arr_file_type)) {

                                             $uploaded_file_type = $arr_file_type['type'];

                                             

                                             $attachment = array();

                                             $attachment['post_id'] = $saved_post_id;

                                             $attachment['title'] = $proper_image_name;

                                             $attachment['content'] = '';

-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;

+                                            $attachment['file'] = $uploads_subdir.'/'.$image_name;

                                             $attachment['mime_type'] = $uploaded_file_type;

                                             $attachment['menu_order'] = $order;

                                             $attachment['is_featured'] = 0;

 

                                             $attachment_set = '';

-                                            foreach ( $attachment as $key => $val ) {

-                                                if ( $val != '' ) {

-                                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                            foreach ($attachment as $key => $val) {

+                                                if ($val != '') {

+                                                    $attachment_set .= $key." = '".$val."', ";

                                                 }

                                             }

-                                            $attachment_set = trim( $attachment_set, ", " );

+                                            $attachment_set = trim($attachment_set, ", ");

                                                                                         

                                             // Add new attachment

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+                                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

                                                                                         

                                             $order++;

                                         }

                                     }

 

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/".implode("' AND file NOT LIKE '%/", $saved_post_images_arr)."' )" : '';

                                     // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

+                                    $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = ".(int) $saved_post_id." ".$saved_post_images_sql);

                                     

-                                    if ( !empty( $saved_post_images_arr ) ) {

+                                    if (!empty($saved_post_images_arr)) {

                                         geodir_set_wp_featured_image($saved_post_id);

                                         /*

                                         $menu_order = 1;

@@ -4572,13 +4572,13 @@ 
                                         }*/

                                     }

                                     

-                                    if ( $order > 1 ) {

+                                    if ($order > 1) {

                                         $images++;

                                     }

                                 }

 

                                 /** This action is documented in geodirectory-functions/post-functions.php */

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

+                                do_action('geodir_after_save_listing', $saved_post_id, $gd_post);

                                 

                                 if (isset($is_featured)) {

                                     geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

@@ -4598,10 +4598,10 @@ 
                 }

 

                 //undo some stuff to make the import quicker

-                wp_defer_term_counting( false );

-                wp_defer_comment_counting( false );

-                $wpdb->query( 'COMMIT;' );

-                $wpdb->query( 'SET autocommit = 1;' );

+                wp_defer_term_counting(false);

+                wp_defer_comment_counting(false);

+                $wpdb->query('COMMIT;');

+                $wpdb->query('SET autocommit = 1;');

 

                 $json = array();

                 $json['processed'] = $processed_actual;

@@ -4612,9 +4612,9 @@ 
                 $json['invalid_addr'] = $invalid_addr;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_loc' ) {

+            } else if ($task == 'import_loc') {

                 global $gd_post_types;

                 $gd_post_types = $post_types;

                 

@@ -4623,82 +4623,82 @@ 
                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

                     $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

+                    $gd_error_location = __('Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory');

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

-                            foreach ($columns as $c => $column ) {

+                            foreach ($columns as $c => $column) {

                                 if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta_title', 'city_meta_desc', 'city_desc', 'region_meta_title', 'region_meta_desc', 'region_desc', 'country_meta_title', 'country_meta_desc', 'country_desc'))) {

                                     $data[$column] = $row[$c];

                                 }

                             }

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+                            if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                 continue;

                             }

                             

                             $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

-                            if ( $import_choice == 'update' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                            if ($import_choice == 'update') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

+                                    $data['location_id'] = (int) $location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

+                                    if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {

+                                        $data['location_id'] = (int) $location->location_id;

                                     }

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                    if ($location_id = geodir_location_insert_city($data, true)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

                                     $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

                                     $skipped++;

                                 } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                    if ($location_id = geodir_location_insert_city($data, true)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                             }

                         }

                     }

@@ -4712,24 +4712,24 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

-            } else if ( $task == 'import_hood' ) {               

+                wp_send_json($json);

+            } else if ($task == 'import_hood') {               

                 if (!empty($file)) {

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

                     $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

-                    $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

+                    $gd_error_hood = __('Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory');

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

                             foreach ($columns as $c => $column) {

@@ -4740,20 +4740,20 @@ 
 

                             if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                 continue;

                             }

                             

                             $location_info = array();

-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);

+                            if (!empty($data['location_id']) && (int) $data['location_id'] > 0) {

+                                $location_info = geodir_get_location_by_id('', (int) $data['location_id']);

                             } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

                                 $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

                             }

 

                             if (empty($location_info)) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                 continue;

                             }

                             

@@ -4768,35 +4768,35 @@ 
                             $hood_data['hood_longitude'] = $data['longitude'];

                             $hood_data['hood_location_id'] = $location_id;

                                     

-                            if ( $import_choice == 'update' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];

+                            if ($import_choice == 'update') {

+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {

+                                    $hood_data['hood_id'] = (int) $data['neighbourhood_id'];

                                     

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;

+                                    $hood_data['hood_id'] = (int) $neighbourhood->hood_id;

                                     

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 } else {

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {

                                     $skipped++;

                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

                                     $skipped++;

@@ -4806,12 +4806,12 @@ 
                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                             }

                         }

                     }

@@ -4825,7 +4825,7 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -4869,29 +4869,29 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_insert_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_insert_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

-	$term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

+	$term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : '';

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {

-		$term_args = array_merge( $term_data, $args );

-		$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

-		$term_args = wp_parse_args( $term_args, $defaults );

-		$term_args = sanitize_term( $term_args, $taxonomy, 'db' );

-		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

+	if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {

+		$term_args = array_merge($term_data, $args);

+		$defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

+		$term_args = wp_parse_args($term_args, $defaults);

+		$term_args = sanitize_term($term_args, $taxonomy, 'db');

+		$args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args);

 	}

 	

-    if( !empty( $term ) ) {

-		$result = wp_insert_term( $term, $taxonomy, $args );

-        if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+    if (!empty($term)) {

+		$result = wp_insert_term($term, $taxonomy, $args);

+        if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

     }

 	

@@ -4921,36 +4921,36 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_update_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_update_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

-	$term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0;

+	$term_id = isset($term_data['term_id']) && !empty($term_data['term_id']) ? $term_data['term_id'] : 0;

 	

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {

+	if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

-	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+	} else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

 	} else {

-		return geodir_imex_insert_term( $taxonomy, $term_data );

+		return geodir_imex_insert_term($taxonomy, $term_data);

 	}

 	

 	return false;

@@ -4969,20 +4969,20 @@ 
  * @param string $post_type Post type.

  * @return int Posts count.

  */

-function geodir_get_posts_count( $post_type ) {

+function geodir_get_posts_count($post_type) {

     global $wpdb, $plugin_prefix;

 

-    if ( !post_type_exists( $post_type ) ) {

+    if (!post_type_exists($post_type)) {

         return 0;

     }

         

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

     // Skip listing with statuses trash, auto-draft etc...

     $skip_statuses = geodir_imex_export_skip_statuses();

     $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+    if (!empty($skip_statuses) && is_array($skip_statuses)) {

+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

     }

     

     /**

@@ -4993,11 +4993,11 @@ 
      *

      * @param string $where SQL where clause part.

      */

-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

+    $where_statuses = apply_filters('geodir_get_posts_count', $where_statuses, $post_type);

 

-    $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

+    $query = $wpdb->prepare("SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses, $post_type);

 

-    $posts_count = (int)$wpdb->get_var( $query );

+    $posts_count = (int) $wpdb->get_var($query);

     

     /**

      * Modify returned post counts for the current post type.

@@ -5008,7 +5008,7 @@ 
      * @param int $posts_count Post counts.

      * @param string $post_type Post type.

      */

-    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

+    $posts_count = apply_filters('geodir_imex_count_posts', $posts_count, $post_type);

 

     return $posts_count;

 }

@@ -5029,19 +5029,19 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {	

+function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {	

 	global $wp_filesystem;

 

-	$posts = geodir_get_export_posts( $post_type, $per_page, $page_no );

+	$posts = geodir_get_export_posts($post_type, $per_page, $page_no);

 

 	$csv_rows = array();

 	

-	if ( !empty( $posts ) ) {

-		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

+	if (!empty($posts)) {

+		$is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');

         $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

-        $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+        $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

         $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;

-        $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+        $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;

 		

 		$csv_row = array();

 		$csv_row[] = 'post_id';

@@ -5052,7 +5052,7 @@ 
 		$csv_row[] = 'default_category';

 		$csv_row[] = 'post_tags';

 		$csv_row[] = 'post_type';

-		if ( $post_type == 'gd_event' ) {

+		if ($post_type == 'gd_event') {

 			$csv_row[] = 'event_date';

 			$csv_row[] = 'event_enddate';

 			$csv_row[] = 'starttime';

@@ -5110,15 +5110,15 @@ 
 		}

 		// WPML

 

-		$custom_fields = geodir_imex_get_custom_fields( $post_type );

-		if ( !empty( $custom_fields ) ) {

-			foreach ( $custom_fields as $custom_field ) {

+		$custom_fields = geodir_imex_get_custom_fields($post_type);

+		if (!empty($custom_fields)) {

+			foreach ($custom_fields as $custom_field) {

 				$csv_row[] = $custom_field->htmlvar_name;

 			}

 		}

 

 		// Export franchise fields

-		$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+		$is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;

 		if ($is_franchise_active) {

 			$csv_row[] = 'gd_is_franchise';

 			$csv_row[] = 'gd_franchise_lock';

@@ -5139,28 +5139,28 @@ 
 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

-		foreach ( $posts as $post ) {$xx++;

+        $xx = 0;

+		foreach ($posts as $post) {$xx++;

 			$post_id = $post['ID'];

 			

-			$gd_post_info = geodir_get_post_info( $post_id );

-			$post_info = (array)$gd_post_info;

+			$gd_post_info = geodir_get_post_info($post_id);

+			$post_info = (array) $gd_post_info;

 						

-			$taxonomy_category = $post_type . 'category';

-			$taxonomy_tags = $post_type . '_tags';

+			$taxonomy_category = $post_type.'category';

+			$taxonomy_tags = $post_type.'_tags';

 			

 			$post_category = '';

 			$default_category_id = $gd_post_info->default_category;

 			$default_category = '';

 			$post_tags = '';

-			$terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );

+			$terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags));

 			

-			if ( !empty( $terms ) && !is_wp_error( $terms ) ) {

+			if (!empty($terms) && !is_wp_error($terms)) {

 				$post_category = array();

 				$post_tags = array();

 			

-				foreach ( $terms as $term ) {

-					if ( $term->taxonomy == $taxonomy_category ) {

+				foreach ($terms as $term) {

+					if ($term->taxonomy == $taxonomy_category) {

 						$post_category[] = $term->name;

 						

 						if ($default_category_id == $term->term_id) {

@@ -5168,7 +5168,7 @@ 
 						}

 					}

 					

-					if ( $term->taxonomy == $taxonomy_tags ) {

+					if ($term->taxonomy == $taxonomy_tags) {

 						$post_tags[] = $term->name;

 					}

 				}

@@ -5176,47 +5176,47 @@ 
 				if (empty($default_category) && !empty($post_category)) {

 					$default_category = $post_category[0]; // Set first one as default category.

 				}

-				$post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';

-				$post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : '';

+				$post_category = !empty($post_category) ? implode(',', $post_category) : '';

+				$post_tags = !empty($post_tags) ? implode(',', $post_tags) : '';

 			}

 

 			// Franchise data

-			if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {

+			if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {

 				$franchise_id = $post_info['franchise'];

 				$gd_franchise_info = geodir_get_post_info($franchise_id);

 

 				if (geodir_franchise_pkg_is_active($gd_franchise_info)) {

-					$franchise_info = (array)$gd_franchise_info;

+					$franchise_info = (array) $gd_franchise_info;

 					$locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);

 					

 					if (!empty($locked_fields)) {

-						foreach( $locked_fields as $locked_field) {

+						foreach ($locked_fields as $locked_field) {

 							if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {

 								$post_info[$locked_field] = $franchise_info[$locked_field];

 							}

 							

 							if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {

-								$franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );

+								$franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags));

 			

-								if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {

+								if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {

 									$franchise_post_category = array();

 									$franchise_post_tags = array();

 								

-									foreach ( $franchise_terms as $franchise_term ) {

-										if ( $franchise_term->taxonomy == $taxonomy_category ) {

+									foreach ($franchise_terms as $franchise_term) {

+										if ($franchise_term->taxonomy == $taxonomy_category) {

 											$franchise_post_category[] = $franchise_term->name;

 										}

 										

-										if ( $franchise_term->taxonomy == $taxonomy_tags ) {

+										if ($franchise_term->taxonomy == $taxonomy_tags) {

 											$franchise_post_tags[] = $franchise_term->name;

 										}

 									}

 									

 									if (in_array($taxonomy_category, $locked_fields)) {

-										$post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';

+										$post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';

 									}

 									if (in_array('post_tags', $locked_fields)) {

-										$post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : '';

+										$post_tags = !empty($franchise_post_tags) ? implode(',', $franchise_post_tags) : '';

 									}

 								}

 							}

@@ -5225,18 +5225,18 @@ 
 				}

 			}

 						

-			$post_images = geodir_get_images( $post_id );

+			$post_images = geodir_get_images($post_id);

 			$current_images = array();

-			if ( !empty( $post_images ) ) {

-				foreach ( $post_images as $post_image ) {

-					$post_image = (array)$post_image;

-					$image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : '';

-					if ( $image ) {

+			if (!empty($post_images)) {

+				foreach ($post_images as $post_image) {

+					$post_image = (array) $post_image;

+					$image = !empty($post_image) && isset($post_image['path']) && $wp_filesystem->is_file($post_image['path']) && $wp_filesystem->exists($post_image['path']) ? $post_image['src'] : '';

+					if ($image) {

 						$current_images[] = $image;

 					}

 				}

 				

-				$images_count = max( $images_count, count( $current_images ) );

+				$images_count = max($images_count, count($current_images));

 			}

 

 			$csv_row = array();

@@ -5248,7 +5248,7 @@ 
 			$csv_row[] = $default_category; // default_category

 			$csv_row[] = $post_tags; // post_tags

 			$csv_row[] = $post_type; // post_type

-			if ( $post_type == 'gd_event' ) {

+			if ($post_type == 'gd_event') {

 				$event_data = geodir_imex_get_event_data($post, $gd_post_info);

 				$csv_row[] = $event_data['event_date']; // event_date

 				$csv_row[] = $event_data['event_enddate']; // enddate

@@ -5269,12 +5269,12 @@ 
 				$csv_row[] = $event_data['recurring_end_date']; // repeat_end

 			}

 			$csv_row[] = $post_info['post_status']; // post_status

-			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

+			$csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured

             if ($is_claim_active) {

-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

+                $csv_row[] = !empty($post_info['claimed']) && (int) $post_info['claimed'] == 1 ? 1 : ''; // claimed

             }

 			if ($is_payment_plugin) {

-				$csv_row[] = (int)$post_info['package_id']; // package_id

+				$csv_row[] = (int) $post_info['package_id']; // package_id

 				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

 			}

             $csv_row[] = $post_info['post_date']; // post_date

@@ -5310,14 +5310,14 @@ 
 			$csv_row[] = $post_info['geodir_special_offers']; // geodir_special_offers

 			// WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type );

-				$csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type );

+				$csv_row[] = geodir_get_language_for_element($post_id, 'post_'.$post_type);

+				$csv_row[] = geodir_imex_original_post_id($post_id, 'post_'.$post_type);

 			}

 			// WPML

 			

-			if ( !empty( $custom_fields ) ) {

-				foreach ( $custom_fields as $custom_field ) {

-					$csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : '';

+			if (!empty($custom_fields)) {

+				foreach ($custom_fields as $custom_field) {

+					$csv_row[] = isset($post_info[$custom_field->htmlvar_name]) ? $post_info[$custom_field->htmlvar_name] : '';

 				}

 			}

 			

@@ -5328,15 +5328,15 @@ 
 				$franchise = '';

 					

 				if (geodir_franchise_pkg_is_active($gd_post_info)) {

-					$gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );

-					$locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';

+					$gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true);

+					$locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : '';

 					$locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');

-					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id

+					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id

 				}

 				

-				$csv_row[] = (int)$gd_is_franchise; // gd_is_franchise

+				$csv_row[] = (int) $gd_is_franchise; // gd_is_franchise

 				$csv_row[] = $locaked_fields; // gd_franchise_lock fields

-				$csv_row[] = (int)$franchise; // franchise id

+				$csv_row[] = (int) $franchise; // franchise id

 			}

             

             /**

@@ -5350,15 +5350,15 @@ 
              */

             $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

 			

-			for ( $c = 0; $c < $images_count; $c++ ) {

-				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

+			for ($c = 0; $c < $images_count; $c++) {

+				$csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE

 			}

 			

 			$csv_rows[] = $csv_row;

 

 		}

 

-		for ( $c = 0; $c < $images_count; $c++ ) {

+		for ($c = 0; $c < $images_count; $c++) {

 			$csv_rows[0][] = 'IMAGE';

 		}

 	}

@@ -5380,30 +5380,30 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

+function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {

     global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

+    if (!post_type_exists($post_type))

         return new stdClass;

         

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

     $limit = '';

-    if ( $per_page > 0 && $page_no > 0 ) {

-        $offset = ( $page_no - 1 ) * $per_page;

+    if ($per_page > 0 && $page_no > 0) {

+        $offset = ($page_no - 1) * $per_page;

         

-        if ( $offset > 0 ) {

-            $limit = " LIMIT " . $offset . "," . $per_page;

+        if ($offset > 0) {

+            $limit = " LIMIT ".$offset.",".$per_page;

         } else {

-            $limit = " LIMIT " . $per_page;

+            $limit = " LIMIT ".$per_page;

         }

     }

 

     // Skip listing with statuses trash, auto-draft etc...

     $skip_statuses = geodir_imex_export_skip_statuses();

     $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+    if (!empty($skip_statuses) && is_array($skip_statuses)) {

+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

     }

     

     /**

@@ -5414,9 +5414,9 @@ 
      *

      * @param string $where SQL where clause part.

      */

-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+    $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);

 

-    $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

+    $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." ORDER BY {$wpdb->posts}.ID ASC".$limit, $post_type);

     /**

      * Modify returned posts SQL query for the current post type.

      *

@@ -5426,8 +5426,8 @@ 
      * @param int $query The SQL query.

      * @param string $post_type Post type.

      */

-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

-    $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

+    $query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);

+    $results = (array) $wpdb->get_results($wpdb->prepare($query, $post_type), ARRAY_A);

 

     /**

      * Modify returned post results for the current post type.

@@ -5438,7 +5438,7 @@ 
      * @param object $results An object containing all post ids.

      * @param string $post_type Post type.

      */

-    return apply_filters( 'geodir_export_posts', $results, $post_type );

+    return apply_filters('geodir_export_posts', $results, $post_type);

 }

 

 /**

@@ -5456,24 +5456,24 @@ 
  * @param string $post_type Post type.

  * @return string The SQL query.

  */

-function geodir_imex_get_events_query( $query, $post_type ) {

-    if ( $post_type == 'gd_event' ) {

+function geodir_imex_get_events_query($query, $post_type) {

+    if ($post_type == 'gd_event') {

         global $wpdb, $plugin_prefix;

         

-        $table = $plugin_prefix . $post_type . '_detail';

+        $table = $plugin_prefix.$post_type.'_detail';

         $schedule_table = EVENT_SCHEDULE;

         

         // Skip listing with statuses trash, auto-draft etc...

         $skip_statuses = geodir_imex_export_skip_statuses();

         $where_statuses = '';

-        if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+        if (!empty($skip_statuses) && is_array($skip_statuses)) {

+            $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

         }

         

         /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */

-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+        $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);

 

-        $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

+        $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type);

     }

 

     return $query;

@@ -5497,35 +5497,35 @@ 
  * @param  string $post_type Post type.

  * @return int Total terms count.

  */

-function geodir_get_terms_count( $post_type ) {

-    $args = array( 'hide_empty' => 0 );

+function geodir_get_terms_count($post_type) {

+    $args = array('hide_empty' => 0);

 

-    remove_all_filters( 'get_terms' );

+    remove_all_filters('get_terms');

 

-    $taxonomy = $post_type . 'category';

+    $taxonomy = $post_type.'category';

 

     // WPML

     $is_wpml = geodir_is_wpml();

     $active_lang = 'all';

-    if ( $is_wpml ) {

+    if ($is_wpml) {

         global $sitepress;

         $active_lang = $sitepress->get_current_language();

         

-        if ( $active_lang != 'all' ) {

-            $sitepress->switch_lang( 'all', true );

+        if ($active_lang != 'all') {

+            $sitepress->switch_lang('all', true);

         }

     }

     // WPML

             

-    $count_terms = wp_count_terms( $taxonomy, $args );

+    $count_terms = wp_count_terms($taxonomy, $args);

 

     // WPML

-    if ( $is_wpml && $active_lang !== 'all' ) {

+    if ($is_wpml && $active_lang !== 'all') {

         global $sitepress;

-        $sitepress->switch_lang( $active_lang, true );

+        $sitepress->switch_lang($active_lang, true);

     }

     // WPML

-    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+    $count_terms = !is_wp_error($count_terms) ? $count_terms : 0;

      

     return $count_terms;

 }

@@ -5542,23 +5542,23 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of terms data.

  */

-function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {

-	$args = array( 'hide_empty' => 0, 'orderby' => 'id' );

+function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {

+	$args = array('hide_empty' => 0, 'orderby' => 'id');

 	

-	remove_all_filters( 'get_terms' );

+	remove_all_filters('get_terms');

 	

-	$taxonomy = $post_type . 'category';

+	$taxonomy = $post_type.'category';

 	

-	if ( $per_page > 0 && $page_no > 0 ) {

-		$args['offset'] = ( $page_no - 1 ) * $per_page;

+	if ($per_page > 0 && $page_no > 0) {

+		$args['offset'] = ($page_no - 1) * $per_page;

 		$args['number'] = $per_page;

 	}

 	

-	$terms = get_terms( $taxonomy, $args );

+	$terms = get_terms($taxonomy, $args);

 

 	$csv_rows = array();

 	

-	if ( !empty( $terms ) ) {

+	if (!empty($terms)) {

 		$csv_row = array();

 		$csv_row[] = 'cat_id';

 		$csv_row[] = 'cat_name';

@@ -5580,16 +5580,16 @@ 
 		

 		$csv_rows[] = $csv_row;

 		

-		foreach ( $terms as $term ) {

-			$cat_icon = get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type );

-			$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+		foreach ($terms as $term) {

+			$cat_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $post_type);

+			$cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

 			

-			$cat_image = geodir_get_default_catimage( $term->term_id, $post_type );

-			$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; 

+			$cat_image = geodir_get_default_catimage($term->term_id, $post_type);

+			$cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; 

 			

 			$cat_parent = '';

-			if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {

-				$parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy );

+			if (isset($term->parent) && (int) $term->parent > 0 && term_exists((int) $term->parent, $taxonomy)) {

+				$parent_term = (array) get_term_by('id', (int) $term->parent, $taxonomy);

 				$cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';

 			}

 			

@@ -5599,15 +5599,15 @@ 
 			$csv_row[] = $term->slug;

 			$csv_row[] = $post_type;

 			$csv_row[] = $cat_parent;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type);

             // WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

-                $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

+				$csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_'.$taxonomy);

+                $csv_row[] = geodir_imex_original_post_id($term->term_id, 'tax_'.$taxonomy);

 			}

 			// WPML

 			$csv_row[] = $term->description;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type);

 			$csv_row[] = $cat_image;

 			$csv_row[] = $cat_icon;

 			

@@ -5626,10 +5626,10 @@ 
  * @param  bool $relative True for relative path & False for absolute path.

  * @return string Path to the cache directory.

  */

-function geodir_path_import_export( $relative = true ) {

+function geodir_path_import_export($relative = true) {

 	$upload_dir = wp_upload_dir();

 	

-	return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';

+	return $relative ? $upload_dir['baseurl'].'/cache' : $upload_dir['basedir'].'/cache';

 }

 

 /**

@@ -5645,8 +5645,8 @@ 
  * @param  bool $clear If true then it overwrite data otherwise add rows at the end of file.

  * @return bool true if success otherwise false.

  */

-function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {

-	if ( empty( $csv_data ) ) {

+function geodir_save_csv_data($file_path, $csv_data = array(), $clear = true) {

+	if (empty($csv_data)) {

 		return false;

 	}

 	

@@ -5654,17 +5654,17 @@ 
 	

 	$mode = $clear ? 'w+' : 'a+';

 	

-	if ( function_exists( 'fputcsv' ) ) {

-		$file = fopen( $file_path, $mode );

-		foreach( $csv_data as $csv_row ) {

+	if (function_exists('fputcsv')) {

+		$file = fopen($file_path, $mode);

+		foreach ($csv_data as $csv_row) {

 			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' );

+			$write_successful = fputcsv($file, $csv_row, ",", $enclosure = '"');

 		}

-		fclose( $file );

+		fclose($file);

 	} else {

-		foreach( $csv_data as $csv_row ) {

+		foreach ($csv_data as $csv_row) {

 			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$wp_filesystem->put_contents( $file_path, $csv_row );

+			$wp_filesystem->put_contents($file_path, $csv_row);

 		}

 	}

 		

@@ -5682,14 +5682,14 @@ 
  * @param  string $file Full path to file.

  * @return int No of file rows.

  */

-function geodir_import_export_line_count( $file ) {

+function geodir_import_export_line_count($file) {

 	global $wp_filesystem;

 	

-	if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {

-		$contents = $wp_filesystem->get_contents_array( $file );

+	if ($wp_filesystem->is_file($file) && $wp_filesystem->exists($file)) {

+		$contents = $wp_filesystem->get_contents_array($file);

 		

-		if ( !empty( $contents ) && is_array( $contents ) ) {

-			return count( $contents ) - 1;

+		if (!empty($contents) && is_array($contents)) {

+			return count($contents) - 1;

 		}

 	}

 	

@@ -5706,11 +5706,11 @@ 
  * @param string $post_type The post type.

  * @return object Queried object.

  */

-function geodir_imex_get_custom_fields( $post_type ) {

+function geodir_imex_get_custom_fields($post_type) {

 	global $wpdb;

 	 

-	$sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );

-	$rows = $wpdb->get_results( $sql );

+	$sql = $wpdb->prepare("SELECT htmlvar_name FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array($post_type));

+	$rows = $wpdb->get_results($sql);

 	 

 	return $rows;

 }

@@ -5789,14 +5789,14 @@ 
 	global $wpdb, $plugin_prefix;

 	

 	$post_type = get_post_type($master_post_id);

-	$post_table = $plugin_prefix . $post_type . '_detail';

+	$post_table = $plugin_prefix.$post_type.'_detail';

 	

-	$query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

-	$data = (array)$wpdb->get_row($query);

+	$query = $wpdb->prepare("SELECT * FROM ".$post_table." WHERE post_id = %d", array($master_post_id));

+	$data = (array) $wpdb->get_row($query);

 	

-	if ( !empty( $data ) ) {

+	if (!empty($data)) {

 		$data['post_id'] = $tr_post_id;

-		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

+		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type.'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

 		

 		$wpdb->update($post_table, $data, array('post_id' => $tr_post_id));		

 		return true;

@@ -5822,7 +5822,7 @@ 
 	global $sitepress, $wpdb;

 	$post_type = get_post_type($master_post_id);

 	

-	remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

+	remove_filter('get_term', array($sitepress, 'get_term_adjust_id')); // AVOID filtering to current language

 

 	$taxonomies = get_object_taxonomies($post_type);

 	foreach ($taxonomies as $taxonomy) {

@@ -5831,9 +5831,9 @@ 
 		

 		if ($terms) {

 			foreach ($terms as $term) {

-				$tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

+				$tr_id = apply_filters('translate_object_id', $term->term_id, $taxonomy, false, $lang);

 				

-				if (!is_null($tr_id)){

+				if (!is_null($tr_id)) {

 					// not using get_term - unfiltered get_term

 					$translated_term = $wpdb->get_row($wpdb->prepare("

 						SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));

@@ -5842,14 +5842,14 @@ 
 				}

 			}

 

-			if (!is_taxonomy_hierarchical($taxonomy)){

-				$terms_array = array_unique( array_map( 'intval', $terms_array ) );

+			if (!is_taxonomy_hierarchical($taxonomy)) {

+				$terms_array = array_unique(array_map('intval', $terms_array));

 			}

 

 			wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

 			

-			if ($taxonomy == $post_type . 'category') {

-				geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

+			if ($taxonomy == $post_type.'category') {

+				geodir_set_postcat_structure($tr_post_id, $post_type.'category');

 			}

 		}

 	}

@@ -5870,15 +5870,15 @@ 
 function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {

 	global $wpdb;

 	

-	$query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

+	$query = $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

 	$wpdb->query($query);

 	

-	$query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

+	$query = $wpdb->prepare("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

 	$post_images = $wpdb->get_results($query);

 	

-	if ( !empty( $post_images ) ) {

-		foreach ( $post_images as $post_image) {

-			$image_data = (array)$post_image;

+	if (!empty($post_images)) {

+		foreach ($post_images as $post_image) {

+			$image_data = (array) $post_image;

 			unset($image_data['ID']);

 			$image_data['post_id'] = $tr_post_id;

 			

@@ -5904,10 +5904,10 @@ 
  * @return array Event data array.

  */

 function geodir_imex_get_event_data($post, $gd_post_info) {

-	$event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : '';

+	$event_date = isset($post['event_date']) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($post['event_date'])) : '';

 	$event_enddate = $event_date;

-	$starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : '';

-	$endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : '';

+	$starttime = isset($post['starttime']) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['starttime'])) : '';

+	$endtime = isset($post['endtime']) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['endtime'])) : '';

 	

 	$is_recurring_event = '';

 	$event_duration_days = '';

@@ -5924,15 +5924,15 @@ 
 		

 	$recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array();

 	if (!empty($recurring_data)) {

-		$event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date;

-		$event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date;

-		$starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime;

-		$endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime;

+		$event_date = isset($recurring_data['event_start']) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_start'])) : $event_date;

+		$event_enddate = isset($recurring_data['event_end']) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_end'])) : $event_date;

+		$starttime = isset($recurring_data['starttime']) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['starttime'])) : $starttime;

+		$endtime = isset($recurring_data['endtime']) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['endtime'])) : $endtime;

 		$is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';

 		$different_times = !empty($recurring_data['different_times']) ? true : false;

 	

-		$recurring_pkg = geodir_event_recurring_pkg( $gd_post_info );

-		$is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true;

+		$recurring_pkg = geodir_event_recurring_pkg($gd_post_info);

+		$is_recurring = isset($gd_post_info->is_recurring) && (int) $gd_post_info->is_recurring == 0 ? false : true;

 			

 		if ($recurring_pkg && $is_recurring) {

 			$recurring_dates = $event_date;

@@ -5942,13 +5942,13 @@ 
 			$recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';

 			

 			if (!empty($recurring_data['event_recurring_dates'])) {

-				$event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

+				$event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);

 				

 				if (!empty($event_recurring_dates)) {

 					$recurring_dates = array();

 					

 					foreach ($event_recurring_dates as $date) {

-						$recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );

+						$recurring_dates[] = date_i18n('d/m/Y', strtotime($date));

 					}

 					

 					$recurring_dates = implode(",", $recurring_dates);

@@ -5964,7 +5964,7 @@ 
 						$times = array();

 						

 						foreach ($recurring_data['starttimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';

 						}

 						

 						$event_starttimes = implode(",", $times);

@@ -5974,7 +5974,7 @@ 
 						$times = array();

 						

 						foreach ($recurring_data['endtimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';

 						}

 						

 						$event_endtimes = implode(",", $times);

@@ -5986,8 +5986,8 @@ 
 					}

 				}

 			} else {

-				$event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1;

-				$recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

+				$event_duration_days = isset($recurring_data['duration_x']) ? (int) $recurring_data['duration_x'] : 1;

+				$recurring_interval = !empty($recurring_data['repeat_x']) && (int) $recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

 				

 				if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {

 					$week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

@@ -6003,11 +6003,11 @@ 
 				}

 				

 				$recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;

-				if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {

-					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : '';

+				if (!empty($recurring_data['repeat_end_type']) && (int) $recurring_data['repeat_end_type'] == 1) {

+					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['repeat_end'])) : '';

 					$max_recurring_count = empty($recurring_end_date) ? 1 : '';

 				} else {

-					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1);

+					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int) $recurring_data['max_repeat'] > 0 ? (int) $recurring_data['max_repeat'] : 1);

 				}

 			}

 		}

@@ -6071,9 +6071,9 @@ 
  * @return array Event data array.

  */

 function geodir_imex_process_event_data($gd_post) {

-	$recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post );

+	$recurring_pkg = geodir_event_recurring_pkg((object) $gd_post);

 

-	$is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true;

+	$is_recurring = isset($gd_post['is_recurring_event']) && (int) $gd_post['is_recurring_event'] == 0 ? false : true;

 	$event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_imex_get_date_ymd($gd_post['event_date']) : '';

 	$event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_imex_get_date_ymd($gd_post['event_enddate']) : $event_date;

 	$all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false;

@@ -6120,17 +6120,17 @@ 
 				$event_recurring_dates = implode(",", $event_recurring_dates);

 			}

 		} else {

-			$duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1;

-			$repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1;

-			$max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1;

-			$repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

+			$duration_x = !empty($gd_post['event_duration_days']) ? (int) $gd_post['event_duration_days'] : 1;

+			$repeat_x = !empty($gd_post['recurring_interval']) ? (int) $gd_post['recurring_interval'] : 1;

+			$max_repeat = !empty($gd_post['max_recurring_count']) ? (int) $gd_post['max_recurring_count'] : 1;

+			$repeat_end = !empty($gd_post['recurring_end_date']) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

 			

 			$repeat_end_type = $repeat_end != '' ? 1 : 0;

 			$max_repeat = $repeat_end != '' ? '' : $max_repeat;

 			

 			$week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));

 			

-			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

+			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days']) != '' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

 			$repeat_days = array();

 			if (!empty($a_repeat_days)) {

 				foreach ($a_repeat_days as $repeat_day) {

@@ -6148,7 +6148,7 @@ 
 			$repeat_weeks = array();

 			if (!empty($a_repeat_weeks)) {

 				foreach ($a_repeat_weeks as $repeat_week) {

-					$repeat_weeks[] = (int)$repeat_week;

+					$repeat_weeks[] = (int) $repeat_week;

 				}

 				

 				$repeat_weeks = array_unique($repeat_weeks);

@@ -6212,7 +6212,7 @@ 
 

     $page_found = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",

             array($slug)

         )

     );

@@ -6267,7 +6267,7 @@ 
  */

 function geodir_admin_upgrade_notice() {

     $class = "error";

-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

+    $message = __("Please update core GeoDirectory or some addons may not function correctly.", "geodirectory");

     echo"<div class=\"$class\"> <p>$message</p></div>";

 }

 

@@ -6279,7 +6279,7 @@ 
  * @param (object) $r

  * @return (string) $output

  */

-function geodire_admin_upgrade_notice( $plugin_data, $r )

+function geodire_admin_upgrade_notice($plugin_data, $r)

 {

     // readme contents

     $args = array(

@@ -6287,7 +6287,7 @@ 
         'redirection' => 5

     );

     $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

-    $data       = wp_remote_get( $url, $args );

+    $data = wp_remote_get($url, $args);

 

     if (!is_wp_error($data) && $data['response']['code'] == 200) {

 

@@ -6302,20 +6302,20 @@ 
 function geodir_in_plugin_update_message($content) {

     // Output Upgrade Notice

     $matches        = null;

-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

+    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote(GEODIRECTORY_VERSION).'\s*=|$)~Uis';

     $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

+    if (preg_match($regexp, $content, $matches)) {

+        if (empty($matches)) {return; }

 

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

+        $version = trim($matches[1]);

+        if ($version && $version > GEODIRECTORY_VERSION) {

 

 

-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

+        $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));

+        if (version_compare(GEODIRECTORY_VERSION, $version, '<')) {

             $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+            foreach ($notices as $index => $line) {

+                $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));

             }

             $upgrade_notice .= '</div> ';

         }

@@ -6339,7 +6339,7 @@ 
 		$default_language = $sitepress->get_default_language();

 		if ($current_language != 'all' && $current_language != $default_language) {

 	?>

-	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory');?></strong></p></div>

+	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory'); ?></strong></p></div>

 	<?php

 		}

 	}

@@ -6354,7 +6354,7 @@ 
  * @param array Listing statuses to be skipped.

  */

 function geodir_imex_export_skip_statuses() {

-    $statuses = array( 'trash', 'auto-draft' );

+    $statuses = array('trash', 'auto-draft');

     

     /**

      * Filter the statuses to skip during GD export listings.

@@ -6364,7 +6364,7 @@ 
      *

      * @param array $statuses Listing statuses to be skipped.

      */

-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

+    $statuses = apply_filters('geodir_imex_export_skip_statuses', $statuses);

      

     return $statuses;

 }

@@ -6404,16 +6404,16 @@ 
 function geodir_imex_get_filter_where($where = '', $post_type = '') {

     global $wpdb;

     

-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+    $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;

     

-    if ( !empty( $filters ) ) {

-        foreach ( $filters as $field => $value ) {

+    if (!empty($filters)) {

+        foreach ($filters as $field => $value) {

             switch ($field) {

                 case 'start_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

+                    $where .= " AND `".$wpdb->posts."`.`post_date` >= '".sanitize_text_field($value)." 00:00:00'";

                 break;

                 case 'end_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

+                    $where .= " AND `".$wpdb->posts."`.`post_date` <= '".sanitize_text_field($value)." 23:59:59'";

                 break;

             }

         }

@@ -6425,25 +6425,25 @@ 
 add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);

 

 

-function geodir_fix_for_primer_theme(){

-    if(!defined( 'PRIMER_VERSION' )){return;}

+function geodir_fix_for_primer_theme() {

+    if (!defined('PRIMER_VERSION')) {return; }

     global $pagenow;

 

-    if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) )  ){

+    if (('post.php' === $pagenow || 'post-new.php' === $pagenow) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']))) {

 

-        $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );

+        $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type($_GET['post']);

 

         $post_types = geodir_get_posttypes();

-        if ($post_type && in_array($post_type, $post_types) ) {

+        if ($post_type && in_array($post_type, $post_types)) {

             global $primer_customizer_layouts;

-            remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);

+            remove_action('add_meta_boxes', array($primer_customizer_layouts, 'add_meta_box'), 10);

         }

     }

 

 }

 

-if(is_admin()){

-    add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);  

+if (is_admin()) {

+    add_action('add_meta_boxes', 'geodir_fix_for_primer_theme', 0);  

 }

 

 

Braces +218 added lines, -117 removed lines

@@ -184,8 +184,9 @@ 
 

         $thumb_img_arr = array();

 

-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')

-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

+        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                    $thumb_img_arr = geodir_get_images($_REQUEST['pid']);
+        }
 

         $totImg = '';

         $image_limit = '';

@@ -236,7 +237,9 @@ 
     {

         global $menu, $geodirectory;

 

-        if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

+        if (current_user_can('manage_options')) {
+        	$menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
+        }
 

         add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

 

@@ -300,7 +303,9 @@ 
      */

     function geodir_admin_custom_menu_order()

     {

-        if (!current_user_can('manage_options')) return false;

+        if (!current_user_can('manage_options')) {
+        	return false;
+        }
         return true;

     }

 }

@@ -331,10 +336,11 @@ 
 			case 'fail':

 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';

 				

-				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

-				else

-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

+				if ($gderr == 21) {
+							    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
+				} else {
+									echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
+				}
                 break;

         }

     }

@@ -385,8 +391,12 @@ 
         include_once('option-pages/' . $current_tab . '_array.php');

     }

     if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

-        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) {
+        	die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
+        }
+        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) {
+        	die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
+        }
 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -398,8 +408,9 @@ 
 		 */

 		do_action('geodir_before_update_options', $current_tab, $geodir_settings);		

 		

-        if (!empty($geodir_settings[$current_tab]))

-            geodir_update_options($geodir_settings[$current_tab]);

+        if (!empty($geodir_settings[$current_tab])) {
+                    geodir_update_options($geodir_settings[$current_tab]);
+        }
 

         /**

          * Called after GeoDirectory options settings are updated.

@@ -447,11 +458,14 @@ 
  * @return bool Returns true if saved.

  */

 function geodir_update_options($options, $dummy = false) {

-    if ((!isset($_POST) || !$_POST) && !$dummy) return false;

+    if ((!isset($_POST) || !$_POST) && !$dummy) {
+    	return false;
+    }
 

     foreach ($options as $value) {

-        if ($dummy && isset($value['std']))

-            $_POST[$value['id']] = $value['std'];

+        if ($dummy && isset($value['std'])) {
+                    $_POST[$value['id']] = $value['std'];
+        }
 

 

         if (isset($value['type']) && $value['type'] == 'checkbox') :

@@ -460,25 +474,23 @@ 
                 update_option($value['id'], $_POST[$value['id']]);

             } else {

                 update_option($value['id'], 0);

-            }

-

-        elseif (isset($value['type']) && $value['type'] == 'image_width') :

+            } elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

             if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

                 update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

                 update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

                 if (isset($_POST[$value['id'] . '_crop'])) :

                     update_option($value['id'] . '_crop', 1);

-                else :

-                    update_option($value['id'] . '_crop', 0);

+                else {
+                	:

+                    update_option($value['id'] . '_crop', 0);
+                }
                 endif;

             } else {

                 update_option($value['id'] . '_width', $value['std']);

                 update_option($value['id'] . '_height', $value['std']);

                 update_option($value['id'] . '_crop', 1);

-            }

-

-        elseif (isset($value['type']) && $value['type'] == 'map') :

+            } elseif (isset($value['type']) && $value['type'] == 'map') :

             $post_types = array();

             $categories = array();

 

@@ -523,8 +535,9 @@ 
                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

                     $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

+                    if (file_exists($img_path)) {
+                                            unlink($img_path);
+                    }
                 }

 

                 update_option($value['id'], '');

@@ -540,8 +553,10 @@ 
                 foreach ($uploadedfile as $key => $uplaod):

                     if ($key == 'name'):

                         $uplaods[$key] = $filename;

-                    else :

-                        $uplaods[$key] = $uplaod;

+                    else {
+                    	:

+                        $uplaods[$key] = $uplaod;
+                    }
                     endif;

                 endforeach;

 

@@ -551,8 +566,9 @@ 
                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

                     $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

+                    if (file_exists($img_path)) {
+                                            unlink($img_path);
+                    }
                 }

 

                 $upload_overrides = array('test_form' => false);

@@ -567,10 +583,12 @@ 
             endif;

 

 

-        else :

+        else {
+        	:

             // same menu setting per theme.

             if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

-                $theme = wp_get_theme();

+                $theme = wp_get_theme();
+        }
                 update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

             }

 

@@ -582,8 +600,9 @@ 
 

         endif;

     }

-    if ($dummy)

-        $_POST = array();

+    if ($dummy) {
+            $_POST = array();
+    }
     return true;

 

 }

@@ -729,9 +748,12 @@ 
         $new_columns = array('location' => __('Location (ID)', 'geodirectory'),

             'categorys' => __('Categories', 'geodirectory'));

 

-        if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

+        if (($offset = array_search('author', array_keys($columns))) === false) {
+        	// if the key doesn't exist

         {

-            $offset = 0; // should we prepend $array with $data?

+            $offset = 0;
+        }
+        // should we prepend $array with $data?

             $offset = count($columns); // or should we append $array with $data? lets pick this one...

         }

 

@@ -791,11 +813,13 @@ 
                     $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

                 }

                 /* If no expire_date is found, output a default message. */

-                if (empty($expire_date))

-                    echo __('Unknown', 'geodirectory');

+                if (empty($expire_date)) {
+                                    echo __('Unknown', 'geodirectory');
+                }
                 /* If there is a expire_date, append 'days left' to the text string. */

-                else

-                    echo $expire_date . $date_diff_text;

+                else {
+                                    echo $expire_date . $date_diff_text;
+                }
                 break;

 

             /* If displaying the 'categorys' column. */

@@ -868,21 +892,26 @@ 
 

     $geodir_posttypes = geodir_get_posttypes();

 

-    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

-        return;

+    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+            return;
+    }
 

     if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

-        if (isset($_REQUEST['_status']))

-            geodir_change_post_status($post_id, $_REQUEST['_status']);

+        if (isset($_REQUEST['_status'])) {
+                    geodir_change_post_status($post_id, $_REQUEST['_status']);
+        }
 

-        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

-            return;

+        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) {
+                    return;
+        }
 

-        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

-            return;

+        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) {
+                    return;
+        }
 

-        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

-            return;

+        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) {
+                    return;
+        }
 

         geodir_save_listing($_REQUEST);

     }

@@ -907,10 +936,18 @@ 
     $tab_id = '';

     $i = 0;

     foreach ($options as $value) :

-        if (!isset($value['name'])) $value['name'] = '';

-        if (!isset($value['class'])) $value['class'] = '';

-        if (!isset($value['css'])) $value['css'] = '';

-        if (!isset($value['std'])) $value['std'] = '';

+        if (!isset($value['name'])) {
+        	$value['name'] = '';
+        }
+        if (!isset($value['class'])) {
+        	$value['class'] = '';
+        }
+        if (!isset($value['css'])) {
+        	$value['css'] = '';
+        }
+        if (!isset($value['std'])) {
+        	$value['std'] = '';
+        }
         $desc = '';

         switch ($value['type']) :

             case 'dummy_installer':

@@ -926,11 +963,13 @@ 
 

                 $i++;

 

-                if (isset($value['id']) && $value['id'])

-                    $tab_id = $value['id'];

+                if (isset($value['id']) && $value['id']) {
+                                    $tab_id = $value['id'];
+                }
 

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+                if (isset($value['desc']) && $value['desc']) {
+                                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';
+                }
 

                 if (isset($value['name']) && $value['name']) {

                     if ($first_title === true) {

@@ -961,10 +1000,12 @@ 
                 break;

 

             case 'sectionstart':

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

-                if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

+                if (isset($value['desc']) && $value['desc']) {
+                                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';
+                }
+                if (isset($value['name']) && $value['name']) {
+                                    echo '<h3>' . $value['name'] . $desc . '</h3>';
+                }
                 /**

                  * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

                  *

@@ -972,7 +1013,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
+                }
                 echo '<table class="form-table">' . "\n\n";

 

                 break;

@@ -984,7 +1027,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
+                }
                 echo '</table>';

                 /**

                  * Called after a GeoDirectory settings sectionend is output in the GD settings page.

@@ -993,7 +1038,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
+                }
                 break;

             case 'text':

                 ?>

@@ -1065,17 +1112,32 @@ 
                     <?php _e('Width', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_width"

                         id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'] . '_width')) {
+	echo stripslashes($size);
+} else {
+	echo $value['std'];
+}
+?>"/>

 

                     <?php _e('Height', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_height"

                         id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'] . '_height')) {
+	echo stripslashes($size);
+} else {
+	echo $value['std'];
+}
+?>"/>

 

                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input

                             name="<?php echo esc_attr($value['id']); ?>_crop"

                             id="<?php echo esc_attr($value['id']); ?>_crop"

-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>

+                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') {
+	checked(get_option($value['id'] . '_crop'), 1);
+} else {
+	checked(1);
+}
+?> /></label>

 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

@@ -1089,17 +1151,22 @@ 
                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

-                                            class="<?php if (isset($value['class'])) echo $value['class']; ?>"

+                                            class="<?php if (isset($value['class'])) {
+	echo $value['class'];
+}
+?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

                             $geodir_select_value = '';

                             if ($option_value != '') {

-                                if ($option_value != '' && $option_value == $key)

-                                    $geodir_select_value = ' selected="selected" ';

+                                if ($option_value != '' && $option_value == $key) {
+                                                                    $geodir_select_value = ' selected="selected" ';
+                                }
                             } else {

-                                if ($value['std'] == $key)

-                                    $geodir_select_value = ' selected="selected" ';

+                                if ($value['std'] == $key) {
+                                                                    $geodir_select_value = ' selected="selected" ';
+                                }
                             }

                             ?>

                             <option

@@ -1124,8 +1191,14 @@ 
                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"

                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

-                                            class="<?php if (isset($value['class'])) echo $value['class']; ?>"

-                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

+                                            class="<?php if (isset($value['class'])) {
+	echo $value['class'];
+}
+?>"

+                                            data-placeholder="<?php if (isset($value['placeholder_text'])) {
+	echo $value['placeholder_text'];
+}
+?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

@@ -1152,7 +1225,10 @@ 
                 <td class="forminp">

                     <input type="file" name="<?php echo esc_attr($value['id']); ?>"

                            id="<?php echo esc_attr($value['id']); ?>" style="<?php echo esc_attr($value['css']); ?>"

-                           class="<?php if (isset($value['class'])) echo $value['class']; ?>"/>

+                           class="<?php if (isset($value['class'])) {
+	echo $value['class'];
+}
+?>"/>

                     <?php if (get_option($value['id'])) { ?>

                         <input type="hidden" name="<?php echo esc_attr($value['id']); ?>_remove"

                                id="<?php echo esc_attr($value['id']); ?>_remove" value="0">

@@ -1233,13 +1309,15 @@ 
                                 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

                             );

                             $geodir_default_map_language = get_option('geodir_default_map_language');

-                            if (empty($geodir_default_map_language))

-                                $geodir_default_map_language = 'en';

+                            if (empty($geodir_default_map_language)) {
+                                                            $geodir_default_map_language = 'en';
+                            }
                             foreach ($arr_map_langages as $language_key => $language_txt) {

-                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

-                                    $geodir_default_language_selected = "selected='selected'";

-                                else

-                                    $geodir_default_language_selected = '';

+                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) {
+                                                                    $geodir_default_language_selected = "selected='selected'";
+                                } else {
+                                                                    $geodir_default_language_selected = '';
+                                }
 

                                 ?>

                                 <option

@@ -1259,14 +1337,16 @@ 
                             <?php

                             $post_types = geodir_get_posttypes('array');

                             $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-                            if (empty($geodir_default_map_search_pt))

-                                $geodir_default_map_search_pt = 'gd_place';

+                            if (empty($geodir_default_map_search_pt)) {
+                                                            $geodir_default_map_search_pt = 'gd_place';
+                            }
                             if (is_array($post_types)) {

                                 foreach ($post_types as $key => $post_types_obj) {

-                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

-                                        $geodir_search_pt_selected = "selected='selected'";

-                                    else

-                                        $geodir_search_pt_selected = '';

+                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) {
+                                                                            $geodir_search_pt_selected = "selected='selected'";
+                                    } else {
+                                                                            $geodir_search_pt_selected = '';
+                                    }
 

                                     ?>

                                     <option

@@ -1386,7 +1466,7 @@ 
                                id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

                             echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+                        } elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

@@ -1406,10 +1486,18 @@ 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

                     <textarea

-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"

+                        <?php if (isset($value['args'])) {
+	echo $value['args'] . ' ';
+}
+?>name="<?php echo esc_attr($value['id']); ?>"

                         id="<?php echo esc_attr($value['id']); ?>"

                         <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

-                        style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span

+                        style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) {
+	echo esc_textarea(stripslashes(get_option($value['id'])));
+} else {
+	echo esc_textarea($value['std']);
+}
+?></textarea><span

                         class="description"><?php echo $value['desc'] ?></span>

 

                 </td>

@@ -1421,10 +1509,11 @@ 
                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><?php

-                    if (get_option($value['id']))

-                        $content = stripslashes(get_option($value['id']));

-                    else

-                        $content = $value['std'];

+                    if (get_option($value['id'])) {
+                                            $content = stripslashes(get_option($value['id']));
+                    } else {
+                                            $content = $value['std'];
+                    }
 

                     $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

 

@@ -1464,7 +1553,9 @@ 
                     'echo' => false,

                     'selected' => $page_setting);

 

-                if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

+                if (isset($value['args'])) {
+                	$args = wp_parse_args($value['args'], $args);
+                }
 

                 ?>

                 <tr valign="top" class="single_select_page">

@@ -1483,8 +1574,10 @@ 
                 if (strstr($country_setting, ':')) :

                     $country = current(explode(':', $country_setting));

                     $state = end(explode(':', $country_setting));

-                else :

-                    $country = $country_setting;

+                else {
+                	:

+                    $country = $country_setting;
+                }
                     $state = '*';

                 endif;

                 ?>

@@ -1511,8 +1604,10 @@ 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"

                             title="Country" class="chosen_select">

                         <?php

-                        if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+                        if ($countries) {
+                        	foreach ($countries as $key => $val) :

+                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';
+                        }
                         endforeach;

                         ?>

                     </select>

@@ -1763,8 +1858,9 @@ 
         endforeach;

     endif;

 

-    if (!empty($place_img_array))

-        $curImages = implode(',', $place_img_array);

+    if (!empty($place_img_array)) {
+            $curImages = implode(',', $place_img_array);
+    }
 

 

     // adjust values here

@@ -2110,16 +2206,17 @@ 
 	global $post, $typenow, $current_screen;

 	

 	$post_type = NULL;

-    if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

-		$post_type = get_post_type($_REQUEST['post']);

-    elseif ($post && isset($post->post_type))

-		$post_type = $post->post_type;

-	elseif ($typenow)

-		$post_type = $typenow;

-	elseif ($current_screen && isset($current_screen->post_type))

-		$post_type = $current_screen->post_type;

-	elseif (isset($_REQUEST['post_type']))

-		$post_type = sanitize_key($_REQUEST['post_type']);

+    if (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) {
+    		$post_type = get_post_type($_REQUEST['post']);
+    } elseif ($post && isset($post->post_type)) {
+    		$post_type = $post->post_type;
+    } elseif ($typenow) {
+			$post_type = $typenow;
+	} elseif ($current_screen && isset($current_screen->post_type)) {
+			$post_type = $current_screen->post_type;
+	} elseif (isset($_REQUEST['post_type'])) {
+			$post_type = sanitize_key($_REQUEST['post_type']);
+	}
 

 

 	return $post_type;

@@ -2179,9 +2276,10 @@ 
 function geodir_hide_admin_preview_button() {

     global $post_type;

     $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

-        echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

-}

+    if(in_array($post_type, $post_types)) {
+            echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
+    }
+    }

 add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

 add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

 

@@ -5383,8 +5481,9 @@ 
 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

     global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

-        return new stdClass;

+    if ( ! post_type_exists( $post_type ) ) {
+            return new stdClass;
+    }
         

     $table = $plugin_prefix . $post_type . '_detail';

 

@@ -6219,7 +6318,9 @@ 
 

     if ($page_found) :

         // Page exists

-        if (!$option_value) update_option($option, $page_found);

+        if (!$option_value) {
+        	update_option($option, $page_found);
+        }
         return;

     endif;

 

geodirectory.php

Indentation +84 added lines, -84 removed lines

@@ -31,30 +31,30 @@ 
  * CHECK FOR OLD COMPATIBILITY PACKS AND DISABLE IF THEY ARE ACTIVE

  */

 if (is_admin()) {

-    /**

-     * Include WordPress core file so we can use core functions to check for active plugins.

-     */

-    include_once(ABSPATH . 'wp-admin/includes/plugin.php');

+	/**

+	 * Include WordPress core file so we can use core functions to check for active plugins.

+	 */

+	include_once(ABSPATH . 'wp-admin/includes/plugin.php');

 

-    if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

-        deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php')) {

+		deactivate_plugins('geodirectory-genesis-compatibility-pack/geodir_genesis_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

-        deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php')) {

+		deactivate_plugins('geodirectory-x-theme-compatibility-pack/geodir_x_compatibility.php');

+	}

 

-    if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

-        deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

-    }

+	if (is_plugin_active('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php')) {

+		deactivate_plugins('geodirectory-enfold-theme-compatibility-pack/geodir_enfold_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

-        deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

-    }

+	if (is_plugin_active('geodir_avada_compatibility/geodir_avada_compatibility.php')) {

+		deactivate_plugins('geodir_avada_compatibility/geodir_avada_compatibility.php');

+	}

 

-    if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

-        deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

-    }

+	if (is_plugin_active('geodir_compat_pack_divi/geodir_divi_compatibility.php')) {

+		deactivate_plugins('geodir_compat_pack_divi/geodir_divi_compatibility.php');

+	}

 

 }

 

@@ -122,19 +122,19 @@ 
  * @package GeoDirectory

  */

 function geodir_error_log($log){

-    /*

+	/*

      * A filter to override the WP_DEBUG setting for function geodir_error_log().

      *

      * @since 1.5.7

      */

-    $should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

-    if ( true === $should_log ) {

-        if ( is_array( $log ) || is_object( $log ) ) {

-            error_log( print_r( $log, true ) );

-        } else {

-            error_log( $log );

-        }

-    }

+	$should_log = apply_filters( 'geodir_log_errors', WP_DEBUG);

+	if ( true === $should_log ) {

+		if ( is_array( $log ) || is_object( $log ) ) {

+			error_log( print_r( $log, true ) );

+		} else {

+			error_log( $log );

+		}

+	}

 }

 /**

  * Include all plugin functions.

@@ -173,66 +173,66 @@ 
  */

 if (is_admin() || defined( 'GD_TESTING_MODE' )) {

 

-    /**

-     * Include functions used in admin area only.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_functions.php');

-    /**

-     * Most actions/hooks used in admin area only are called from here.

-     *

-     * @since 1.6.11

-     */

-    require_once('geodirectory-admin/admin_dummy_data_functions.php');

-    /**

-     * Most actions/hooks used in admin area only are called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_hooks_actions.php');

-    /**

-     * Most admin JS and CSS is called from here.

-     *

-     * @since 1.0.0

-     */

-    require_once('geodirectory-admin/admin_template_tags.php');

-    /**

-     * Include any functions needed for upgrades.

-     *

-     * @since 1.0.0

-     */

-    require_once(geodir_plugin_path() . '/upgrade.php');

-    if (get_option('geodir_installed') != 1) {

-        /**

-         * Define language constants, here as they are not loaded yet.

-         *

-         * @since 1.0.0

-         */

-        require_once(geodir_plugin_path() . '/language.php');

-        /**

-         * Include the plugin install file that sets up the databases and any options on first run.

-         *

-         * @since 1.0.0

-         */

-        require_once('geodirectory-admin/admin_install.php');

-        register_activation_hook(__FILE__, 'geodir_activation');

-    }

-    register_deactivation_hook(__FILE__, 'geodir_deactivation');

-

-    /*

+	/**

+	 * Include functions used in admin area only.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_functions.php');

+	/**

+	 * Most actions/hooks used in admin area only are called from here.

+	 *

+	 * @since 1.6.11

+	 */

+	require_once('geodirectory-admin/admin_dummy_data_functions.php');

+	/**

+	 * Most actions/hooks used in admin area only are called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_hooks_actions.php');

+	/**

+	 * Most admin JS and CSS is called from here.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once('geodirectory-admin/admin_template_tags.php');

+	/**

+	 * Include any functions needed for upgrades.

+	 *

+	 * @since 1.0.0

+	 */

+	require_once(geodir_plugin_path() . '/upgrade.php');

+	if (get_option('geodir_installed') != 1) {

+		/**

+		 * Define language constants, here as they are not loaded yet.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once(geodir_plugin_path() . '/language.php');

+		/**

+		 * Include the plugin install file that sets up the databases and any options on first run.

+		 *

+		 * @since 1.0.0

+		 */

+		require_once('geodirectory-admin/admin_install.php');

+		register_activation_hook(__FILE__, 'geodir_activation');

+	}

+	register_deactivation_hook(__FILE__, 'geodir_deactivation');

+

+	/*

      * Show a upgrade warning message if applicable.

      *

      * @since 1.5.6

      */

-    global $pagenow;

+	global $pagenow;

    if ( 'plugins.php' === $pagenow )

-    {

-        // Better update message

-        $file   = basename( __FILE__ );

-        $folder = basename( dirname( __FILE__ ) );

-        $hook = "in_plugin_update_message-{$folder}/{$file}";

-        add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

-    }

+	{

+		// Better update message

+		$file   = basename( __FILE__ );

+		$folder = basename( dirname( __FILE__ ) );

+		$hook = "in_plugin_update_message-{$folder}/{$file}";

+		add_action( $hook, 'geodire_admin_upgrade_notice', 20, 2 );

+	}

 

 }

upgrade.php

Indentation +546 added lines, -546 removed lines

@@ -10,47 +10,47 @@ 
 global $wpdb;

 

 if (get_option('geodirectory' . '_db_version') != GEODIRECTORY_VERSION) {

-    /**

-     * Include custom database table related functions.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once('geodirectory-admin/admin_db_install.php');

-    add_action('plugins_loaded', 'geodirectory_upgrade_all', 10);

-    if (GEODIRECTORY_VERSION <= '1.3.6') {

-        add_action('plugins_loaded', 'geodir_upgrade_136', 11);

-    }

+	/**

+	 * Include custom database table related functions.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once('geodirectory-admin/admin_db_install.php');

+	add_action('plugins_loaded', 'geodirectory_upgrade_all', 10);

+	if (GEODIRECTORY_VERSION <= '1.3.6') {

+		add_action('plugins_loaded', 'geodir_upgrade_136', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.4.6') {

-        add_action('init', 'geodir_upgrade_146', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.4.6') {

+		add_action('init', 'geodir_upgrade_146', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.4.8') {

-        add_action('init', 'geodir_upgrade_148', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.4.8') {

+		add_action('init', 'geodir_upgrade_148', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.5.0') {

-        add_action('init', 'geodir_upgrade_150', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.5.0') {

+		add_action('init', 'geodir_upgrade_150', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.5.2') {

-        add_action('init', 'geodir_upgrade_152', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.5.2') {

+		add_action('init', 'geodir_upgrade_152', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.5.3') {

-        add_action('init', 'geodir_upgrade_153', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.5.3') {

+		add_action('init', 'geodir_upgrade_153', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.5.4') {

-        add_action('init', 'geodir_upgrade_154', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.5.4') {

+		add_action('init', 'geodir_upgrade_154', 11);

+	}

 

 

 

-    add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

+	add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

 

-    update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

+	update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

 

 }

 

@@ -63,10 +63,10 @@ 
  */

 function geodirectory_upgrade_all()

 {

-    geodir_create_tables();

-    geodir_update_review_db();

-    gd_install_theme_compat();

-    gd_convert_custom_field_display();

+	geodir_create_tables();

+	geodir_update_review_db();

+	gd_install_theme_compat();

+	gd_convert_custom_field_display();

 }

 

 /**

@@ -77,7 +77,7 @@ 
  */

 function geodir_upgrade_136()

 {

-    geodir_fix_review_overall_rating();

+	geodir_fix_review_overall_rating();

 }

 

 /**

@@ -87,7 +87,7 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_146(){

-    gd_convert_virtual_pages();

+	gd_convert_virtual_pages();

 }

 

 /**

@@ -97,7 +97,7 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_150(){

-    gd_fix_cpt_rewrite_slug();

+	gd_fix_cpt_rewrite_slug();

 }

 

 

@@ -109,11 +109,11 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_148(){

-    /*

+	/*

      * Blank the users google password if present as we now use oAuth 2.0

      */

-    update_option('geodir_ga_pass','');

-    update_option('geodir_ga_user','');

+	update_option('geodir_ga_pass','');

+	update_option('geodir_ga_user','');

 

 }

 

@@ -125,8 +125,8 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_153(){

-    geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 }

 

 /**

@@ -136,7 +136,7 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_154(){

-    geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

 }

 

 /**

@@ -146,7 +146,7 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_152(){

-    gd_fix_address_detail_table_limit();

+	gd_fix_address_detail_table_limit();

 }

 

 

@@ -162,12 +162,12 @@ 
  */

 function geodir_update_review_db()

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    geodir_fix_review_date();

-    geodir_fix_review_post_status();

-    geodir_fix_review_content();

-    geodir_fix_review_location();

+	geodir_fix_review_date();

+	geodir_fix_review_post_status();

+	geodir_fix_review_content();

+	geodir_fix_review_location();

 

 }

 

@@ -180,8 +180,8 @@ 
  */

 function geodir_fix_review_date()

 {

-    global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

+	global $wpdb;

+	$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

 }

 

 /**

@@ -193,8 +193,8 @@ 
  */

 function geodir_fix_review_post_status()

 {

-    global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

+	global $wpdb;

+	$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

 }

 

 /**

@@ -207,12 +207,12 @@ 
  */

 function geodir_fix_review_content()

 {

-    global $wpdb;

-    if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

-        return true;

-    } else {

-        return false;

-    }

+	global $wpdb;

+	if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

+		return true;

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -225,20 +225,20 @@ 
  */

 function geodir_fix_review_location()

 {

-    global $wpdb;

+	global $wpdb;

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

 

-            $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

+			$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

 

-        }

-        return true;

-    }

-    return false;

+		}

+		return true;

+	}

+	return false;

 }

 

 /**

@@ -250,82 +250,82 @@ 
  */

 function geodir_fix_review_overall_rating()

 {

-    global $wpdb;

+	global $wpdb;

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            $reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			$reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

 

-            if (!empty($reviews)) {

-                foreach ($reviews as $post_id) {

-                    geodir_update_postrating($post_id->post_id, $key);

-                }

+			if (!empty($reviews)) {

+				foreach ($reviews as $post_id) {

+					geodir_update_postrating($post_id->post_id, $key);

+				}

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 }

 

 

 function gd_convert_custom_field_display(){

-    global $wpdb;

+	global $wpdb;

 

-    $field_info = $wpdb->get_results("select * from " . GEODIR_CUSTOM_FIELDS_TABLE);

+	$field_info = $wpdb->get_results("select * from " . GEODIR_CUSTOM_FIELDS_TABLE);

 

-    $has_run = get_option('gd_convert_custom_field_display');

-    if($has_run){return;}

+	$has_run = get_option('gd_convert_custom_field_display');

+	if($has_run){return;}

 

-    // set the field_type_key for standard fields

-    $wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET field_type_key = field_type");

+	// set the field_type_key for standard fields

+	$wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET field_type_key = field_type");

 

 

-    if(is_array( $field_info)){

+	if(is_array( $field_info)){

 

-        foreach( $field_info as $cf){

+		foreach( $field_info as $cf){

 

-            $id = $cf->id;

+			$id = $cf->id;

 

-            if(!property_exists($cf,'show_in') || !$id){return;}

+			if(!property_exists($cf,'show_in') || !$id){return;}

 

-            $show_in_arr = array();

+			$show_in_arr = array();

 

-            if($cf->is_default){

-                $show_in_arr[] = "[detail]";

-            }

+			if($cf->is_default){

+				$show_in_arr[] = "[detail]";

+			}

 

-            if($cf->show_on_detail){

-                $show_in_arr[] = "[moreinfo]";

-            }

+			if($cf->show_on_detail){

+				$show_in_arr[] = "[moreinfo]";

+			}

 

-            if($cf->show_on_listing){

-                $show_in_arr[] = "[listing]";

-            }

+			if($cf->show_on_listing){

+				$show_in_arr[] = "[listing]";

+			}

 

-            if($cf->show_as_tab || $cf->htmlvar_name=='geodir_video' || $cf->htmlvar_name=='geodir_special_offers'){

-                $show_in_arr[] = "[owntab]";

-            }

+			if($cf->show_as_tab || $cf->htmlvar_name=='geodir_video' || $cf->htmlvar_name=='geodir_special_offers'){

+				$show_in_arr[] = "[owntab]";

+			}

 

-            if($cf->htmlvar_name=='post' || $cf->htmlvar_name=='geodir_contact' || $cf->htmlvar_name=='geodir_timing'){

-                $show_in_arr[] = "[mapbubble]";

-            }

+			if($cf->htmlvar_name=='post' || $cf->htmlvar_name=='geodir_contact' || $cf->htmlvar_name=='geodir_timing'){

+				$show_in_arr[] = "[mapbubble]";

+			}

 

-            if(!empty($show_in_arr )){

-                $show_in_arr = implode(',',$show_in_arr);

-            }else{

-                $show_in_arr = '';

-            }

+			if(!empty($show_in_arr )){

+				$show_in_arr = implode(',',$show_in_arr);

+			}else{

+				$show_in_arr = '';

+			}

 

-            $wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET show_in='$show_in_arr' WHERE id=$id");

+			$wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET show_in='$show_in_arr' WHERE id=$id");

 

-        }

+		}

 

-        update_option('gd_convert_custom_field_display',1);

-    }

+		update_option('gd_convert_custom_field_display',1);

+	}

 }

 

 ############################################

@@ -341,372 +341,372 @@ 
  */

 function gd_install_theme_compat()

 {

-    global $wpdb;

+	global $wpdb;

 

-    $theme_compat = array();

-    $theme_compat = get_option('gd_theme_compats');

+	$theme_compat = array();

+	$theme_compat = get_option('gd_theme_compats');

 //GDF

-    $theme_compat['GeoDirectory_Framework'] = array(

-        'geodir_wrapper_open_id' => 'geodir_wrapper',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

-        'geodir_wrapper_content_open_id' => 'geodir_content',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<!-- removed -->',

-        'geodir_main_content_close_replace' => '<!-- removed -->',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => '',

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => ''

-    );

+	$theme_compat['GeoDirectory_Framework'] = array(

+		'geodir_wrapper_open_id' => 'geodir_wrapper',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

+		'geodir_wrapper_content_open_id' => 'geodir_content',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<!-- removed -->',

+		'geodir_main_content_close_replace' => '<!-- removed -->',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => '',

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => ''

+	);

 

 //Directory Theme

-    $theme_compat['Directory_Starter'] = array(

-        'geodir_wrapper_open_id' => 'geodir_wrapper',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

-        'geodir_wrapper_content_open_id' => 'geodir_content',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<!-- removed -->',

-        'geodir_main_content_close_replace' => '<!-- removed -->',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => '',

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => ''

-    );

+	$theme_compat['Directory_Starter'] = array(

+		'geodir_wrapper_open_id' => 'geodir_wrapper',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

+		'geodir_wrapper_content_open_id' => 'geodir_content',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<!-- removed -->',

+		'geodir_main_content_close_replace' => '<!-- removed -->',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => '',

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => ''

+	);

 

 //Jobby

-    $theme_compat['Jobby'] = $theme_compat['Directory_Starter'];

+	$theme_compat['Jobby'] = $theme_compat['Directory_Starter'];

 

 //GeoProperty

-    $theme_compat['GeoProperty'] = $theme_compat['Directory_Starter'];

+	$theme_compat['GeoProperty'] = $theme_compat['Directory_Starter'];

 

 //Avada

-    $theme_compat['Avada'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '<!-- removed -->',

-        'geodir_wrapper_close_replace' => '<!-- removed -->',

-        'geodir_wrapper_content_open_id' => 'content',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_right_close_replace' => '</div><!-- end sidebar -->',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_left_close_replace' => '</div><!-- end sidebar -->',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<!-- removed -->',

-        'geodir_main_content_close_replace' => '<!-- removed -->',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.geodir-sidebar-left{float:left}select,textarea{border-style:solid;border-width:1px}.top-menu li > div{visibility:visible}.geodir-chosen-container-single .chosen-single{height:auto}ul li#menu-item-gd-location-switcher ul{width:222px}ul li#menu-item-gd-location-switcher ul li{padding-right:0!important}#mobile-nav li#mobile-menu-item-gd-location-switcher li a{padding-left:10px;padding-right:10px}#menu-item-gd-location-switcher dd,#mobile-menu-item-gd-location-switcher{margin-left:0}#menu-item-gd-location-switcher dd a{display:block}.geodir-chosen-container .chosen-results li.highlighted{background-color:#eee;background-image:none;color:#444}#mobile-nav li.mobile-nav-item li a:before{content:\'\';margin:0}#mobile-nav li.mobile-nav-item li a{padding:10px;width:auto}.geodir-listing-search{text-align:center}.geodir-search{float:none;margin:0}.geodir-search select,.geodir-search .search_by_post,.geodir-search input[type="text"],.geodir-search button[type="button"], .geodir-search input[type="button"],.geodir-search input[type="submit"]{display:inline-block;float:none}.geodir-cat-list ul li,.map_category ul li{list-style-type:none}.wpgeo-avada .page-title ul li:after{content:\'\'}.top_banner_section{margin-bottom:0}.geodir-category-list-in{margin:0;padding:15px}.geodir_full_page .geodir-cat-list .widget-title{margin-top:0}.geodir_full_page .geodir-cat-list ul li{padding-left:0}.geodir-loc-bar{border:none;margin:0;padding:0}.geodir-loc-bar-in{padding:15px 0}.geodir_full_page section.widget{margin-bottom:20px}.sidebar .geodir-loginbox-list li{margin-bottom:10px;padding-bottom:10px}.sidebar .geodir-loginbox-list li a{display:block}.sidebar .geodir-chosen-container .chosen-results li{margin:0;padding:5px 6px}.sidebar .geodir-chosen-container .chosen-results li.highlighted{background:#eee;background-image:none;color:#000}.sidebar .geodir_category_list_view li.geodir-gridview{display:inline-block;margin-bottom:15px}.wpgeo-avada.double-sidebars #main #sidebar{margin-left:3%}.wpgeo-avada.double-sidebars #main #sidebar-2{margin-left:-100%}.wpgeo-avada.double-sidebars #content{float:left;margin-left:0}.geodir_full_page section.widget{margin-bottom: 0px;} .sidebar .widget .geodir-hide {display: none;}li.fusion-mobile-nav-item .geodir_location_tab_container a:before{content: "" !important; margin-right: auto !important;}li.fusion-mobile-nav-item .geodir_location_tab_container a{padding-left:5px !important;}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Avada'

-    );

+	$theme_compat['Avada'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '<!-- removed -->',

+		'geodir_wrapper_close_replace' => '<!-- removed -->',

+		'geodir_wrapper_content_open_id' => 'content',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_right_close_replace' => '</div><!-- end sidebar -->',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_left_close_replace' => '</div><!-- end sidebar -->',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<!-- removed -->',

+		'geodir_main_content_close_replace' => '<!-- removed -->',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.geodir-sidebar-left{float:left}select,textarea{border-style:solid;border-width:1px}.top-menu li > div{visibility:visible}.geodir-chosen-container-single .chosen-single{height:auto}ul li#menu-item-gd-location-switcher ul{width:222px}ul li#menu-item-gd-location-switcher ul li{padding-right:0!important}#mobile-nav li#mobile-menu-item-gd-location-switcher li a{padding-left:10px;padding-right:10px}#menu-item-gd-location-switcher dd,#mobile-menu-item-gd-location-switcher{margin-left:0}#menu-item-gd-location-switcher dd a{display:block}.geodir-chosen-container .chosen-results li.highlighted{background-color:#eee;background-image:none;color:#444}#mobile-nav li.mobile-nav-item li a:before{content:\'\';margin:0}#mobile-nav li.mobile-nav-item li a{padding:10px;width:auto}.geodir-listing-search{text-align:center}.geodir-search{float:none;margin:0}.geodir-search select,.geodir-search .search_by_post,.geodir-search input[type="text"],.geodir-search button[type="button"], .geodir-search input[type="button"],.geodir-search input[type="submit"]{display:inline-block;float:none}.geodir-cat-list ul li,.map_category ul li{list-style-type:none}.wpgeo-avada .page-title ul li:after{content:\'\'}.top_banner_section{margin-bottom:0}.geodir-category-list-in{margin:0;padding:15px}.geodir_full_page .geodir-cat-list .widget-title{margin-top:0}.geodir_full_page .geodir-cat-list ul li{padding-left:0}.geodir-loc-bar{border:none;margin:0;padding:0}.geodir-loc-bar-in{padding:15px 0}.geodir_full_page section.widget{margin-bottom:20px}.sidebar .geodir-loginbox-list li{margin-bottom:10px;padding-bottom:10px}.sidebar .geodir-loginbox-list li a{display:block}.sidebar .geodir-chosen-container .chosen-results li{margin:0;padding:5px 6px}.sidebar .geodir-chosen-container .chosen-results li.highlighted{background:#eee;background-image:none;color:#000}.sidebar .geodir_category_list_view li.geodir-gridview{display:inline-block;margin-bottom:15px}.wpgeo-avada.double-sidebars #main #sidebar{margin-left:3%}.wpgeo-avada.double-sidebars #main #sidebar-2{margin-left:-100%}.wpgeo-avada.double-sidebars #content{float:left;margin-left:0}.geodir_full_page section.widget{margin-bottom: 0px;} .sidebar .widget .geodir-hide {display: none;}li.fusion-mobile-nav-item .geodir_location_tab_container a:before{content: "" !important; margin-right: auto !important;}li.fusion-mobile-nav-item .geodir_location_tab_container a{padding-left:5px !important;}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Avada'

+	);

 

 //Enfold

-    $theme_compat['Enfold'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '</div></main>',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '',

-        'geodir_sidebar_right_close_replace' => '</div></aside><!-- sidebar ends here-->',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '',

-        'geodir_sidebar_left_close_replace' => '</div></aside><!-- sidebar ends here-->',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.geodir_full_page .top_banner_section{margin-bottom:0}.widget .geodir-cat-list ul li{clear:none}.wpgeo-enfold .av-main-nav ul{width:222px}.geodir-listing-search .geodir-loc-bar{border-top:none;padding:0}#main .geodir-listing-search,.geodir-listing-search .geodir-loc-bar{margin-bottom:0}#main .geodir-loc-bar-in,#main .geodir-category-list-in{background-color:#fcfcfc;margin:20px 0;padding:20px}#main .geodir_full_page .geodir-loc-bar-in,#main .geodir_full_page .geodir-loc-bar,#main .geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}#main .geodir-loc-bar-in{padding:20px}#main .geodir-search{margin:0;width:100%}#main .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#main .geodir-search input[type="text"]{margin:0 3% 0 0;padding:10px;width:32.4%}#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"]{font-size:inherit;line-height:2.25;margin:0;padding:7px;width:13%}.enfold-home-top section.widget{margin:0;padding:0}.enfold-home-top .top_banner_section{margin-bottom:0}.enfold-home-top .geodir-loc-bar{background:#fcfcfc;border:none;margin:0;padding:0}#main .enfold-home-top .geodir-loc-bar-in{background:none;border:none;margin:0 auto;padding:20px 0}#main .geodir-breadcrumb{border-bottom-style:solid;border-bottom-width:1px}#gd-tabs dt{clear:none}#geodir_slider ul li{list-style-type:none;margin:0;padding:0}#respond{clear:both}#comments .comments-title span{display:inline;font-size:inherit;font-weight:700}#reviewsTab .comments-area .bypostauthor cite span{display:inline}#top #comments .commentlist .comment,#top #comments .commentlist .comment > div{min-height:0}.commentlist .commenttext{padding-top:15px}#comment_imagesdropbox{margin-bottom:20px}.wpgeo-enfold .geodir_category_list_view li{margin-left:0;padding:0}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_category_list_view li .geodir-post-img{display:block}.wpgeo-enfold .geodir_event_listing_calendar tr.title{background:#ccc}@media only screen and (max-width:480px){.geodir_category_list_view li .geodir-content,.geodir_category_list_view li .geodir-post-img,.geodir_category_list_view li .geodir-addinfo{float:none;width:100%;margin:10px 0}#main .geodir-search input[type="text"],#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"],#main .geodir-search select{margin:10px 0;width:100%}}#main .geodir_full_page section:last-child .geodir-loc-bar{margin-bottom: -1px;border-bottom: none;}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Enfold'

-    );

+	$theme_compat['Enfold'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '</div></main>',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '',

+		'geodir_sidebar_right_close_replace' => '</div></aside><!-- sidebar ends here-->',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '',

+		'geodir_sidebar_left_close_replace' => '</div></aside><!-- sidebar ends here-->',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.geodir_full_page .top_banner_section{margin-bottom:0}.widget .geodir-cat-list ul li{clear:none}.wpgeo-enfold .av-main-nav ul{width:222px}.geodir-listing-search .geodir-loc-bar{border-top:none;padding:0}#main .geodir-listing-search,.geodir-listing-search .geodir-loc-bar{margin-bottom:0}#main .geodir-loc-bar-in,#main .geodir-category-list-in{background-color:#fcfcfc;margin:20px 0;padding:20px}#main .geodir_full_page .geodir-loc-bar-in,#main .geodir_full_page .geodir-loc-bar,#main .geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}#main .geodir-loc-bar-in{padding:20px}#main .geodir-search{margin:0;width:100%}#main .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#main .geodir-search input[type="text"]{margin:0 3% 0 0;padding:10px;width:32.4%}#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"]{font-size:inherit;line-height:2.25;margin:0;padding:7px;width:13%}.enfold-home-top section.widget{margin:0;padding:0}.enfold-home-top .top_banner_section{margin-bottom:0}.enfold-home-top .geodir-loc-bar{background:#fcfcfc;border:none;margin:0;padding:0}#main .enfold-home-top .geodir-loc-bar-in{background:none;border:none;margin:0 auto;padding:20px 0}#main .geodir-breadcrumb{border-bottom-style:solid;border-bottom-width:1px}#gd-tabs dt{clear:none}#geodir_slider ul li{list-style-type:none;margin:0;padding:0}#respond{clear:both}#comments .comments-title span{display:inline;font-size:inherit;font-weight:700}#reviewsTab .comments-area .bypostauthor cite span{display:inline}#top #comments .commentlist .comment,#top #comments .commentlist .comment > div{min-height:0}.commentlist .commenttext{padding-top:15px}#comment_imagesdropbox{margin-bottom:20px}.wpgeo-enfold .geodir_category_list_view li{margin-left:0;padding:0}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_category_list_view li .geodir-post-img{display:block}.wpgeo-enfold .geodir_event_listing_calendar tr.title{background:#ccc}@media only screen and (max-width:480px){.geodir_category_list_view li .geodir-content,.geodir_category_list_view li .geodir-post-img,.geodir_category_list_view li .geodir-addinfo{float:none;width:100%;margin:10px 0}#main .geodir-search input[type="text"],#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"],#main .geodir-search select{margin:10px 0;width:100%}}#main .geodir_full_page section:last-child .geodir-loc-bar{margin-bottom: -1px;border-bottom: none;}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Enfold'

+	);

 

 // X

-    $theme_compat['X'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.x-colophon.bottom{clear:both}#geodir-main-content,.geodir_flex-container{margin-top:16px}.geodir-x ul{list-style:none}.widget ul.geodir_category_list_view{border:none}.geodir_category_list_view li.geodir-gridview:last-child{border-bottom:1px solid #e1e1e1}.home .x-header-landmark{display:none}.geodir-x .x-main .geodir_advance_search_widget{margin:0}.geodir-x .top_banner_section{margin-bottom:0}.geodir-loc-bar{background:rgba(0,0,0,0.05);margin:0;padding:0}.geodir-loc-bar-in{background:none;border:none;padding:10px}.geodir-search{margin:0;width:100%}.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{border:1px solid #ccc;box-shadow:none;height:auto;line-height:21px;margin:0 1% 0 0;padding:5px 10px}.widget .geodir-search select,.geodir-search input[type="text"]{width:28%}.geodir-search input[type="submit"],.geodir-search input[type="button"]{line-height:19px;margin-right:0;width:11%}.geodir-search input:hover[type="submit"],.geodir-search input:hover[type="button"]{background:#333;color:#fff}.geodir-cat-list .widget-title{margin-top:0}.geodir-x .geodir-category-list-in{background:rgba(0,0,0,0.05);border:none}.widget .geodir-cat-list ul.geodir-popular-cat-list{border:none;border-radius:0;box-shadow:none}.geodir_full_page .geodir-cat-list ul li{border:none}.geodir_full_page .geodir-cat-list ul li a{border:none}.post-type-archive .geodir-loc-bar{border:none;margin-top:20px}#menu-item-gd-location-switcher dd{margin-left:0}.geodir-chosen-container-single .chosen-single{height:auto}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_full_page section.widget{clear:both}.x-ethos .entry-title{margin-bottom:20px}.x-ethos .geodir-chosen-container-single .chosen-single{padding:0 0 0 8px}.x-ethos .widget ul li a,.x-ethos .geodir_category_list_view li{color:#333}@media only screen and (max-width:767px){.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{margin:0 0 10px;width:100%}}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-loc-bar,.geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-category-list-in{border-bottom:1px solid rgba(0,0,0,0.1)}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'X'

-    );

+	$theme_compat['X'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.x-colophon.bottom{clear:both}#geodir-main-content,.geodir_flex-container{margin-top:16px}.geodir-x ul{list-style:none}.widget ul.geodir_category_list_view{border:none}.geodir_category_list_view li.geodir-gridview:last-child{border-bottom:1px solid #e1e1e1}.home .x-header-landmark{display:none}.geodir-x .x-main .geodir_advance_search_widget{margin:0}.geodir-x .top_banner_section{margin-bottom:0}.geodir-loc-bar{background:rgba(0,0,0,0.05);margin:0;padding:0}.geodir-loc-bar-in{background:none;border:none;padding:10px}.geodir-search{margin:0;width:100%}.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{border:1px solid #ccc;box-shadow:none;height:auto;line-height:21px;margin:0 1% 0 0;padding:5px 10px}.widget .geodir-search select,.geodir-search input[type="text"]{width:28%}.geodir-search input[type="submit"],.geodir-search input[type="button"]{line-height:19px;margin-right:0;width:11%}.geodir-search input:hover[type="submit"],.geodir-search input:hover[type="button"]{background:#333;color:#fff}.geodir-cat-list .widget-title{margin-top:0}.geodir-x .geodir-category-list-in{background:rgba(0,0,0,0.05);border:none}.widget .geodir-cat-list ul.geodir-popular-cat-list{border:none;border-radius:0;box-shadow:none}.geodir_full_page .geodir-cat-list ul li{border:none}.geodir_full_page .geodir-cat-list ul li a{border:none}.post-type-archive .geodir-loc-bar{border:none;margin-top:20px}#menu-item-gd-location-switcher dd{margin-left:0}.geodir-chosen-container-single .chosen-single{height:auto}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_full_page section.widget{clear:both}.x-ethos .entry-title{margin-bottom:20px}.x-ethos .geodir-chosen-container-single .chosen-single{padding:0 0 0 8px}.x-ethos .widget ul li a,.x-ethos .geodir_category_list_view li{color:#333}@media only screen and (max-width:767px){.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{margin:0 0 10px;width:100%}}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-loc-bar,.geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-category-list-in{border-bottom:1px solid rgba(0,0,0,0.1)}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'X'

+	);

 

 // Divi

-    $theme_compat['Divi'] = array(

-        'geodir_wrapper_open_id' => 'main-content',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => 'left-area',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '<div class="container"><div id="content-area" class="clearfix"><div id="[id]" class="[class]" role="main" >',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => 'sidebar',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_right_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

-        'geodir_sidebar_left_open_id' => 'sidebar',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_left_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('#left-area ul.geodir-direction-nav{list-style-type:none}#sidebar .geodir-company_info{margin-left:30px}#sidebar .geodir-widget{float:none;margin:0 0 30px 30px}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.archive .entry-header,.geodir-breadcrumb{border-bottom:1px solid #e2e2e2}.archive .entry-header h1,ul#breadcrumbs{margin:0 auto;width:1080px}#left-area ul.geodir_category_list_view{padding:10px 0}.nav li#menu-item-gd-location-switcher ul{width:222px}#menu-item-gd-location-switcher li.gd-location-switcher-menu-item{padding-right:0}#menu-item-gd-location-switcher dd{margin-left:0}#menu-item-gd-location-switcher .geodir_location_tab_container dd a{padding:5px;width:auto}@media only screen and ( max-width: 980px ){.geodir-loc-bar-in,.geodir-cat-list,ul#breadcrumbs{width:690px}}@media only screen and ( max-width: 767px ){.geodir-loc-bar-in,.geodir-cat-list,ul#breadcrumbs{width:400px}}@media only screen and ( max-width: 479px ){.geodir-loc-bar-in,.geodir-cat-list,ul#breadcrumbs{width:280px}}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Divi'

-    );

+	$theme_compat['Divi'] = array(

+		'geodir_wrapper_open_id' => 'main-content',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => 'left-area',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '<div class="container"><div id="content-area" class="clearfix"><div id="[id]" class="[class]" role="main" >',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => 'sidebar',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_right_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

+		'geodir_sidebar_left_open_id' => 'sidebar',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_left_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('#left-area ul.geodir-direction-nav{list-style-type:none}#sidebar .geodir-company_info{margin-left:30px}#sidebar .geodir-widget{float:none;margin:0 0 30px 30px}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.archive .entry-header,.geodir-breadcrumb{border-bottom:1px solid #e2e2e2}.archive .entry-header h1,ul#breadcrumbs{margin:0 auto;width:1080px}#left-area ul.geodir_category_list_view{padding:10px 0}.nav li#menu-item-gd-location-switcher ul{width:222px}#menu-item-gd-location-switcher li.gd-location-switcher-menu-item{padding-right:0}#menu-item-gd-location-switcher dd{margin-left:0}#menu-item-gd-location-switcher .geodir_location_tab_container dd a{padding:5px;width:auto}@media only screen and ( max-width: 980px ){.geodir-loc-bar-in,.geodir-cat-list,ul#breadcrumbs{width:690px}}@media only screen and ( max-width: 767px ){.geodir-loc-bar-in,.geodir-cat-list,ul#breadcrumbs{width:400px}}@media only screen and ( max-width: 479px ){.geodir-loc-bar-in,.geodir-cat-list,ul#breadcrumbs{width:280px}}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Divi'

+	);

 

 // Genesis

-    $theme_compat['Genesis'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => 'content-sidebar-wrap',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => 'content',

-        'geodir_wrapper_content_open_replace' => '<div class="[class]" role="main" >',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => 'sidebar sidebar-primary widget-area',

-        'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => 'sidebar sidebar-secondary widget-area',

-        'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<main  id="[id]" class="entry [class]"  role="main">',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-gd-location-switcher menu-item-has-children gd-location-switcher',

-        'geodir_theme_compat_css' => stripslashes('.full-width-content #geodir-wrapper-content{width:100%}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}.content{float:left}.sidebar-content .content,.sidebar-content #geodir-wrapper-content{float:right}.sidebar .geodir-company_info{background-color:#fff;border:none}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.geodir-breadcrumb-bar{margin-bottom:-35px} .search-page .entry-title,.listings-page .entry-title{font-size: 20px;}.site-inner .geodir-breadcrumb-bar{margin-bottom:0px}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Genesis'

-    );

+	$theme_compat['Genesis'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => 'content-sidebar-wrap',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => 'content',

+		'geodir_wrapper_content_open_replace' => '<div class="[class]" role="main" >',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => 'sidebar sidebar-primary widget-area',

+		'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => 'sidebar sidebar-secondary widget-area',

+		'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<main  id="[id]" class="entry [class]"  role="main">',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-gd-location-switcher menu-item-has-children gd-location-switcher',

+		'geodir_theme_compat_css' => stripslashes('.full-width-content #geodir-wrapper-content{width:100%}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}.content{float:left}.sidebar-content .content,.sidebar-content #geodir-wrapper-content{float:right}.sidebar .geodir-company_info{background-color:#fff;border:none}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.geodir-breadcrumb-bar{margin-bottom:-35px} .search-page .entry-title,.listings-page .entry-title{font-size: 20px;}.site-inner .geodir-breadcrumb-bar{margin-bottom:0px}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Genesis'

+	);

 

 // Jupiter

-    $theme_compat['Jupiter'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '<div id="theme-page"><div class="mk-main-wrapper-holder"><div  class="theme-page-wrapper mk-main-wrapper  mk-grid vc_row-fluid">',

-        'geodir_wrapper_close_replace' => '</div></div></div>',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => 'mk-sidebar',

-        'geodir_sidebar_right_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

-        'geodir_sidebar_right_open_replace' => '',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => 'mk-sidebar',

-        'geodir_sidebar_left_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

-        'geodir_sidebar_left_open_replace' => '',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_before_title_filter' => '<h3 class="widgettitle geodir-widget-title">',

-        'geodir_after_title_filter' => '',

-        'geodir_menu_li_class_filter' => 'menu-item menu-item-has-children no-mega-menu',

-        'geodir_sub_menu_ul_class_filter' => '',

-        'geodir_sub_menu_li_class_filter' => '',

-        'geodir_menu_a_class_filter' => 'menu-item-link',

-        'geodir_sub_menu_a_class_filter' => 'menu-item-link one-page-nav-item',

-        'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher menu-item-has-children no-mega-menu',

-        'geodir_location_switcher_menu_a_class_filter' => 'menu-item-link',

-        'geodir_location_switcher_menu_sub_ul_class_filter' => '',

-        'geodir_location_switcher_menu_sub_li_class_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.geodir-widget li,.geodir_category_list_view li{margin:0}#theme-page h3.geodir-entry-title{font-size:14px}#menu-item-gd-location-switcher dd{line-height:44px}#menu-item-gd-location-switcher .geodir_location_sugestion{line-height:20px}.geodir_loginbox{overflow:visible}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Jupiter'

-    );

+	$theme_compat['Jupiter'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '<div id="theme-page"><div class="mk-main-wrapper-holder"><div  class="theme-page-wrapper mk-main-wrapper  mk-grid vc_row-fluid">',

+		'geodir_wrapper_close_replace' => '</div></div></div>',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => 'mk-sidebar',

+		'geodir_sidebar_right_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

+		'geodir_sidebar_right_open_replace' => '',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => 'mk-sidebar',

+		'geodir_sidebar_left_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

+		'geodir_sidebar_left_open_replace' => '',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_before_title_filter' => '<h3 class="widgettitle geodir-widget-title">',

+		'geodir_after_title_filter' => '',

+		'geodir_menu_li_class_filter' => 'menu-item menu-item-has-children no-mega-menu',

+		'geodir_sub_menu_ul_class_filter' => '',

+		'geodir_sub_menu_li_class_filter' => '',

+		'geodir_menu_a_class_filter' => 'menu-item-link',

+		'geodir_sub_menu_a_class_filter' => 'menu-item-link one-page-nav-item',

+		'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher menu-item-has-children no-mega-menu',

+		'geodir_location_switcher_menu_a_class_filter' => 'menu-item-link',

+		'geodir_location_switcher_menu_sub_ul_class_filter' => '',

+		'geodir_location_switcher_menu_sub_li_class_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.geodir-widget li,.geodir_category_list_view li{margin:0}#theme-page h3.geodir-entry-title{font-size:14px}#menu-item-gd-location-switcher dd{line-height:44px}#menu-item-gd-location-switcher .geodir_location_sugestion{line-height:20px}.geodir_loginbox{overflow:visible}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Jupiter'

+	);

 

 // Multi News

-    $theme_compat['Multi_News'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => 'main-container clearfix',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '<div class="main-left" ><div class="main-content  "><div class="site-content page-wrap">',

-        'geodir_wrapper_content_close_replace' => '</div></div></div>',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside  class="sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  class="secondary-sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<div class="site-content page-wrap">',

-        'geodir_main_content_close_replace' => '</div>',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_full_page_class_filter' => 'section full-width-section',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_before_title_filter' => '<div class="widget-title"><h2>',

-        'geodir_after_title_filter' => '</h2></div>',

-        'geodir_menu_li_class_filter' => '',

-        'geodir_sub_menu_ul_class_filter' => '',

-        'geodir_sub_menu_li_class_filter' => '',

-        'geodir_menu_a_class_filter' => '',

-        'geodir_sub_menu_a_class_filter' => '',

-        'geodir_location_switcher_menu_li_class_filter' => '',

-        'geodir_location_switcher_menu_a_class_filter' => '',

-        'geodir_location_switcher_menu_sub_ul_class_filter' => '',

-        'geodir_location_switcher_menu_sub_li_class_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.full-width-section .geodir-search{margin:0;width:100%}.geodir_full_page .geodir-search{margin:0 auto;float:none}.geodir-search input[type=button],.geodir-search input[type=submit]{width:13%}.geodir-search input[type=text]{border:1px solid #ddd;border-radius:0;padding:0 8px}.geodir-category-list-in,.geodir-loc-bar-in{background:#f2f2f2;border-color:#dbdbdb}.geodir-category-list-in{margin-top:0}.geodir-cat-list .widget-title h2{margin:-13px -13px 13px}.widget .geodir-cat-list ul li.geodir-pcat-show a:before{display:none!important}.widget .geodir-cat-list ul li.geodir-pcat-show i{margin-right:5px}.container .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#geodir_carousel,#geodir_slider{border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;margin-bottom:20px!important;border:1px solid #e1e1e1;box-shadow:none}#geodir_carousel{padding:10px}.geodir-tabs-content ol.commentlist{margin:40px 0;padding:0}li#post_mapTab{min-height:400px}#reviewsTab ol.commentlist li{border-bottom:none}#reviewsTab ol.commentlist li article.comment{border-bottom:1px solid #e1e1e1;padding-bottom:10px}.comment-content .rating{display:none}.comment-respond .gd_rating{margin-bottom:20px}div.geodir-rating{width:85px!important}.comment-respond .comment-notes{margin-bottom:10px}.average-review span,.comment-form label,.dtreviewed,.geodir-details-sidebar-user-links a,.geodir-viewall,.geodir_more_info span,.reviewer,dl.geodir-tab-head dd a{font-family:"Archivo Narrow",sans-serif}section.comment-content{margin:0 0 0 12%}#reviewsTab .comments-area .comment-content{width:auto}section.comment-content .description,section.comment-content p{margin:15px 0}dl.geodir-tab-head dd a{background:#f3f3f3;margin-top:-1px;font-size:14px;padding:0 15px}dl.geodir-tab-head dd.geodir-tab-active a{padding-bottom:1px}.geodir-widget .geodir_list_heading,.geodir-widget h3.widget-title{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px;color:#2d2d2d}.geodir-widget .geodir_list_heading h3{background:0 0;border:none}.geodir-widget .geodir_list_heading{margin:-13px -14px 13px}.geodir-map-listing-page{border-width:1px 0 0;border-style:solid;border-color:#dbdbdb}.geodir-sidebar-wrap .geodir-company_info{margin:15px}.geodir-details-sidebar-social-sharing iframe{float:left}.geodir-details-sidebar-rating{overflow:hidden}.geodir-details-sidebar-rating .gd_rating_show,.geodir-details-sidebar-rating .geodir-rating{float:left;margin-right:15px}.geodir-details-sidebar-rating span.item{float:left;margin-top:5px}.geodir-details-sidebar-rating .average-review{top:-4px;position:relative}.geodir-details-sidebar-rating span.item img{margin-top:5px}.geodir_full_page{background:#fff;border:1px solid #e1e1e1;-webkit-box-shadow:0 1px 0 #e5e5e5;box-shadow:0 1px 0 #e5e5e5;padding:15px;margin-bottom:20px;clear:both}.geodir_map_container .main_list img{margin:0 5px}.geodir_category_list_view li.geodir-gridview .geodir-post-img .geodir_thumbnail{margin-bottom:10px}.geodir-addinfo .geodir-pinpoint,.geodir-addinfo a i{margin-right:5px}.geodir_category_list_view li.geodir-gridview h3{font-size:18px;margin-bottom:10px}#related_listingTab ul.geodir_category_list_view{padding:0!important}#reviewsTab #comments .gd_rating{margin-top:5px}.widget .geodir_category_list_view li .geodir-entry-content,.widget .geodir_category_list_view li a:before{display:none!important}.geodir_category_list_view li .geodir-entry-title{margin-bottom:10px}.widget ul.geodir_category_list_view{padding:15px}.sidebar .widget .geodir_category_list_view li{width:calc(100% - 25px)}.widget .geodir-loginbox-list li{overflow:visible!important}.widget ul.chosen-results{margin:0!important}.main_list_selecter{margin-right:5px}.geodir-viewall{float:right;width:auto!important}.widget-title h2{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px}.widget:first-child .geodir_list_heading .widget-title{margin-top:0}.geodir_list_heading .widget-title{float:left;width:80%;margin-top:0}.geodir_list_heading .widget-title h2{padding:0 px;background:0 0;border:none;height:auto;line-height:auto}.chosen-default:before{content:none;display:none;position:absolute;margin-left:-1000000px;float:left}#geodir-wrapper .entry-crumbs{margin-bottom:20px}.geodir-search .mom-select{float:left;width:150px;margin:5px;border:1px solid #ddd;height:40px}.iprelative .gm-style .gm-style-iw{width:100%!important}'),

-        'geodir_theme_compat_js' => 'jQuery(document).ready(function(e){e(".geodir_full_page").length&&""===e.trim(e(".geodir_full_page").html())&&e(".geodir_full_page").css({display:"none"})});',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Multi_News'

-    );

-

-    //Kelo

-    $theme_compat['Kleo'] = array(

-        'geodir_theme_compat_code' => 'Kleo'

-    );

-

-    update_option('gd_theme_compats', $theme_compat);

-

-    gd_set_theme_compat();// set the compat pack if avail

+	$theme_compat['Multi_News'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => 'main-container clearfix',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '<div class="main-left" ><div class="main-content  "><div class="site-content page-wrap">',

+		'geodir_wrapper_content_close_replace' => '</div></div></div>',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside  class="sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  class="secondary-sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<div class="site-content page-wrap">',

+		'geodir_main_content_close_replace' => '</div>',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_full_page_class_filter' => 'section full-width-section',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_before_title_filter' => '<div class="widget-title"><h2>',

+		'geodir_after_title_filter' => '</h2></div>',

+		'geodir_menu_li_class_filter' => '',

+		'geodir_sub_menu_ul_class_filter' => '',

+		'geodir_sub_menu_li_class_filter' => '',

+		'geodir_menu_a_class_filter' => '',

+		'geodir_sub_menu_a_class_filter' => '',

+		'geodir_location_switcher_menu_li_class_filter' => '',

+		'geodir_location_switcher_menu_a_class_filter' => '',

+		'geodir_location_switcher_menu_sub_ul_class_filter' => '',

+		'geodir_location_switcher_menu_sub_li_class_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.full-width-section .geodir-search{margin:0;width:100%}.geodir_full_page .geodir-search{margin:0 auto;float:none}.geodir-search input[type=button],.geodir-search input[type=submit]{width:13%}.geodir-search input[type=text]{border:1px solid #ddd;border-radius:0;padding:0 8px}.geodir-category-list-in,.geodir-loc-bar-in{background:#f2f2f2;border-color:#dbdbdb}.geodir-category-list-in{margin-top:0}.geodir-cat-list .widget-title h2{margin:-13px -13px 13px}.widget .geodir-cat-list ul li.geodir-pcat-show a:before{display:none!important}.widget .geodir-cat-list ul li.geodir-pcat-show i{margin-right:5px}.container .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#geodir_carousel,#geodir_slider{border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;margin-bottom:20px!important;border:1px solid #e1e1e1;box-shadow:none}#geodir_carousel{padding:10px}.geodir-tabs-content ol.commentlist{margin:40px 0;padding:0}li#post_mapTab{min-height:400px}#reviewsTab ol.commentlist li{border-bottom:none}#reviewsTab ol.commentlist li article.comment{border-bottom:1px solid #e1e1e1;padding-bottom:10px}.comment-content .rating{display:none}.comment-respond .gd_rating{margin-bottom:20px}div.geodir-rating{width:85px!important}.comment-respond .comment-notes{margin-bottom:10px}.average-review span,.comment-form label,.dtreviewed,.geodir-details-sidebar-user-links a,.geodir-viewall,.geodir_more_info span,.reviewer,dl.geodir-tab-head dd a{font-family:"Archivo Narrow",sans-serif}section.comment-content{margin:0 0 0 12%}#reviewsTab .comments-area .comment-content{width:auto}section.comment-content .description,section.comment-content p{margin:15px 0}dl.geodir-tab-head dd a{background:#f3f3f3;margin-top:-1px;font-size:14px;padding:0 15px}dl.geodir-tab-head dd.geodir-tab-active a{padding-bottom:1px}.geodir-widget .geodir_list_heading,.geodir-widget h3.widget-title{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px;color:#2d2d2d}.geodir-widget .geodir_list_heading h3{background:0 0;border:none}.geodir-widget .geodir_list_heading{margin:-13px -14px 13px}.geodir-map-listing-page{border-width:1px 0 0;border-style:solid;border-color:#dbdbdb}.geodir-sidebar-wrap .geodir-company_info{margin:15px}.geodir-details-sidebar-social-sharing iframe{float:left}.geodir-details-sidebar-rating{overflow:hidden}.geodir-details-sidebar-rating .gd_rating_show,.geodir-details-sidebar-rating .geodir-rating{float:left;margin-right:15px}.geodir-details-sidebar-rating span.item{float:left;margin-top:5px}.geodir-details-sidebar-rating .average-review{top:-4px;position:relative}.geodir-details-sidebar-rating span.item img{margin-top:5px}.geodir_full_page{background:#fff;border:1px solid #e1e1e1;-webkit-box-shadow:0 1px 0 #e5e5e5;box-shadow:0 1px 0 #e5e5e5;padding:15px;margin-bottom:20px;clear:both}.geodir_map_container .main_list img{margin:0 5px}.geodir_category_list_view li.geodir-gridview .geodir-post-img .geodir_thumbnail{margin-bottom:10px}.geodir-addinfo .geodir-pinpoint,.geodir-addinfo a i{margin-right:5px}.geodir_category_list_view li.geodir-gridview h3{font-size:18px;margin-bottom:10px}#related_listingTab ul.geodir_category_list_view{padding:0!important}#reviewsTab #comments .gd_rating{margin-top:5px}.widget .geodir_category_list_view li .geodir-entry-content,.widget .geodir_category_list_view li a:before{display:none!important}.geodir_category_list_view li .geodir-entry-title{margin-bottom:10px}.widget ul.geodir_category_list_view{padding:15px}.sidebar .widget .geodir_category_list_view li{width:calc(100% - 25px)}.widget .geodir-loginbox-list li{overflow:visible!important}.widget ul.chosen-results{margin:0!important}.main_list_selecter{margin-right:5px}.geodir-viewall{float:right;width:auto!important}.widget-title h2{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px}.widget:first-child .geodir_list_heading .widget-title{margin-top:0}.geodir_list_heading .widget-title{float:left;width:80%;margin-top:0}.geodir_list_heading .widget-title h2{padding:0 px;background:0 0;border:none;height:auto;line-height:auto}.chosen-default:before{content:none;display:none;position:absolute;margin-left:-1000000px;float:left}#geodir-wrapper .entry-crumbs{margin-bottom:20px}.geodir-search .mom-select{float:left;width:150px;margin:5px;border:1px solid #ddd;height:40px}.iprelative .gm-style .gm-style-iw{width:100%!important}'),

+		'geodir_theme_compat_js' => 'jQuery(document).ready(function(e){e(".geodir_full_page").length&&""===e.trim(e(".geodir_full_page").html())&&e(".geodir_full_page").css({display:"none"})});',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Multi_News'

+	);

+

+	//Kelo

+	$theme_compat['Kleo'] = array(

+		'geodir_theme_compat_code' => 'Kleo'

+	);

+

+	update_option('gd_theme_compats', $theme_compat);

+

+	gd_set_theme_compat();// set the compat pack if avail

 }

 

 

@@ -718,61 +718,61 @@ 
  * @global object $wpdb WordPress Database object.

  */

 function gd_convert_virtual_pages(){

-    global $wpdb;

-

-    // Update the add listing page settings

-    $add_listing_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('add-listing')

-        )

-    );

-

-    if($add_listing_page){

-        wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

-        update_option( 'geodir_add_listing_page', $add_listing_page);

-    }

-

-    // Update the listing preview page settings

-    $listing_preview_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('listing-preview')

-        )

-    );

-

-    if($listing_preview_page){

-        wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

-        update_option( 'geodir_preview_page', $listing_preview_page);

-    }

-

-    // Update the listing success page settings

-    $listing_success_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('listing-success')

-        )

-    );

-

-    if($listing_success_page){

-        wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

-        update_option( 'geodir_success_page', $listing_success_page);

-    }

-

-    // Update the listing success page settings

-    $location_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('location')

-        )

-    );

-

-    if($location_page){

-        $location_slug = get_option('geodir_location_prefix');

-        if(!$location_slug ){$location_slug  = 'location';}

-        wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

-        update_option( 'geodir_location_page', $location_page);

-    }

+	global $wpdb;

+

+	// Update the add listing page settings

+	$add_listing_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('add-listing')

+		)

+	);

+

+	if($add_listing_page){

+		wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

+		update_option( 'geodir_add_listing_page', $add_listing_page);

+	}

+

+	// Update the listing preview page settings

+	$listing_preview_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('listing-preview')

+		)

+	);

+

+	if($listing_preview_page){

+		wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

+		update_option( 'geodir_preview_page', $listing_preview_page);

+	}

+

+	// Update the listing success page settings

+	$listing_success_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('listing-success')

+		)

+	);

+

+	if($listing_success_page){

+		wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

+		update_option( 'geodir_success_page', $listing_success_page);

+	}

+

+	// Update the listing success page settings

+	$location_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('location')

+		)

+	);

+

+	if($location_page){

+		$location_slug = get_option('geodir_location_prefix');

+		if(!$location_slug ){$location_slug  = 'location';}

+		wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

+		update_option( 'geodir_location_page', $location_page);

+	}

 

 }

 

@@ -786,31 +786,31 @@ 
 function gd_fix_cpt_rewrite_slug()

 {

 

-    $alt_post_types = array();

-    $post_types = get_option('geodir_post_types');

+	$alt_post_types = array();

+	$post_types = get_option('geodir_post_types');

 

 

-    if (is_array($post_types)){

+	if (is_array($post_types)){

 

-        foreach ($post_types as $post_type => $args) {

+		foreach ($post_types as $post_type => $args) {

 

 

-            if(isset($args['rewrite']['slug'])){

-                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

-            }

+			if(isset($args['rewrite']['slug'])){

+				$args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

+			}

 

-                $alt_post_types[$post_type] = $args;

+				$alt_post_types[$post_type] = $args;

 

-        }

-    }

+		}

+	}

 

-    if(!empty($alt_post_types)) {

-        update_option('geodir_post_types',$alt_post_types);

-        }

+	if(!empty($alt_post_types)) {

+		update_option('geodir_post_types',$alt_post_types);

+		}

 

 

-    // flush the rewrite rules

-    flush_rewrite_rules();

+	// flush the rewrite rules

+	flush_rewrite_rules();

 }

 

 

@@ -823,18 +823,18 @@ 
  */

 function gd_fix_address_detail_table_limit()

 {

-    global $wpdb;

-

-    $all_postypes = geodir_get_posttypes();

-

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            try {

-                $wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

-            } catch(Exception $e) {

-                error_log( 'Error: ' . $e->getMessage() );

-            }

-        }

-    }

+	global $wpdb;

+

+	$all_postypes = geodir_get_posttypes();

+

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			try {

+				$wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

+			} catch(Exception $e) {

+				error_log( 'Error: ' . $e->getMessage() );

+			}

+		}

+	}

 }