View GitHub Repository geodirectory

Schedule Inspection
Subscribe
Test Failed
Pull Request — master (#380)
by Kiran
14:52
created
Status
Category
Toggle Patches
geodirectory_template_tags.php 3 patches
Braces   +34 added lines, -19 removed lines patch added patch discarded remove patch 
@@ -252,7 +252,7 @@  discard block
 
 block discarded – undo
252 252 
         </script>
253 253
254 254 
         <?php
255 
-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
255 
+    } elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
256 256 
         echo stripslashes(get_option('geodir_ga_tracking_code'));
257 257 
     }
258 258 
 }

@@ -291,13 +291,14 @@  discard block
 
 block discarded – undo
291 291 
  */
292 292 
 function geodir_add_async_forscript($url)
293 293 
 {
294 
-    if (strpos($url, '#asyncload')===false)
295 
-        return $url;
296 
-    else if (is_admin())
297 
-        return str_replace('#asyncload', '', $url);
298 
-    else
299 
-        return str_replace('#asyncload', '', $url)."' async='async";
300 
-}
294 
+    if (strpos($url, '#asyncload')===false) {
295 
+            return $url;
296 
+    } else if (is_admin()) {
297 
+            return str_replace('#asyncload', '', $url);
298 
+    } else {
299 
+            return str_replace('#asyncload', '', $url)."' async='async";
300 
+    }
301 
+    }
301 302 
 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);
302 303
303 304 
 /**

@@ -364,8 +365,10 @@  discard block
 
 block discarded – undo
364 365
365 366 
     $half_pages_to_show = round($pages_to_show / 2);
366 367
367 
-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.
368 
-        return;
368 
+    if (geodir_is_page('home')) {
369 
+    	// dont apply default  pagination for geodirectory home page.
370 
+        return;
371 
+    }
369 372
370 373 
     if (!is_single()) {
371 374 
         if (function_exists('geodir_location_geo_home_link')) {

@@ -485,11 +488,21 @@  discard block
 
 block discarded – undo
485 488 
     }
486 489 
     $dist_dif = 1000;
487 490
488 
-    if ($dist <= 5000) $dist_dif = 500;
489 
-    if ($dist <= 1000) $dist_dif = 100;
490 
-    if ($dist <= 500) $dist_dif = 50;
491 
-    if ($dist <= 100) $dist_dif = 10;
492 
-    if ($dist <= 50) $dist_dif = 5;
491 
+    if ($dist <= 5000) {
492 
+    	$dist_dif = 500;
493 
+    }
494 
+    if ($dist <= 1000) {
495 
+    	$dist_dif = 100;
496 
+    }
497 
+    if ($dist <= 500) {
498 
+    	$dist_dif = 50;
499 
+    }
500 
+    if ($dist <= 100) {
501 
+    	$dist_dif = 10;
502 
+    }
503 
+    if ($dist <= 50) {
504 
+    	$dist_dif = 5;
505 
+    }
493 506
494 507 
     ?>
495 508 
     <script type="text/javascript">

@@ -550,12 +563,14 @@  discard block
 
 block discarded – undo
550 563 
  */
551 564 
 function geodir_add_sharelocation_scripts() {
552 565 
     $default_search_for_text = SEARCH_FOR_TEXT;
553 
-    if (get_option('geodir_search_field_default_text'))
554 
-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
566 
+    if (get_option('geodir_search_field_default_text')) {
567 
+            $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
568 
+    }
555 569
556 570 
     $default_near_text = NEAR_TEXT;
557 
-    if (get_option('geodir_near_field_default_text'))
558 
-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
571 
+    if (get_option('geodir_near_field_default_text')) {
572 
+            $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
573 
+    }
559 574
560 575 
     $search_location = geodir_get_default_location();
561 576
Please login to merge, or discard this patch.
Indentation   +337 added lines, -337 removed lines patch added patch discarded remove patch 
@@ -22,7 +22,7 @@  discard block
 
 block discarded – undo
22 22 
  */
23 23 
 function geodir_core_dequeue_script()
24 24 
 {
25 
-    wp_dequeue_script('flexslider');
25 
+	wp_dequeue_script('flexslider');
26 26 
 }
27 27
28 28 
 add_action('wp_print_scripts', 'geodir_core_dequeue_script', 100);

@@ -35,168 +35,168 @@  discard block
 
 block discarded – undo
35 35 
  */
36 36 
 function geodir_templates_scripts()
37 37 
 {
38 
-    $is_detail_page = false;
39 
-    $geodir_map_name = geodir_map_name();
38 
+	$is_detail_page = false;
39 
+	$geodir_map_name = geodir_map_name();
40 40
41 
-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
42 
-        $is_detail_page = true;
43 
-    }
44 
-
45 
-    wp_enqueue_script('jquery');
46 
-
47 
-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
48 
-    wp_enqueue_script('geodirectory-script');
41 
+	if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
42 
+		$is_detail_page = true;
43 
+	}
49 44
50 
-    $geodir_vars_data = array(
51 
-        'siteurl' => get_option('siteurl'),
52 
-        'geodir_plugin_url' => geodir_plugin_url(),
53 
-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),
54 
-        'geodir_ajax_url' => geodir_get_ajax_url(),
55 
-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
56 
-        'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue
57 
-    );
45 
+	wp_enqueue_script('jquery');
46 
+
47 
+	wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
48 
+	wp_enqueue_script('geodirectory-script');
49 
+
50 
+	$geodir_vars_data = array(
51 
+		'siteurl' => get_option('siteurl'),
52 
+		'geodir_plugin_url' => geodir_plugin_url(),
53 
+		'geodir_lazy_load' => get_option('geodir_lazy_load',1),
54 
+		'geodir_ajax_url' => geodir_get_ajax_url(),
55 
+		'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
56 
+		'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue
57 
+	);
58 
+
59 
+	/**
60 
+	 * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.
61 
+	 *
62 
+	 * This is used by addons to add JS translatable variables.
63 
+	 *
64 
+	 * @since 1.4.4
65 
+	 * @param array $geodir_vars_data {
66 
+	 *    geodir var data used by addons to add JS translatable variables.
67 
+	 *
68 
+	 *    @type string $siteurl Site url.
69 
+	 *    @type string $geodir_plugin_url Geodirectory core plugin url.
70 
+	 *    @type string $geodir_ajax_url Geodirectory plugin ajax url.
71 
+	 *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.
72 
+	 *    @type int $is_rtl Checks if current locale is RTL.
73 
+	 *
74 
+	 * }
75 
+	 */
76 
+	$geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
77 
+
78 
+	wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
79 
+
80 
+	wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
81 
+	if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
82 
+
83 
+	wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
84 
+	wp_enqueue_script('geodirectory-lightbox-jquery');
85 
+
86 
+	wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
87 
+	if ($is_detail_page) {
88 
+		wp_enqueue_script('geodirectory-jquery-simplemodal');
89 
+	}
58 90
59 
-    /**
60 
-     * Filter the `geodir_var` data array that outputs the  wp_localize_script() translations and variables.
61 
-     *
62 
-     * This is used by addons to add JS translatable variables.
63 
-     *
64 
-     * @since 1.4.4
65 
-     * @param array $geodir_vars_data {
66 
-     *    geodir var data used by addons to add JS translatable variables.
67 
-     *
68 
-     *    @type string $siteurl Site url.
69 
-     *    @type string $geodir_plugin_url Geodirectory core plugin url.
70 
-     *    @type string $geodir_ajax_url Geodirectory plugin ajax url.
71 
-     *    @type int $geodir_gd_modal Disable GD modal that displays slideshow images in popup?.
72 
-     *    @type int $is_rtl Checks if current locale is RTL.
73 
-     *
74 
-     * }
75 
-     */
76 
-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
77 
-
78 
-    wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
79 
-
80 
-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
81 
-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
82 
-
83 
-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
84 
-    wp_enqueue_script('geodirectory-lightbox-jquery');
85 
-
86 
-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
87 
-    if ($is_detail_page) {
88 
-        wp_enqueue_script('geodirectory-jquery-simplemodal');
89 
-    }
90 
-
91 
-    if (in_array($geodir_map_name, array('auto', 'google'))) {
92 
-        $map_lang = "&language=" . geodir_get_map_default_language();
93 
-        $map_key = "&key=" . geodir_get_map_api_key();
94 
-        /**
95 
-         * Filter the variables that are added to the end of the google maps script call.
96 
-         *
97 
-         * This i used to change things like google maps language etc.
98 
-         *
99 
-         * @since 1.0.0
100 
-         * @param string $var The string to filter, default is empty string.
101 
-         */
102 
-        $map_extra = apply_filters('geodir_googlemap_script_extra', '');
103 
-        wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
104 
-    }
91 
+	if (in_array($geodir_map_name, array('auto', 'google'))) {
92 
+		$map_lang = "&language=" . geodir_get_map_default_language();
93 
+		$map_key = "&key=" . geodir_get_map_api_key();
94 
+		/**
95 
+		 * Filter the variables that are added to the end of the google maps script call.
96 
+		 *
97 
+		 * This i used to change things like google maps language etc.
98 
+		 *
99 
+		 * @since 1.0.0
100 
+		 * @param string $var The string to filter, default is empty string.
101 
+		 */
102 
+		$map_extra = apply_filters('geodir_googlemap_script_extra', '');
103 
+		wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
104 
+	}
105 105
106 
-    if ($geodir_map_name == 'osm') {
107 
-        // Leaflet OpenStreetMap
108 
-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
109 
-        wp_enqueue_style('geodirectory-leaflet-style');
106 
+	if ($geodir_map_name == 'osm') {
107 
+		// Leaflet OpenStreetMap
108 
+		wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
109 
+		wp_enqueue_style('geodirectory-leaflet-style');
110 110
111 
-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
112 
-        wp_enqueue_script('geodirectory-leaflet-script');
111 
+		wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
112 
+		wp_enqueue_script('geodirectory-leaflet-script');
113 113
114 
-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);
115 
-        wp_enqueue_script('geodirectory-leaflet-geo-script');
114 
+		wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);
115 
+		wp_enqueue_script('geodirectory-leaflet-geo-script');
116 116
117 
-        if ($is_detail_page) {
118 
-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
119 
-            wp_enqueue_style('geodirectory-leaflet-routing-style');
117 
+		if ($is_detail_page) {
118 
+			wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
119 
+			wp_enqueue_style('geodirectory-leaflet-routing-style');
120 120
121 
-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);
122 
-            wp_enqueue_script('geodirectory-leaflet-routing-script');
123 
-        }
124 
-    }
125 
-    wp_enqueue_script( 'jquery-ui-autocomplete' );
121 
+			wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);
122 
+			wp_enqueue_script('geodirectory-leaflet-routing-script');
123 
+		}
124 
+	}
125 
+	wp_enqueue_script( 'jquery-ui-autocomplete' );
126 126
127 
-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
128 
-    wp_enqueue_script('geodirectory-goMap-script');
129 
-
130 
-
131 
-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
132 
-    wp_enqueue_script('chosen');
133 
-
134 
-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
135 
-    wp_enqueue_script('geodirectory-choose-ajax');
136 
-
137 
-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
138 
-
139 
-    if (is_page() && geodir_is_page('add-listing')) {
140 
-        // SCRIPT FOR UPLOAD
141 
-        wp_enqueue_script('plupload-all');
142 
-        wp_enqueue_script('jquery-ui-sortable');
143 
-
144 
-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
145 
-        wp_enqueue_script('geodirectory-plupload-script');
146 
-        // SCRIPT FOR UPLOAD END
147 
-
148 
-        // check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls
149 
-        if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
150 
-            $ajax_url = admin_url('admin-ajax.php');
151 
-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
152 
-            $ajax_url = admin_url('admin-ajax.php');
153 
-        } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
154 
-            $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
155 
-        } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
156 
-            $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
157 
-        } else {
158 
-            $ajax_url = admin_url('admin-ajax.php');
159 
-        }
127 
+	wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
128 
+	wp_enqueue_script('geodirectory-goMap-script');
129 
+
130 
+
131 
+	wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
132 
+	wp_enqueue_script('chosen');
133 
+
134 
+	wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
135 
+	wp_enqueue_script('geodirectory-choose-ajax');
136 
+
137 
+	wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
138 
+
139 
+	if (is_page() && geodir_is_page('add-listing')) {
140 
+		// SCRIPT FOR UPLOAD
141 
+		wp_enqueue_script('plupload-all');
142 
+		wp_enqueue_script('jquery-ui-sortable');
143 
+
144 
+		wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
145 
+		wp_enqueue_script('geodirectory-plupload-script');
146 
+		// SCRIPT FOR UPLOAD END
147 
+
148 
+		// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls
149 
+		if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
150 
+			$ajax_url = admin_url('admin-ajax.php');
151 
+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
152 
+			$ajax_url = admin_url('admin-ajax.php');
153 
+		} elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {
154 
+			$ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));
155 
+		} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {
156 
+			$ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));
157 
+		} else {
158 
+			$ajax_url = admin_url('admin-ajax.php');
159 
+		}
160 160
161 
-        // place js config array for plupload
162 
-        $plupload_init = array(
163 
-            'runtimes' => 'html5,silverlight,flash,browserplus,gears,html4',
164 
-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader
165 
-            'container' => 'plupload-upload-ui', // will be adjusted per uploader
166 
-            'drop_element' => 'dropbox', // will be adjusted per uploader
167 
-            'file_data_name' => 'async-upload', // will be adjusted per uploader
168 
-            'multiple_queues' => true,
169 
-            'max_file_size' => geodir_max_upload_size(),
170 
-            'url' => $ajax_url,
171 
-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
172 
-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
173 
-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
174 
-            'multipart' => true,
175 
-            'urlstream_upload' => true,
176 
-            'multi_selection' => false, // will be added per uploader
177 
-            // additional post data to send to our ajax hook
178 
-            'multipart_params' => array(
179 
-                '_ajax_nonce' => "", // will be added per uploader
180 
-                'action' => 'plupload_action', // the ajax action name
181 
-                'imgid' => 0 // will be added per uploader
182 
-            )
183 
-        );
184 
-        $base_plupload_config = json_encode($plupload_init);
185 
-
186 
-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
187 
-            'upload_img_size' => geodir_max_upload_size());
188 
-
189 
-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
190 
-
191 
-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
192 
-    } // End if for add place page
193 
-
194 
-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
195 
-    if ($is_detail_page) {
161 
+		// place js config array for plupload
162 
+		$plupload_init = array(
163 
+			'runtimes' => 'html5,silverlight,flash,browserplus,gears,html4',
164 
+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader
165 
+			'container' => 'plupload-upload-ui', // will be adjusted per uploader
166 
+			'drop_element' => 'dropbox', // will be adjusted per uploader
167 
+			'file_data_name' => 'async-upload', // will be adjusted per uploader
168 
+			'multiple_queues' => true,
169 
+			'max_file_size' => geodir_max_upload_size(),
170 
+			'url' => $ajax_url,
171 
+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
172 
+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
173 
+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
174 
+			'multipart' => true,
175 
+			'urlstream_upload' => true,
176 
+			'multi_selection' => false, // will be added per uploader
177 
+			// additional post data to send to our ajax hook
178 
+			'multipart_params' => array(
179 
+				'_ajax_nonce' => "", // will be added per uploader
180 
+				'action' => 'plupload_action', // the ajax action name
181 
+				'imgid' => 0 // will be added per uploader
182 
+			)
183 
+		);
184 
+		$base_plupload_config = json_encode($plupload_init);
185 
+
186 
+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
187 
+			'upload_img_size' => geodir_max_upload_size());
188 
+
189 
+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
190 
+
191 
+		wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
192 
+	} // End if for add place page
193 
+
194 
+	wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
195 
+	if ($is_detail_page) {
196 196 
 		wp_enqueue_script('geodirectory-post-custom-js');
197 197 
 	}
198 198
199 
-    // font awesome rating script
199 
+	// font awesome rating script
200 200 
 	if (get_option('geodir_reviewrating_enable_font_awesome')) {
201 201 
 		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
202 202 
 		wp_enqueue_script('geodir-barrating-js');

@@ -205,11 +205,11 @@  discard block
 
 block discarded – undo
205 205 
 		wp_enqueue_script('geodir-jRating-js');
206 206 
 	}
207 207
208 
-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
209 
-    wp_enqueue_script('geodir-on-document-load');
208 
+	wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
209 
+	wp_enqueue_script('geodir-on-document-load');
210 210
211 
-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
212 
-    wp_enqueue_script('google-geometa');
211 
+	wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
212 
+	wp_enqueue_script('google-geometa');
213 213 
 }
214 214
215 215 
 /**

@@ -223,8 +223,8 @@  discard block
 
 block discarded – undo
223 223 
  */
224 224 
 function geodir_header_scripts()
225 225 
 {
226 
-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
227 
-    echo stripslashes(get_option('geodir_header_scripts'));
226 
+	echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
227 
+	echo stripslashes(get_option('geodir_header_scripts'));
228 228 
 }
229 229
230 230 
 /**

@@ -237,7 +237,7 @@  discard block
 
 block discarded – undo
237 237 
  */
238 238 
 function geodir_google_analytics_tracking_code()
239 239 
 {
240 
-    if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
240 
+	if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
241 241
242 242 
         <script>
243 243 
             (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

@@ -252,9 +252,9 @@  discard block
 
 block discarded – undo
252 252 
         </script>
253 253
254 254 
         <?php
255 
-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
256 
-        echo stripslashes(get_option('geodir_ga_tracking_code'));
257 
-    }
255 
+	}elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
256 
+		echo stripslashes(get_option('geodir_ga_tracking_code'));
257 
+	}
258 258 
 }
259 259
260 260 
 /**

@@ -268,16 +268,16 @@  discard block
 
 block discarded – undo
268 268 
 function geodir_footer_scripts()
269 269 
 {
270 270
271 
-    echo stripslashes(get_option('geodir_footer_scripts'));
271 
+	echo stripslashes(get_option('geodir_footer_scripts'));
272 272
273 
-    /*
273 
+	/*
274 274 
      * Apple suck and can't/won't fix bugs: https://bugs.webkit.org/show_bug.cgi?id=136041
275 275 
      *
276 276 
      * Flexbox wont wrap on ios for search form items
277 277 
      */
278 
-    if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
279 
-        echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
280 
-    }
278 
+	if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
279 
+		echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
280 
+	}
281 281 
 }
282 282
283 283 
 

@@ -291,12 +291,12 @@  discard block
 
 block discarded – undo
291 291 
  */
292 292 
 function geodir_add_async_forscript($url)
293 293 
 {
294 
-    if (strpos($url, '#asyncload')===false)
295 
-        return $url;
296 
-    else if (is_admin())
297 
-        return str_replace('#asyncload', '', $url);
298 
-    else
299 
-        return str_replace('#asyncload', '', $url)."' async='async";
294 
+	if (strpos($url, '#asyncload')===false)
295 
+		return $url;
296 
+	else if (is_admin())
297 
+		return str_replace('#asyncload', '', $url);
298 
+	else
299 
+		return str_replace('#asyncload', '', $url)."' async='async";
300 300 
 }
301 301 
 add_filter('clean_url', 'geodir_add_async_forscript', 11, 1);
302 302 
 

@@ -309,17 +309,17 @@  discard block
 
 block discarded – undo
309 309 
 function geodir_templates_styles()
310 310 
 {
311 311
312 
-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
313 
-    wp_enqueue_style('geodir-core-scss');
314 
-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
312 
+	wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
313 
+	wp_enqueue_style('geodir-core-scss');
314 
+	wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
315 315
316 
-    if(is_rtl()){
317 
-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
318 
-    wp_enqueue_style('geodirectory-frontend-rtl-style');
319 
-    }
316 
+	if(is_rtl()){
317 
+	wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
318 
+	wp_enqueue_style('geodirectory-frontend-rtl-style');
319 
+	}
320 320
321 
-    wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
322 
-    wp_enqueue_style('font-awesome');
321 
+	wp_register_style('font-awesome', '//maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
322 
+	wp_enqueue_style('font-awesome');
323 323
324 324
325 325 
 }

@@ -333,7 +333,7 @@  discard block
 
 block discarded – undo
333 333 
  */
334 334 
 function geodir_get_sidebar()
335 335 
 {
336 
-    get_sidebar('geodirectory');
336 
+	get_sidebar('geodirectory');
337 337 
 }
338 338
339 339 
 /**

@@ -352,122 +352,122 @@  discard block
 
 block discarded – undo
352 352 
  * @param bool $always_show Do you want to show the pagination always? Default: false.
353 353 
  */
354 354 
 function geodir_pagination($before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {
355 
-    global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;
355 
+	global $wp_query, $posts_per_page, $wpdb, $paged, $blog_id;
356 356
357 
-    if (empty($prelabel)) {
358 
-        $prelabel = '<strong>&laquo;</strong>';
359 
-    }
357 
+	if (empty($prelabel)) {
358 
+		$prelabel = '<strong>&laquo;</strong>';
359 
+	}
360 360
361 
-    if (empty($nxtlabel)) {
362 
-        $nxtlabel = '<strong>&raquo;</strong>';
363 
-    }
361 
+	if (empty($nxtlabel)) {
362 
+		$nxtlabel = '<strong>&raquo;</strong>';
363 
+	}
364 364
365 
-    $half_pages_to_show = round($pages_to_show / 2);
365 
+	$half_pages_to_show = round($pages_to_show / 2);
366 366
367 
-    if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.
368 
-        return;
367 
+	if (geodir_is_page('home')) // dont apply default  pagination for geodirectory home page.
368 
+		return;
369 369
370 
-    if (!is_single()) {
371 
-        if (function_exists('geodir_location_geo_home_link')) {
372 
-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
373 
-        }
374 
-        $numposts = $wp_query->found_posts;
370 
+	if (!is_single()) {
371 
+		if (function_exists('geodir_location_geo_home_link')) {
372 
+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
373 
+		}
374 
+		$numposts = $wp_query->found_posts;
375 375
376 
-        $max_page = ceil($numposts / $posts_per_page);
376 
+		$max_page = ceil($numposts / $posts_per_page);
377 377
378 
-        if (empty($paged)) {
379 
-            $paged = 1;
380 
-        }
378 
+		if (empty($paged)) {
379 
+			$paged = 1;
380 
+		}
381 381
382 
-        $post_type = geodir_get_current_posttype();
383 
-        $listing_type_name = get_post_type_plural_label($post_type);
384 
-        if (geodir_is_page('listing') || geodir_is_page('search')) {
385 
-            $term = array();
382 
+		$post_type = geodir_get_current_posttype();
383 
+		$listing_type_name = get_post_type_plural_label($post_type);
384 
+		if (geodir_is_page('listing') || geodir_is_page('search')) {
385 
+			$term = array();
386 386
387 
-            if (is_tax()) {
388 
-                $term_id = get_queried_object_id();
389 
-                $taxonomy = get_query_var('taxonomy');
387 
+			if (is_tax()) {
388 
+				$term_id = get_queried_object_id();
389 
+				$taxonomy = get_query_var('taxonomy');
390 390
391 
-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
392 
-                    $term = get_term($term_id, $post_type . 'category');
393 
-                }
394 
-            }
391 
+				if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
392 
+					$term = get_term($term_id, $post_type . 'category');
393 
+				}
394 
+			}
395 395
396 
-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
397 
-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];
396 
+			if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
397 
+				$taxonomy_search = $_REQUEST['s' . $post_type . 'category'];
398 398
399 
-                if (!is_array($taxonomy_search)) {
400 
-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');
401 
-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
402 
-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');
403 
-                }
404 
-            }
399 
+				if (!is_array($taxonomy_search)) {
400 
+					$term = get_term((int)$taxonomy_search, $post_type . 'category');
401 
+				} else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
402 
+					$term = get_term((int)$taxonomy_search[0], $post_type . 'category');
403 
+				}
404 
+			}
405 405
406 
-            if (!empty($term) && !is_wp_error($term)) {
407 
-                $listing_type_name = $term->name;
408 
-            }
409 
-        }
406 
+			if (!empty($term) && !is_wp_error($term)) {
407 
+				$listing_type_name = $term->name;
408 
+			}
409 
+		}
410 410
411 
-        if ($max_page > 1 || $always_show) {
412 
-            // Extra pagination info
413 
-            $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
414 
-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;
415 
-            $end_no = min($paged * $posts_per_page, $numposts);
411 
+		if ($max_page > 1 || $always_show) {
412 
+			// Extra pagination info
413 
+			$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
414 
+			$start_no = ( $paged - 1 ) * $posts_per_page + 1;
415 
+			$end_no = min($paged * $posts_per_page, $numposts);
416 416
417 
-            if ($geodir_pagination_more_info != '') {
418 
-                if ($listing_type_name) {
419 
-                    $listing_type_name = __($listing_type_name, 'geodirectory');
420 
-                    $pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);
421 
-                } else {
422 
-                    $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
423 
-                }
424 
-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';
425 
-                /**
426 
-                 * Adds an extra pagination info above/under pagination.
427 
-                 *
428 
-                 * @since 1.5.9
429 
-                 *
430 
-                 * @param string $pagination_info Extra pagination info content.
431 
-                 * @param string $listing_type_name Listing results type.
432 
-                 * @param string $start_no First result number.
433 
-                 * @param string $end_no Last result number.
434 
-                 * @param string $numposts Total number of listings.
435 
-                 * @param string $post_type The post type.
436 
-                 */
437 
-                $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
417 
+			if ($geodir_pagination_more_info != '') {
418 
+				if ($listing_type_name) {
419 
+					$listing_type_name = __($listing_type_name, 'geodirectory');
420 
+					$pegination_desc = wp_sprintf(__('Showing %s %d-%d of %d', 'geodirectory'), $listing_type_name, $start_no, $end_no, $numposts);
421 
+				} else {
422 
+					$pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
423 
+				}
424 
+				$pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';
425 
+				/**
426 
+				 * Adds an extra pagination info above/under pagination.
427 
+				 *
428 
+				 * @since 1.5.9
429 
+				 *
430 
+				 * @param string $pagination_info Extra pagination info content.
431 
+				 * @param string $listing_type_name Listing results type.
432 
+				 * @param string $start_no First result number.
433 
+				 * @param string $end_no Last result number.
434 
+				 * @param string $numposts Total number of listings.
435 
+				 * @param string $post_type The post type.
436 
+				 */
437 
+				$pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
438 438
439 
-                if ($geodir_pagination_more_info == 'before') {
440 
-                    $before = $before . $pagination_info;
441 
-                } else if ($geodir_pagination_more_info == 'after') {
442 
-                    $after = $pagination_info . $after;
443 
-                }
444 
-            }
439 
+				if ($geodir_pagination_more_info == 'before') {
440 
+					$before = $before . $pagination_info;
441 
+				} else if ($geodir_pagination_more_info == 'after') {
442 
+					$after = $pagination_info . $after;
443 
+				}
444 
+			}
445 445
446 
-            echo "$before <div class='Navi gd-navi'>";
447 
-            if ($paged >= ($pages_to_show - 1)) {
448 
-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';
449 
-            }
450 
-            previous_posts_link($prelabel);
451 
-            for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
452 
-                if ($i >= 1 && $i <= $max_page) {
453 
-                    if ($i == $paged) {
454 
-                        echo "<strong class='on'>$i</strong>";
455 
-                    } else {
456 
-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
457 
-                    }
458 
-                }
459 
-            }
460 
-            next_posts_link($nxtlabel, $max_page);
461 
-            if (($paged + $half_pages_to_show) < ($max_page)) {
462 
-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';
463 
-            }
464 
-            echo "</div> $after";
465 
-        }
446 
+			echo "$before <div class='Navi gd-navi'>";
447 
+			if ($paged >= ($pages_to_show - 1)) {
448 
+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';
449 
+			}
450 
+			previous_posts_link($prelabel);
451 
+			for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {
452 
+				if ($i >= 1 && $i <= $max_page) {
453 
+					if ($i == $paged) {
454 
+						echo "<strong class='on'>$i</strong>";
455 
+					} else {
456 
+						echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
457 
+					}
458 
+				}
459 
+			}
460 
+			next_posts_link($nxtlabel, $max_page);
461 
+			if (($paged + $half_pages_to_show) < ($max_page)) {
462 
+				echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';
463 
+			}
464 
+			echo "</div> $after";
465 
+		}
466 466
467 
-        if (function_exists('geodir_location_geo_home_link')) {
468 
-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
469 
-        }
470 
-    }
467 
+		if (function_exists('geodir_location_geo_home_link')) {
468 
+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
469 
+		}
470 
+	}
471 471 
 }
472 472
473 473 
 /**

@@ -478,20 +478,20 @@  discard block
 
 block discarded – undo
478 478 
  */
479 479 
 function geodir_listingsearch_scripts()
480 480 
 {
481 
-    if (get_option('gd_search_dist') != '') {
482 
-        $dist = get_option('gd_search_dist');
483 
-    } else {
484 
-        $dist = 500;
485 
-    }
486 
-    $dist_dif = 1000;
487 
-
488 
-    if ($dist <= 5000) $dist_dif = 500;
489 
-    if ($dist <= 1000) $dist_dif = 100;
490 
-    if ($dist <= 500) $dist_dif = 50;
491 
-    if ($dist <= 100) $dist_dif = 10;
492 
-    if ($dist <= 50) $dist_dif = 5;
493 
-
494 
-    ?>
481 
+	if (get_option('gd_search_dist') != '') {
482 
+		$dist = get_option('gd_search_dist');
483 
+	} else {
484 
+		$dist = 500;
485 
+	}
486 
+	$dist_dif = 1000;
487 
+
488 
+	if ($dist <= 5000) $dist_dif = 500;
489 
+	if ($dist <= 1000) $dist_dif = 100;
490 
+	if ($dist <= 500) $dist_dif = 50;
491 
+	if ($dist <= 100) $dist_dif = 10;
492 
+	if ($dist <= 50) $dist_dif = 5;
493 
+
494 
+	?>
495 495 
     <script type="text/javascript">
496 496
497 497 
         jQuery(function ($) {

@@ -549,20 +549,20 @@  discard block
 
 block discarded – undo
549 549 
  * @package GeoDirectory
550 550 
  */
551 551 
 function geodir_add_sharelocation_scripts() {
552 
-    $default_search_for_text = SEARCH_FOR_TEXT;
553 
-    if (get_option('geodir_search_field_default_text'))
554 
-        $default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
552 
+	$default_search_for_text = SEARCH_FOR_TEXT;
553 
+	if (get_option('geodir_search_field_default_text'))
554 
+		$default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');
555 555
556 
-    $default_near_text = NEAR_TEXT;
557 
-    if (get_option('geodir_near_field_default_text'))
558 
-        $default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
556 
+	$default_near_text = NEAR_TEXT;
557 
+	if (get_option('geodir_near_field_default_text'))
558 
+		$default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');
559 559
560 
-    $search_location = geodir_get_default_location();
560 
+	$search_location = geodir_get_default_location();
561 561
562 
-    $default_search_for_text = addslashes(stripslashes($default_search_for_text));
563 
-    $default_near_text = addslashes(stripslashes($default_near_text));
564 
-    $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';
565 
-    ?>
562 
+	$default_search_for_text = addslashes(stripslashes($default_search_for_text));
563 
+	$default_near_text = addslashes(stripslashes($default_near_text));
564 
+	$city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';
565 
+	?>
566 566 
     <script type="text/javascript">
567 567 
         var default_location = '<?php echo $city ;?>';
568 568 
         var latlng;

@@ -643,14 +643,14 @@  discard block
 
 block discarded – undo
643 643 
                     initialise2();
644 644 
                 } else {
645 645 
                     <?php
646 
-                    $near_add = get_option('geodir_search_near_addition');
647 
-                    /**
648 
-                     * Adds any extra info to the near search box query when trying to geolocate it via google api.
649 
-                     *
650 
-                     * @since 1.0.0
651 
-                     */
652 
-                    $near_add2 = apply_filters('geodir_search_near_addition', '');
653 
-                    ?>
646 
+					$near_add = get_option('geodir_search_near_addition');
647 
+					/**
648 
+					 * Adds any extra info to the near search box query when trying to geolocate it via google api.
649 
+					 *
650 
+					 * @since 1.0.0
651 
+					 */
652 
+					$near_add2 = apply_filters('geodir_search_near_addition', '');
653 
+					?>
654 654 
                     if (window.gdMaps === 'google') {
655 655 
                         Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},
656 656 
                             function (results, status) {

@@ -753,30 +753,30 @@  discard block
 
 block discarded – undo
753 753 
  */
754 754 
 function geodir_show_badges_on_image($which, $post, $link)
755 755 
 {
756 
-    $return = '';
757 
-    switch ($which) {
758 
-        case 'featured':
759 
-            /**
760 
-             * Filter the featured image badge html that appears in the listings pages over the thumbnail.
761 
-             *
762 
-             * @since 1.0.0
763 
-             * @param object $post The post object.
764 
-             * @param string $link The link to the post.
765 
-             */
766 
-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);
767 
-            break;
768 
-        case 'new' :
769 
-            /**
770 
-             * Filter the new image badge html that appears in the listings pages over the thumbnail.
771 
-             *
772 
-             * @since 1.0.0
773 
-             * @param object $post The post object.
774 
-             * @param string $link The link to the post.
775 
-             */
776 
-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);
777 
-            break;
778 
-
779 
-    }
756 
+	$return = '';
757 
+	switch ($which) {
758 
+		case 'featured':
759 
+			/**
760 
+			 * Filter the featured image badge html that appears in the listings pages over the thumbnail.
761 
+			 *
762 
+			 * @since 1.0.0
763 
+			 * @param object $post The post object.
764 
+			 * @param string $link The link to the post.
765 
+			 */
766 
+			$return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);
767 
+			break;
768 
+		case 'new' :
769 
+			/**
770 
+			 * Filter the new image badge html that appears in the listings pages over the thumbnail.
771 
+			 *
772 
+			 * @since 1.0.0
773 
+			 * @param object $post The post object.
774 
+			 * @param string $link The link to the post.
775 
+			 */
776 
+			$return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);
777 
+			break;
778 
+
779 
+	}
780 780
781 
-    return $return;
781 
+	return $return;
782 782 
 }
Please login to merge, or discard this patch.
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch 
@@ -38,21 +38,21 @@  discard block
 
 block discarded – undo
38 38 
     $is_detail_page = false;
39 39 
     $geodir_map_name = geodir_map_name();
40 40
41 
-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {
41 
+    if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) {
42 42 
         $is_detail_page = true;
43 43 
     }
44 44
45 45 
     wp_enqueue_script('jquery');
46 46
47 
-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
47 
+    wp_register_script('geodirectory-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION);
48 48 
     wp_enqueue_script('geodirectory-script');
49 49
50 50 
     $geodir_vars_data = array(
51 51 
         'siteurl' => get_option('siteurl'),
52 52 
         'geodir_plugin_url' => geodir_plugin_url(),
53 
-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),
53 
+        'geodir_lazy_load' => get_option('geodir_lazy_load', 1),
54 54 
         'geodir_ajax_url' => geodir_get_ajax_url(),
55 
-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),
55 
+        'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),
56 56 
         'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue
57 57 
     );
58 58 
 

@@ -73,24 +73,24 @@  discard block
 
 block discarded – undo
73 73 
      *
74 74 
      * }
75 75 
      */
76 
-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);
76 
+    $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);
77 77
78 78 
     wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);
79 79
80 
-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);
81 
-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}
80 
+    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION, true);
81 
+    if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }
82 82
83 
-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);
83 
+    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url().'/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);
84 84 
     wp_enqueue_script('geodirectory-lightbox-jquery');
85 85
86 
-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);
86 
+    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url().'/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION, true);
87 87 
     if ($is_detail_page) {
88 88 
         wp_enqueue_script('geodirectory-jquery-simplemodal');
89 89 
     }
90 90
91 91 
     if (in_array($geodir_map_name, array('auto', 'google'))) {
92 
-        $map_lang = "&language=" . geodir_get_map_default_language();
93 
-        $map_key = "&key=" . geodir_get_map_api_key();
92 
+        $map_lang = "&language=".geodir_get_map_default_language();
93 
+        $map_key = "&key=".geodir_get_map_api_key();
94 94 
         /**
95 95 
          * Filter the variables that are added to the end of the google maps script call.
96 96 
          *

@@ -100,48 +100,48 @@  discard block
 
 block discarded – undo
100 100 
          * @param string $var The string to filter, default is empty string.
101 101 
          */
102 102 
         $map_extra = apply_filters('geodir_googlemap_script_extra', '');
103 
-        wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);
103 
+        wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);
104 104 
     }
105 105
106 106 
     if ($geodir_map_name == 'osm') {
107 107 
         // Leaflet OpenStreetMap
108 
-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
108 
+        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
109 109 
         wp_enqueue_style('geodirectory-leaflet-style');
110 110
111 
-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
111 
+        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
112 112 
         wp_enqueue_script('geodirectory-leaflet-script');
113 113
114 
-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);
114 
+        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);
115 115 
         wp_enqueue_script('geodirectory-leaflet-geo-script');
116 116
117 117 
         if ($is_detail_page) {
118 
-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
118 
+            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);
119 119 
             wp_enqueue_style('geodirectory-leaflet-routing-style');
120 120
121 
-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);
121 
+            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);
122 122 
             wp_enqueue_script('geodirectory-leaflet-routing-script');
123 123 
         }
124 124 
     }
125 
-    wp_enqueue_script( 'jquery-ui-autocomplete' );
125 
+    wp_enqueue_script('jquery-ui-autocomplete');
126 126
127 
-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
127 
+    wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
128 128 
     wp_enqueue_script('geodirectory-goMap-script');
129 129
130 130
131 
-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
131 
+    wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);
132 132 
     wp_enqueue_script('chosen');
133 133
134 
-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
134 
+    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);
135 135 
     wp_enqueue_script('geodirectory-choose-ajax');
136 136
137 
-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
137 
+    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);
138 138
139 139 
     if (is_page() && geodir_is_page('add-listing')) {
140 140 
         // SCRIPT FOR UPLOAD
141 141 
         wp_enqueue_script('plupload-all');
142 142 
         wp_enqueue_script('jquery-ui-sortable');
143 143
144 
-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);
144 
+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
145 145 
         wp_enqueue_script('geodirectory-plupload-script');
146 146 
         // SCRIPT FOR UPLOAD END
147 147 
 

@@ -188,27 +188,27 @@  discard block
 
 block discarded – undo
188 188
189 189 
         wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
190 190
191 
-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');
191 
+        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation.min.js#asyncload');
192 192 
     } // End if for add place page
193 193
194 
-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
194 
+    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url().'/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
195 195 
     if ($is_detail_page) {
196 196 
 		wp_enqueue_script('geodirectory-post-custom-js');
197 197 
 	}
198 198
199 199 
     // font awesome rating script
200 200 
 	if (get_option('geodir_reviewrating_enable_font_awesome')) {
201 
-		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
201 
+		wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);
202 202 
 		wp_enqueue_script('geodir-barrating-js');
203 203 
 	} else { // default rating script
204 
-		wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);
204 
+		wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);
205 205 
 		wp_enqueue_script('geodir-jRating-js');
206 206 
 	}
207 207
208 
-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
208 
+    wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
209 209 
     wp_enqueue_script('geodir-on-document-load');
210 210
211 
-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
211 
+    wp_register_script('google-geometa', geodir_plugin_url().'/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);
212 212 
     wp_enqueue_script('google-geometa');
213 213 
 }
214 214 
 

@@ -223,7 +223,7 @@  discard block
 
 block discarded – undo
223 223 
  */
224 224 
 function geodir_header_scripts()
225 225 
 {
226 
-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';
226 
+    echo '<style>'.stripslashes(get_option('geodir_coustem_css')).'</style>';
227 227 
     echo stripslashes(get_option('geodir_header_scripts'));
228 228 
 }
229 229 
 

@@ -237,7 +237,7 @@  discard block
 
 block discarded – undo
237 237 
  */
238 238 
 function geodir_google_analytics_tracking_code()
239 239 
 {
240 
-    if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?>
240 
+    if (get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')) {?>
241 241
242 242 
         <script>
243 243 
             (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

@@ -245,14 +245,14 @@  discard block
 
 block discarded – undo
245 245 
                 m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
246 246 
             })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
247 247
248 
-            ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id'));?>', 'auto');
249 
-            <?php if(get_option('geodir_ga_anonymize_ip')){echo "ga('set', 'anonymizeIP', true);";}?>
248 
+            ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id')); ?>', 'auto');
249 
+            <?php if (get_option('geodir_ga_anonymize_ip')) {echo "ga('set', 'anonymizeIP', true);"; }?>
250 250 
             ga('send', 'pageview');
251 251
252 252 
         </script>
253 253
254 254 
         <?php
255 
-    }elseif(get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){
255 
+    }elseif (get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')) {
256 256 
         echo stripslashes(get_option('geodir_ga_tracking_code'));
257 257 
     }
258 258 
 }

@@ -275,7 +275,7 @@  discard block
 
 block discarded – undo
275 275 
      *
276 276 
      * Flexbox wont wrap on ios for search form items
277 277 
      */
278 
-    if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {
278 
+    if (!empty($_SERVER['HTTP_USER_AGENT']) && preg_match('/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'])) {
279 279 
         echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>";
280 280 
     }
281 281 
 }

@@ -291,7 +291,7 @@  discard block
 
 block discarded – undo
291 291 
  */
292 292 
 function geodir_add_async_forscript($url)
293 293 
 {
294 
-    if (strpos($url, '#asyncload')===false)
294 
+    if (strpos($url, '#asyncload') === false)
295 295 
         return $url;
296 296 
     else if (is_admin())
297 297 
         return str_replace('#asyncload', '', $url);

@@ -309,12 +309,12 @@  discard block
 
 block discarded – undo
309 309 
 function geodir_templates_styles()
310 310 
 {
311 311
312 
-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
312 
+    wp_register_style('geodir-core-scss', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);
313 313 
     wp_enqueue_style('geodir-core-scss');
314 
-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
314 
+    wp_register_style('geodir-core-scss-footer', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);
315 315
316 
-    if(is_rtl()){
317 
-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
316 
+    if (is_rtl()) {
317 
+    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);
318 318 
     wp_enqueue_style('geodirectory-frontend-rtl-style');
319 319 
     }
320 320 
 

@@ -388,18 +388,18 @@  discard block
 
 block discarded – undo
388 388 
                 $term_id = get_queried_object_id();
389 389 
                 $taxonomy = get_query_var('taxonomy');
390 390
391 
-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {
392 
-                    $term = get_term($term_id, $post_type . 'category');
391 
+                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type.'category') {
392 
+                    $term = get_term($term_id, $post_type.'category');
393 393 
                 }
394 394 
             }
395 395
396 
-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {
397 
-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];
396 
+            if (geodir_is_page('search') && !empty($_REQUEST['s'.$post_type.'category'])) {
397 
+                $taxonomy_search = $_REQUEST['s'.$post_type.'category'];
398 398
399 399 
                 if (!is_array($taxonomy_search)) {
400 
-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');
401 
-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
402 
-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');
400 
+                    $term = get_term((int) $taxonomy_search, $post_type.'category');
401 
+                } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search
402 
+                    $term = get_term((int) $taxonomy_search[0], $post_type.'category');
403 403 
                 }
404 404 
             }
405 405 
             

@@ -411,7 +411,7 @@  discard block
 
 block discarded – undo
411 411 
         if ($max_page > 1 || $always_show) {
412 412 
             // Extra pagination info
413 413 
             $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
414 
-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;
414 
+            $start_no = ($paged - 1) * $posts_per_page + 1;
415 415 
             $end_no = min($paged * $posts_per_page, $numposts);
416 416
417 417 
             if ($geodir_pagination_more_info != '') {

@@ -421,7 +421,7 @@  discard block
 
 block discarded – undo
421 421 
                 } else {
422 422 
                     $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);
423 423 
                 }
424 
-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';
424 
+                $pagination_info = '<div class="gd-pagination-details">'.$pegination_desc.'</div>';
425 425 
                 /**
426 426 
                  * Adds an extra pagination info above/under pagination.
427 427 
                  *

@@ -437,15 +437,15 @@  discard block
 
 block discarded – undo
437 437 
                 $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);
438 438
439 439 
                 if ($geodir_pagination_more_info == 'before') {
440 
-                    $before = $before . $pagination_info;
440 
+                    $before = $before.$pagination_info;
441 441 
                 } else if ($geodir_pagination_more_info == 'after') {
442 
-                    $after = $pagination_info . $after;
442 
+                    $after = $pagination_info.$after;
443 443 
                 }
444 444 
             }
445 445
446 446 
             echo "$before <div class='Navi gd-navi'>";
447 447 
             if ($paged >= ($pages_to_show - 1)) {
448 
-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';
448 
+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link()).'">&laquo;</a>';
449 449 
             }
450 450 
             previous_posts_link($prelabel);
451 451 
             for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

@@ -453,13 +453,13 @@  discard block
 
 block discarded – undo
453 453 
                     if ($i == $paged) {
454 454 
                         echo "<strong class='on'>$i</strong>";
455 455 
                     } else {
456 
-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';
456 
+                        echo ' <a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($i)).'">'.$i.'</a> ';
457 457 
                     }
458 458 
                 }
459 459 
             }
460 460 
             next_posts_link($nxtlabel, $max_page);
461 461 
             if (($paged + $half_pages_to_show) < ($max_page)) {
462 
-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';
462 
+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)).'">&raquo;</a>';
463 463 
             }
464 464 
             echo "</div> $after";
465 465 
         }

@@ -497,7 +497,7 @@  discard block
 
 block discarded – undo
497 497 
         jQuery(function ($) {
498 498 
             $("#distance_slider").slider({
499 499 
                 range: true,
500 
-                values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],
500 
+                values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],
501 501 
                 min: 0,
502 502 
                 max: <?php echo $dist; ?>,
503 503 
                 step: <?php echo $dist_dif; ?>,

@@ -564,7 +564,7 @@  discard block
 
 block discarded – undo
564 564 
     $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : '';
565 565 
     ?>
566 566 
     <script type="text/javascript">
567 
-        var default_location = '<?php echo $city ;?>';
567 
+        var default_location = '<?php echo $city; ?>';
568 568 
         var latlng;
569 569 
         var address;
570 570 
         var dist = 0;

@@ -580,7 +580,7 @@  discard block
 
 block discarded – undo
580 580 
 				var $form = jQuery(this).closest('form');
581 581
582 582 
 				if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();
583 
-				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);
583 
+				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);
584 584
585 585 
 				// Disable location based search for disabled location post type.
586 586 
 				if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {

@@ -594,7 +594,7 @@  discard block
 
 block discarded – undo
594 594 
 					}
595 595 
 				}
596 596
597 
-				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) {
597 
+				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) {
598 598 
 					geodir_setsearch($form);
599 599 
 				} else {
600 600 
 					jQuery(".snear", $form).val('');

@@ -612,7 +612,7 @@  discard block
 
 block discarded – undo
612 612 
         });
613 613
614 614 
 		function geodir_setsearch($form) {
615 
-			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location);
615 
+			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location);
616 616 
 			geocodeAddress($form);
617 617 
 		}
618 618 
 

@@ -631,15 +631,15 @@  discard block
 
 block discarded – undo
631 631 
             // Call the geocode function
632 632 
             Sgeocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;
633 633
634 
-            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {
635 
-                if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {
634 
+            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {
635 
+                if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {
636 636 
                     jQuery(".snear", $form).val('');
637 637 
                 }
638 638 
                 jQuery($form).submit();
639 639 
             } else {
640 640 
                 var address = jQuery(".snear", $form).val();
641 641
642 
-                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {
642 
+                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {
643 643 
                     initialise2();
644 644 
                 } else {
645 645 
                     <?php

@@ -652,12 +652,12 @@  discard block
 
 block discarded – undo
652 652 
                     $near_add2 = apply_filters('geodir_search_near_addition', '');
653 653 
                     ?>
654 654 
                     if (window.gdMaps === 'google') {
655 
-                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},
655 
+                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", '.$near_add.'"' : '').$near_add2; ?>},
656 656 
                             function (results, status) {
657 657 
                                 if (status == google.maps.GeocoderStatus.OK) {
658 658 
                                     updateSearchPosition(results[0].geometry.location, $form);
659 659 
                                 } else {
660 
-                                    alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory');?>" + status);
660 
+                                    alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory'); ?>" + status);
661 661 
                                 }
662 662 
                             });
663 663 
                     } else if (window.gdMaps === 'osm') {

@@ -666,7 +666,7 @@  discard block
 
 block discarded – undo
666 666 
                                 if (typeof geo !== 'undefined' && geo.lat && geo.lon) {
667 667 
                                     updateSearchPosition(geo, $form);
668 668 
                                 } else {
669 
-                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory');?>");
669 
+                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory'); ?>");
670 670 
                                 }
671 671 
                             });
672 672 
                     } else {

@@ -712,19 +712,19 @@  discard block
 
 block discarded – undo
712 712 
             var msg;
713 713 
             switch (err.code) {
714 714 
                 case err.UNKNOWN_ERROR:
715 
-                    msg = "<?php _e('Unable to find your location','geodirectory');?>";
715 
+                    msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";
716 716 
                     break;
717 717 
                 case err.PERMISSION_DENINED:
718 
-                    msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";
718 
+                    msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";
719 719 
                     break;
720 720 
                 case err.POSITION_UNAVAILABLE:
721 
-                    msg = "<?php _e('Your location is currently unknown','geodirectory');?>";
721 
+                    msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";
722 722 
                     break;
723 723 
                 case err.BREAK:
724 
-                    msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";
724 
+                    msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";
725 725 
                     break;
726 726 
                 default:
727 
-                    msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";
727 
+                    msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";
728 728 
             }
729 729 
             jQuery('#info').html(msg);
730 730 
         }

@@ -763,7 +763,7 @@  discard block
 
 block discarded – undo
763 763 
              * @param object $post The post object.
764 764 
              * @param string $link The link to the post.
765 765 
              */
766 
-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);
766 
+            $return = apply_filters('geodir_featured_badge_on_image', '<a href="'.$link.'"><span class="geodir_featured_img">&nbsp;</span></a>', $post, $link);
767 767 
             break;
768 768 
         case 'new' :
769 769 
             /**

@@ -773,7 +773,7 @@  discard block
 
 block discarded – undo
773 773 
              * @param object $post The post object.
774 774 
              * @param string $link The link to the post.
775 775 
              */
776 
-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);
776 
+            $return = apply_filters('geodir_new_badge_on_image', '<a href="'.$link.'"><span class="geodir_new_listing">&nbsp;</span></a>', $post, $link);
777 777 
             break;
778 778
779 779 
     }
Please login to merge, or discard this patch.
geodirectory-functions/helper_functions.php 4 patches
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -146,7 +146,7 @@  discard block
 
 block discarded – undo
146 146
147 147 
     if (geodir_is_wpml()){
148 148 
         $home_url = icl_get_home_url();
149 
-    }else{
149 
+    } else{
150 150 
         $home_url = home_url();
151 151 
     }
152 152 
 
@@ -159,7 +159,7 @@  discard block
 
 block discarded – undo
159 159 
         $slug = $post->post_name;
160 160 
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
161 161 
         $login_url = trailingslashit($home_url)."$slug/";
162 
-    }else{
162 
+    } else{
163 163 
         $login_url = trailingslashit($home_url)."?geodir_signup=true";
164 164 
     }
165 165 
 
@@ -202,7 +202,7 @@  discard block
 
 block discarded – undo
202 202
203 203 
     if (geodir_is_wpml()){
204 204 
         $home_url = icl_get_home_url();
205 
-    }else{
205 
+    } else{
206 206 
         $home_url = home_url();
207 207 
     }
208 208 
 
@@ -215,7 +215,7 @@  discard block
 
 block discarded – undo
215 215 
         $slug = $post->post_name;
216 216 
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
217 217 
         $info_url = trailingslashit($home_url)."$slug/";
218 
-    }else{
218 
+    } else{
219 219 
         $info_url = trailingslashit($home_url);
220 220 
     }
221 221
Please login to merge, or discard this patch.
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -1173,7 +1173,7 @@
 
 block discarded – undo
1173 1173 
  *
1174 1174 
  * @param string $str The string being decoded.
1175 1175 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
1176 
- * @return string The width of string.
1176 
+ * @return integer The width of string.
1177 1177 
  */
1178 1178 
 function geodir_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
1179 1179 
 	if ( function_exists( 'mb_strwidth' ) ) {
Please login to merge, or discard this patch.
Indentation   +390 added lines, -390 removed lines patch added patch discarded remove patch 
@@ -14,13 +14,13 @@  discard block
 
 block discarded – undo
14 14 
  * @return int|null Return the page ID if present or null if not.
15 15 
  */
16 16 
 function geodir_add_listing_page_id(){
17 
-    $gd_page_id = get_option('geodir_add_listing_page');
17 
+	$gd_page_id = get_option('geodir_add_listing_page');
18 18
19 
-    if (function_exists('icl_object_id')) {
20 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
21 
-    }
19 
+	if (function_exists('icl_object_id')) {
20 
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
21 
+	}
22 22
23 
-    return $gd_page_id;
23 
+	return $gd_page_id;
24 24 
 }
25 25
26 26 
 /**
 
@@ -31,13 +31,13 @@  discard block
 
 block discarded – undo
31 31 
  * @return int|null Return the page ID if present or null if not.
32 32 
  */
33 33 
 function geodir_preview_page_id(){
34 
-    $gd_page_id = get_option('geodir_preview_page');
34 
+	$gd_page_id = get_option('geodir_preview_page');
35 35
36 
-    if (function_exists('icl_object_id')) {
37 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
38 
-    }
36 
+	if (function_exists('icl_object_id')) {
37 
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
38 
+	}
39 39
40 
-    return $gd_page_id;
40 
+	return $gd_page_id;
41 41 
 }
42 42
43 43 
 /**
 
@@ -48,13 +48,13 @@  discard block
 
 block discarded – undo
48 48 
  * @return int|null Return the page ID if present or null if not.
49 49 
  */
50 50 
 function geodir_success_page_id(){
51 
-    $gd_page_id = get_option('geodir_success_page');
51 
+	$gd_page_id = get_option('geodir_success_page');
52 52
53 
-    if (function_exists('icl_object_id')) {
54 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
55 
-    }
53 
+	if (function_exists('icl_object_id')) {
54 
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
55 
+	}
56 56
57 
-    return $gd_page_id;
57 
+	return $gd_page_id;
58 58 
 }
59 59
60 60 
 /**
 
@@ -65,13 +65,13 @@  discard block
 
 block discarded – undo
65 65 
  * @return int|null Return the page ID if present or null if not.
66 66 
  */
67 67 
 function geodir_location_page_id(){
68 
-    $gd_page_id = get_option('geodir_location_page');
68 
+	$gd_page_id = get_option('geodir_location_page');
69 69
70 
-    if (function_exists('icl_object_id')) {
71 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
72 
-    }
70 
+	if (function_exists('icl_object_id')) {
71 
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
72 
+	}
73 73
74 
-    return $gd_page_id;
74 
+	return $gd_page_id;
75 75 
 }
76 76
77 77 
 /**
 
@@ -82,13 +82,13 @@  discard block
 
 block discarded – undo
82 82 
  * @return int|null Return the page ID if present or null if not.
83 83 
  */
84 84 
 function geodir_home_page_id(){
85 
-    $gd_page_id = get_option('geodir_home_page');
85 
+	$gd_page_id = get_option('geodir_home_page');
86 86
87 
-    if (function_exists('icl_object_id')) {
88 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
89 
-    }
87 
+	if (function_exists('icl_object_id')) {
88 
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
89 
+	}
90 90
91 
-    return $gd_page_id;
91 
+	return $gd_page_id;
92 92 
 }
93 93
94 94 
 /**
 
@@ -99,13 +99,13 @@  discard block
 
 block discarded – undo
99 99 
  * @return int|null Return the page ID if present or null if not.
100 100 
  */
101 101 
 function geodir_info_page_id(){
102 
-    $gd_page_id = get_option('geodir_info_page');
102 
+	$gd_page_id = get_option('geodir_info_page');
103 103
104 
-    if (function_exists('icl_object_id')) {
105 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
106 
-    }
104 
+	if (function_exists('icl_object_id')) {
105 
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
106 
+	}
107 107
108 
-    return $gd_page_id;
108 
+	return $gd_page_id;
109 109 
 }
110 110
111 111 
 /**
 
@@ -116,13 +116,13 @@  discard block
 
 block discarded – undo
116 116 
  * @return int|null Return the page ID if present or null if not.
117 117 
  */
118 118 
 function geodir_login_page_id(){
119 
-    $gd_page_id = get_option('geodir_login_page');
119 
+	$gd_page_id = get_option('geodir_login_page');
120 120
121 
-    if (function_exists('icl_object_id')) {
122 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
123 
-    }
121 
+	if (function_exists('icl_object_id')) {
122 
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
123 
+	}
124 124
125 
-    return $gd_page_id;
125 
+	return $gd_page_id;
126 126 
 }
127 127
128 128 
 
@@ -134,51 +134,51 @@  discard block
 
 block discarded – undo
134 134 
  * @return int|null Return the page ID if present or null if not.
135 135 
  */
136 136 
 function geodir_login_url($args=array()){
137 
-    $gd_page_id = get_option('geodir_login_page');
138 
-
139 
-    if (function_exists('icl_object_id')) {
140 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
141 
-    }
142 
-
143 
-    if (function_exists('geodir_location_geo_home_link')) {
144 
-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
145 
-    }
146 
-
147 
-    if (geodir_is_wpml()){
148 
-        $home_url = icl_get_home_url();
149 
-    }else{
150 
-        $home_url = home_url();
151 
-    }
152 
-
153 
-    if (function_exists('geodir_location_geo_home_link')) {
154 
-        add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
155 
-    }
156 
-
157 
-    if($gd_page_id){
158 
-        $post = get_post($gd_page_id);
159 
-        $slug = $post->post_name;
160 
-        //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
161 
-        $login_url = trailingslashit($home_url)."$slug/";
162 
-    }else{
163 
-        $login_url = trailingslashit($home_url)."?geodir_signup=true";
164 
-    }
165 
-
166 
-    if($args){
167 
-        $login_url = add_query_arg($args,$login_url );
168 
-    }
169 
-
170 
-    /**
171 
-     * Filter the GeoDirectory login page url.
172 
-     *
173 
-     * This filter can be used to change the GeoDirectory page url.
174 
-     *
175 
-     * @since 1.5.3
176 
-     * @package GeoDirectory
177 
-     * @param string $login_url The url of the login page.
178 
-     * @param array $args The array of query args used.
179 
-     * @param int $gd_page_id The page id of the GD login page.
180 
-     */
181 
-	    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
137 
+	$gd_page_id = get_option('geodir_login_page');
138 
+
139 
+	if (function_exists('icl_object_id')) {
140 
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
141 
+	}
142 
+
143 
+	if (function_exists('geodir_location_geo_home_link')) {
144 
+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
145 
+	}
146 
+
147 
+	if (geodir_is_wpml()){
148 
+		$home_url = icl_get_home_url();
149 
+	}else{
150 
+		$home_url = home_url();
151 
+	}
152 
+
153 
+	if (function_exists('geodir_location_geo_home_link')) {
154 
+		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
155 
+	}
156 
+
157 
+	if($gd_page_id){
158 
+		$post = get_post($gd_page_id);
159 
+		$slug = $post->post_name;
160 
+		//$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
161 
+		$login_url = trailingslashit($home_url)."$slug/";
162 
+	}else{
163 
+		$login_url = trailingslashit($home_url)."?geodir_signup=true";
164 
+	}
165 
+
166 
+	if($args){
167 
+		$login_url = add_query_arg($args,$login_url );
168 
+	}
169 
+
170 
+	/**
171 
+	 * Filter the GeoDirectory login page url.
172 
+	 *
173 
+	 * This filter can be used to change the GeoDirectory page url.
174 
+	 *
175 
+	 * @since 1.5.3
176 
+	 * @package GeoDirectory
177 
+	 * @param string $login_url The url of the login page.
178 
+	 * @param array $args The array of query args used.
179 
+	 * @param int $gd_page_id The page id of the GD login page.
180 
+	 */
181 
+		return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
182 182 
 }
183 183
184 184 
 /**
 
@@ -190,40 +190,40 @@  discard block
 
 block discarded – undo
190 190 
  * @return string Info page url.
191 191 
  */
192 192 
 function geodir_info_url($args=array()){
193 
-    $gd_page_id = get_option('geodir_info_page');
194 
-
195 
-    if (function_exists('icl_object_id')) {
196 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
197 
-    }
198 
-
199 
-    if (function_exists('geodir_location_geo_home_link')) {
200 
-        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
201 
-    }
202 
-
203 
-    if (geodir_is_wpml()){
204 
-        $home_url = icl_get_home_url();
205 
-    }else{
206 
-        $home_url = home_url();
207 
-    }
208 
-
209 
-    if (function_exists('geodir_location_geo_home_link')) {
210 
-        add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
211 
-    }
212 
-
213 
-    if($gd_page_id){
214 
-        $post = get_post($gd_page_id);
215 
-        $slug = $post->post_name;
216 
-        //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
217 
-        $info_url = trailingslashit($home_url)."$slug/";
218 
-    }else{
219 
-        $info_url = trailingslashit($home_url);
220 
-    }
221 
-
222 
-    if($args){
223 
-        $info_url = add_query_arg($args,$info_url );
224 
-    }
225 
-
226 
-    return $info_url;
193 
+	$gd_page_id = get_option('geodir_info_page');
194 
+
195 
+	if (function_exists('icl_object_id')) {
196 
+		$gd_page_id =  icl_object_id($gd_page_id, 'page', true);
197 
+	}
198 
+
199 
+	if (function_exists('geodir_location_geo_home_link')) {
200 
+		remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
201 
+	}
202 
+
203 
+	if (geodir_is_wpml()){
204 
+		$home_url = icl_get_home_url();
205 
+	}else{
206 
+		$home_url = home_url();
207 
+	}
208 
+
209 
+	if (function_exists('geodir_location_geo_home_link')) {
210 
+		add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
211 
+	}
212 
+
213 
+	if($gd_page_id){
214 
+		$post = get_post($gd_page_id);
215 
+		$slug = $post->post_name;
216 
+		//$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
217 
+		$info_url = trailingslashit($home_url)."$slug/";
218 
+	}else{
219 
+		$info_url = trailingslashit($home_url);
220 
+	}
221 
+
222 
+	if($args){
223 
+		$info_url = add_query_arg($args,$info_url );
224 
+	}
225 
+
226 
+	return $info_url;
227 227 
 }
228 228
229 229 
 /**
 
@@ -239,11 +239,11 @@  discard block
 
 block discarded – undo
239 239 
  * @return string Returns converted string.
240 240 
  */
241 241 
 function geodir_ucwords($string, $charset='UTF-8') {
242 
-    if (function_exists('mb_convert_case')) {
243 
-        return mb_convert_case($string, MB_CASE_TITLE, $charset);
244 
-    } else {
245 
-        return ucwords($string);
246 
-    }
242 
+	if (function_exists('mb_convert_case')) {
243 
+		return mb_convert_case($string, MB_CASE_TITLE, $charset);
244 
+	} else {
245 
+		return ucwords($string);
246 
+	}
247 247 
 }
248 248
249 249 
 /**
 
@@ -259,11 +259,11 @@  discard block
 
 block discarded – undo
259 259 
  * @return string Returns converted string.
260 260 
  */
261 261 
 function geodir_strtolower($string, $charset='UTF-8') {
262 
-    if (function_exists('mb_convert_case')) {
263 
-        return mb_convert_case($string, MB_CASE_LOWER, $charset);
264 
-    } else {
265 
-        return strtolower($string);
266 
-    }
262 
+	if (function_exists('mb_convert_case')) {
263 
+		return mb_convert_case($string, MB_CASE_LOWER, $charset);
264 
+	} else {
265 
+		return strtolower($string);
266 
+	}
267 267 
 }
268 268
269 269 
 /**
 
@@ -279,11 +279,11 @@  discard block
 
 block discarded – undo
279 279 
  * @return string Returns converted string.
280 280 
  */
281 281 
 function geodir_strtoupper($string, $charset='UTF-8') {
282 
-    if (function_exists('mb_convert_case')) {
283 
-        return mb_convert_case($string, MB_CASE_UPPER, $charset);
284 
-    } else {
285 
-        return strtoupper($string);
286 
-    }
282 
+	if (function_exists('mb_convert_case')) {
283 
+		return mb_convert_case($string, MB_CASE_UPPER, $charset);
284 
+	} else {
285 
+		return strtoupper($string);
286 
+	}
287 287 
 }
288 288
289 289 
 /**
 
@@ -462,11 +462,11 @@  discard block
 
 block discarded – undo
462 462 
  * @package GeoDirectory
463 463 
  */
464 464 
 function _gd_die_handler() {
465 
-    if ( defined( 'GD_TESTING_MODE' ) ) {
466 
-        return '_gd_die_handler';
467 
-    } else {
468 
-        die();
469 
-    }
465 
+	if ( defined( 'GD_TESTING_MODE' ) ) {
466 
+		return '_gd_die_handler';
467 
+	} else {
468 
+		die();
469 
+	}
470 470 
 }
471 471
472 472 
 /**
 
@@ -481,9 +481,9 @@  discard block
 
 block discarded – undo
481 481 
  * @param int $status     Optional. Status code.
482 482 
  */
483 483 
 function gd_die( $message = '', $title = '', $status = 400 ) {
484 
-    add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
485 
-    add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
486 
-    wp_die( $message, $title, array( 'response' => $status ));
484 
+	add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
485 
+	add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
486 
+	wp_die( $message, $title, array( 'response' => $status ));
487 487 
 }
488 488
489 489 
 /*
 
@@ -652,37 +652,37 @@  discard block
 
 block discarded – undo
652 652 
  * @return string The formatted date.
653 653 
  */
654 654 
 function geodir_date($date_input, $date_to, $date_from = '') {
655 
-    if (empty($date_input) || empty($date_to)) {
656 
-        return NULL;
657 
-    }
655 
+	if (empty($date_input) || empty($date_to)) {
656 
+		return NULL;
657 
+	}
658 658
659 
-    $date = '';
660 
-    if (!empty($date_from)) {
661 
-        $datetime = date_create_from_format($date_from, $date_input);
659 
+	$date = '';
660 
+	if (!empty($date_from)) {
661 
+		$datetime = date_create_from_format($date_from, $date_input);
662 662
663 
-        if (!empty($datetime)) {
664 
-            $date = $datetime->format($date_to);
665 
-        }
666 
-    }
663 
+		if (!empty($datetime)) {
664 
+			$date = $datetime->format($date_to);
665 
+		}
666 
+	}
667 667
668 
-    if (empty($date)) {
669 
-        $date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input;
670 
-        $date = date_i18n($date_to, strtotime($date));
671 
-    }
668 
+	if (empty($date)) {
669 
+		$date = strpos($date_input, '/') !== false ? str_replace('/', '-', $date_input) : $date_input;
670 
+		$date = date_i18n($date_to, strtotime($date));
671 
+	}
672 672
673 
-    $date = geodir_maybe_untranslate_date($date);
674 
-    /**
675 
-     * Filter the the date format conversion.
676 
-     *
677 
-     * @since 1.6.7
678 
-     * @package GeoDirectory
679 
-     *
680 
-     * @param string $date The date string.
681 
-     * @param string $date_input The date input.
682 
-     * @param string $date_to The destination date format.
683 
-     * @param string $date_from The source date format.
684 
-     */
685 
-    return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from);
673 
+	$date = geodir_maybe_untranslate_date($date);
674 
+	/**
675 
+	 * Filter the the date format conversion.
676 
+	 *
677 
+	 * @since 1.6.7
678 
+	 * @package GeoDirectory
679 
+	 *
680 
+	 * @param string $date The date string.
681 
+	 * @param string $date_input The date input.
682 
+	 * @param string $date_to The destination date format.
683 
+	 * @param string $date_from The source date format.
684 
+	 */
685 
+	return apply_filters('geodir_date', $date, $date_input, $date_to, $date_from);
686 686 
 }
687 687
688 688 
 /**
 
@@ -707,91 +707,91 @@  discard block
 
 block discarded – undo
707 707 
  * @return string Trimmed string.
708 708 
  */
709 709 
 function geodir_excerpt($text, $length = 100, $options = array()) {
710 
-    if (!(int)$length > 0) {
711 
-        return $text;
712 
-    }
713 
-    $default = array(
714 
-        'ellipsis' => '', 'exact' => true, 'html' => true, 'trimWidth' => false,
710 
+	if (!(int)$length > 0) {
711 
+		return $text;
712 
+	}
713 
+	$default = array(
714 
+		'ellipsis' => '', 'exact' => true, 'html' => true, 'trimWidth' => false,
715 715 
 	);
716 
-    if (!empty($options['html']) && function_exists('mb_internal_encoding') && strtolower(mb_internal_encoding()) === 'utf-8') {
717 
-        $default['ellipsis'] = "";
718 
-    }
719 
-    $options += $default;
720 
-
721 
-    $prefix = '';
722 
-    $suffix = $options['ellipsis'];
723 
-
724 
-    if ($options['html']) {
725 
-        $ellipsisLength = geodir_strlen(strip_tags($options['ellipsis']), $options);
726 
-
727 
-        $truncateLength = 0;
728 
-        $totalLength = 0;
729 
-        $openTags = array();
730 
-        $truncate = '';
731 
-
732 
-        preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
733 
-        foreach ($tags as $tag) {
734 
-            $contentLength = geodir_strlen($tag[3], $options);
735 
-
736 
-            if ($truncate === '') {
737 
-                if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) {
738 
-                    if (preg_match('/<[\w]+[^>]*>/', $tag[0])) {
739 
-                        array_unshift($openTags, $tag[2]);
740 
-                    } elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) {
741 
-                        $pos = array_search($closeTag[1], $openTags);
742 
-                        if ($pos !== false) {
743 
-                            array_splice($openTags, $pos, 1);
744 
-                        }
745 
-                    }
746 
-                }
747 
-
748 
-                $prefix .= $tag[1];
749 
-
750 
-                if ($totalLength + $contentLength + $ellipsisLength > $length) {
751 
-                    $truncate = $tag[3];
752 
-                    $truncateLength = $length - $totalLength;
753 
-                } else {
754 
-                    $prefix .= $tag[3];
755 
-                }
756 
-            }
757 
-
758 
-            $totalLength += $contentLength;
759 
-            if ($totalLength > $length) {
760 
-                break;
761 
-            }
762 
-        }
763 
-
764 
-        if ($totalLength <= $length) {
765 
-            return $text;
766 
-        }
767 
-
768 
-        $text = $truncate;
769 
-        $length = $truncateLength;
770 
-
771 
-        foreach ($openTags as $tag) {
772 
-            $suffix .= '</' . $tag . '>';
773 
-        }
774 
-    } else {
775 
-        if (geodir_strlen($text, $options) <= $length) {
776 
-            return $text;
777 
-        }
778 
-        $ellipsisLength = geodir_strlen($options['ellipsis'], $options);
779 
-    }
780 
-
781 
-    $result = geodir_substr($text, 0, $length - $ellipsisLength, $options);
782 
-
783 
-    if (!$options['exact']) {
784 
-        if (geodir_substr($text, $length - $ellipsisLength, 1, $options) !== ' ') {
785 
-            $result = geodir_remove_last_word($result);
786 
-        }
787 
-
788 
-        // Do not need to count ellipsis in the cut, if result is empty.
789 
-        if (!strlen($result)) {
790 
-            $result = geodir_substr($text, 0, $length, $options);
791 
-        }
792 
-    }
793 
-
794 
-    return $prefix . $result . $suffix;
716 
+	if (!empty($options['html']) && function_exists('mb_internal_encoding') && strtolower(mb_internal_encoding()) === 'utf-8') {
717 
+		$default['ellipsis'] = "";
718 
+	}
719 
+	$options += $default;
720 
+
721 
+	$prefix = '';
722 
+	$suffix = $options['ellipsis'];
723 
+
724 
+	if ($options['html']) {
725 
+		$ellipsisLength = geodir_strlen(strip_tags($options['ellipsis']), $options);
726 
+
727 
+		$truncateLength = 0;
728 
+		$totalLength = 0;
729 
+		$openTags = array();
730 
+		$truncate = '';
731 
+
732 
+		preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
733 
+		foreach ($tags as $tag) {
734 
+			$contentLength = geodir_strlen($tag[3], $options);
735 
+
736 
+			if ($truncate === '') {
737 
+				if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/i', $tag[2])) {
738 
+					if (preg_match('/<[\w]+[^>]*>/', $tag[0])) {
739 
+						array_unshift($openTags, $tag[2]);
740 
+					} elseif (preg_match('/<\/([\w]+)[^>]*>/', $tag[0], $closeTag)) {
741 
+						$pos = array_search($closeTag[1], $openTags);
742 
+						if ($pos !== false) {
743 
+							array_splice($openTags, $pos, 1);
744 
+						}
745 
+					}
746 
+				}
747 
+
748 
+				$prefix .= $tag[1];
749 
+
750 
+				if ($totalLength + $contentLength + $ellipsisLength > $length) {
751 
+					$truncate = $tag[3];
752 
+					$truncateLength = $length - $totalLength;
753 
+				} else {
754 
+					$prefix .= $tag[3];
755 
+				}
756 
+			}
757 
+
758 
+			$totalLength += $contentLength;
759 
+			if ($totalLength > $length) {
760 
+				break;
761 
+			}
762 
+		}
763 
+
764 
+		if ($totalLength <= $length) {
765 
+			return $text;
766 
+		}
767 
+
768 
+		$text = $truncate;
769 
+		$length = $truncateLength;
770 
+
771 
+		foreach ($openTags as $tag) {
772 
+			$suffix .= '</' . $tag . '>';
773 
+		}
774 
+	} else {
775 
+		if (geodir_strlen($text, $options) <= $length) {
776 
+			return $text;
777 
+		}
778 
+		$ellipsisLength = geodir_strlen($options['ellipsis'], $options);
779 
+	}
780 
+
781 
+	$result = geodir_substr($text, 0, $length - $ellipsisLength, $options);
782 
+
783 
+	if (!$options['exact']) {
784 
+		if (geodir_substr($text, $length - $ellipsisLength, 1, $options) !== ' ') {
785 
+			$result = geodir_remove_last_word($result);
786 
+		}
787 
+
788 
+		// Do not need to count ellipsis in the cut, if result is empty.
789 
+		if (!strlen($result)) {
790 
+			$result = geodir_substr($text, 0, $length, $options);
791 
+		}
792 
+	}
793 
+
794 
+	return $prefix . $result . $suffix;
795 795 
 }
796 796
797 797 
 /**
 
@@ -815,28 +815,28 @@  discard block
 
 block discarded – undo
815 815 
  * @return int
816 816 
  */
817 817 
 function geodir_strlen($text, array $options) {
818 
-    if (empty($options['trimWidth'])) {
819 
-        $strlen = 'geodir_utf8_strlen';
820 
-    } else {
821 
-        $strlen = 'geodir_utf8_strwidth';
822 
-    }
823 
-
824 
-    if (empty($options['html'])) {
825 
-        return $strlen($text);
826 
-    }
827 
-
828 
-    $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
829 
-    $replace = preg_replace_callback(
830 
-        $pattern,
831 
-        function ($match) use ($strlen) {
832 
-            $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
833 
-
834 
-            return str_repeat(' ', $strlen($utf8, 'UTF-8'));
835 
-        },
836 
-        $text
837 
-    );
838 
-
839 
-    return $strlen($replace);
818 
+	if (empty($options['trimWidth'])) {
819 
+		$strlen = 'geodir_utf8_strlen';
820 
+	} else {
821 
+		$strlen = 'geodir_utf8_strwidth';
822 
+	}
823 
+
824 
+	if (empty($options['html'])) {
825 
+		return $strlen($text);
826 
+	}
827 
+
828 
+	$pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
829 
+	$replace = preg_replace_callback(
830 
+		$pattern,
831 
+		function ($match) use ($strlen) {
832 
+			$utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
833 
+
834 
+			return str_repeat(' ', $strlen($utf8, 'UTF-8'));
835 
+		},
836 
+		$text
837 
+	);
838 
+
839 
+	return $strlen($replace);
840 840 
 }
841 841
842 842 
 /**
 
@@ -857,80 +857,80 @@  discard block
 
 block discarded – undo
857 857 
  * @return string
858 858 
  */
859 859 
 function geodir_substr($text, $start, $length, array $options) {
860 
-    if (empty($options['trimWidth'])) {
861 
-        $substr = 'geodir_utf8_substr';
862 
-    } else {
863 
-        $substr = 'geodir_utf8_strimwidth';
864 
-    }
865 
-
866 
-    $maxPosition = geodir_strlen($text, array('trimWidth' => false) + $options);
867 
-    if ($start < 0) {
868 
-        $start += $maxPosition;
869 
-        if ($start < 0) {
870 
-            $start = 0;
871 
-        }
872 
-    }
873 
-    if ($start >= $maxPosition) {
874 
-        return '';
875 
-    }
876 
-
877 
-    if ($length === null) {
878 
-        $length = geodir_strlen($text, $options);
879 
-    }
880 
-
881 
-    if ($length < 0) {
882 
-        $text = geodir_substr($text, $start, null, $options);
883 
-        $start = 0;
884 
-        $length += geodir_strlen($text, $options);
885 
-    }
886 
-
887 
-    if ($length <= 0) {
888 
-        return '';
889 
-    }
890 
-
891 
-    if (empty($options['html'])) {
892 
-        return (string)$substr($text, $start, $length);
893 
-    }
894 
-
895 
-    $totalOffset = 0;
896 
-    $totalLength = 0;
897 
-    $result = '';
898 
-
899 
-    $pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i';
900 
-    $parts = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
901 
-    foreach ($parts as $part) {
902 
-        $offset = 0;
903 
-
904 
-        if ($totalOffset < $start) {
905 
-            $len = geodir_strlen($part, array('trimWidth' => false) + $options);
906 
-            if ($totalOffset + $len <= $start) {
907 
-                $totalOffset += $len;
908 
-                continue;
909 
-            }
910 
-
911 
-            $offset = $start - $totalOffset;
912 
-            $totalOffset = $start;
913 
-        }
914 
-
915 
-        $len = geodir_strlen($part, $options);
916 
-        if ($offset !== 0 || $totalLength + $len > $length) {
917 
-            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
918 
-                // Entities cannot be passed substr.
919 
-                continue;
920 
-            }
921 
-
922 
-            $part = $substr($part, $offset, $length - $totalLength);
923 
-            $len = geodir_strlen($part, $options);
924 
-        }
925 
-
926 
-        $result .= $part;
927 
-        $totalLength += $len;
928 
-        if ($totalLength >= $length) {
929 
-            break;
930 
-        }
931 
-    }
932 
-
933 
-    return $result;
860 
+	if (empty($options['trimWidth'])) {
861 
+		$substr = 'geodir_utf8_substr';
862 
+	} else {
863 
+		$substr = 'geodir_utf8_strimwidth';
864 
+	}
865 
+
866 
+	$maxPosition = geodir_strlen($text, array('trimWidth' => false) + $options);
867 
+	if ($start < 0) {
868 
+		$start += $maxPosition;
869 
+		if ($start < 0) {
870 
+			$start = 0;
871 
+		}
872 
+	}
873 
+	if ($start >= $maxPosition) {
874 
+		return '';
875 
+	}
876 
+
877 
+	if ($length === null) {
878 
+		$length = geodir_strlen($text, $options);
879 
+	}
880 
+
881 
+	if ($length < 0) {
882 
+		$text = geodir_substr($text, $start, null, $options);
883 
+		$start = 0;
884 
+		$length += geodir_strlen($text, $options);
885 
+	}
886 
+
887 
+	if ($length <= 0) {
888 
+		return '';
889 
+	}
890 
+
891 
+	if (empty($options['html'])) {
892 
+		return (string)$substr($text, $start, $length);
893 
+	}
894 
+
895 
+	$totalOffset = 0;
896 
+	$totalLength = 0;
897 
+	$result = '';
898 
+
899 
+	$pattern = '/(&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};)/i';
900 
+	$parts = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
901 
+	foreach ($parts as $part) {
902 
+		$offset = 0;
903 
+
904 
+		if ($totalOffset < $start) {
905 
+			$len = geodir_strlen($part, array('trimWidth' => false) + $options);
906 
+			if ($totalOffset + $len <= $start) {
907 
+				$totalOffset += $len;
908 
+				continue;
909 
+			}
910 
+
911 
+			$offset = $start - $totalOffset;
912 
+			$totalOffset = $start;
913 
+		}
914 
+
915 
+		$len = geodir_strlen($part, $options);
916 
+		if ($offset !== 0 || $totalLength + $len > $length) {
917 
+			if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
918 
+				// Entities cannot be passed substr.
919 
+				continue;
920 
+			}
921 
+
922 
+			$part = $substr($part, $offset, $length - $totalLength);
923 
+			$len = geodir_strlen($part, $options);
924 
+		}
925 
+
926 
+		$result .= $part;
927 
+		$totalLength += $len;
928 
+		if ($totalLength >= $length) {
929 
+			break;
930 
+		}
931 
+	}
932 
+
933 
+	return $result;
934 934 
 }
935 935
936 936 
 /**
 
@@ -943,21 +943,21 @@  discard block
 
 block discarded – undo
943 943 
  * @return string
944 944 
  */
945 945 
 function geodir_remove_last_word($text) {
946 
-    $spacepos = geodir_utf8_strrpos($text, ' ');
946 
+	$spacepos = geodir_utf8_strrpos($text, ' ');
947 947
948 
-    if ($spacepos !== false) {
949 
-        $lastWord = geodir_utf8_strrpos($text, $spacepos);
948 
+	if ($spacepos !== false) {
949 
+		$lastWord = geodir_utf8_strrpos($text, $spacepos);
950 950
951 
-        // Some languages are written without word separation.
952 
-        // We recognize a string as a word if it does not contain any full-width characters.
953 
-        if (geodir_utf8_strwidth($lastWord) === geodir_utf8_strlen($lastWord)) {
954 
-            $text = geodir_utf8_substr($text, 0, $spacepos);
955 
-        }
951 
+		// Some languages are written without word separation.
952 
+		// We recognize a string as a word if it does not contain any full-width characters.
953 
+		if (geodir_utf8_strwidth($lastWord) === geodir_utf8_strlen($lastWord)) {
954 
+			$text = geodir_utf8_substr($text, 0, $spacepos);
955 
+		}
956 956
957 
-        return $text;
958 
-    }
957 
+		return $text;
958 
+	}
959 959
960 
-    return '';
960 
+	return '';
961 961 
 }
962 962
963 963 
 function geodir_tool_restore_cpt_from_taxonomies(){
 
@@ -1075,11 +1075,11 @@  discard block
 
 block discarded – undo
1075 1075 
  * @return string
1076 1076 
  */
1077 1077 
 function geodir_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) {
1078 
-    if ( function_exists( 'mb_strimwidth' ) ) {
1079 
-        return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
1080 
-    }
1078 
+	if ( function_exists( 'mb_strimwidth' ) ) {
1079 
+		return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
1080 
+	}
1081 1081
1082 
-    return geodir_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
1082 
+	return geodir_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
1083 1083 
 }
1084 1084
1085 1085 
 /**
 
@@ -1093,11 +1093,11 @@  discard block
 
 block discarded – undo
1093 1093 
  * @return int Returns the number of characters in string.
1094 1094 
  */
1095 1095 
 function geodir_utf8_strlen( $str, $encoding = 'UTF-8' ) {
1096 
-    if ( function_exists( 'mb_strlen' ) ) {
1097 
-        return mb_strlen( $str, $encoding );
1098 
-    }
1096 
+	if ( function_exists( 'mb_strlen' ) ) {
1097 
+		return mb_strlen( $str, $encoding );
1098 
+	}
1099 1099
1100 
-    return strlen( $str );
1100 
+	return strlen( $str );
1101 1101 
 }
1102 1102
1103 1103 
 /**
 
@@ -1113,11 +1113,11 @@  discard block
 
 block discarded – undo
1113 1113 
  * @return int Returns the position of the first occurrence of search in the string.
1114 1114 
  */
1115 1115 
 function geodir_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
1116 
-    if ( function_exists( 'mb_strpos' ) ) {
1117 
-        return mb_strpos( $str, $find, $offset, $encoding );
1118 
-    }
1116 
+	if ( function_exists( 'mb_strpos' ) ) {
1117 
+		return mb_strpos( $str, $find, $offset, $encoding );
1118 
+	}
1119 1119
1120 
-    return strpos( $str, $find, $offset );
1120 
+	return strpos( $str, $find, $offset );
1121 1121 
 }
1122 1122
1123 1123 
 /**
 
@@ -1133,11 +1133,11 @@  discard block
 
 block discarded – undo
1133 1133 
  * @return int Returns the position of the last occurrence of search.
1134 1134 
  */
1135 1135 
 function geodir_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
1136 
-    if ( function_exists( 'mb_strrpos' ) ) {
1137 
-        return mb_strrpos( $str, $find, $offset, $encoding );
1138 
-    }
1136 
+	if ( function_exists( 'mb_strrpos' ) ) {
1137 
+		return mb_strrpos( $str, $find, $offset, $encoding );
1138 
+	}
1139 1139
1140 
-    return strrpos( $str, $find, $offset );
1140 
+	return strrpos( $str, $find, $offset );
1141 1141 
 }
1142 1142
1143 1143 
 /**
 
@@ -1154,15 +1154,15 @@  discard block
 
 block discarded – undo
1154 1154 
  * @return string
1155 1155 
  */
1156 1156 
 function geodir_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) {
1157 
-    if ( function_exists( 'mb_substr' ) ) {
1158 
-        if ( $length === null ) {
1159 
-            return mb_substr( $str, $start, geodir_utf8_strlen( $str, $encoding ), $encoding );
1160 
-        } else {
1161 
-            return mb_substr( $str, $start, $length, $encoding );
1162 
-        }
1163 
-    }
1157 
+	if ( function_exists( 'mb_substr' ) ) {
1158 
+		if ( $length === null ) {
1159 
+			return mb_substr( $str, $start, geodir_utf8_strlen( $str, $encoding ), $encoding );
1160 
+		} else {
1161 
+			return mb_substr( $str, $start, $length, $encoding );
1162 
+		}
1163 
+	}
1164 1164
1165 
-    return substr( $str, $start, $length );
1165 
+	return substr( $str, $start, $length );
1166 1166 
 }
1167 1167
1168 1168 
 /**
 
@@ -1195,20 +1195,20 @@  discard block
 
 block discarded – undo
1195 1195 
  * @return string The resulting string.
1196 1196 
  */
1197 1197 
 function geodir_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) {
1198 
-    if ( function_exists( 'mb_strlen' ) ) {
1199 
-        $first_letter = geodir_strtoupper( geodir_utf8_substr( $str, 0, 1, $encoding ), $encoding );
1200 
-        $str_end = "";
1198 
+	if ( function_exists( 'mb_strlen' ) ) {
1199 
+		$first_letter = geodir_strtoupper( geodir_utf8_substr( $str, 0, 1, $encoding ), $encoding );
1200 
+		$str_end = "";
1201 1201
1202 
-        if ( $lower_str_end ) {
1203 
-            $str_end = geodir_strtolower( geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
1204 
-        } else {
1205 
-            $str_end = geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding );
1206 
-        }
1202 
+		if ( $lower_str_end ) {
1203 
+			$str_end = geodir_strtolower( geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
1204 
+		} else {
1205 
+			$str_end = geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding );
1206 
+		}
1207 1207
1208 
-        return $first_letter . $str_end;
1209 
-    }
1208 
+		return $first_letter . $str_end;
1209 
+	}
1210 1210
1211 
-    return ucfirst( $str );
1211 
+	return ucfirst( $str );
1212 1212 
 }
1213 1213
1214 1214 
 function geodir_total_listings_count($post_type = false)
Please login to merge, or discard this patch.
Spacing   +123 added lines, -123 removed lines patch added patch discarded remove patch 
@@ -13,11 +13,11 @@  discard block
 
 block discarded – undo
13 13 
  * @since 1.4.6
14 14 
  * @return int|null Return the page ID if present or null if not.
15 15 
  */
16 
-function geodir_add_listing_page_id(){
16 
+function geodir_add_listing_page_id() {
17 17 
     $gd_page_id = get_option('geodir_add_listing_page');
18 18
19 19 
     if (function_exists('icl_object_id')) {
20 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
20 
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
21 21 
     }
22 22
23 23 
     return $gd_page_id;
 
@@ -30,11 +30,11 @@  discard block
 
 block discarded – undo
30 30 
  * @since 1.4.6
31 31 
  * @return int|null Return the page ID if present or null if not.
32 32 
  */
33 
-function geodir_preview_page_id(){
33 
+function geodir_preview_page_id() {
34 34 
     $gd_page_id = get_option('geodir_preview_page');
35 35
36 36 
     if (function_exists('icl_object_id')) {
37 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
37 
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
38 38 
     }
39 39
40 40 
     return $gd_page_id;
 
@@ -47,11 +47,11 @@  discard block
 
 block discarded – undo
47 47 
  * @since 1.4.6
48 48 
  * @return int|null Return the page ID if present or null if not.
49 49 
  */
50 
-function geodir_success_page_id(){
50 
+function geodir_success_page_id() {
51 51 
     $gd_page_id = get_option('geodir_success_page');
52 52
53 53 
     if (function_exists('icl_object_id')) {
54 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
54 
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
55 55 
     }
56 56
57 57 
     return $gd_page_id;
 
@@ -64,11 +64,11 @@  discard block
 
 block discarded – undo
64 64 
  * @since 1.4.6
65 65 
  * @return int|null Return the page ID if present or null if not.
66 66 
  */
67 
-function geodir_location_page_id(){
67 
+function geodir_location_page_id() {
68 68 
     $gd_page_id = get_option('geodir_location_page');
69 69
70 70 
     if (function_exists('icl_object_id')) {
71 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
71 
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
72 72 
     }
73 73
74 74 
     return $gd_page_id;
 
@@ -81,11 +81,11 @@  discard block
 
 block discarded – undo
81 81 
  * @since 1.5.4
82 82 
  * @return int|null Return the page ID if present or null if not.
83 83 
  */
84 
-function geodir_home_page_id(){
84 
+function geodir_home_page_id() {
85 85 
     $gd_page_id = get_option('geodir_home_page');
86 86
87 87 
     if (function_exists('icl_object_id')) {
88 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
88 
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
89 89 
     }
90 90
91 91 
     return $gd_page_id;
 
@@ -98,11 +98,11 @@  discard block
 
 block discarded – undo
98 98 
  * @since 1.5.3
99 99 
  * @return int|null Return the page ID if present or null if not.
100 100 
  */
101 
-function geodir_info_page_id(){
101 
+function geodir_info_page_id() {
102 102 
     $gd_page_id = get_option('geodir_info_page');
103 103
104 104 
     if (function_exists('icl_object_id')) {
105 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
105 
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
106 106 
     }
107 107
108 108 
     return $gd_page_id;
 
@@ -115,11 +115,11 @@  discard block
 
 block discarded – undo
115 115 
  * @since 1.5.3
116 116 
  * @return int|null Return the page ID if present or null if not.
117 117 
  */
118 
-function geodir_login_page_id(){
118 
+function geodir_login_page_id() {
119 119 
     $gd_page_id = get_option('geodir_login_page');
120 120
121 121 
     if (function_exists('icl_object_id')) {
122 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
122 
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
123 123 
     }
124 124
125 125 
     return $gd_page_id;
 
@@ -133,20 +133,20 @@  discard block
 
 block discarded – undo
133 133 
  * @since 1.5.3
134 134 
  * @return int|null Return the page ID if present or null if not.
135 135 
  */
136 
-function geodir_login_url($args=array()){
136 
+function geodir_login_url($args = array()) {
137 137 
     $gd_page_id = get_option('geodir_login_page');
138 138
139 139 
     if (function_exists('icl_object_id')) {
140 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
140 
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
141 141 
     }
142 142
143 143 
     if (function_exists('geodir_location_geo_home_link')) {
144 144 
         remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
145 145 
     }
146 146
147 
-    if (geodir_is_wpml()){
147 
+    if (geodir_is_wpml()) {
148 148 
         $home_url = icl_get_home_url();
149 
-    }else{
149 
+    } else {
150 150 
         $home_url = home_url();
151 151 
     }
152 152 
 
@@ -154,17 +154,17 @@  discard block
 
 block discarded – undo
154 154 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
155 155 
     }
156 156
157 
-    if($gd_page_id){
157 
+    if ($gd_page_id) {
158 158 
         $post = get_post($gd_page_id);
159 159 
         $slug = $post->post_name;
160 160 
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
161 161 
         $login_url = trailingslashit($home_url)."$slug/";
162 
-    }else{
162 
+    } else {
163 163 
         $login_url = trailingslashit($home_url)."?geodir_signup=true";
164 164 
     }
165 165
166 
-    if($args){
167 
-        $login_url = add_query_arg($args,$login_url );
166 
+    if ($args) {
167 
+        $login_url = add_query_arg($args, $login_url);
168 168 
     }
169 169
170 170 
     /**
 
@@ -178,7 +178,7 @@  discard block
 
 block discarded – undo
178 178 
      * @param array $args The array of query args used.
179 179 
      * @param int $gd_page_id The page id of the GD login page.
180 180 
      */
181 
-	    return apply_filters('geodir_login_url',$login_url,$args,$gd_page_id);
181 
+	    return apply_filters('geodir_login_url', $login_url, $args, $gd_page_id);
182 182 
 }
183 183
184 184 
 /**
 
@@ -189,20 +189,20 @@  discard block
 
 block discarded – undo
189 189 
  * @since 1.5.16 Added WPML lang code to url.
190 190 
  * @return string Info page url.
191 191 
  */
192 
-function geodir_info_url($args=array()){
192 
+function geodir_info_url($args = array()) {
193 193 
     $gd_page_id = get_option('geodir_info_page');
194 194
195 195 
     if (function_exists('icl_object_id')) {
196 
-        $gd_page_id =  icl_object_id($gd_page_id, 'page', true);
196 
+        $gd_page_id = icl_object_id($gd_page_id, 'page', true);
197 197 
     }
198 198
199 199 
     if (function_exists('geodir_location_geo_home_link')) {
200 200 
         remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
201 201 
     }
202 202
203 
-    if (geodir_is_wpml()){
203 
+    if (geodir_is_wpml()) {
204 204 
         $home_url = icl_get_home_url();
205 
-    }else{
205 
+    } else {
206 206 
         $home_url = home_url();
207 207 
     }
208 208 
 
@@ -210,17 +210,17 @@  discard block
 
 block discarded – undo
210 210 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
211 211 
     }
212 212
213 
-    if($gd_page_id){
213 
+    if ($gd_page_id) {
214 214 
         $post = get_post($gd_page_id);
215 215 
         $slug = $post->post_name;
216 216 
         //$login_url = get_permalink($gd_page_id );// get_permalink can only be user after theme-Setup hook, any earlier and it errors
217 217 
         $info_url = trailingslashit($home_url)."$slug/";
218 
-    }else{
218 
+    } else {
219 219 
         $info_url = trailingslashit($home_url);
220 220 
     }
221 221
222 
-    if($args){
223 
-        $info_url = add_query_arg($args,$info_url );
222 
+    if ($args) {
223 
+        $info_url = add_query_arg($args, $info_url);
224 224 
     }
225 225
226 226 
     return $info_url;
 
@@ -238,7 +238,7 @@  discard block
 
 block discarded – undo
238 238 
  * @param string $charset Character set to use for conversion.
239 239 
  * @return string Returns converted string.
240 240 
  */
241 
-function geodir_ucwords($string, $charset='UTF-8') {
241 
+function geodir_ucwords($string, $charset = 'UTF-8') {
242 242 
     if (function_exists('mb_convert_case')) {
243 243 
         return mb_convert_case($string, MB_CASE_TITLE, $charset);
244 244 
     } else {
 
@@ -258,7 +258,7 @@  discard block
 
 block discarded – undo
258 258 
  * @param string $charset Character set to use for conversion.
259 259 
  * @return string Returns converted string.
260 260 
  */
261 
-function geodir_strtolower($string, $charset='UTF-8') {
261 
+function geodir_strtolower($string, $charset = 'UTF-8') {
262 262 
     if (function_exists('mb_convert_case')) {
263 263 
         return mb_convert_case($string, MB_CASE_LOWER, $charset);
264 264 
     } else {
 
@@ -278,7 +278,7 @@  discard block
 
 block discarded – undo
278 278 
  * @param string $charset Character set to use for conversion.
279 279 
  * @return string Returns converted string.
280 280 
  */
281 
-function geodir_strtoupper($string, $charset='UTF-8') {
281 
+function geodir_strtoupper($string, $charset = 'UTF-8') {
282 282 
     if (function_exists('mb_convert_case')) {
283 283 
         return mb_convert_case($string, MB_CASE_UPPER, $charset);
284 284 
     } else {
 
@@ -309,7 +309,7 @@  discard block
 
 block discarded – undo
309 309
310 310 
 	$url = trim($parts[0]);
311 311 
 	if ($formatted && $url != '') {
312 
-		$url = str_replace( ' ', '%20', $url );
312 
+		$url = str_replace(' ', '%20', $url);
313 313 
 		$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
314 314
315 315 
 		if (0 !== stripos($url, 'mailto:')) {
 
@@ -319,8 +319,8 @@  discard block
 
 block discarded – undo
319 319
320 320 
 		$url = str_replace(';//', '://', $url);
321 321
322 
-		if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
323 
-			$url = 'http://' . $url;
322 
+		if (strpos($url, ':') === false && !in_array($url[0], array('/', '#', '?')) && !preg_match('/^[a-z0-9-]+?\.php/i', $url)) {
323 
+			$url = 'http://'.$url;
324 324 
 		}
325 325
326 326 
 		$url = wp_kses_normalize_entities($url);
 
@@ -462,7 +462,7 @@  discard block
 
 block discarded – undo
462 462 
  * @package GeoDirectory
463 463 
  */
464 464 
 function _gd_die_handler() {
465 
-    if ( defined( 'GD_TESTING_MODE' ) ) {
465 
+    if (defined('GD_TESTING_MODE')) {
466 466 
         return '_gd_die_handler';
467 467 
     } else {
468 468 
         die();
 
@@ -480,10 +480,10 @@  discard block
 
 block discarded – undo
480 480 
  * @param string $title   Optional. Error title.
481 481 
  * @param int $status     Optional. Status code.
482 482 
  */
483 
-function gd_die( $message = '', $title = '', $status = 400 ) {
484 
-    add_filter( 'wp_die_ajax_handler', '_gd_die_handler', 10, 3 );
485 
-    add_filter( 'wp_die_handler', '_gd_die_handler', 10, 3 );
486 
-    wp_die( $message, $title, array( 'response' => $status ));
483 
+function gd_die($message = '', $title = '', $status = 400) {
484 
+    add_filter('wp_die_ajax_handler', '_gd_die_handler', 10, 3);
485 
+    add_filter('wp_die_handler', '_gd_die_handler', 10, 3);
486 
+    wp_die($message, $title, array('response' => $status));
487 487 
 }
488 488
489 489 
 /*
 
@@ -493,7 +493,7 @@  discard block
 
 block discarded – undo
493 493 
  * @param string $php_format The PHP date format.
494 494 
  * @return string The jQuery format date string.
495 495 
  */
496 
-function geodir_date_format_php_to_jqueryui( $php_format ) {
496 
+function geodir_date_format_php_to_jqueryui($php_format) {
497 497 
 	$symbols = array(
498 498 
 		// Day
499 499 
 		'd' => 'dd',
 
@@ -533,27 +533,27 @@  discard block
 
 block discarded – undo
533 533 
 	$jqueryui_format = "";
534 534 
 	$escaping = false;
535 535
536 
-	for ( $i = 0; $i < strlen( $php_format ); $i++ ) {
536 
+	for ($i = 0; $i < strlen($php_format); $i++) {
537 537 
 		$char = $php_format[$i];
538 538
539 539 
 		// PHP date format escaping character
540 
-		if ( $char === '\\' ) {
540 
+		if ($char === '\\') {
541 541 
 			$i++;
542 542
543 
-			if ( $escaping ) {
543 
+			if ($escaping) {
544 544 
 				$jqueryui_format .= $php_format[$i];
545 545 
 			} else {
546 
-				$jqueryui_format .= '\'' . $php_format[$i];
546 
+				$jqueryui_format .= '\''.$php_format[$i];
547 547 
 			}
548 548
549 549 
 			$escaping = true;
550 550 
 		} else {
551 
-			if ( $escaping ) {
551 
+			if ($escaping) {
552 552 
 				$jqueryui_format .= "'";
553 553 
 				$escaping = false;
554 554 
 			}
555 555
556 
-			if ( isset( $symbols[$char] ) ) {
556 
+			if (isset($symbols[$char])) {
557 557 
 				$jqueryui_format .= $symbols[$char];
558 558 
 			} else {
559 559 
 				$jqueryui_format .= $char;
 
@@ -572,7 +572,7 @@  discard block
 
 block discarded – undo
572 572 
  * @return string The untranslated date string.
573 573 
  * @since 1.6.5
574 574 
  */
575 
-function geodir_maybe_untranslate_date($date){
575 
+function geodir_maybe_untranslate_date($date) {
576 576 
 	$english_long_months = array(
577 577 
 		'January',
578 578 
 		'February',
 
@@ -588,7 +588,7 @@  discard block
 
 block discarded – undo
588 588 
 		'December',
589 589 
 	);
590 590
591 
-	$non_english_long_months  = array(
591 
+	$non_english_long_months = array(
592 592 
 		__('January'),
593 593 
 		__('February'),
594 594 
 		__('March'),
 
@@ -602,7 +602,7 @@  discard block
 
 block discarded – undo
602 602 
 		__('November'),
603 603 
 		__('December'),
604 604 
 	);
605 
-	$date = str_replace($non_english_long_months,$english_long_months,$date);
605 
+	$date = str_replace($non_english_long_months, $english_long_months, $date);
606 606
607 607
608 608 
 	$english_short_months = array(
 
@@ -621,21 +621,21 @@  discard block
 
 block discarded – undo
621 621 
 	);
622 622
623 623 
 	$non_english_short_months = array(
624 
-		' '._x( 'Jan', 'January abbreviation' ).' ',
625 
-		' '._x( 'Feb', 'February abbreviation' ).' ',
626 
-		' '._x( 'Mar', 'March abbreviation' ).' ',
627 
-		' '._x( 'Apr', 'April abbreviation' ).' ',
628 
-		' '._x( 'May', 'May abbreviation' ).' ',
629 
-		' '._x( 'Jun', 'June abbreviation' ).' ',
630 
-		' '._x( 'Jul', 'July abbreviation' ).' ',
631 
-		' '._x( 'Aug', 'August abbreviation' ).' ',
632 
-		' '._x( 'Sep', 'September abbreviation' ).' ',
633 
-		' '._x( 'Oct', 'October abbreviation' ).' ',
634 
-		' '._x( 'Nov', 'November abbreviation' ).' ',
635 
-		' '._x( 'Dec', 'December abbreviation' ).' ',
624 
+		' '._x('Jan', 'January abbreviation').' ',
625 
+		' '._x('Feb', 'February abbreviation').' ',
626 
+		' '._x('Mar', 'March abbreviation').' ',
627 
+		' '._x('Apr', 'April abbreviation').' ',
628 
+		' '._x('May', 'May abbreviation').' ',
629 
+		' '._x('Jun', 'June abbreviation').' ',
630 
+		' '._x('Jul', 'July abbreviation').' ',
631 
+		' '._x('Aug', 'August abbreviation').' ',
632 
+		' '._x('Sep', 'September abbreviation').' ',
633 
+		' '._x('Oct', 'October abbreviation').' ',
634 
+		' '._x('Nov', 'November abbreviation').' ',
635 
+		' '._x('Dec', 'December abbreviation').' ',
636 636 
 	);
637 637
638 
-	$date = str_replace($non_english_short_months,$english_short_months,$date);
638 
+	$date = str_replace($non_english_short_months, $english_short_months, $date);
639 639
640 640
641 641 
 	return $date;
 
@@ -707,7 +707,7 @@  discard block
 
 block discarded – undo
707 707 
  * @return string Trimmed string.
708 708 
  */
709 709 
 function geodir_excerpt($text, $length = 100, $options = array()) {
710 
-    if (!(int)$length > 0) {
710 
+    if (!(int) $length > 0) {
711 711 
         return $text;
712 712 
     }
713 713 
     $default = array(
 
@@ -769,7 +769,7 @@  discard block
 
 block discarded – undo
769 769 
         $length = $truncateLength;
770 770
771 771 
         foreach ($openTags as $tag) {
772 
-            $suffix .= '</' . $tag . '>';
772 
+            $suffix .= '</'.$tag.'>';
773 773 
         }
774 774 
     } else {
775 775 
         if (geodir_strlen($text, $options) <= $length) {
 
@@ -791,7 +791,7 @@  discard block
 
 block discarded – undo
791 791 
         }
792 792 
     }
793 793
794 
-    return $prefix . $result . $suffix;
794 
+    return $prefix.$result.$suffix;
795 795 
 }
796 796
797 797 
 /**
 
@@ -828,7 +828,7 @@  discard block
 
 block discarded – undo
828 828 
     $pattern = '/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i';
829 829 
     $replace = preg_replace_callback(
830 830 
         $pattern,
831 
-        function ($match) use ($strlen) {
831 
+        function($match) use ($strlen) {
832 832 
             $utf8 = html_entity_decode($match[0], ENT_HTML5 | ENT_QUOTES, 'UTF-8');
833 833
834 834 
             return str_repeat(' ', $strlen($utf8, 'UTF-8'));
 
@@ -889,7 +889,7 @@  discard block
 
 block discarded – undo
889 889 
     }
890 890
891 891 
     if (empty($options['html'])) {
892 
-        return (string)$substr($text, $start, $length);
892 
+        return (string) $substr($text, $start, $length);
893 893 
     }
894 894
895 895 
     $totalOffset = 0;
 
@@ -914,7 +914,7 @@  discard block
 
 block discarded – undo
914 914
915 915 
         $len = geodir_strlen($part, $options);
916 916 
         if ($offset !== 0 || $totalLength + $len > $length) {
917 
-            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8') ) {
917 
+            if (strpos($part, '&') === 0 && preg_match($pattern, $part) && $part !== html_entity_decode($part, ENT_HTML5 | ENT_QUOTES, 'UTF-8')) {
918 918 
                 // Entities cannot be passed substr.
919 919 
                 continue;
920 920 
             }
 
@@ -960,39 +960,39 @@  discard block
 
 block discarded – undo
960 960 
     return '';
961 961 
 }
962 962
963 
-function geodir_tool_restore_cpt_from_taxonomies(){
963 
+function geodir_tool_restore_cpt_from_taxonomies() {
964 964
965 965 
 	$cpts = get_option('geodir_post_types');
966 966
967 
-	if(!empty($cpts)){return;}
967 
+	if (!empty($cpts)) {return; }
968 968
969 969 
 	$taxonomies = get_option('geodir_taxonomies');
970 970
971 
-	if(empty($taxonomies)){return;}
971 
+	if (empty($taxonomies)) {return; }
972 972
973 973 
 	$cpts = array();
974 974
975 
-	foreach($taxonomies as $key => $val){
975 
+	foreach ($taxonomies as $key => $val) {
976 976
977 
-		if(strpos($val['listing_slug'], '/') === false) {
978 
-			$cpts[$val['object_type']] = array('cpt'=>$val['object_type'],'slug'=>$val['listing_slug']);
977 
+		if (strpos($val['listing_slug'], '/') === false) {
978 
+			$cpts[$val['object_type']] = array('cpt'=>$val['object_type'], 'slug'=>$val['listing_slug']);
979 979 
 		}
980 980
981 981 
 	}
982 982
983 
-	if(empty($cpts)){return;}
983 
+	if (empty($cpts)) {return; }
984 984
985 985
986 986 
 	$cpts_restore = $cpts;
987 987
988 
-	foreach($cpts as $cpt){
988 
+	foreach ($cpts as $cpt) {
989 989
990 990
991 
-		$is_custom = $cpt['cpt']=='gd_place' ? 0 : 1;
991 
+		$is_custom = $cpt['cpt'] == 'gd_place' ? 0 : 1;
992 992
993 
-		$cpts_restore[$cpt['cpt']] = array (
993 
+		$cpts_restore[$cpt['cpt']] = array(
994 994 
 				'labels' =>
995 
-					array (
995 
+					array(
996 996 
 						'name' => $cpt['slug'],
997 997 
 						'singular_name' => $cpt['slug'],
998 998 
 						'add_new' => 'Add New',
 
@@ -1020,14 +1020,14 @@  discard block
 
 block discarded – undo
1020 1020 
 				'public' => true,
1021 1021 
 				'query_var' => true,
1022 1022 
 				'rewrite' =>
1023 
-					array (
1023 
+					array(
1024 1024 
 						'slug' => $cpt['slug'],
1025 1025 
 						'with_front' => false,
1026 1026 
 						'hierarchical' => true,
1027 1027 
 						'feeds' => true,
1028 1028 
 					),
1029 1029 
 				'supports' =>
1030 
-					array (
1030 
+					array(
1031 1031 
 						0 => 'title',
1032 1032 
 						1 => 'editor',
1033 1033 
 						2 => 'author',
 
@@ -1037,14 +1037,14 @@  discard block
 
 block discarded – undo
1037 1037 
 						6 => 'comments',
1038 1038 
 					),
1039 1039 
 				'taxonomies' =>
1040 
-					array (
1040 
+					array(
1041 1041 
 						0 => $cpt['cpt'].'category',
1042 1042 
 						1 => $cpt['cpt'].'_tags',
1043 1043 
 					),
1044 1044 
 				'is_custom' => $is_custom,
1045 1045 
 				'listing_order' => '1',
1046 1046 
 				'seo' =>
1047 
-					array (
1047 
+					array(
1048 1048 
 						'meta_keyword' => '',
1049 1049 
 						'meta_description' => '',
1050 1050 
 					),
 
@@ -1056,7 +1056,7 @@  discard block
 
 block discarded – undo
1056 1056 
 	}
1057 1057
1058 1058
1059 
-	update_option('geodir_post_types',$cpts_restore);
1059 
+	update_option('geodir_post_types', $cpts_restore);
1060 1060
1061 1061 
 }
1062 1062 
 
@@ -1074,12 +1074,12 @@  discard block
 
 block discarded – undo
1074 1074 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
1075 1075 
  * @return string
1076 1076 
  */
1077 
-function geodir_utf8_strimwidth( $str, $start, $width, $trimmaker = '', $encoding = 'UTF-8' ) {
1078 
-    if ( function_exists( 'mb_strimwidth' ) ) {
1079 
-        return mb_strimwidth( $str, $start, $width, $trimmaker, $encoding );
1077 
+function geodir_utf8_strimwidth($str, $start, $width, $trimmaker = '', $encoding = 'UTF-8') {
1078 
+    if (function_exists('mb_strimwidth')) {
1079 
+        return mb_strimwidth($str, $start, $width, $trimmaker, $encoding);
1080 1080 
     }
1081 1081
1082 
-    return geodir_utf8_substr( $str, $start, $width, $encoding ) . $trimmaker;
1082 
+    return geodir_utf8_substr($str, $start, $width, $encoding).$trimmaker;
1083 1083 
 }
1084 1084
1085 1085 
 /**
 
@@ -1092,12 +1092,12 @@  discard block
 
 block discarded – undo
1092 1092 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
1093 1093 
  * @return int Returns the number of characters in string.
1094 1094 
  */
1095 
-function geodir_utf8_strlen( $str, $encoding = 'UTF-8' ) {
1096 
-    if ( function_exists( 'mb_strlen' ) ) {
1097 
-        return mb_strlen( $str, $encoding );
1095 
+function geodir_utf8_strlen($str, $encoding = 'UTF-8') {
1096 
+    if (function_exists('mb_strlen')) {
1097 
+        return mb_strlen($str, $encoding);
1098 1098 
     }
1099 1099
1100 
-    return strlen( $str );
1100 
+    return strlen($str);
1101 1101 
 }
1102 1102
1103 1103 
 /**
 
@@ -1112,12 +1112,12 @@  discard block
 
 block discarded – undo
1112 1112 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
1113 1113 
  * @return int Returns the position of the first occurrence of search in the string.
1114 1114 
  */
1115 
-function geodir_utf8_strpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
1116 
-    if ( function_exists( 'mb_strpos' ) ) {
1117 
-        return mb_strpos( $str, $find, $offset, $encoding );
1115 
+function geodir_utf8_strpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
1116 
+    if (function_exists('mb_strpos')) {
1117 
+        return mb_strpos($str, $find, $offset, $encoding);
1118 1118 
     }
1119 1119
1120 
-    return strpos( $str, $find, $offset );
1120 
+    return strpos($str, $find, $offset);
1121 1121 
 }
1122 1122
1123 1123 
 /**
 
@@ -1132,12 +1132,12 @@  discard block
 
 block discarded – undo
1132 1132 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
1133 1133 
  * @return int Returns the position of the last occurrence of search.
1134 1134 
  */
1135 
-function geodir_utf8_strrpos( $str, $find, $offset = 0, $encoding = 'UTF-8' ) {
1136 
-    if ( function_exists( 'mb_strrpos' ) ) {
1137 
-        return mb_strrpos( $str, $find, $offset, $encoding );
1135 
+function geodir_utf8_strrpos($str, $find, $offset = 0, $encoding = 'UTF-8') {
1136 
+    if (function_exists('mb_strrpos')) {
1137 
+        return mb_strrpos($str, $find, $offset, $encoding);
1138 1138 
     }
1139 1139
1140 
-    return strrpos( $str, $find, $offset );
1140 
+    return strrpos($str, $find, $offset);
1141 1141 
 }
1142 1142
1143 1143 
 /**
 
@@ -1153,16 +1153,16 @@  discard block
 
 block discarded – undo
1153 1153 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
1154 1154 
  * @return string
1155 1155 
  */
1156 
-function geodir_utf8_substr( $str, $start, $length = null, $encoding = 'UTF-8' ) {
1157 
-    if ( function_exists( 'mb_substr' ) ) {
1158 
-        if ( $length === null ) {
1159 
-            return mb_substr( $str, $start, geodir_utf8_strlen( $str, $encoding ), $encoding );
1156 
+function geodir_utf8_substr($str, $start, $length = null, $encoding = 'UTF-8') {
1157 
+    if (function_exists('mb_substr')) {
1158 
+        if ($length === null) {
1159 
+            return mb_substr($str, $start, geodir_utf8_strlen($str, $encoding), $encoding);
1160 1160 
         } else {
1161 
-            return mb_substr( $str, $start, $length, $encoding );
1161 
+            return mb_substr($str, $start, $length, $encoding);
1162 1162 
         }
1163 1163 
     }
1164 1164
1165 
-    return substr( $str, $start, $length );
1165 
+    return substr($str, $start, $length);
1166 1166 
 }
1167 1167
1168 1168 
 /**
 
@@ -1175,12 +1175,12 @@  discard block
 
 block discarded – undo
1175 1175 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
1176 1176 
  * @return string The width of string.
1177 1177 
  */
1178 
-function geodir_utf8_strwidth( $str, $encoding = 'UTF-8' ) {
1179 
-	if ( function_exists( 'mb_strwidth' ) ) {
1180 
-		return mb_strwidth( $str, $encoding );
1178 
+function geodir_utf8_strwidth($str, $encoding = 'UTF-8') {
1179 
+	if (function_exists('mb_strwidth')) {
1180 
+		return mb_strwidth($str, $encoding);
1181 1181 
 	}
1182 1182
1183 
-	return geodir_utf8_strlen( $str, $encoding );
1183 
+	return geodir_utf8_strlen($str, $encoding);
1184 1184 
 }
1185 1185
1186 1186 
 /**
 
@@ -1194,21 +1194,21 @@  discard block
 
 block discarded – undo
1194 1194 
  * @param string $encoding The encoding parameter is the character encoding. Default "UTF-8".
1195 1195 
  * @return string The resulting string.
1196 1196 
  */
1197 
-function geodir_utf8_ucfirst( $str, $lower_str_end = false, $encoding = 'UTF-8' ) {
1198 
-    if ( function_exists( 'mb_strlen' ) ) {
1199 
-        $first_letter = geodir_strtoupper( geodir_utf8_substr( $str, 0, 1, $encoding ), $encoding );
1197 
+function geodir_utf8_ucfirst($str, $lower_str_end = false, $encoding = 'UTF-8') {
1198 
+    if (function_exists('mb_strlen')) {
1199 
+        $first_letter = geodir_strtoupper(geodir_utf8_substr($str, 0, 1, $encoding), $encoding);
1200 1200 
         $str_end = "";
1201 1201
1202 
-        if ( $lower_str_end ) {
1203 
-            $str_end = geodir_strtolower( geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding ), $encoding );
1202 
+        if ($lower_str_end) {
1203 
+            $str_end = geodir_strtolower(geodir_utf8_substr($str, 1, geodir_utf8_strlen($str, $encoding), $encoding), $encoding);
1204 1204 
         } else {
1205 
-            $str_end = geodir_utf8_substr( $str, 1, geodir_utf8_strlen( $str, $encoding ), $encoding );
1205 
+            $str_end = geodir_utf8_substr($str, 1, geodir_utf8_strlen($str, $encoding), $encoding);
1206 1206 
         }
1207 1207
1208 
-        return $first_letter . $str_end;
1208 
+        return $first_letter.$str_end;
1209 1209 
     }
1210 1210
1211 
-    return ucfirst( $str );
1211 
+    return ucfirst($str);
1212 1212 
 }
1213 1213
1214 1214 
 function geodir_total_listings_count($post_type = false)
 
@@ -1218,13 +1218,13 @@  discard block
 
 block discarded – undo
1218 1218 
 	$count = 0;
1219 1219
1220 1220 
 	if ($post_type) {
1221 
-		$count = $count + $wpdb->get_var("select count(post_id) from " . $wpdb->prefix . "geodir_" . $post_type . "_detail");
1221 
+		$count = $count + $wpdb->get_var("select count(post_id) from ".$wpdb->prefix."geodir_".$post_type."_detail");
1222 1222 
 	} else {
1223 1223 
 		$all_postypes = geodir_get_posttypes();
1224 1224
1225 1225 
 		if (!empty($all_postypes)) {
1226 1226 
 			foreach ($all_postypes as $key) {
1227 
-				$count = $count + $wpdb->get_var("select count(post_id) from " . $wpdb->prefix . "geodir_" . $key . "_detail");
1227 
+				$count = $count + $wpdb->get_var("select count(post_id) from ".$wpdb->prefix."geodir_".$key."_detail");
1228 1228 
 			}
1229 1229 
 		}
1230 1230 
 	}
Please login to merge, or discard this patch.
geodirectory-templates/listing-filter-form.php 2 patches
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch 
@@ -13,26 +13,26 @@  discard block
 
 block discarded – undo
13 13 
 global $wp_query, $current_term, $query;
14 14
15 15 
 if (function_exists('geodir_location_geo_home_link')) {
16 
-    remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
16 
+	remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
17 17 
 }
18 18
19 19 
 if (geodir_is_wpml() && defined('DOING_AJAX') && DOING_AJAX){
20 
-    $search_url = icl_get_home_url();
20 
+	$search_url = icl_get_home_url();
21 21 
 } else {
22 
-    $search_url = get_home_url();
22 
+	$search_url = get_home_url();
23 23 
 }
24 24
25 25 
 $search_url = trailingslashit($search_url);
26 26
27 27 
 if (function_exists('geodir_location_geo_home_link')) {
28 
-    add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
28 
+	add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
29 29 
 }
30 30
31 31 
 $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
32 32 
 $form_class = 'geodir-listing-search';
33 33
34 34 
 if($new_style){
35 
-    $form_class .= ' gd-search-bar-style';
35 
+	$form_class .= ' gd-search-bar-style';
36 36 
 }
37 37 
 ?>
38 38 
 <form class="<?php

@@ -49,56 +49,56 @@  discard block
 
 block discarded – undo
49 49 
     <div class="geodir-loc-bar">
50 50
51 51 
         <?php
52 
-        /**
53 
-         * Called inside the search form but before any of the fields.
54 
-         *
55 
-         * @since 1.0.0
56 
-         */
57 
-        do_action('geodir_before_search_form') ?>
52 
+		/**
53 
+		 * Called inside the search form but before any of the fields.
54 
+		 *
55 
+		 * @since 1.0.0
56 
+		 */
57 
+		do_action('geodir_before_search_form') ?>
58 58
59 59 
         <div class="clearfix geodir-loc-bar-in">
60 60 
             <div class="geodir-search">
61 61
62 62 
                 <?php
63 63
64 
-                /**
65 
-                 * Adds the input fields to the search form.
66 
-                 *
67 
-                 * @since 1.6.9
68 
-                 */
69 
-                do_action('geodir_search_form_inputs');
64 
+				/**
65 
+				 * Adds the input fields to the search form.
66 
+				 *
67 
+				 * @since 1.6.9
68 
+				 */
69 
+				do_action('geodir_search_form_inputs');
70 70
71 71
72 72
73 
-                /**
74 
-                 * Called on the GD search form just before the search button.
75 
-                 *
76 
-                 * @since 1.0.0
77 
-                 */
78 
-                do_action('geodir_before_search_button');
73 
+				/**
74 
+				 * Called on the GD search form just before the search button.
75 
+				 *
76 
+				 * @since 1.0.0
77 
+				 */
78 
+				do_action('geodir_before_search_button');
79 79
80 80
81 
-                /**
82 
-                 * Called on the GD search form just after the search button.
83 
-                 *
84 
-                 * @since 1.0.0
85 
-                 */
86 
-                do_action('geodir_after_search_button');
81 
+				/**
82 
+				 * Called on the GD search form just after the search button.
83 
+				 *
84 
+				 * @since 1.0.0
85 
+				 */
86 
+				do_action('geodir_after_search_button');
87 87
88 88
89 
-                ?>
89 
+				?>
90 90 
             </div>
91 91
92 92
93 93 
         </div>
94 94
95 95 
         <?php
96 
-        /**
97 
-         * Called inside the search form but after all the input fields.
98 
-         *
99 
-         * @since 1.0.0
100 
-         */
101 
-        do_action('geodir_after_search_form') ?>
96 
+		/**
97 
+		 * Called inside the search form but after all the input fields.
98 
+		 *
99 
+		 * @since 1.0.0
100 
+		 */
101 
+		do_action('geodir_after_search_form') ?>
102 102
103 103
104 104 
     </div>
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -16,7 +16,7 @@  discard block
 
 block discarded – undo
16 16 
     remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
17 17 
 }
18 18
19 
-if (geodir_is_wpml() && defined('DOING_AJAX') && DOING_AJAX){
19 
+if (geodir_is_wpml() && defined('DOING_AJAX') && DOING_AJAX) {
20 20 
     $search_url = icl_get_home_url();
21 21 
 } else {
22 22 
     $search_url = get_home_url();

@@ -31,7 +31,7 @@  discard block
 
 block discarded – undo
31 31 
 $new_style = get_option('geodir_show_search_old_search_from') ? false : true;
32 32 
 $form_class = 'geodir-listing-search';
33 33
34 
-if($new_style){
34 
+if ($new_style) {
35 35 
     $form_class .= ' gd-search-bar-style';
36 36 
 }
37 37 
 ?>
Please login to merge, or discard this patch.
geodirectory-templates/geodir-signup.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -14,13 +14,13 @@
 
 block discarded – undo
14 14 
  */
15 15 
 if (get_current_user_id()) {
16 16
17 
-    $_redirect = home_url();
18 
-    if (isset($_REQUEST['redirect_add_listing'])) {
19 
-        $_redirect = $_REQUEST['redirect_add_listing'];
20 
-    }
17 
+	$_redirect = home_url();
18 
+	if (isset($_REQUEST['redirect_add_listing'])) {
19 
+		$_redirect = $_REQUEST['redirect_add_listing'];
20 
+	}
21 21
22 
-    wp_safe_redirect($_redirect , 302);
23 
-    exit;
22 
+	wp_safe_redirect($_redirect , 302);
23 
+	exit;
24 24 
 }
25 25
26 26 
 // call header
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -19,7 +19,7 @@
 
 block discarded – undo
19 19 
         $_redirect = $_REQUEST['redirect_add_listing'];
20 20 
     }
21 21
22 
-    wp_safe_redirect($_redirect , 302);
22 
+    wp_safe_redirect($_redirect, 302);
23 23 
     exit;
24 24 
 }
25 25
Please login to merge, or discard this patch.
geodirectory-admin/option-pages/title_meta_settings_array.php 2 patches
Indentation   +367 added lines, -367 removed lines patch added patch discarded remove patch 
@@ -10,7 +10,7 @@  discard block
 
 block discarded – undo
10 10
11 11 
 $gd_wpseo_use = '';
12 12 
 if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
13 
-    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
13 
+	$gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
14 14 
 }
15 15
16 16 
 /**
 
@@ -21,375 +21,375 @@  discard block
 
 block discarded – undo
21 21 
  */
22 22 
 $geodir_settings['title_meta_settings'] = apply_filters('geodir_title_meta_settings', array(
23 23
24 
-    /* Listing Permalink Settings start */
25 
-    array('name' => __('Title / Meta', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set page title and meta', 'id' => 'geodir_title_meta_settings '),
24 
+	/* Listing Permalink Settings start */
25 
+	array('name' => __('Title / Meta', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set page title and meta', 'id' => 'geodir_title_meta_settings '),
26 26
27 
-    array('name' => $gd_wpseo_use.__('Available Variables', 'geodirectory'),
28 
-        'desc' => '%%title%%, %%sitename%%, %%sitedesc%%, %%excerpt%%, %%pt_single%%, %%pt_plural%%, %%category%%, %%id%%, %%sep%%, %%location%%, %%in_location%%, %%in_location_single%%, %%location_single%%, %%location_country%%, %%in_location_country%%, %%location_region%%, %%in_location_region%%, %%location_city%%, %%in_location_city%%, %%location_sep%%, %%search_term%%, %%search_near%%, %%name%%, %%page%%, %%pagenumber%%, %%pagetotal%%',
29 
-        'type' => 'sectionstart',
30 
-        'id' => 'geodir_meta_vars'),
27 
+	array('name' => $gd_wpseo_use.__('Available Variables', 'geodirectory'),
28 
+		'desc' => '%%title%%, %%sitename%%, %%sitedesc%%, %%excerpt%%, %%pt_single%%, %%pt_plural%%, %%category%%, %%id%%, %%sep%%, %%location%%, %%in_location%%, %%in_location_single%%, %%location_single%%, %%location_country%%, %%in_location_country%%, %%location_region%%, %%in_location_region%%, %%location_city%%, %%in_location_city%%, %%location_sep%%, %%search_term%%, %%search_near%%, %%name%%, %%page%%, %%pagenumber%%, %%pagetotal%%',
29 
+		'type' => 'sectionstart',
30 
+		'id' => 'geodir_meta_vars'),
31 31
32 
-    array('type' => 'sectionend', 'id' => 'geodir_meta_vars'),
32 
+	array('type' => 'sectionend', 'id' => 'geodir_meta_vars'),
33 33
34 
-    array('name' => __('Title & Metas Settings', 'geodirectory'),
35 
-        'type' => 'sectionstart',
36 
-        'desc' => '',
37 
-        'id' => 'geodir_titles_and_metas'),
38 
-
39 
-    array(
40 
-        'name' => __( 'Disable overwrite by Yoast SEO titles & metas on GD pages', 'geodirectory' ),
41 
-        'desc' => __( 'This allows to disable overwriting by Yoast SEO titles & metas on GD pages. If ticked then GD pages will use titles & metas settings from GeoDirectory > Titles & Metas. Otherwise it will use titles & metas settings from SEO > Titles & Metas.', 'geodirectory' ),
42 
-        'id' => 'geodir_disable_yoast_meta',
43 
-        'type' => 'checkbox',
44 
-        'std' => '0'
45 
-    ),
46 
-
47 
-    array('type' => 'sectionend', 'id' => 'geodir_titles_and_metas'),
48 
-
49 
-    array('name' => __('Homepage Meta Settings', 'geodirectory'),
50 
-        'type' => 'sectionstart',
51 
-        'desc' => '',
52 
-        'id' => 'geodir_home_meta'),
53 
-
54 
-    array(
55 
-        'name' => __('Homepage meta title', 'geodirectory'),
56 
-        'desc' => __('This will use the title of the page set as frontpage if left blank.', 'geodirectory'),
57 
-        'id' => 'geodir_meta_title_homepage',
58 
-        'type' => 'text',
59 
-        'css' => 'width:100%;',
60 
-        'std' => '',
61 
-        'placeholder' => ''
62 
-    ),
63 
-
64 
-    array(
65 
-        'name' => __('Homepage meta description', 'geodirectory'),
66 
-        'desc' => __('Enter the meta description for the homepage.', 'geodirectory'),
67 
-        'id' => 'geodir_meta_desc_homepage',
68 
-        'type' => 'textarea',
69 
-        'css' => 'width:100%;',
70 
-        'std' => ''
71 
-    ),
72 
-
73 
-    array('type' => 'sectionend', 'id' => 'geodir_home_meta'),
74 
-
75 
-    // details page meta
76 
-    array('name' => __('Details Page Meta Settings', 'geodirectory'),
77 
-        'type' => 'sectionstart',
78 
-        'desc' => '',
79 
-        'id' => 'geodir_details_meta'),
80 
-
81 
-    array(
82 
-        'name' => __('Details page meta title', 'geodirectory'),
83 
-        'desc' => __('Enter the meta title for the details page.', 'geodirectory'),
84 
-        'id' => 'geodir_meta_title_detail',
85 
-        'type' => 'text',
86 
-        'css' => 'width:100%;',
87 
-        'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
88 
-        'placeholder' => '%%title%% %%sep%% %%sitename%%'
89 
-    ),
90 
-
91 
-    array(
92 
-        'name' => __('Details page meta description', 'geodirectory'),
93 
-        'desc' => __('Enter the meta description for the details page.', 'geodirectory'),
94 
-        'id' => 'geodir_meta_desc_detail',
95 
-        'type' => 'textarea',
96 
-        'css' => 'width:100%;',
97 
-        'std' => __('%%excerpt%%', 'geodirectory'),
98 
-        'placeholder' => '%%excerpt%%'
99 
-    ),
100 
-
101 
-    array('type' => 'sectionend', 'id' => 'geodir_details_meta'),
102 
-
103 
-    // CPT page meta
104 
-    array('name' => __('Post Type Page Meta Settings', 'geodirectory'),
105 
-        'type' => 'sectionstart',
106 
-        'desc' => '',
107 
-        'id' => 'geodir_pt_meta'),
108 
-
109 
-    array(
110 
-        'name' => __('Post type page meta title', 'geodirectory'),
111 
-        'desc' => __('Enter the meta title for the post type pages.', 'geodirectory'),
112 
-        'id' => 'geodir_meta_title_pt',
113 
-        'type' => 'text',
114 
-        'css' => 'width:100%;',
115 
-        'std' => __('%%pt_plural%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
116 
-        'placeholder' => '%%pt_plural%% %%in_location%% %%sep%% %%sitename%%'
117 
-    ),
118 
-
119 
-    array(
120 
-        'name' => __('Post type page meta description', 'geodirectory'),
121 
-        'desc' => __('Enter the meta description for the post type pages.', 'geodirectory'),
122 
-        'id' => 'geodir_meta_desc_pt',
123 
-        'type' => 'textarea',
124 
-        'css' => 'width:100%;',
125 
-        'std' => __('%%pt_plural%% %%in_location%%', 'geodirectory'),
126 
-        'placeholder' => '%%pt_plural%% %%in_location%%'
127 
-    ),
128 
-
129 
-    array(
130 
-        'name' => __('Post type page title', 'geodirectory'),
131 
-        'desc' => __('Enter the title for the post type pages.', 'geodirectory'),
132 
-        'id' => 'geodir_page_title_pt',
133 
-        'type' => 'text',
134 
-        'css' => 'width:100%;',
135 
-        'std' => __('All %%pt_plural%% %%in_location_single%%', 'geodirectory'),
136 
-        'placeholder' => 'All %%pt_plural%% %%in_location_single%%'
137 
-    ),
138 
-
139 
-    array('type' => 'sectionend', 'id' => 'geodir_pt_meta'),
140 
-
141 
-    // Cat listing page meta
142 
-    array('name' => __('Listing Page Meta Settings', 'geodirectory'),
143 
-        'type' => 'sectionstart',
144 
-        'desc' => '',
145 
-        'id' => 'geodir_pt_meta'),
146 
-
147 
-    array(
148 
-        'name' => __('Listing page meta title', 'geodirectory'),
149 
-        'desc' => __('Enter the meta title for the category listing pages.', 'geodirectory'),
150 
-        'id' => 'geodir_meta_title_listing',
151 
-        'type' => 'text',
152 
-        'css' => 'width:100%;',
153 
-        'std' => __('%%category%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
154 
-        'placeholder' => '%%category%% %%in_location%% %%sep%% %%sitename%%'
155 
-    ),
156 
-
157 
-    array(
158 
-        'name' => __('Listing page meta description', 'geodirectory'),
159 
-        'desc' => __('Enter the meta description for the category listing pages.', 'geodirectory'),
160 
-        'id' => 'geodir_meta_desc_listing',
161 
-        'type' => 'textarea',
162 
-        'css' => 'width:100%;',
163 
-        'std' => __('Posts related to Category: %%category%% %%in_location%%', 'geodirectory'),
164 
-        'placeholder' => 'Posts related to Category: %%category%% %%in_location%%'
165 
-    ),
166 
-
167 
-    array(
168 
-        'name' => __('Category listing page title', 'geodirectory'),
169 
-        'desc' => __('Enter the title for the category listing pages.', 'geodirectory'),
170 
-        'id' => 'geodir_page_title_cat-listing',
171 
-        'type' => 'text',
172 
-        'css' => 'width:100%;',
173 
-        'std' => __('All %%category%% %%in_location_single%%', 'geodirectory'),
174 
-        'placeholder' => 'All %%category%% %%in_location_single%%'
175 
-    ),
176 
-
177 
-    array(
178 
-        'name' => __('Tag listing page title', 'geodirectory'),
179 
-        'desc' => __('Enter the title for the tag listing pages.', 'geodirectory'),
180 
-        'id' => 'geodir_page_title_tag-listing',
181 
-        'type' => 'text',
182 
-        'css' => 'width:100%;',
183 
-        'std' => __('Tag: %%tag%% %%in_location_single%%', 'geodirectory'),
184 
-        'placeholder' => 'Tag: %%tag%% %%in_location_single%%'
185 
-    ),
186 
-
187 
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
188 
-
189 
-    // location page meta
190 
-    array('name' => __('Location Page Meta Settings', 'geodirectory'),
191 
-        'type' => 'sectionstart',
192 
-        'desc' => '',
193 
-        'id' => 'geodir_pt_meta'),
194 
-
195 
-    array(
196 
-        'name' => __('Location page meta title', 'geodirectory'),
197 
-        'desc' => __('Enter the meta title for the location pages.', 'geodirectory'),
198 
-        'id' => 'geodir_meta_title_location',
199 
-        'type' => 'text',
200 
-        'css' => 'width:100%;',
201 
-        'std' => __('%%title%% %%location%% %%sep%% %%sitename%%', 'geodirectory'),
202 
-        'placeholder' => '%%title%% %%location%% %%sep%% %%sitename%%'
203 
-    ),
204 
-
205 
-    array(
206 
-        'name' => __('Location page meta description', 'geodirectory'),
207 
-        'desc' => __('Enter the meta description for the location pages.', 'geodirectory'),
208 
-        'id' => 'geodir_meta_desc_location',
209 
-        'type' => 'textarea',
210 
-        'css' => 'width:100%;',
211 
-        'std' => __('%%location%%', 'geodirectory'),
212 
-        'placeholder' => '%%location%%'
213 
-    ),
214 
-
215 
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
216 
-
217 
-    // Search page meta
218 
-    array('name' => __('Search Page Meta Settings', 'geodirectory'),
219 
-        'type' => 'sectionstart',
220 
-        'desc' => '',
221 
-        'id' => 'geodir_pt_meta'),
222 
-
223 
-    array(
224 
-        'name' => __('Search page meta title', 'geodirectory'),
225 
-        'desc' => __('Enter the meta title for the search page.', 'geodirectory'),
226 
-        'id' => 'geodir_meta_title_search',
227 
-        'type' => 'text',
228 
-        'css' => 'width:100%;',
229 
-        'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%', 'geodirectory'),
230 
-        'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%'
231 
-    ),
232 
-
233 
-    array(
234 
-        'name' => __('Search page meta description', 'geodirectory'),
235 
-        'desc' => __('Enter the meta description for the search page.', 'geodirectory'),
236 
-        'id' => 'geodir_meta_desc_search',
237 
-        'type' => 'textarea',
238 
-        'css' => 'width:100%;',
239 
-        'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%%', 'geodirectory'),
240 
-        'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%%'
241 
-    ),
242 
-
243 
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
244 
-
245 
-    //Add listing page meta
246 
-    array('name' => __('Add Listing Page Meta Settings', 'geodirectory'),
247 
-        'type' => 'sectionstart',
248 
-        'desc' => '',
249 
-        'id' => 'geodir_pt_meta'),
250 
-
251 
-    array(
252 
-        'name' => __('Add listing page meta title', 'geodirectory'),
253 
-        'desc' => __('Enter the meta title for the add listing page.', 'geodirectory'),
254 
-        'id' => 'geodir_meta_title_add-listing',
255 
-        'type' => 'text',
256 
-        'css' => 'width:100%;',
257 
-        'std' => __('Add %%pt_single%% %%sep%% %%sitename%%', 'geodirectory'),
258 
-        'placeholder' => 'Add %%pt_single%% %%sep%% %%sitename%%'
259 
-    ),
260 
-
261 
-    array(
262 
-        'name' => __('Add listing page meta description', 'geodirectory'),
263 
-        'desc' => __('Enter the meta description for the add listing page.', 'geodirectory'),
264 
-        'id' => 'geodir_meta_desc_add-listing',
265 
-        'type' => 'textarea',
266 
-        'css' => 'width:100%;',
267 
-        'std' => __('Add %%pt_single%%', 'geodirectory'),
268 
-        'placeholder' => 'Add %%pt_single%%'
269 
-    ),
270 
-
271 
-    array(
272 
-        'name' => __('Add listing page title', 'geodirectory'),
273 
-        'desc' => __('Enter the title for the add listing page.', 'geodirectory'),
274 
-        'id' => 'geodir_page_title_add-listing',
275 
-        'type' => 'text',
276 
-        'css' => 'width:100%;',
277 
-        'std' => __('Add %%pt_single%%', 'geodirectory'),
278 
-        'placeholder' => 'Add %%pt_single%%'
279 
-    ),
280 
-
281 
-    array(
282 
-        'name' => __('Edit listing page title', 'geodirectory'),
283 
-        'desc' => __('Enter the title for the edit listing page.', 'geodirectory'),
284 
-        'id' => 'geodir_page_title_edit-listing',
285 
-        'type' => 'text',
286 
-        'css' => 'width:100%;',
287 
-        'std' => __('Edit %%pt_single%%', 'geodirectory'),
288 
-        'placeholder' => 'Edit %%pt_single%%'
289 
-    ),
290 
-
291 
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
292 
-
293 
-    //Author page meta
294 
-    array('name' => __('Author Page Meta Settings', 'geodirectory'),
295 
-        'type' => 'sectionstart',
296 
-        'desc' => '',
297 
-        'id' => 'geodir_pt_meta'),
298 
-
299 
-    array(
300 
-        'name' => __('Author page meta title', 'geodirectory'),
301 
-        'desc' => __('Enter the meta title for the author page.', 'geodirectory'),
302 
-        'id' => 'geodir_meta_title_author',
303 
-        'type' => 'text',
304 
-        'css' => 'width:100%;',
305 
-        'std' => __('Author: %%name%% %%sep%% %%sitename%%', 'geodirectory'),
306 
-        'placeholder' => 'Author: %%name%% %%sep%% %%sitename%%'
307 
-    ),
308 
-
309 
-    array(
310 
-        'name' => __('Author page meta description', 'geodirectory'),
311 
-        'desc' => __('Enter the meta description for the author page.', 'geodirectory'),
312 
-        'id' => 'geodir_meta_desc_author',
313 
-        'type' => 'textarea',
314 
-        'css' => 'width:100%;',
315 
-        'std' => ''
316 
-    ),
317 
-
318 
-    array(
319 
-        'name' => __('Author page title', 'geodirectory'),
320 
-        'desc' => __('Enter the title for the author page.', 'geodirectory'),
321 
-        'id' => 'geodir_page_title_author',
322 
-        'type' => 'text',
323 
-        'css' => 'width:100%;',
324 
-        'std' => __('%%pt_plural%% by: %%name%%', 'geodirectory'),
325 
-        'placeholder' => '%%pt_plural%% by: %%name%%'
326 
-    ),
327 
-
328 
-    array(
329 
-        'name' => __('Author favorite page title', 'geodirectory'),
330 
-        'desc' => __('Enter the title for the author favorite page.', 'geodirectory'),
331 
-        'id' => 'geodir_page_title_favorite',
332 
-        'type' => 'text',
333 
-        'css' => 'width:100%;',
334 
-        'std' => __('%%name%%: Favorite %%pt_plural%%', 'geodirectory'),
335 
-        'placeholder' => '%%name%%: Favorite %%pt_plural%%'
336 
-    ),
337 
-
338 
-    array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
339 
-
340 
-    //Login page meta
341 
-    array('name' => __('Login Page Meta Settings', 'geodirectory'),
342 
-        'type' => 'sectionstart',
343 
-        'desc' => '',
344 
-        'id' => 'geodir_login_meta'),
345 
-
346 
-    array(
347 
-        'name' => __('Login page meta title', 'geodirectory'),
348 
-        'desc' => __('Enter the meta title for the login page.', 'geodirectory'),
349 
-        'id' => 'geodir_meta_title_login',
350 
-        'type' => 'text',
351 
-        'css' => 'width:100%;',
352 
-        'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
353 
-        'placeholder' => '%%title%% %%sep%% %%sitename%%'
354 
-    ),
355 
-
356 
-    array(
357 
-        'name' => __('Login page meta description', 'geodirectory'),
358 
-        'desc' => __('Enter the meta description for the login page.', 'geodirectory'),
359 
-        'id' => 'geodir_meta_desc_login',
360 
-        'type' => 'textarea',
361 
-        'css' => 'width:100%;',
362 
-        'std' => ''
363 
-    ),
364 
-
365 
-    array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
366 
-
367 
-    //Listing success page meta
368 
-    array('name' => __('Listing Success Page Meta Settings', 'geodirectory'),
369 
-        'type' => 'sectionstart',
370 
-        'desc' => '',
371 
-        'id' => 'geodir_login_meta'),
372 
-
373 
-    array(
374 
-        'name' => __('Listing success page meta title', 'geodirectory'),
375 
-        'desc' => __('Enter the meta title for the listing success page.', 'geodirectory'),
376 
-        'id' => 'geodir_meta_title_listing-success',
377 
-        'type' => 'text',
378 
-        'css' => 'width:100%;',
379 
-        'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
380 
-        'placeholder' => '%%title%% %%sep%% %%sitename%%'
381 
-    ),
382 
-
383 
-    array(
384 
-        'name' => __('Listing success page meta description', 'geodirectory'),
385 
-        'desc' => __('Enter the meta description for the listing success page.', 'geodirectory'),
386 
-        'id' => 'geodir_meta_desc_listing-success',
387 
-        'type' => 'textarea',
388 
-        'css' => 'width:100%;',
389 
-        'std' => ''
390 
-    ),
391 
-
392 
-    array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
34 
+	array('name' => __('Title & Metas Settings', 'geodirectory'),
35 
+		'type' => 'sectionstart',
36 
+		'desc' => '',
37 
+		'id' => 'geodir_titles_and_metas'),
38 
+
39 
+	array(
40 
+		'name' => __( 'Disable overwrite by Yoast SEO titles & metas on GD pages', 'geodirectory' ),
41 
+		'desc' => __( 'This allows to disable overwriting by Yoast SEO titles & metas on GD pages. If ticked then GD pages will use titles & metas settings from GeoDirectory > Titles & Metas. Otherwise it will use titles & metas settings from SEO > Titles & Metas.', 'geodirectory' ),
42 
+		'id' => 'geodir_disable_yoast_meta',
43 
+		'type' => 'checkbox',
44 
+		'std' => '0'
45 
+	),
46 
+
47 
+	array('type' => 'sectionend', 'id' => 'geodir_titles_and_metas'),
48 
+
49 
+	array('name' => __('Homepage Meta Settings', 'geodirectory'),
50 
+		'type' => 'sectionstart',
51 
+		'desc' => '',
52 
+		'id' => 'geodir_home_meta'),
53 
+
54 
+	array(
55 
+		'name' => __('Homepage meta title', 'geodirectory'),
56 
+		'desc' => __('This will use the title of the page set as frontpage if left blank.', 'geodirectory'),
57 
+		'id' => 'geodir_meta_title_homepage',
58 
+		'type' => 'text',
59 
+		'css' => 'width:100%;',
60 
+		'std' => '',
61 
+		'placeholder' => ''
62 
+	),
63 
+
64 
+	array(
65 
+		'name' => __('Homepage meta description', 'geodirectory'),
66 
+		'desc' => __('Enter the meta description for the homepage.', 'geodirectory'),
67 
+		'id' => 'geodir_meta_desc_homepage',
68 
+		'type' => 'textarea',
69 
+		'css' => 'width:100%;',
70 
+		'std' => ''
71 
+	),
72 
+
73 
+	array('type' => 'sectionend', 'id' => 'geodir_home_meta'),
74 
+
75 
+	// details page meta
76 
+	array('name' => __('Details Page Meta Settings', 'geodirectory'),
77 
+		'type' => 'sectionstart',
78 
+		'desc' => '',
79 
+		'id' => 'geodir_details_meta'),
80 
+
81 
+	array(
82 
+		'name' => __('Details page meta title', 'geodirectory'),
83 
+		'desc' => __('Enter the meta title for the details page.', 'geodirectory'),
84 
+		'id' => 'geodir_meta_title_detail',
85 
+		'type' => 'text',
86 
+		'css' => 'width:100%;',
87 
+		'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
88 
+		'placeholder' => '%%title%% %%sep%% %%sitename%%'
89 
+	),
90 
+
91 
+	array(
92 
+		'name' => __('Details page meta description', 'geodirectory'),
93 
+		'desc' => __('Enter the meta description for the details page.', 'geodirectory'),
94 
+		'id' => 'geodir_meta_desc_detail',
95 
+		'type' => 'textarea',
96 
+		'css' => 'width:100%;',
97 
+		'std' => __('%%excerpt%%', 'geodirectory'),
98 
+		'placeholder' => '%%excerpt%%'
99 
+	),
100 
+
101 
+	array('type' => 'sectionend', 'id' => 'geodir_details_meta'),
102 
+
103 
+	// CPT page meta
104 
+	array('name' => __('Post Type Page Meta Settings', 'geodirectory'),
105 
+		'type' => 'sectionstart',
106 
+		'desc' => '',
107 
+		'id' => 'geodir_pt_meta'),
108 
+
109 
+	array(
110 
+		'name' => __('Post type page meta title', 'geodirectory'),
111 
+		'desc' => __('Enter the meta title for the post type pages.', 'geodirectory'),
112 
+		'id' => 'geodir_meta_title_pt',
113 
+		'type' => 'text',
114 
+		'css' => 'width:100%;',
115 
+		'std' => __('%%pt_plural%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
116 
+		'placeholder' => '%%pt_plural%% %%in_location%% %%sep%% %%sitename%%'
117 
+	),
118 
+
119 
+	array(
120 
+		'name' => __('Post type page meta description', 'geodirectory'),
121 
+		'desc' => __('Enter the meta description for the post type pages.', 'geodirectory'),
122 
+		'id' => 'geodir_meta_desc_pt',
123 
+		'type' => 'textarea',
124 
+		'css' => 'width:100%;',
125 
+		'std' => __('%%pt_plural%% %%in_location%%', 'geodirectory'),
126 
+		'placeholder' => '%%pt_plural%% %%in_location%%'
127 
+	),
128 
+
129 
+	array(
130 
+		'name' => __('Post type page title', 'geodirectory'),
131 
+		'desc' => __('Enter the title for the post type pages.', 'geodirectory'),
132 
+		'id' => 'geodir_page_title_pt',
133 
+		'type' => 'text',
134 
+		'css' => 'width:100%;',
135 
+		'std' => __('All %%pt_plural%% %%in_location_single%%', 'geodirectory'),
136 
+		'placeholder' => 'All %%pt_plural%% %%in_location_single%%'
137 
+	),
138 
+
139 
+	array('type' => 'sectionend', 'id' => 'geodir_pt_meta'),
140 
+
141 
+	// Cat listing page meta
142 
+	array('name' => __('Listing Page Meta Settings', 'geodirectory'),
143 
+		'type' => 'sectionstart',
144 
+		'desc' => '',
145 
+		'id' => 'geodir_pt_meta'),
146 
+
147 
+	array(
148 
+		'name' => __('Listing page meta title', 'geodirectory'),
149 
+		'desc' => __('Enter the meta title for the category listing pages.', 'geodirectory'),
150 
+		'id' => 'geodir_meta_title_listing',
151 
+		'type' => 'text',
152 
+		'css' => 'width:100%;',
153 
+		'std' => __('%%category%% %%in_location%% %%sep%% %%sitename%%', 'geodirectory'),
154 
+		'placeholder' => '%%category%% %%in_location%% %%sep%% %%sitename%%'
155 
+	),
156 
+
157 
+	array(
158 
+		'name' => __('Listing page meta description', 'geodirectory'),
159 
+		'desc' => __('Enter the meta description for the category listing pages.', 'geodirectory'),
160 
+		'id' => 'geodir_meta_desc_listing',
161 
+		'type' => 'textarea',
162 
+		'css' => 'width:100%;',
163 
+		'std' => __('Posts related to Category: %%category%% %%in_location%%', 'geodirectory'),
164 
+		'placeholder' => 'Posts related to Category: %%category%% %%in_location%%'
165 
+	),
166 
+
167 
+	array(
168 
+		'name' => __('Category listing page title', 'geodirectory'),
169 
+		'desc' => __('Enter the title for the category listing pages.', 'geodirectory'),
170 
+		'id' => 'geodir_page_title_cat-listing',
171 
+		'type' => 'text',
172 
+		'css' => 'width:100%;',
173 
+		'std' => __('All %%category%% %%in_location_single%%', 'geodirectory'),
174 
+		'placeholder' => 'All %%category%% %%in_location_single%%'
175 
+	),
176 
+
177 
+	array(
178 
+		'name' => __('Tag listing page title', 'geodirectory'),
179 
+		'desc' => __('Enter the title for the tag listing pages.', 'geodirectory'),
180 
+		'id' => 'geodir_page_title_tag-listing',
181 
+		'type' => 'text',
182 
+		'css' => 'width:100%;',
183 
+		'std' => __('Tag: %%tag%% %%in_location_single%%', 'geodirectory'),
184 
+		'placeholder' => 'Tag: %%tag%% %%in_location_single%%'
185 
+	),
186 
+
187 
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
188 
+
189 
+	// location page meta
190 
+	array('name' => __('Location Page Meta Settings', 'geodirectory'),
191 
+		'type' => 'sectionstart',
192 
+		'desc' => '',
193 
+		'id' => 'geodir_pt_meta'),
194 
+
195 
+	array(
196 
+		'name' => __('Location page meta title', 'geodirectory'),
197 
+		'desc' => __('Enter the meta title for the location pages.', 'geodirectory'),
198 
+		'id' => 'geodir_meta_title_location',
199 
+		'type' => 'text',
200 
+		'css' => 'width:100%;',
201 
+		'std' => __('%%title%% %%location%% %%sep%% %%sitename%%', 'geodirectory'),
202 
+		'placeholder' => '%%title%% %%location%% %%sep%% %%sitename%%'
203 
+	),
204 
+
205 
+	array(
206 
+		'name' => __('Location page meta description', 'geodirectory'),
207 
+		'desc' => __('Enter the meta description for the location pages.', 'geodirectory'),
208 
+		'id' => 'geodir_meta_desc_location',
209 
+		'type' => 'textarea',
210 
+		'css' => 'width:100%;',
211 
+		'std' => __('%%location%%', 'geodirectory'),
212 
+		'placeholder' => '%%location%%'
213 
+	),
214 
+
215 
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
216 
+
217 
+	// Search page meta
218 
+	array('name' => __('Search Page Meta Settings', 'geodirectory'),
219 
+		'type' => 'sectionstart',
220 
+		'desc' => '',
221 
+		'id' => 'geodir_pt_meta'),
222 
+
223 
+	array(
224 
+		'name' => __('Search page meta title', 'geodirectory'),
225 
+		'desc' => __('Enter the meta title for the search page.', 'geodirectory'),
226 
+		'id' => 'geodir_meta_title_search',
227 
+		'type' => 'text',
228 
+		'css' => 'width:100%;',
229 
+		'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%', 'geodirectory'),
230 
+		'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%% %%sep%% %%sitename%%'
231 
+	),
232 
+
233 
+	array(
234 
+		'name' => __('Search page meta description', 'geodirectory'),
235 
+		'desc' => __('Enter the meta description for the search page.', 'geodirectory'),
236 
+		'id' => 'geodir_meta_desc_search',
237 
+		'type' => 'textarea',
238 
+		'css' => 'width:100%;',
239 
+		'std' => __('%%pt_plural%% search results for %%search_term%%, Near %%search_near%%', 'geodirectory'),
240 
+		'placeholder' => '%%pt_plural%% search results for %%search_term%%, Near %%search_near%%'
241 
+	),
242 
+
243 
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
244 
+
245 
+	//Add listing page meta
246 
+	array('name' => __('Add Listing Page Meta Settings', 'geodirectory'),
247 
+		'type' => 'sectionstart',
248 
+		'desc' => '',
249 
+		'id' => 'geodir_pt_meta'),
250 
+
251 
+	array(
252 
+		'name' => __('Add listing page meta title', 'geodirectory'),
253 
+		'desc' => __('Enter the meta title for the add listing page.', 'geodirectory'),
254 
+		'id' => 'geodir_meta_title_add-listing',
255 
+		'type' => 'text',
256 
+		'css' => 'width:100%;',
257 
+		'std' => __('Add %%pt_single%% %%sep%% %%sitename%%', 'geodirectory'),
258 
+		'placeholder' => 'Add %%pt_single%% %%sep%% %%sitename%%'
259 
+	),
260 
+
261 
+	array(
262 
+		'name' => __('Add listing page meta description', 'geodirectory'),
263 
+		'desc' => __('Enter the meta description for the add listing page.', 'geodirectory'),
264 
+		'id' => 'geodir_meta_desc_add-listing',
265 
+		'type' => 'textarea',
266 
+		'css' => 'width:100%;',
267 
+		'std' => __('Add %%pt_single%%', 'geodirectory'),
268 
+		'placeholder' => 'Add %%pt_single%%'
269 
+	),
270 
+
271 
+	array(
272 
+		'name' => __('Add listing page title', 'geodirectory'),
273 
+		'desc' => __('Enter the title for the add listing page.', 'geodirectory'),
274 
+		'id' => 'geodir_page_title_add-listing',
275 
+		'type' => 'text',
276 
+		'css' => 'width:100%;',
277 
+		'std' => __('Add %%pt_single%%', 'geodirectory'),
278 
+		'placeholder' => 'Add %%pt_single%%'
279 
+	),
280 
+
281 
+	array(
282 
+		'name' => __('Edit listing page title', 'geodirectory'),
283 
+		'desc' => __('Enter the title for the edit listing page.', 'geodirectory'),
284 
+		'id' => 'geodir_page_title_edit-listing',
285 
+		'type' => 'text',
286 
+		'css' => 'width:100%;',
287 
+		'std' => __('Edit %%pt_single%%', 'geodirectory'),
288 
+		'placeholder' => 'Edit %%pt_single%%'
289 
+	),
290 
+
291 
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
292 
+
293 
+	//Author page meta
294 
+	array('name' => __('Author Page Meta Settings', 'geodirectory'),
295 
+		'type' => 'sectionstart',
296 
+		'desc' => '',
297 
+		'id' => 'geodir_pt_meta'),
298 
+
299 
+	array(
300 
+		'name' => __('Author page meta title', 'geodirectory'),
301 
+		'desc' => __('Enter the meta title for the author page.', 'geodirectory'),
302 
+		'id' => 'geodir_meta_title_author',
303 
+		'type' => 'text',
304 
+		'css' => 'width:100%;',
305 
+		'std' => __('Author: %%name%% %%sep%% %%sitename%%', 'geodirectory'),
306 
+		'placeholder' => 'Author: %%name%% %%sep%% %%sitename%%'
307 
+	),
308 
+
309 
+	array(
310 
+		'name' => __('Author page meta description', 'geodirectory'),
311 
+		'desc' => __('Enter the meta description for the author page.', 'geodirectory'),
312 
+		'id' => 'geodir_meta_desc_author',
313 
+		'type' => 'textarea',
314 
+		'css' => 'width:100%;',
315 
+		'std' => ''
316 
+	),
317 
+
318 
+	array(
319 
+		'name' => __('Author page title', 'geodirectory'),
320 
+		'desc' => __('Enter the title for the author page.', 'geodirectory'),
321 
+		'id' => 'geodir_page_title_author',
322 
+		'type' => 'text',
323 
+		'css' => 'width:100%;',
324 
+		'std' => __('%%pt_plural%% by: %%name%%', 'geodirectory'),
325 
+		'placeholder' => '%%pt_plural%% by: %%name%%'
326 
+	),
327 
+
328 
+	array(
329 
+		'name' => __('Author favorite page title', 'geodirectory'),
330 
+		'desc' => __('Enter the title for the author favorite page.', 'geodirectory'),
331 
+		'id' => 'geodir_page_title_favorite',
332 
+		'type' => 'text',
333 
+		'css' => 'width:100%;',
334 
+		'std' => __('%%name%%: Favorite %%pt_plural%%', 'geodirectory'),
335 
+		'placeholder' => '%%name%%: Favorite %%pt_plural%%'
336 
+	),
337 
+
338 
+	array('type' => 'sectionend', 'id' => 'geodir_location_meta'),
339 
+
340 
+	//Login page meta
341 
+	array('name' => __('Login Page Meta Settings', 'geodirectory'),
342 
+		'type' => 'sectionstart',
343 
+		'desc' => '',
344 
+		'id' => 'geodir_login_meta'),
345 
+
346 
+	array(
347 
+		'name' => __('Login page meta title', 'geodirectory'),
348 
+		'desc' => __('Enter the meta title for the login page.', 'geodirectory'),
349 
+		'id' => 'geodir_meta_title_login',
350 
+		'type' => 'text',
351 
+		'css' => 'width:100%;',
352 
+		'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
353 
+		'placeholder' => '%%title%% %%sep%% %%sitename%%'
354 
+	),
355 
+
356 
+	array(
357 
+		'name' => __('Login page meta description', 'geodirectory'),
358 
+		'desc' => __('Enter the meta description for the login page.', 'geodirectory'),
359 
+		'id' => 'geodir_meta_desc_login',
360 
+		'type' => 'textarea',
361 
+		'css' => 'width:100%;',
362 
+		'std' => ''
363 
+	),
364 
+
365 
+	array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
366 
+
367 
+	//Listing success page meta
368 
+	array('name' => __('Listing Success Page Meta Settings', 'geodirectory'),
369 
+		'type' => 'sectionstart',
370 
+		'desc' => '',
371 
+		'id' => 'geodir_login_meta'),
372 
+
373 
+	array(
374 
+		'name' => __('Listing success page meta title', 'geodirectory'),
375 
+		'desc' => __('Enter the meta title for the listing success page.', 'geodirectory'),
376 
+		'id' => 'geodir_meta_title_listing-success',
377 
+		'type' => 'text',
378 
+		'css' => 'width:100%;',
379 
+		'std' => __('%%title%% %%sep%% %%sitename%%', 'geodirectory'),
380 
+		'placeholder' => '%%title%% %%sep%% %%sitename%%'
381 
+	),
382 
+
383 
+	array(
384 
+		'name' => __('Listing success page meta description', 'geodirectory'),
385 
+		'desc' => __('Enter the meta description for the listing success page.', 'geodirectory'),
386 
+		'id' => 'geodir_meta_desc_listing-success',
387 
+		'type' => 'textarea',
388 
+		'css' => 'width:100%;',
389 
+		'std' => ''
390 
+	),
391 
+
392 
+	array('type' => 'sectionend', 'id' => 'geodir_login_meta'),
393 393
394 394
395 395
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -10,7 +10,7 @@  discard block
 
 block discarded – undo
10 10
11 11 
 $gd_wpseo_use = '';
12 12 
 if ((class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) && !geodir_disable_yoast_seo_metas()) {
13 
-    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
13 
+    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.', 'geodirectory')."</b><br />";
14 14 
 }
15 15
16 16 
 /**
 
@@ -37,8 +37,8 @@  discard block
 
 block discarded – undo
37 37 
         'id' => 'geodir_titles_and_metas'),
38 38
39 39 
     array(
40 
-        'name' => __( 'Disable overwrite by Yoast SEO titles & metas on GD pages', 'geodirectory' ),
41 
-        'desc' => __( 'This allows to disable overwriting by Yoast SEO titles & metas on GD pages. If ticked then GD pages will use titles & metas settings from GeoDirectory > Titles & Metas. Otherwise it will use titles & metas settings from SEO > Titles & Metas.', 'geodirectory' ),
40 
+        'name' => __('Disable overwrite by Yoast SEO titles & metas on GD pages', 'geodirectory'),
41 
+        'desc' => __('This allows to disable overwriting by Yoast SEO titles & metas on GD pages. If ticked then GD pages will use titles & metas settings from GeoDirectory > Titles & Metas. Otherwise it will use titles & metas settings from SEO > Titles & Metas.', 'geodirectory'),
42 42 
         'id' => 'geodir_disable_yoast_meta',
43 43 
         'type' => 'checkbox',
44 44 
         'std' => '0'
Please login to merge, or discard this patch.
geodirectory-functions/user_functions.php 3 patches
Indentation   +119 added lines, -119 removed lines patch added patch discarded remove patch 
@@ -13,28 +13,28 @@  discard block
 
 block discarded – undo
13 13 
  */
14 14 
 function geodir_user_favourite_listing_count($user_id=false)
15 15 
 {
16 
-    global $wpdb, $plugin_prefix, $current_user;
16 
+	global $wpdb, $plugin_prefix, $current_user;
17 17
18 
-    if(!$user_id){$user_id = $current_user->ID;}
19 
-    if(!$user_id){return array();}
18 
+	if(!$user_id){$user_id = $current_user->ID;}
19 
+	if(!$user_id){return array();}
20 20
21 
-    $user_favorites = get_user_meta($user_id, 'gd_user_favourite_post', true);
22 
-    $all_posts = get_option('geodir_favorite_link_user_dashboard');
21 
+	$user_favorites = get_user_meta($user_id, 'gd_user_favourite_post', true);
22 
+	$all_posts = get_option('geodir_favorite_link_user_dashboard');
23 23
24 
-    $user_listing = array();
25 
-    if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
26 
-        $user_favorites = "'" . implode("','", $user_favorites) . "'";
24 
+	$user_listing = array();
25 
+	if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
26 
+		$user_favorites = "'" . implode("','", $user_favorites) . "'";
27 27
28 
-        foreach ($all_posts as $ptype) {
29 
-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
28 
+		foreach ($all_posts as $ptype) {
29 
+			$total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
30 30
31 
-            if ($total_posts > 0) {
32 
-                $user_listing[$ptype] = $total_posts;
33 
-            }
34 
-        }
35 
-    }
31 
+			if ($total_posts > 0) {
32 
+				$user_listing[$ptype] = $total_posts;
33 
+			}
34 
+		}
35 
+	}
36 36
37 
-    return $user_listing;
37 
+	return $user_listing;
38 38 
 }
39 39
40 40 
 
@@ -47,51 +47,51 @@  discard block
 
 block discarded – undo
47 47 
  */
48 48
49 49 
 function geodir_user_show_favourites($user_id='',$output_type='select'){
50 
-    // My Favourites in Dashboard
51 
-    $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
52 
-    $user_favourite = geodir_user_favourite_listing_count($user_id);
53 
-
54 
-    if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
55 
-        $favourite_links = '';
56 
-        $post_types = geodir_get_posttypes('object');
57 
-
58 
-        $author_link = get_author_posts_url($user_id);
59 
-        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
60 
-
61 
-        foreach ($post_types as $key => $postobj) {
62 
-            if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
63 
-                $name = $postobj->labels->name;
64 
-                $post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false);
65 
-
66 
-                $selected = '';
67 
-
68 
-                if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
69 
-                    $selected = 'selected="selected"';
70 
-                }
71 
-                /**
72 
-                 * Filter favorite listing link.
73 
-                 *
74 
-                 * @since 1.0.0
75 
-                 * @param string $post_type_link Favorite listing link.
76 
-                 * @param string $key Favorite listing array key.
77 
-                 * @param int $current_user->ID Current user ID.
78 
-                 */
79 
-                $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
80 
-
81 
-                if($output_type=='select'){
82 
-                    $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
83 
-                }elseif($output_type=='link'){
84 
-                    $favourite_links[] = '<a href="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
85 
-                }
86 
-
87 
-
88 
-            }
89 
-        }
90 
-
91 
-        if ($favourite_links != '') {
92 
-            $user = get_user_by( 'ID', $user_id );
93 
-            if($output_type=='select') {
94 
-                ?>
50 
+	// My Favourites in Dashboard
51 
+	$show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
52 
+	$user_favourite = geodir_user_favourite_listing_count($user_id);
53 
+
54 
+	if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {
55 
+		$favourite_links = '';
56 
+		$post_types = geodir_get_posttypes('object');
57 
+
58 
+		$author_link = get_author_posts_url($user_id);
59 
+		$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
60 
+
61 
+		foreach ($post_types as $key => $postobj) {
62 
+			if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {
63 
+				$name = $postobj->labels->name;
64 
+				$post_type_link = geodir_getlink($author_link, array('stype' => $key, 'list' => 'favourite'), false);
65 
+
66 
+				$selected = '';
67 
+
68 
+				if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {
69 
+					$selected = 'selected="selected"';
70 
+				}
71 
+				/**
72 
+				 * Filter favorite listing link.
73 
+				 *
74 
+				 * @since 1.0.0
75 
+				 * @param string $post_type_link Favorite listing link.
76 
+				 * @param string $key Favorite listing array key.
77 
+				 * @param int $current_user->ID Current user ID.
78 
+				 */
79 
+				$post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
80 
+
81 
+				if($output_type=='select'){
82 
+					$favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
83 
+				}elseif($output_type=='link'){
84 
+					$favourite_links[] = '<a href="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
85 
+				}
86 
+
87 
+
88 
+			}
89 
+		}
90 
+
91 
+		if ($favourite_links != '') {
92 
+			$user = get_user_by( 'ID', $user_id );
93 
+			if($output_type=='select') {
94 
+				?>
95 95 
                 <li>
96 96 
                     <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value"
97 97 
                             option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false"
 
@@ -102,62 +102,62 @@  discard block
 
 block discarded – undo
102 102 
                     </select>
103 103 
                 </li>
104 104 
             <?php
105 
-            }elseif($output_type=='link'){
106 
-                if(!empty($favourite_links)){
107 
-                    echo implode(" | ",$favourite_links);
108 
-                }
109 
-
110 
-            }
111 
-        }
112 
-    }
105 
+			}elseif($output_type=='link'){
106 
+				if(!empty($favourite_links)){
107 
+					echo implode(" | ",$favourite_links);
108 
+				}
109 
+
110 
+			}
111 
+		}
112 
+	}
113 113 
 }
114 114
115 115
116 116
117 117 
 function geodir_user_show_listings($user_id='',$output_type='select'){
118 118
119 
-    $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
120 
-    $user_listing = geodir_user_post_listing_count($user_id);
121 
-
122 
-    if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
123 
-        $listing_links = '';
124 
-
125 
-        $post_types = geodir_get_posttypes('object');
126 
-
127 
-        $author_link = get_author_posts_url($user_id);
128 
-        $author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
129 
-
130 
-        foreach ($post_types as $key => $postobj) {
131 
-            if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
132 
-                $name = $postobj->labels->name;
133 
-                $listing_link = geodir_getlink($author_link, array('stype' => $key), false);
134 
-
135 
-                $selected = '';
136 
-                if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
137 
-                    $selected = 'selected="selected"';
138 
-                }
139 
-
140 
-                /**
141 
-                 * Filter my listing link.
142 
-                 *
143 
-                 * @since 1.0.0
144 
-                 * @param string $listing_link My listing link.
145 
-                 * @param string $key My listing array key.
146 
-                 * @param int $current_user->ID Current user ID.
147 
-                 */
148 
-                $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
149 
-                if($output_type=='select') {
150 
-                    $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
151 
-                }elseif($output_type=='link'){
152 
-                    $listing_links[] = '<a href="' .$listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
153 
-                }
154 
-            }
155 
-        }
156 
-
157 
-        if ($listing_links != '') {
158 
-            $user = get_user_by( 'ID', $user_id );
159 
-            if($output_type=='select') {
160 
-                ?>
119 
+	$show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
120 
+	$user_listing = geodir_user_post_listing_count($user_id);
121 
+
122 
+	if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {
123 
+		$listing_links = '';
124 
+
125 
+		$post_types = geodir_get_posttypes('object');
126 
+
127 
+		$author_link = get_author_posts_url($user_id);
128 
+		$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);
129 
+
130 
+		foreach ($post_types as $key => $postobj) {
131 
+			if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {
132 
+				$name = $postobj->labels->name;
133 
+				$listing_link = geodir_getlink($author_link, array('stype' => $key), false);
134 
+
135 
+				$selected = '';
136 
+				if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {
137 
+					$selected = 'selected="selected"';
138 
+				}
139 
+
140 
+				/**
141 
+				 * Filter my listing link.
142 
+				 *
143 
+				 * @since 1.0.0
144 
+				 * @param string $listing_link My listing link.
145 
+				 * @param string $key My listing array key.
146 
+				 * @param int $current_user->ID Current user ID.
147 
+				 */
148 
+				$listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
149 
+				if($output_type=='select') {
150 
+					$listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
151 
+				}elseif($output_type=='link'){
152 
+					$listing_links[] = '<a href="' .$listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
153 
+				}
154 
+			}
155 
+		}
156 
+
157 
+		if ($listing_links != '') {
158 
+			$user = get_user_by( 'ID', $user_id );
159 
+			if($output_type=='select') {
160 
+				?>
161 161 
                 <li>
162 162 
                     <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value"
163 163 
                             option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false"
 
@@ -168,13 +168,13 @@  discard block
 
 block discarded – undo
168 168 
                     </select>
169 169 
                 </li>
170 170 
             <?php
171 
-            }elseif($output_type=='link'){
172 
-                if(!empty($listing_links )){
173 
-                    echo implode(" | ",$listing_links );
174 
-                }
175 
-
176 
-            }
177 
-        }
178 
-    }
171 
+			}elseif($output_type=='link'){
172 
+				if(!empty($listing_links )){
173 
+					echo implode(" | ",$listing_links );
174 
+				}
175 
+
176 
+			}
177 
+		}
178 
+	}
179 179
180 180 
 }
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch 
@@ -11,22 +11,22 @@  discard block
 
 block discarded – undo
11 11 
  * @global string $plugin_prefix Geodirectory plugin table prefix.
12 12 
  * @return array User listing count for each post type.
13 13 
  */
14 
-function geodir_user_favourite_listing_count($user_id=false)
14 
+function geodir_user_favourite_listing_count($user_id = false)
15 15 
 {
16 16 
     global $wpdb, $plugin_prefix, $current_user;
17 17
18 
-    if(!$user_id){$user_id = $current_user->ID;}
19 
-    if(!$user_id){return array();}
18 
+    if (!$user_id) {$user_id = $current_user->ID; }
19 
+    if (!$user_id) {return array(); }
20 20
21 21 
     $user_favorites = get_user_meta($user_id, 'gd_user_favourite_post', true);
22 22 
     $all_posts = get_option('geodir_favorite_link_user_dashboard');
23 23
24 24 
     $user_listing = array();
25 25 
     if (is_array($all_posts) && !empty($all_posts) && is_array($user_favorites) && !empty($user_favorites)) {
26 
-        $user_favorites = "'" . implode("','", $user_favorites) . "'";
26 
+        $user_favorites = "'".implode("','", $user_favorites)."'";
27 27
28 28 
         foreach ($all_posts as $ptype) {
29 
-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE  post_type='" . $ptype . "' AND post_status = 'publish' AND ID IN (" . $user_favorites . ")");
29 
+            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE  post_type='".$ptype."' AND post_status = 'publish' AND ID IN (".$user_favorites.")");
30 30
31 31 
             if ($total_posts > 0) {
32 32 
                 $user_listing[$ptype] = $total_posts;
 
@@ -46,7 +46,7 @@  discard block
 
 block discarded – undo
46 46 
  * @package GeoDirectory
47 47 
  */
48 48
49 
-function geodir_user_show_favourites($user_id='',$output_type='select'){
49 
+function geodir_user_show_favourites($user_id = '', $output_type = 'select') {
50 50 
     // My Favourites in Dashboard
51 51 
     $show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');
52 52 
     $user_favourite = geodir_user_favourite_listing_count($user_id);
 
@@ -78,10 +78,10 @@  discard block
 
 block discarded – undo
78 78 
                  */
79 79 
                 $post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $user_id);
80 80
81 
-                if($output_type=='select'){
82 
-                    $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
83 
-                }elseif($output_type=='link'){
84 
-                    $favourite_links[] = '<a href="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
81 
+                if ($output_type == 'select') {
82 
+                    $favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>';
83 
+                }elseif ($output_type == 'link') {
84 
+                    $favourite_links[] = '<a href="'.$post_type_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</a>';
85 85 
                 }
86 86
87 87 
 
@@ -89,8 +89,8 @@  discard block
 
 block discarded – undo
89 89 
         }
90 90
91 91 
         if ($favourite_links != '') {
92 
-            $user = get_user_by( 'ID', $user_id );
93 
-            if($output_type=='select') {
92 
+            $user = get_user_by('ID', $user_id);
93 
+            if ($output_type == 'select') {
94 94 
                 ?>
95 95 
                 <li>
96 96 
                     <select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value"
 
@@ -102,9 +102,9 @@  discard block
 
 block discarded – undo
102 102 
                     </select>
103 103 
                 </li>
104 104 
             <?php
105 
-            }elseif($output_type=='link'){
106 
-                if(!empty($favourite_links)){
107 
-                    echo implode(" | ",$favourite_links);
105 
+            }elseif ($output_type == 'link') {
106 
+                if (!empty($favourite_links)) {
107 
+                    echo implode(" | ", $favourite_links);
108 108 
                 }
109 109
110 110 
             }
 
@@ -114,7 +114,7 @@  discard block
 
 block discarded – undo
114 114
115 115
116 116
117 
-function geodir_user_show_listings($user_id='',$output_type='select'){
117 
+function geodir_user_show_listings($user_id = '', $output_type = 'select') {
118 118
119 119 
     $show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');
120 120 
     $user_listing = geodir_user_post_listing_count($user_id);
 
@@ -146,17 +146,17 @@  discard block
 
 block discarded – undo
146 146 
                  * @param int $current_user->ID Current user ID.
147 147 
                  */
148 148 
                 $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
149 
-                if($output_type=='select') {
150 
-                    $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
151 
-                }elseif($output_type=='link'){
152 
-                    $listing_links[] = '<a href="' .$listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
149 
+                if ($output_type == 'select') {
150 
+                    $listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</option>';
151 
+                }elseif ($output_type == 'link') {
152 
+                    $listing_links[] = '<a href="'.$listing_link.'">'.__(geodir_utf8_ucfirst($name), 'geodirectory').'</a>';
153 153 
                 }
154 154 
             }
155 155 
         }
156 156
157 157 
         if ($listing_links != '') {
158 
-            $user = get_user_by( 'ID', $user_id );
159 
-            if($output_type=='select') {
158 
+            $user = get_user_by('ID', $user_id);
159 
+            if ($output_type == 'select') {
160 160 
                 ?>
161 161 
                 <li>
162 162 
                     <select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value"
 
@@ -168,9 +168,9 @@  discard block
 
 block discarded – undo
168 168 
                     </select>
169 169 
                 </li>
170 170 
             <?php
171 
-            }elseif($output_type=='link'){
172 
-                if(!empty($listing_links )){
173 
-                    echo implode(" | ",$listing_links );
171 
+            }elseif ($output_type == 'link') {
172 
+                if (!empty($listing_links)) {
173 
+                    echo implode(" | ", $listing_links);
174 174 
                 }
175 175
176 176 
             }
Please login to merge, or discard this patch.
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -80,7 +80,7 @@  discard block
 
 block discarded – undo
80 80
81 81 
                 if($output_type=='select'){
82 82 
                     $favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
83 
-                }elseif($output_type=='link'){
83 
+                } elseif($output_type=='link'){
84 84 
                     $favourite_links[] = '<a href="' . $post_type_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
85 85 
                 }
86 86 
 
@@ -102,7 +102,7 @@  discard block
 
 block discarded – undo
102 102 
                     </select>
103 103 
                 </li>
104 104 
             <?php
105 
-            }elseif($output_type=='link'){
105 
+            } elseif($output_type=='link'){
106 106 
                 if(!empty($favourite_links)){
107 107 
                     echo implode(" | ",$favourite_links);
108 108 
                 }
 
@@ -148,7 +148,7 @@  discard block
 
 block discarded – undo
148 148 
                 $listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $user_id);
149 149 
                 if($output_type=='select') {
150 150 
                     $listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</option>';
151 
-                }elseif($output_type=='link'){
151 
+                } elseif($output_type=='link'){
152 152 
                     $listing_links[] = '<a href="' .$listing_link . '">' . __(geodir_utf8_ucfirst($name), 'geodirectory') . '</a>';
153 153 
                 }
154 154 
             }
 
@@ -168,7 +168,7 @@  discard block
 
 block discarded – undo
168 168 
                     </select>
169 169 
                 </li>
170 170 
             <?php
171 
-            }elseif($output_type=='link'){
171 
+            } elseif($output_type=='link'){
172 172 
                 if(!empty($listing_links )){
173 173 
                     echo implode(" | ",$listing_links );
174 174 
                 }
Please login to merge, or discard this patch.
geodirectory-functions/compatibility/BuddyBoss.php 3 patches
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch 
@@ -12,77 +12,77 @@
 
 block discarded – undo
12 12
13 13 
 remove_action('geodir_page_title', 'geodir_action_page_title', 10);
14 14 
 function gd_buddyboss_action_calls(){
15 
-    // listings page remove
16 
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
17 
-    remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
18 
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
19 
-    remove_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);
20 
-    remove_action('geodir_listings_page_description', 'geodir_location_action_listings_description', 100); // for location manager
21 
-    remove_action('geodir_listings_page_description', 'geodir_cpt_pt_desc', 10); //CPT manager
15 
+	// listings page remove
16 
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
17 
+	remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
18 
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
19 
+	remove_action('geodir_listings_page_description', 'geodir_action_listings_description', 10);
20 
+	remove_action('geodir_listings_page_description', 'geodir_location_action_listings_description', 100); // for location manager
21 
+	remove_action('geodir_listings_page_description', 'geodir_cpt_pt_desc', 10); //CPT manager
22 22
23 
-    //listing page add
24 
-    add_action('geodir_listings_content', 'geodir_breadcrumb', 3);
25 
-    add_action('geodir_listings_content', 'geodir_action_geodir_sidebar_listings_top', 4);
26 
-    add_action('geodir_listings_content', 'geodir_cpt_pt_desc', 5); //CPT manager
27 
-    if(defined("GEODIRLOCATION_VERSION")){
28 
-        add_action('geodir_listings_content', 'geodir_location_action_listings_description', 5);
29 
-    }else{
30 
-        add_action('geodir_listings_content', 'geodir_action_listings_description', 5);
31 
-    }
32 
-    add_action('geodir_listings_content', 'geodir_action_listings_title', 9);
23 
+	//listing page add
24 
+	add_action('geodir_listings_content', 'geodir_breadcrumb', 3);
25 
+	add_action('geodir_listings_content', 'geodir_action_geodir_sidebar_listings_top', 4);
26 
+	add_action('geodir_listings_content', 'geodir_cpt_pt_desc', 5); //CPT manager
27 
+	if(defined("GEODIRLOCATION_VERSION")){
28 
+		add_action('geodir_listings_content', 'geodir_location_action_listings_description', 5);
29 
+	}else{
30 
+		add_action('geodir_listings_content', 'geodir_action_listings_description', 5);
31 
+	}
32 
+	add_action('geodir_listings_content', 'geodir_action_listings_title', 9);
33 33
34 34
35 
-    // details page remove
36 
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_set_preview_post', 8);
37 
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_preview_code', 9);
38 
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
39 
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
35 
+	// details page remove
36 
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_set_preview_post', 8);
37 
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_preview_code', 9);
38 
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
39 
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
40 40
41 41
42 
-    //details page add
43 
-    add_action('geodir_article_open', 'geodir_action_geodir_set_preview_post', 1);
44 
-    add_action('geodir_article_open','geodir_action_geodir_preview_code', 2);
45 
-    add_action('geodir_article_open', 'geodir_breadcrumb', 3);
46 
-    add_action('geodir_article_open', 'geodir_action_geodir_sidebar_detail_top', 5);
42 
+	//details page add
43 
+	add_action('geodir_article_open', 'geodir_action_geodir_set_preview_post', 1);
44 
+	add_action('geodir_article_open','geodir_action_geodir_preview_code', 2);
45 
+	add_action('geodir_article_open', 'geodir_breadcrumb', 3);
46 
+	add_action('geodir_article_open', 'geodir_action_geodir_sidebar_detail_top', 5);
47 47
48 48
49 49
50 
-    //location/home remove
51 
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
52 
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
50 
+	//location/home remove
51 
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
52 
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
53 53
54 
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
55 
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
54 
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
55 
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
56 56
57 
-    //location/home add
58 
-    add_action('geodir_home_content', 'geodir_breadcrumb', 3);
59 
-    add_action('geodir_location_content', 'geodir_breadcrumb', 3);
57 
+	//location/home add
58 
+	add_action('geodir_home_content', 'geodir_breadcrumb', 3);
59 
+	add_action('geodir_location_content', 'geodir_breadcrumb', 3);
60 60
61 
-    add_action('geodir_home_content', 'geodir_action_geodir_sidebar_home_top', 5);
62 
-    add_action('geodir_location_content', 'geodir_action_geodir_sidebar_home_top', 5);
61 
+	add_action('geodir_home_content', 'geodir_action_geodir_sidebar_home_top', 5);
62 
+	add_action('geodir_location_content', 'geodir_action_geodir_sidebar_home_top', 5);
63 63
64 
-    // search remove
65 
-    remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
66 
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
67 
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
64 
+	// search remove
65 
+	remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
66 
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
67 
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
68 68
69 
-    //search add
70 
-    add_action('geodir_search_content', 'geodir_action_geodir_sidebar_search_top', 5);
71 
-    add_action('geodir_search_content', 'geodir_breadcrumb', 3);
72 
-    add_action('geodir_search_content', 'geodir_action_search_page_title', 6);
69 
+	//search add
70 
+	add_action('geodir_search_content', 'geodir_action_geodir_sidebar_search_top', 5);
71 
+	add_action('geodir_search_content', 'geodir_breadcrumb', 3);
72 
+	add_action('geodir_search_content', 'geodir_action_search_page_title', 6);
73 73
74 74
75 75
76 76 
 }
77 77
78 78 
 function gd_bb__dequeue_script() {
79 
-    if(geodir_is_geodir_page()){
80 
-        wp_dequeue_script( 'selectboxes');
81 
-    }
79 
+	if(geodir_is_geodir_page()){
80 
+		wp_dequeue_script( 'selectboxes');
81 
+	}
82 82 
 }
83 83 
 add_action( 'wp_print_scripts', 'gd_bb__dequeue_script', 100 );
84 84
85 85 
 add_action('geodir_listings_content','_bb_do_geodir_listings_page_description',11);
86 86 
 function _bb_do_geodir_listings_page_description(){
87 
-    do_action('geodir_listings_page_description');
87 
+	do_action('geodir_listings_page_description');
88 88 
 }
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -11,7 +11,7 @@  discard block
 
 block discarded – undo
11 11 
 add_action('after_setup_theme', 'gd_buddyboss_action_calls', 11);
12 12
13 13 
 remove_action('geodir_page_title', 'geodir_action_page_title', 10);
14 
-function gd_buddyboss_action_calls(){
14 
+function gd_buddyboss_action_calls() {
15 15 
     // listings page remove
16 16 
     remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
17 17 
     remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
 
@@ -24,9 +24,9 @@  discard block
 
 block discarded – undo
24 24 
     add_action('geodir_listings_content', 'geodir_breadcrumb', 3);
25 25 
     add_action('geodir_listings_content', 'geodir_action_geodir_sidebar_listings_top', 4);
26 26 
     add_action('geodir_listings_content', 'geodir_cpt_pt_desc', 5); //CPT manager
27 
-    if(defined("GEODIRLOCATION_VERSION")){
27 
+    if (defined("GEODIRLOCATION_VERSION")) {
28 28 
         add_action('geodir_listings_content', 'geodir_location_action_listings_description', 5);
29 
-    }else{
29 
+    } else {
30 30 
         add_action('geodir_listings_content', 'geodir_action_listings_description', 5);
31 31 
     }
32 32 
     add_action('geodir_listings_content', 'geodir_action_listings_title', 9);
 
@@ -41,7 +41,7 @@  discard block
 
 block discarded – undo
41 41
42 42 
     //details page add
43 43 
     add_action('geodir_article_open', 'geodir_action_geodir_set_preview_post', 1);
44 
-    add_action('geodir_article_open','geodir_action_geodir_preview_code', 2);
44 
+    add_action('geodir_article_open', 'geodir_action_geodir_preview_code', 2);
45 45 
     add_action('geodir_article_open', 'geodir_breadcrumb', 3);
46 46 
     add_action('geodir_article_open', 'geodir_action_geodir_sidebar_detail_top', 5);
47 47 
 
@@ -76,13 +76,13 @@  discard block
 
 block discarded – undo
76 76 
 }
77 77
78 78 
 function gd_bb__dequeue_script() {
79 
-    if(geodir_is_geodir_page()){
80 
-        wp_dequeue_script( 'selectboxes');
79 
+    if (geodir_is_geodir_page()) {
80 
+        wp_dequeue_script('selectboxes');
81 81 
     }
82 82 
 }
83 
-add_action( 'wp_print_scripts', 'gd_bb__dequeue_script', 100 );
83 
+add_action('wp_print_scripts', 'gd_bb__dequeue_script', 100);
84 84
85 
-add_action('geodir_listings_content','_bb_do_geodir_listings_page_description',11);
86 
-function _bb_do_geodir_listings_page_description(){
85 
+add_action('geodir_listings_content', '_bb_do_geodir_listings_page_description', 11);
86 
+function _bb_do_geodir_listings_page_description() {
87 87 
     do_action('geodir_listings_page_description');
88 88 
 }
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -26,7 +26,7 @@
 
 block discarded – undo
26 26 
     add_action('geodir_listings_content', 'geodir_cpt_pt_desc', 5); //CPT manager
27 27 
     if(defined("GEODIRLOCATION_VERSION")){
28 28 
         add_action('geodir_listings_content', 'geodir_location_action_listings_description', 5);
29 
-    }else{
29 
+    } else{
30 30 
         add_action('geodir_listings_content', 'geodir_action_listings_description', 5);
31 31 
     }
32 32 
     add_action('geodir_listings_content', 'geodir_action_listings_title', 9);
Please login to merge, or discard this patch.
geodirectory-functions/taxonomy_functions.php 3 patches
Spacing   +128 added lines, -128 removed lines patch added patch discarded remove patch 
@@ -60,16 +60,16 @@  discard block
 
 block discarded – undo
60 60 
                              * @since 1.0.0
61 61 
                              * @param string $menu_class The menu HTML class.
62 62 
                              */
63 
-                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
63 
+                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);
64 64 
                             /**
65 65 
                              * Filter the menu a class.
66 66 
                              *
67 67 
                              * @since 1.0.0
68 68 
                              */
69 69 
                             $a_class = apply_filters('geodir_menu_a_class', '');
70 
-                            $items .= '<li class="' . $li_class . '">
71 
-									<a href="' . get_post_type_archive_link($post_type) . '" class="' . $a_class . '">
72 
-										' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . '
70 
+                            $items .= '<li class="'.$li_class.'">
71 
+									<a href="' . get_post_type_archive_link($post_type).'" class="'.$a_class.'">
72 
+										' . __(geodir_utf8_ucfirst($args->labels->name), 'geodirectory').'
73 73 
 									</a>
74 74 
 								</li>';
75 75 
                         }

@@ -88,14 +88,14 @@  discard block
 
 block discarded – undo
88 88 
              * @since 1.0.0
89 89 
              * @param string $menu_class The menu HTML class.
90 90 
              */
91 
-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);
91 
+            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings '.$menu_class);
92 92 
             /**
93 93 
              * Filter the sub menu li class.
94 94 
              *
95 95 
              * @since 1.0.0
96 96 
              * @param string $menu_class The menu HTML class.
97 97 
              */
98 
-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
98 
+            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);
99 99 
             /**
100 100 
              * Filter the sub menu ul class.
101 101 
              *

@@ -114,9 +114,9 @@  discard block
 
 block discarded – undo
114 114 
              * @since 1.0.0
115 115 
              */
116 116 
             $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
117 
-            $items .= '<li class="' . $li_class . '">
118 
-					<a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>
119 
-					<ul class="' . $sub_ul_class . '">';
117 
+            $items .= '<li class="'.$li_class.'">
118 
+					<a href="#" class="' . $a_class.'">'.__('Listing', 'geodirectory').'</a>
119 
+					<ul class="' . $sub_ul_class.'">';
120 120 
             $post_types = geodir_get_posttypes('object');
121 121
122 122 
             $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

@@ -133,9 +133,9 @@  discard block
 
 block discarded – undo
133 133 
                                 if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
134 134 
                                     $menu_class = 'current-menu-item';
135 135
136 
-                                $items .= '<li class="' . $sub_li_class . '">
137 
-														<a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '">
138 
-															' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . '
136 
+                                $items .= '<li class="'.$sub_li_class.'">
137 
+														<a href="' . get_post_type_archive_link($post_type).'" class="'.$sub_a_class.'">
138 
+															' . __(geodir_utf8_ucfirst($args->labels->name), 'geodirectory').'
139 139 
 														</a>
140 140 
 													</li>';
141 141 
                             }

@@ -151,7 +151,7 @@  discard block
 
 block discarded – undo
151 151 
              *
152 152 
              * @since 1.5.9
153 153 
              */
154 
-            $items .= apply_filters('geodir_menu_after_sub_ul','');
154 
+            $items .= apply_filters('geodir_menu_after_sub_ul', '');
155 155 
             $items .= '</li>';
156 156 
         }
157 157 
     }

@@ -184,7 +184,7 @@  discard block
 
 block discarded – undo
184 184 
                                      * @since 1.0.0
185 185 
                                      * @param string $menu_class The menu HTML class.
186 186 
                                      */
187 
-                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
187 
+                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);
188 188 
                                     /**
189 189 
                                      * Filter the menu a class.
190 190 
                                      *

@@ -192,9 +192,9 @@  discard block
 
 block discarded – undo
192 192 
                                      */
193 193 
                                     $a_class = apply_filters('geodir_menu_a_class', '');
194 194 
                                     $cpt_name = __($args->labels->singular_name, 'geodirectory');
195 
-                                    $items .= '<li class="' . $li_class . '">
196 
-											<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '">
197 
-												' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
195 
+                                    $items .= '<li class="'.$li_class.'">
196 
+											<a href="' . geodir_get_addlisting_link($post_type).'" class="'.$a_class.'">
197 
+												' . sprintf(__('Add %s', 'geodirectory'), $cpt_name).'
198 198 
 											</a>
199 199 
 										</li>';
200 200 
                                 }

@@ -218,14 +218,14 @@  discard block
 
 block discarded – undo
218 218 
              * @since 1.0.0
219 219 
              * @param string $menu_class The menu HTML class.
220 220 
              */
221 
-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);
221 
+            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing '.$menu_class);
222 222 
             /**
223 223 
              * Filter the sub menu li class.
224 224 
              *
225 225 
              * @since 1.0.0
226 226 
              * @param string $menu_class The menu HTML class.
227 227 
              */
228 
-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
228 
+            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);
229 229 
             /**
230 230 
              * Filter the sub menu ul class.
231 231 
              *

@@ -244,9 +244,9 @@  discard block
 
 block discarded – undo
244 244 
              * @since 1.0.0
245 245 
              */
246 246 
             $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
247 
-            $items .= '<li  class="' . $li_class . '">
248 
-					<a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>
249 
-					<ul class="' . $sub_ul_class . '">';
247 
+            $items .= '<li  class="'.$li_class.'">
248 
+					<a href="#" class="' . $a_class.'">'.__('Add Listing', 'geodirectory').'</a>
249 
+					<ul class="' . $sub_ul_class.'">';
250 250
251 251 
             $post_types = geodir_get_posttypes('object');
252 252 
 

@@ -269,11 +269,11 @@  discard block
 
 block discarded – undo
269 269 
                                          * @since 1.0.0
270 270 
                                          * @param string $menu_class The menu HTML class.
271 271 
                                          */
272 
-                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
272 
+                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);
273 273 
                                         $cpt_name = __($args->labels->singular_name, 'geodirectory');
274 
-                                        $items .= '<li class="' . $sub_li_class . '">
275 
-														<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '">
276 
-															' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
274 
+                                        $items .= '<li class="'.$sub_li_class.'">
275 
+														<a href="' . geodir_get_addlisting_link($post_type).'" class="'.$sub_a_class.'">
276 
+															' . sprintf(__('Add %s', 'geodirectory'), $cpt_name).'
277 277 
 														</a>
278 278 
 													</li>';
279 279 
                                     }

@@ -285,7 +285,7 @@  discard block
 
 block discarded – undo
285 285 
             }
286 286
287 287 
             $items .= '	</ul> ';
288 
-            $items .= apply_filters('geodir_menu_after_sub_ul','');
288 
+            $items .= apply_filters('geodir_menu_after_sub_ul', '');
289 289 
             $items .= '</li>';
290 290
291 291 
         }

@@ -313,14 +313,14 @@  discard block
 
 block discarded – undo
313 313 
     $geodir_theme_location = get_option('geodir_theme_location_nav');
314 314 
     $geodir_theme_location_nav = array();
315 315 
     if (empty($locations) && empty($geodir_theme_location)) {
316 
-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
316 
+        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items()."</ul></div>", $menu);
317 317 
         $geodir_theme_location_nav[] = $args['theme_location'];
318 318 
         update_option('geodir_theme_location_nav', $geodir_theme_location_nav);
319 319 
     }
320 320 
     //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.
321 321 
 //		$menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);
322 322 
     else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))
323 
-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
323 
+        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items()."</ul></div>", $menu);
324 324
325 325 
     return $menu;
326 326 
 

@@ -348,7 +348,7 @@  discard block
 
 block discarded – undo
348 348
349 349 
     if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {
350 350
351 
-        $items = $items . geodir_add_nav_menu_items();
351 
+        $items = $items.geodir_add_nav_menu_items();
352 352 
         return $items;
353 353
354 354 
     } else {

@@ -373,12 +373,12 @@  discard block
 
 block discarded – undo
373 373
374 374 
     $taxonomies = geodir_get_taxonomies();
375 375 
     $taxonomies = implode("','", $taxonomies);
376 
-    $taxonomies = "'" . $taxonomies . "'";
376 
+    $taxonomies = "'".$taxonomies."'";
377 377
378 378 
     $pn_categories = $wpdb->get_results(
379 379 
         $wpdb->prepare(
380 380 
             "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",
381 
-            array($wpdb->terms . term_id)
381 
+            array($wpdb->terms.term_id)
382 382 
         )
383 383 
     );
384 384 
 

@@ -407,7 +407,7 @@  discard block
 
 block discarded – undo
407 407
408 408 
     if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
409 409 
         if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
410 
-            $geodir_post_type = get_post_type((int)$_REQUEST['pid']);
410 
+            $geodir_post_type = get_post_type((int) $_REQUEST['pid']);
411 411 
         elseif (isset($_REQUEST['listing_type']))
412 412 
             $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);
413 413 
     }

@@ -425,7 +425,7 @@  discard block
 
 block discarded – undo
425 425 
     if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))
426 426 
         $geodir_post_type = '';
427 427
428 
-    if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
428 
+    if (defined('DOING_AJAX') && isset($_REQUEST['stype'])) {
429 429 
         $geodir_post_type = sanitize_text_field($_REQUEST['stype']);
430 430 
     }
431 431 
 

@@ -435,7 +435,7 @@  discard block
 
 block discarded – undo
435 435 
      *
436 436 
      * @since 1.6.9
437 437 
      */
438 
-    return apply_filters('geodir_get_current_posttype',$geodir_post_type);
438 
+    return apply_filters('geodir_get_current_posttype', $geodir_post_type);
439 439 
 }
440 440
441 441 
 /**

@@ -449,18 +449,18 @@  discard block
 
 block discarded – undo
449 449 
  */
450 450 
 function geodir_get_default_posttype()
451 451 
 {
452 
-    $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );
452 
+    $post_types = apply_filters('geodir_get_default_posttype', geodir_get_posttypes('object'));
453 453
454 454 
     $stype = false;
455 
-    foreach ( $post_types as $post_type => $info ) {
455 
+    foreach ($post_types as $post_type => $info) {
456 456 
         global $wpdb;
457 
-        $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );
458 
-        if ( $has_posts ) {
457 
+        $has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));
458 
+        if ($has_posts) {
459 459 
             $stype = $post_type; break;
460 460 
         }
461 461 
     }
462 462
463 
-    if(!$stype){
463 
+    if (!$stype) {
464 464 
         $stype = 'gd_place';
465 465 
     }
466 466 
 

@@ -485,14 +485,14 @@  discard block
 
 block discarded – undo
485 485 
         switch ($output):
486 486 
             case 'object':
487 487 
             case 'Object':
488 
-                $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types;
488 
+                $post_types = json_decode(json_encode($post_types), FALSE); //(object)$post_types;
489 489 
                 break;
490 490 
             case 'array':
491 491 
             case 'Array':
492 
-                $post_types = (array)$post_types;
492 
+                $post_types = (array) $post_types;
493 493 
                 break;
494 494 
 			case 'options':
495 
-                $post_types = (array)$post_types;
495 
+                $post_types = (array) $post_types;
496 496
497 497 
 				$options = array();
498 498 
 				if (!empty($post_types)) {

@@ -610,15 +610,15 @@  discard block
 
 block discarded – undo
610 610
611 611 
         $categories = get_terms($taxonomies);
612 612
613 
-        $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
613 
+        $html .= '<option value="0">'.__('All', 'geodirectory').'</option>';
614 614
615 615 
         foreach ($categories as $category_obj) {
616 616 
             $select_opt = '';
617 617 
             if ($selected == $category_obj->term_id) {
618 618 
                 $select_opt = 'selected="selected"';
619 619 
             }
620 
-            $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'
621 
-                . geodir_utf8_ucfirst($category_obj->name) . '</option>';
620 
+            $html .= '<option '.$select_opt.' value="'.$category_obj->term_id.'">'
621 
+                . geodir_utf8_ucfirst($category_obj->name).'</option>';
622 622 
         }
623 623
624 624 
         if ($echo)

@@ -686,7 +686,7 @@  discard block
 
 block discarded – undo
686 686 
     } elseif (isset($wp_query->tax_query->queries)) {
687 687 
         $tax_arr = $wp_query->tax_query->queries;
688 688 
         //if tax query has 'relation' set then it will break wp_list_pluck so we remove it
689 
-        if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
689 
+        if (isset($tax_arr['relation'])) {unset($tax_arr['relation']); }
690 690 
         $taxonomies = wp_list_pluck($tax_arr, 'taxonomy');
691 691 
     }
692 692 
 

@@ -740,7 +740,7 @@  discard block
 
 block discarded – undo
740 740
741 741 
             if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
742 742 
                 if ($cat_parent == 0) {
743 
-                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;
743 
+                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-'.$cat_display;
744 744 
                     $main_list_class = 'class="main_list_selecter"';
745 745 
                 } else {
746 746 
                     //$display = 'display:none';

@@ -750,7 +750,7 @@  discard block
 
 block discarded – undo
750 750
751 751 
             if ($cat_display == 'checkbox' || $cat_display == 'radio') {
752 752 
                 $p = 0;
753 
-                $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';
753 
+                $out = '<div class="'.$list_class.' gd-cat-row-'.$cat_parent.'" style="margin-left:'.$p.'px;'.$display.';">';
754 754 
             }
755 755
756 756 
             foreach ($cat_terms as $cat_term) {

@@ -765,12 +765,12 @@  discard block
 
 block discarded – undo
765 765 
                 }
766 766
767 767 
                 if ($cat_display == 'radio')
768 
-                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';
768 
+                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category['.$cat_term->taxonomy.'][]" '.$main_list_class.' alt="'.$cat_term->taxonomy.'" title="'.geodir_utf8_ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.geodir_utf8_ucfirst($cat_term->name).'</span>';
769 769 
                 elseif ($cat_display == 'select' || $cat_display == 'multiselect')
770 
-                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>';
770 
+                    $out .= '<option '.$main_list_class.' style="margin-left:'.$p.'px;" alt="'.$cat_term->taxonomy.'" title="'.geodir_utf8_ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' >'.$term_check.geodir_utf8_ucfirst($cat_term->name).'</option>';
771 771
772 772 
                 else {
773 
-                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';
773 
+                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category['.$cat_term->taxonomy.'][]" '.$main_list_class.' alt="'.$cat_term->taxonomy.'" title="'.geodir_utf8_ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.geodir_utf8_ucfirst($cat_term->name).'</span>';
774 774 
                 }
775 775
776 776 
                 // Call recurson to print sub cats

@@ -809,7 +809,7 @@  discard block
 
 block discarded – undo
809 809 
             $cat_exclude = serialize($exclude_cats);
810 810
811 811 
         if (isset($_REQUEST['backandedit'])) {
812 
-            $post = (object)$gd_session->get('listing');
812 
+            $post = (object) $gd_session->get('listing');
813 813
814 814 
             if (!is_array($post->post_category[$cat_taxonomy]))
815 815 
                 $post_category = $post->post_category[$cat_taxonomy];

@@ -841,7 +841,7 @@  discard block
 
 block discarded – undo
841 841
842 842 
             if (!empty($post_category)) {
843 843 
                 $cat1 = array_filter(explode(',', $post_category));
844 
-                $post_category = ',' . implode(',', $cat1) . ',';
844 
+                $post_category = ','.implode(',', $cat1).',';
845 845
846 846 
             }
847 847 
 

@@ -852,7 +852,7 @@  discard block
 
 block discarded – undo
852 852 
                 foreach ($post_category_upd as $cat) {
853 853
854 854 
                     if (!in_array($cat, $exclude_cats) && $cat != '') {
855 
-                        $post_category_change .= ',' . $cat;
855 
+                        $post_category_change .= ','.$cat;
856 856 
                     }
857 857 
                 }
858 858 
                 $post_category = $post_category_change;

@@ -864,11 +864,11 @@  discard block
 
 block discarded – undo
864 864 
             }
865 865 
         }
866 866
867 
-        echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';
867 
+        echo '<input type="hidden" id="cat_limit" value="'.$cat_limit.'" name="cat_limit['.$cat_taxonomy.']"  />';
868 868
869 
-        echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';
869 
+        echo '<input type="hidden" id="post_category" value="'.$post_category.'" name="post_category['.$cat_taxonomy.']"  />';
870 870
871 
-        echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';
871 
+        echo '<input type="hidden" id="post_category_str" value="'.$post_category_str.'" name="post_category_str['.$cat_taxonomy.']"  />';
872 872
873 873
874 874 
         ?>

@@ -887,14 +887,14 @@  discard block
 
 block discarded – undo
887 887
888 888 
             function show_subcatlist(main_cat, catObj) {
889 889 
                 if (main_cat != '') {
890 
-					var url = '<?php echo geodir_get_ajax_url();?>';
891 
-                    var cat_taxonomy = '<?php echo $cat_taxonomy;?>';
892 
-                    var cat_exclude = '<?php echo base64_encode($cat_exclude);?>';
890 
+					var url = '<?php echo geodir_get_ajax_url(); ?>';
891 
+                    var cat_taxonomy = '<?php echo $cat_taxonomy; ?>';
892 
+                    var cat_exclude = '<?php echo base64_encode($cat_exclude); ?>';
893 893 
                     var cat_limit = jQuery('#' + cat_taxonomy).find('#cat_limit').val();
894 
-					<?php if ((int)$cat_limit > 0) { ?>
894 
+					<?php if ((int) $cat_limit > 0) { ?>
895 895 
 					var selected = parseInt(jQuery('#' + cat_taxonomy).find('.cat_sublist > div.post_catlist_item').length);
896 896 
 					if (cat_limit != '' && selected > 0 && selected >= cat_limit && cat_limit != 0) {
897 
-						alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int)$cat_limit));?>");
897 
+						alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int) $cat_limit)); ?>");
898 898 
 						return false;
899 899 
 					}
900 900 
 					<?php } ?>

@@ -933,7 +933,7 @@  discard block
 
 block discarded – undo
933 933 
             }
934 934
935 935 
             function update_listing_cat(el) {
936 
-                var cat_taxonomy = '<?php echo $cat_taxonomy;?>';
936 
+                var cat_taxonomy = '<?php echo $cat_taxonomy; ?>';
937 937 
                 var cat_ids = '';
938 938 
                 var main_cat = '';
939 939 
                 var sub_cat = '';

@@ -1014,7 +1014,7 @@  discard block
 
 block discarded – undo
1014 1014 
         <div class="main_cat_list" style=" <?php if (isset($style)) {
1015 1015 
             echo $style;
1016 1016 
         }?> ">
1017 
-            <?php geodir_get_catlist($cat_taxonomy, 0);  // print main categories list
1017 
+            <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list
1018 1018 
             ?>
1019 1019 
         </div>
1020 1020 
     <?php

@@ -1041,9 +1041,9 @@  discard block
 
 block discarded – undo
1041 1041 
     if ($exclude != '') {
1042 1042 
         $exclude_cats = maybe_unserialize(base64_decode($exclude));
1043 1043
1044 
-        if(is_array( $exclude_cats)){
1045 
-            $exclude_cats = array_map( 'intval', $exclude_cats );
1046 
-        }else{
1044 
+        if (is_array($exclude_cats)) {
1045 
+            $exclude_cats = array_map('intval', $exclude_cats);
1046 
+        } else {
1047 1047 
             $exclude_cats = intval($exclude_cats);
1048 1048 
         }
1049 1049 
 

@@ -1057,25 +1057,25 @@  discard block
 
 block discarded – undo
1057 1057 
         <?php $main_cat = get_term($parrent, $request_taxonomy); ?>
1058 1058
1059 1059 
         <div class="post_catlist_item" style="border:1px solid #CCCCCC; margin:5px auto; padding:5px;">
1060 
-            <img alt="move icon" src="<?php echo geodir_plugin_url() . '/geodirectory-assets/images/move.png';?>"
1060 
+            <img alt="move icon" src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png'; ?>"
1061 1061 
                  onclick="jQuery(this).closest('div').remove();update_listing_cat(this);" align="right"/>
1062 1062 
             <?php /* ?>
1063 1063 
 		<img src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png';?>" onclick="jQuery(this).closest('div').remove();show_subcatlist();" align="right" />
1064 1064 
 		<?php */ ?>
1065 1065
1066 
-            <input type="checkbox" value="<?php echo $main_cat->term_id;?>" class="listing_main_cat"
1066 
+            <input type="checkbox" value="<?php echo $main_cat->term_id; ?>" class="listing_main_cat"
1067 1067 
                    onchange="if(jQuery(this).is(':checked')){jQuery(this).closest('div').find('.post_default_category').prop('checked',false).show();}else{jQuery(this).closest('div').find('.post_default_category').prop('checked',false).hide();};update_listing_cat()"
1068 1068 
                    checked="checked" disabled="disabled"/>
1069 1069 
        <span>
1070 
-        <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name));?>
1070 
+        <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>
1071 1071 
         </span>
1072 1072 
             <br/>
1073 1073
1074 1074 
             <div class="post_default_category">
1075 
-                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>"
1076 
-                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?>   />
1075 
+                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id; ?>"
1076 
+                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" '; ?>   />
1077 1077 
         <span>
1078 
-        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>
1078 
+        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>
1079 1079 
         </span>
1080 1080 
             </div>
1081 1081 
 

@@ -1108,7 +1108,7 @@  discard block
 
 block discarded – undo
1108 1108 
         $post_cat_str = $post_categories[$request_taxonomy];
1109 1109 
         $post_cat_array = explode("#", $post_cat_str);
1110 1110 
         if (is_array($post_cat_array)) {
1111 
-            $post_cat_array = array_unique( $post_cat_array );
1111 
+            $post_cat_array = array_unique($post_cat_array);
1112 1112
1113 1113 
 			foreach ($post_cat_array as $post_cat_html) {
1114 1114 
 

@@ -1123,7 +1123,7 @@  discard block
 
 block discarded – undo
1123 1123 
                 }
1124 1124 
                 $post_sub_catid = '';
1125 1125 
                 if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
1126 
-                    $post_sub_catid = (int)$post_cat_info[1];
1126 
+                    $post_sub_catid = (int) $post_cat_info[1];
1127 1127 
                 }
1128 1128
1129 1129 
                 geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1144,7 +1144,7 @@  discard block
 
 block discarded – undo
1144 1144 
             }
1145 1145
1146 1146 
             if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
1147 
-                $post_sub_catid = (int)$post_cat_info[1];
1147 
+                $post_sub_catid = (int) $post_cat_info[1];
1148 1148 
             }
1149 1149
1150 1150 
             geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1176,9 +1176,9 @@  discard block
 
 block discarded – undo
1176 1176 
         if (!$selected)
1177 1177 
             $option_slected = ' selected="selected" ';
1178 1178
1179 
-        echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';
1179 
+        echo '<select field_type="select" id="'.sanitize_text_field($cat_taxonomy).'" class="chosen_select" '.$onchange.' option-ajaxChosen="false" >';
1180 1180
1181 
-        echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
1181 
+        echo '<option value="" '.$option_selected.' >'.__('Select Category', 'geodirectory').'</option>';
1182 1182
1183 1183 
         foreach ($cat_terms as $cat_term) {
1184 1184 
             $option_selected = '';

@@ -1186,10 +1186,10 @@  discard block
 
 block discarded – undo
1186 1186 
                 $option_selected = ' selected="selected" ';
1187 1187
1188 1188 
             // Count child terms
1189 
-            $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );
1190 
-            $has_child = !empty( $child_terms ) ? 't' : 'f';
1189 
+            $child_terms = get_terms($cat_taxonomy, array('parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1));
1190 
+            $has_child = !empty($child_terms) ? 't' : 'f';
1191 1191
1192 
-            echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>';
1192 
+            echo '<option  '.$option_selected.' alt="'.$cat_term->taxonomy.'" title="'.geodir_utf8_ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" _hc="'.$has_child.'" >'.geodir_utf8_ucfirst($cat_term->name).'</option>';
1193 1193 
         }
1194 1194 
         echo '</select>';
1195 1195 
     }

@@ -1220,7 +1220,7 @@  discard block
 
 block discarded – undo
1220 1220 
             2 => __('Custom field updated.', 'geodirectory'),
1221 1221 
             3 => __('Custom field deleted.', 'geodirectory'),
1222 1222 
             4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
1223 
-            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,
1223 
+            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int) $_GET['revision'], false)) : false,
1224 1224 
             6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
1225 1225 
             7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
1226 1226 
             8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

@@ -1246,7 +1246,7 @@  discard block
 
 block discarded – undo
1246 1246
1247 1247 
     global $wpdb;
1248 1248
1249 
-    $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';
1249 
+    $menu_icon = geodir_plugin_url().'/geodirectory-assets/images/favicon.ico';
1250 1250
1251 1251 
     if (!$listing_slug = get_option('geodir_listing_prefix'))
1252 1252 
         $listing_slug = 'places';

@@ -1259,11 +1259,11 @@  discard block
 
 block discarded – undo
1259 1259
1260 1260 
         $gd_placetags = array();
1261 1261 
         $gd_placetags['object_type'] = 'gd_place';
1262 
-        $gd_placetags['listing_slug'] = $listing_slug . '/tags';
1262 
+        $gd_placetags['listing_slug'] = $listing_slug.'/tags';
1263 1263 
         $gd_placetags['args'] = array(
1264 1264 
             'public' => true,
1265 1265 
             'hierarchical' => false,
1266 
-            'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
1266 
+            'rewrite' => array('slug' => $listing_slug.'/tags', 'with_front' => false, 'hierarchical' => true),
1267 1267 
             'query_var' => true,
1268 1268
1269 1269 
             'labels' => array(

@@ -1357,7 +1357,7 @@  discard block
 
 block discarded – undo
1357 1357 
             'menu_icon' => $menu_icon,
1358 1358 
             'public' => true,
1359 1359 
             'query_var' => true,
1360 
-            'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
1360 
+            'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
1361 1361 
             'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
1362 1362 
             'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
1363 1363 
 

@@ -1390,12 +1390,12 @@  discard block
 
 block discarded – undo
1390 1390 
         return $_REQUEST['lang'];
1391 1391 
     }
1392 1392
1393 
-    $url = str_replace(array("http://","https://"),"",$url);
1393 
+    $url = str_replace(array("http://", "https://"), "", $url);
1394 1394
1395 1395 
     // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
1396 
-    $site_url = str_replace(array("http://","https://"),"",site_url());
1396 
+    $site_url = str_replace(array("http://", "https://"), "", site_url());
1397 1397
1398 
-    $url = str_replace($site_url,"",$url);
1398 
+    $url = str_replace($site_url, "", $url);
1399 1399
1400 1400 
     $segments = explode('/', trim($url, '/'));
1401 1401 
 

@@ -1461,9 +1461,9 @@  discard block
 
 block discarded – undo
1461 1461 
     if (in_array($post->post_type, geodir_get_posttypes())) {
1462 1462
1463 1463 
         // if we dont have a GD post then try to grab it
1464 
-        if(!isset($post->default_category)){
1464 
+        if (!isset($post->default_category)) {
1465 1465 
             $gd_post = geodir_get_post_info($post->ID);
1466 
-            if(!empty($gd_post)){
1466 
+            if (!empty($gd_post)) {
1467 1467 
                 $post = $gd_post;
1468 1468 
             }
1469 1469 
         }

@@ -1473,17 +1473,17 @@  discard block
 
 block discarded – undo
1473 1473 
         $slug = $post_types[$post->post_type]['rewrite']['slug'];
1474 1474
1475 1475 
         // Alter the CPT slug if WPML is set to do so
1476 
-        if(function_exists('icl_object_id')){
1477 
-            if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
1476 
+        if (function_exists('icl_object_id')) {
1477 
+            if (gd_wpml_slug_translation_turned_on($post->post_type) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
1478 1478
1479 1479 
                 $org_slug = $slug;
1480 
-                $slug = apply_filters( 'wpml_translate_single_string',
1480 
+                $slug = apply_filters('wpml_translate_single_string',
1481 1481 
                     $slug,
1482 1482 
                     'WordPress',
1483 
-                    'URL slug: ' . $slug,
1483 
+                    'URL slug: '.$slug,
1484 1484 
                     $language_code);
1485 1485
1486 
-                if(!$slug){$slug = $org_slug;}
1486 
+                if (!$slug) {$slug = $org_slug; }
1487 1487
1488 1488 
             }
1489 1489 
         }

@@ -1505,11 +1505,11 @@  discard block
 
 block discarded – undo
1505 1505 
         }
1506 1506
1507 1507 
         $post_link = trailingslashit(
1508 
-            preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )
1508 
+            preg_replace("/".preg_quote($slug, "/")."/", $slug."/%gd_taxonomy%", $post_link, 1)
1509 1509 
         );
1510 1510
1511 1511 
         if ($fix_url) {
1512 
-            $post_link = $site_url . $post_link;
1512 
+            $post_link = $site_url.$post_link;
1513 1513 
         }
1514 1514
1515 1515 
         if (isset($comment_post_cache[$post->ID])) {

@@ -1528,12 +1528,12 @@  discard block
 
 block discarded – undo
1528 1528 
             $ID = $post->ID;
1529 1529 
             $post2 = $wpdb->get_row(
1530 1530 
                 $wpdb->prepare(
1531 
-                    "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",
1531 
+                    "SELECT * from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",
1532 1532 
                     array($post->ID)
1533 1533 
                 )
1534 1534 
             );
1535 1535
1536 
-            $post = (object)array_merge((array)$post, (array)$post2);
1536 
+            $post = (object) array_merge((array) $post, (array) $post2);
1537 1537
1538 1538 
             $comment_post_cache[$post->ID] = $post;
1539 1539 
         }

@@ -1542,7 +1542,7 @@  discard block
 
 block discarded – undo
1542 1542
1543 1543 
         if (false !== strpos($post_link, '%gd_taxonomy%')) {
1544 1544
1545 
-            if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
1545 
+            if (apply_filters("geodir_add_location_url_to_url", get_option('geodir_add_location_url'), $post->post_type, $post)) {
1546 1546 
                 $location_request = '';
1547 1547
1548 1548 
 

@@ -1556,7 +1556,7 @@  discard block
 
 block discarded – undo
1556 1556 
                         $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
1557 1557 
                         $post->country_slug = str_replace(']', '', $post->country_slug);
1558 1558
1559 
-                        $post_location = (object)array('country_slug' => $post->country_slug,
1559 
+                        $post_location = (object) array('country_slug' => $post->country_slug,
1560 1560 
                             'region_slug' => $post->region_slug,
1561 1561 
                             'city_slug' => $post->city_slug
1562 1562 
                         );

@@ -1569,7 +1569,7 @@  discard block
 
 block discarded – undo
1569 1569
1570 1570 
                     $post_location_sql = $wpdb->get_results(
1571 1571 
                         $wpdb->prepare(
1572 
-                            "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",
1572 
+                            "SELECT post_locations from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",
1573 1573 
                             array($post->ID)
1574 1574 
                         )
1575 1575 
                     );

@@ -1585,7 +1585,7 @@  discard block
 
 block discarded – undo
1585 1585 
                             $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
1586 1586 
                             $post->country_slug = str_replace(']', '', $post->country_slug);
1587 1587
1588 
-                            $post_location = (object)array('country_slug' => $post->country_slug,
1588 
+                            $post_location = (object) array('country_slug' => $post->country_slug,
1589 1589 
                                 'region_slug' => $post->region_slug,
1590 1590 
                                 'city_slug' => $post->city_slug
1591 1591 
                             );

@@ -1614,7 +1614,7 @@  discard block
 
 block discarded – undo
1614 1614 
 					}
1615 1615 
 					$location_slug[] = $city_slug;
1616 1616
1617 
-					$location_request .= implode('/', $location_slug) . '/';
1617 
+					$location_request .= implode('/', $location_slug).'/';
1618 1618 
                 }
1619 1619 
             }
1620 1620 
 

@@ -1630,9 +1630,9 @@  discard block
 
 block discarded – undo
1630 1630 
                 } else {
1631 1631 
                     $post_terms = '';
1632 1632
1633 
-                    if(isset($_POST['post_default_category']) && $_POST['post_default_category']){
1633 
+                    if (isset($_POST['post_default_category']) && $_POST['post_default_category']) {
1634 1634 
                         $post_terms = absint($_POST['post_default_category']);
1635 
-                    }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]){
1635 
+                    }elseif (isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]) {
1636 1636 
                         $post_terms = explode(",", trim($_POST['post_category'][$taxonomies], ","));
1637 1637 
                         $post_terms = absint($post_terms[0]);
1638 1638 
                     }elseif (isset($post->{$taxonomies})) {

@@ -1678,14 +1678,14 @@  discard block
 
 block discarded – undo
1678 1678 
             $request_term = trim($request_term, '/');
1679 1679
1680 1680 
             // Fix with WPML the location terms added twice when CPT slug is translated.
1681 
-            if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {
1681 
+            if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/'.$request_term.$detailurl_separator) !== false) {
1682 1682 
                 $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
1683 1683 
             }
1684 1684
1685 1685 
             if (!empty($request_term))
1686 
-                $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
1686 
+                $post_link = str_replace('%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);
1687 1687 
             else
1688 
-                $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
1688 
+                $post_link = str_replace('/%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);
1689 1689 
             //echo $post_link ;
1690 1690 
         }
1691 1691 
         // temp cache the permalink

@@ -1760,9 +1760,9 @@  discard block
 
 block discarded – undo
1760 1760 
                 $url_separator = '';
1761 1761
1762 1762 
                 if (get_option('permalink_structure') != '') {
1763 
-                    $old_listing_slug = '/' . $listing_slug . '/';
1763 
+                    $old_listing_slug = '/'.$listing_slug.'/';
1764 1764 
                     $request_term = implode("/", $location_terms);
1765 
-                    $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';
1765 
+                    $new_listing_slug = '/'.$listing_slug.'/'.$request_term.'/';
1766 1766
1767 1767 
                     $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));
1768 1768 
                 } else {

@@ -1782,25 +1782,25 @@  discard block
 
 block discarded – undo
1782 1782 
         // Alter the CPT slug if WPML is set to do so
1783 1783 
         if (function_exists('icl_object_id')) {
1784 1784 
             $post_types = get_option('geodir_post_types');
1785 
-            $post_type = str_replace("category","",$taxonomy);
1786 
-            $post_type = str_replace("_tags","",$post_type);
1785 
+            $post_type = str_replace("category", "", $taxonomy);
1786 
+            $post_type = str_replace("_tags", "", $post_type);
1787 1787 
             $slug = $post_types[$post_type]['rewrite']['slug'];
1788 1788 
             if (gd_wpml_slug_translation_turned_on($post_type)) {
1789 1789 
                 global $sitepress;
1790 1790 
                 $default_lang = $sitepress->get_default_language();
1791 1791 
                 $language_code = gd_wpml_get_lang_from_url($termlink);
1792 
-                if (!$language_code ) {
1793 
-                    $language_code  = $default_lang;
1792 
+                if (!$language_code) {
1793 
+                    $language_code = $default_lang;
1794 1794 
                 }
1795 1795
1796 1796 
                 $org_slug = $slug;
1797 
-                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);
1797 
+                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: '.$slug, $language_code);
1798 1798
1799 1799 
                 if (!$slug) {
1800 1800 
                     $slug = $org_slug;
1801 1801 
                 }
1802 1802
1803 
-                $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug  ,$termlink, 1));
1803 
+                $termlink = trailingslashit(preg_replace("/".preg_quote($org_slug, "/")."/", $slug, $termlink, 1));
1804 1804 
             }
1805 1805 
         }
1806 1806 
     }

@@ -1830,7 +1830,7 @@  discard block
 
 block discarded – undo
1830 1830
1831 1831 
 	if (in_array($post_type, geodir_get_posttypes())) {
1832 1832 
 		if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {
1833 
-			if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {
1833 
+			if (geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {
1834 1834 
                 $location_terms = array(
1835 1835 
                     'gd_country' => $post->country_slug,
1836 1836 
                     'gd_region' => $post->region_slug,

@@ -1847,7 +1847,7 @@  discard block
 
 block discarded – undo
1847 1847 
 					$location_terms = implode("/", $location_terms);
1848 1848 
 					$location_terms = rtrim($location_terms, '/');
1849 1849
1850 
-					$link .= urldecode($location_terms) . '/';
1850 
+					$link .= urldecode($location_terms).'/';
1851 1851 
 				} else {
1852 1852 
 					$link = geodir_getlink($link, $location_terms);
1853 1853 
 				}

@@ -1935,9 +1935,9 @@  discard block
 
 block discarded – undo
1935 1935 
             return 0;
1936 1936 
         $where = 't.term_id = %d';
1937 1937 
         if (!empty($taxonomy))
1938 
-            return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
1938 
+            return $wpdb->get_row($wpdb->prepare($tax_select.$where." AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
1939 1939 
         else
1940 
-            return $wpdb->get_var($wpdb->prepare($select . $where, $term));
1940 
+            return $wpdb->get_var($wpdb->prepare($select.$where, $term));
1941 1941 
     }
1942 1942
1943 1943 
     $term = trim(wp_unslash($term));

@@ -1949,7 +1949,7 @@  discard block
 
 block discarded – undo
1949 1949
1950 1950 
     $where_fields = array($slug);
1951 1951 
     if (!empty($taxonomy)) {
1952 
-        $parent = (int)$parent;
1952 
+        $parent = (int) $parent;
1953 1953 
         if ($parent > 0) {
1954 1954 
             $where_fields[] = $parent;
1955 1955 
             $else_where_fields[] = $parent;

@@ -2013,13 +2013,13 @@  discard block
 
 block discarded – undo
2013 2013 
         $post_types = geodir_get_posttypes();
2014 2014 
         $tax_arr = array();
2015 2015 
         foreach ($post_types as $post_type) {
2016 
-            $tax_arr[] = "'" . $post_type . "category'";
2016 
+            $tax_arr[] = "'".$post_type."category'";
2017 2017 
         }
2018 2018 
         $tax_c = implode(',', $tax_arr);
2019 2019 
         $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
2020 2020 
         //$terms = get_terms( $taxonomy );
2021 2021
2022 
-        if($terms) {
2022 
+        if ($terms) {
2023 2023 
             foreach ($terms as $term) {
2024 2024 
                 $post_type = str_replace("category", "", $term->taxonomy);
2025 2025 
                 $a_terms[$post_type][] = $term;

@@ -2027,7 +2027,7 @@  discard block
 
 block discarded – undo
2027 2027 
             }
2028 2028 
         }
2029 2029
2030 
-        if($a_terms) {
2030 
+        if ($a_terms) {
2031 2031 
             foreach ($a_terms as $pt => $t2) {
2032 2032
2033 2033 
                 foreach ($t2 as $term) {

@@ -2052,7 +2052,7 @@  discard block
 
 block discarded – undo
2052 2052 
     }
2053 2053
2054 2054 
     if (is_ssl()) {
2055 
-        $terms_icons = str_replace("http:","https:",$terms_icons );
2055 
+        $terms_icons = str_replace("http:", "https:", $terms_icons);
2056 2056 
     }
2057 2057
2058 2058 
     return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
Please login to merge, or discard this patch.
Indentation   +1252 added lines, -1252 removed lines patch added patch discarded remove patch 
@@ -33,265 +33,265 @@  discard block
 
 block discarded – undo
33 33 
  */
34 34 
 function geodir_add_nav_menu_items()
35 35 
 {
36 
-    $items = '';
37 
-    // apply filter to add more navigations // -Filter-Location-Manager
38 
-
39 
-    if (get_option('geodir_show_listing_nav')) {
40 
-
41 
-        $menu_class = '';
42 
-        if (geodir_is_page('listing'))
43 
-            $menu_class = 'current-menu-item';
44 
-
45 
-
46 
-        //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION
47 
-        $post_types = geodir_get_posttypes('object');
48 
-        $show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');
49 
-        if (!empty($post_types)) {
50 
-            foreach ($post_types as $post_type => $args) {
51 
-                if (!empty($show_post_type_main_nav)) {
52 
-                    if (in_array($post_type, $show_post_type_main_nav)) {
53 
-                        if (get_post_type_archive_link($post_type)) {
54 
-                            $menu_class = '';
55 
-                            if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
56 
-                                $menu_class = 'current-menu-item';
57 
-                            /**
58 
-                             * Filter the menu li class.
59 
-                             *
60 
-                             * @since 1.0.0
61 
-                             * @param string $menu_class The menu HTML class.
62 
-                             */
63 
-                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
64 
-                            /**
65 
-                             * Filter the menu a class.
66 
-                             *
67 
-                             * @since 1.0.0
68 
-                             */
69 
-                            $a_class = apply_filters('geodir_menu_a_class', '');
70 
-                            $items .= '<li class="' . $li_class . '">
36 
+	$items = '';
37 
+	// apply filter to add more navigations // -Filter-Location-Manager
38 
+
39 
+	if (get_option('geodir_show_listing_nav')) {
40 
+
41 
+		$menu_class = '';
42 
+		if (geodir_is_page('listing'))
43 
+			$menu_class = 'current-menu-item';
44 
+
45 
+
46 
+		//SHOW LISTING OF POST TYPE IN MAIN NAVIGATION
47 
+		$post_types = geodir_get_posttypes('object');
48 
+		$show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');
49 
+		if (!empty($post_types)) {
50 
+			foreach ($post_types as $post_type => $args) {
51 
+				if (!empty($show_post_type_main_nav)) {
52 
+					if (in_array($post_type, $show_post_type_main_nav)) {
53 
+						if (get_post_type_archive_link($post_type)) {
54 
+							$menu_class = '';
55 
+							if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
56 
+								$menu_class = 'current-menu-item';
57 
+							/**
58 
+							 * Filter the menu li class.
59 
+							 *
60 
+							 * @since 1.0.0
61 
+							 * @param string $menu_class The menu HTML class.
62 
+							 */
63 
+							$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
64 
+							/**
65 
+							 * Filter the menu a class.
66 
+							 *
67 
+							 * @since 1.0.0
68 
+							 */
69 
+							$a_class = apply_filters('geodir_menu_a_class', '');
70 
+							$items .= '<li class="' . $li_class . '">
71 71 
 									<a href="' . get_post_type_archive_link($post_type) . '" class="' . $a_class . '">
72 72 
 										' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . '
73 73 
 									</a>
74 74 
 								</li>';
75 
-                        }
76 
-                    }
77 
-                }
78 
-            }
79 
-        }
80 
-        //END LISTING OF POST TYPE IN MAIN NAVIGATION
81 
-
82 
-        $view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');
83 
-        $is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false;
84 
-        if ($is_listing_sub_meny_exists) {
85 
-            /**
86 
-             * Filter the menu li class.
87 
-             *
88 
-             * @since 1.0.0
89 
-             * @param string $menu_class The menu HTML class.
90 
-             */
91 
-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);
92 
-            /**
93 
-             * Filter the sub menu li class.
94 
-             *
95 
-             * @since 1.0.0
96 
-             * @param string $menu_class The menu HTML class.
97 
-             */
98 
-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
99 
-            /**
100 
-             * Filter the sub menu ul class.
101 
-             *
102 
-             * @since 1.0.0
103 
-             */
104 
-            $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
105 
-            /**
106 
-             * Filter the menu a class.
107 
-             *
108 
-             * @since 1.0.0
109 
-             */
110 
-            $a_class = apply_filters('geodir_menu_a_class', '');
111 
-            /**
112 
-             * Filter the sub menu a class.
113 
-             *
114 
-             * @since 1.0.0
115 
-             */
116 
-            $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
117 
-            $items .= '<li class="' . $li_class . '">
75 
+						}
76 
+					}
77 
+				}
78 
+			}
79 
+		}
80 
+		//END LISTING OF POST TYPE IN MAIN NAVIGATION
81 
+
82 
+		$view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');
83 
+		$is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false;
84 
+		if ($is_listing_sub_meny_exists) {
85 
+			/**
86 
+			 * Filter the menu li class.
87 
+			 *
88 
+			 * @since 1.0.0
89 
+			 * @param string $menu_class The menu HTML class.
90 
+			 */
91 
+			$li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);
92 
+			/**
93 
+			 * Filter the sub menu li class.
94 
+			 *
95 
+			 * @since 1.0.0
96 
+			 * @param string $menu_class The menu HTML class.
97 
+			 */
98 
+			$sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
99 
+			/**
100 
+			 * Filter the sub menu ul class.
101 
+			 *
102 
+			 * @since 1.0.0
103 
+			 */
104 
+			$sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
105 
+			/**
106 
+			 * Filter the menu a class.
107 
+			 *
108 
+			 * @since 1.0.0
109 
+			 */
110 
+			$a_class = apply_filters('geodir_menu_a_class', '');
111 
+			/**
112 
+			 * Filter the sub menu a class.
113 
+			 *
114 
+			 * @since 1.0.0
115 
+			 */
116 
+			$sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
117 
+			$items .= '<li class="' . $li_class . '">
118 118 
 					<a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>
119 119 
 					<ul class="' . $sub_ul_class . '">';
120 
-            $post_types = geodir_get_posttypes('object');
120 
+			$post_types = geodir_get_posttypes('object');
121 121
122 
-            $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');
122 
+			$show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');
123 123
124 
-            if (!empty($post_types)) {
125 
-                global $geodir_add_location_url;
126 
-                $geodir_add_location_url = true;
127 
-                foreach ($post_types as $post_type => $args) {
128 
-                    if (!empty($show_listing_post_types)) {
129 
-                        if (in_array($post_type, $show_listing_post_types)) {
130 
-                            if (get_post_type_archive_link($post_type)) {
124 
+			if (!empty($post_types)) {
125 
+				global $geodir_add_location_url;
126 
+				$geodir_add_location_url = true;
127 
+				foreach ($post_types as $post_type => $args) {
128 
+					if (!empty($show_listing_post_types)) {
129 
+						if (in_array($post_type, $show_listing_post_types)) {
130 
+							if (get_post_type_archive_link($post_type)) {
131 131
132 
-                                $menu_class = '';
133 
-                                if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
134 
-                                    $menu_class = 'current-menu-item';
132 
+								$menu_class = '';
133 
+								if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
134 
+									$menu_class = 'current-menu-item';
135 135
136 
-                                $items .= '<li class="' . $sub_li_class . '">
136 
+								$items .= '<li class="' . $sub_li_class . '">
137 137 
 														<a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '">
138 138 
 															' . __(geodir_utf8_ucfirst($args->labels->name),'geodirectory') . '
139 139 
 														</a>
140 140 
 													</li>';
141 
-                            }
142 
-                        }
143 
-                    }
144 
-                }
145 
-                $geodir_add_location_url = NULL;
146 
-            }
141 
+							}
142 
+						}
143 
+					}
144 
+				}
145 
+				$geodir_add_location_url = NULL;
146 
+			}
147 147
148 
-            $items .= '	</ul> ';
149 
-            /**
150 
-             * Filter called after the sub menu closing ul tag for dynamic added menu items.
151 
-             *
152 
-             * @since 1.5.9
153 
-             */
154 
-            $items .= apply_filters('geodir_menu_after_sub_ul','');
155 
-            $items .= '</li>';
156 
-        }
157 
-    }
158 
-
159 
-    if (get_option('geodir_show_addlisting_nav')) {
160 
-
161 
-        $menu_class = '';
162 
-        if (geodir_is_page('add-listing'))
163 
-            $menu_class = 'current-menu-item';
164 
-
165 
-        //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION
166 
-        $post_types = geodir_get_posttypes('object');
167 
-        $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');
168 
-        $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
169 
-
170 
-        if (!empty($post_types)) {
171 
-            foreach ($post_types as $post_type => $args) {
172 
-                if (!empty($geodir_allow_posttype_frontend)) {
173 
-                    if (in_array($post_type, $geodir_allow_posttype_frontend)) {
174 
-                        if (!empty($show_add_listing_post_types_main_nav)) {
175 
-                            if (in_array($post_type, $show_add_listing_post_types_main_nav)) {
176 
-                                if (geodir_get_addlisting_link($post_type)) {
177 
-
178 
-                                    $menu_class = '';
179 
-                                    if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
180 
-                                        $menu_class = 'current-menu-item';
181 
-                                    /**
182 
-                                     * Filter the menu li class.
183 
-                                     *
184 
-                                     * @since 1.0.0
185 
-                                     * @param string $menu_class The menu HTML class.
186 
-                                     */
187 
-                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
188 
-                                    /**
189 
-                                     * Filter the menu a class.
190 
-                                     *
191 
-                                     * @since 1.0.0
192 
-                                     */
193 
-                                    $a_class = apply_filters('geodir_menu_a_class', '');
194 
-                                    $cpt_name = __($args->labels->singular_name, 'geodirectory');
195 
-                                    $items .= '<li class="' . $li_class . '">
148 
+			$items .= '	</ul> ';
149 
+			/**
150 
+			 * Filter called after the sub menu closing ul tag for dynamic added menu items.
151 
+			 *
152 
+			 * @since 1.5.9
153 
+			 */
154 
+			$items .= apply_filters('geodir_menu_after_sub_ul','');
155 
+			$items .= '</li>';
156 
+		}
157 
+	}
158 
+
159 
+	if (get_option('geodir_show_addlisting_nav')) {
160 
+
161 
+		$menu_class = '';
162 
+		if (geodir_is_page('add-listing'))
163 
+			$menu_class = 'current-menu-item';
164 
+
165 
+		//SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION
166 
+		$post_types = geodir_get_posttypes('object');
167 
+		$show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');
168 
+		$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');
169 
+
170 
+		if (!empty($post_types)) {
171 
+			foreach ($post_types as $post_type => $args) {
172 
+				if (!empty($geodir_allow_posttype_frontend)) {
173 
+					if (in_array($post_type, $geodir_allow_posttype_frontend)) {
174 
+						if (!empty($show_add_listing_post_types_main_nav)) {
175 
+							if (in_array($post_type, $show_add_listing_post_types_main_nav)) {
176 
+								if (geodir_get_addlisting_link($post_type)) {
177 
+
178 
+									$menu_class = '';
179 
+									if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
180 
+										$menu_class = 'current-menu-item';
181 
+									/**
182 
+									 * Filter the menu li class.
183 
+									 *
184 
+									 * @since 1.0.0
185 
+									 * @param string $menu_class The menu HTML class.
186 
+									 */
187 
+									$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
188 
+									/**
189 
+									 * Filter the menu a class.
190 
+									 *
191 
+									 * @since 1.0.0
192 
+									 */
193 
+									$a_class = apply_filters('geodir_menu_a_class', '');
194 
+									$cpt_name = __($args->labels->singular_name, 'geodirectory');
195 
+									$items .= '<li class="' . $li_class . '">
196 196 
 											<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '">
197 197 
 												' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
198 198 
 											</a>
199 199 
 										</li>';
200 
-                                }
201 
-                            }
202 
-                        }
203 
-                    }
204 
-                }
205 
-            }
206 
-        }
207 
-        //END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION
208 
-    }
209 
-
210 
-    $view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');
211 
-    $is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false;
212 
-    if ($is_add_listing_sub_meny_exists) {
213 
-
214 
-        if (get_option('geodir_show_addlisting_nav')) {
215 
-            /**
216 
-             * Filter the menu li class.
217 
-             *
218 
-             * @since 1.0.0
219 
-             * @param string $menu_class The menu HTML class.
220 
-             */
221 
-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);
222 
-            /**
223 
-             * Filter the sub menu li class.
224 
-             *
225 
-             * @since 1.0.0
226 
-             * @param string $menu_class The menu HTML class.
227 
-             */
228 
-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
229 
-            /**
230 
-             * Filter the sub menu ul class.
231 
-             *
232 
-             * @since 1.0.0
233 
-             */
234 
-            $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
235 
-            /**
236 
-             * Filter the menu a class.
237 
-             *
238 
-             * @since 1.0.0
239 
-             */
240 
-            $a_class = apply_filters('geodir_menu_a_class', '');
241 
-            /**
242 
-             * Filter the sub menu a class.
243 
-             *
244 
-             * @since 1.0.0
245 
-             */
246 
-            $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
247 
-            $items .= '<li  class="' . $li_class . '">
200 
+								}
201 
+							}
202 
+						}
203 
+					}
204 
+				}
205 
+			}
206 
+		}
207 
+		//END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION
208 
+	}
209 
+
210 
+	$view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');
211 
+	$is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false;
212 
+	if ($is_add_listing_sub_meny_exists) {
213 
+
214 
+		if (get_option('geodir_show_addlisting_nav')) {
215 
+			/**
216 
+			 * Filter the menu li class.
217 
+			 *
218 
+			 * @since 1.0.0
219 
+			 * @param string $menu_class The menu HTML class.
220 
+			 */
221 
+			$li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);
222 
+			/**
223 
+			 * Filter the sub menu li class.
224 
+			 *
225 
+			 * @since 1.0.0
226 
+			 * @param string $menu_class The menu HTML class.
227 
+			 */
228 
+			$sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);
229 
+			/**
230 
+			 * Filter the sub menu ul class.
231 
+			 *
232 
+			 * @since 1.0.0
233 
+			 */
234 
+			$sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');
235 
+			/**
236 
+			 * Filter the menu a class.
237 
+			 *
238 
+			 * @since 1.0.0
239 
+			 */
240 
+			$a_class = apply_filters('geodir_menu_a_class', '');
241 
+			/**
242 
+			 * Filter the sub menu a class.
243 
+			 *
244 
+			 * @since 1.0.0
245 
+			 */
246 
+			$sub_a_class = apply_filters('geodir_sub_menu_a_class', '');
247 
+			$items .= '<li  class="' . $li_class . '">
248 248 
 					<a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>
249 249 
 					<ul class="' . $sub_ul_class . '">';
250 250
251 
-            $post_types = geodir_get_posttypes('object');
252 
-
253 
-            $show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');
254 
-
255 
-            if (!empty($post_types)) {
256 
-                foreach ($post_types as $post_type => $args) {
257 
-                    if (!empty($geodir_allow_posttype_frontend)) {
258 
-                        if (in_array($post_type, $geodir_allow_posttype_frontend)) {
259 
-                            if (!empty($show_add_listing_post_types)) {
260 
-                                if (in_array($post_type, $show_add_listing_post_types)) {
261 
-                                    if (geodir_get_addlisting_link($post_type)) {
262 
-
263 
-                                        $menu_class = '';
264 
-                                        if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
265 
-                                            $menu_class = 'current-menu-item';
266 
-                                        /**
267 
-                                         * Filter the menu li class.
268 
-                                         *
269 
-                                         * @since 1.0.0
270 
-                                         * @param string $menu_class The menu HTML class.
271 
-                                         */
272 
-                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
273 
-                                        $cpt_name = __($args->labels->singular_name, 'geodirectory');
274 
-                                        $items .= '<li class="' . $sub_li_class . '">
251 
+			$post_types = geodir_get_posttypes('object');
252 
+
253 
+			$show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');
254 
+
255 
+			if (!empty($post_types)) {
256 
+				foreach ($post_types as $post_type => $args) {
257 
+					if (!empty($geodir_allow_posttype_frontend)) {
258 
+						if (in_array($post_type, $geodir_allow_posttype_frontend)) {
259 
+							if (!empty($show_add_listing_post_types)) {
260 
+								if (in_array($post_type, $show_add_listing_post_types)) {
261 
+									if (geodir_get_addlisting_link($post_type)) {
262 
+
263 
+										$menu_class = '';
264 
+										if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
265 
+											$menu_class = 'current-menu-item';
266 
+										/**
267 
+										 * Filter the menu li class.
268 
+										 *
269 
+										 * @since 1.0.0
270 
+										 * @param string $menu_class The menu HTML class.
271 
+										 */
272 
+										$li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);
273 
+										$cpt_name = __($args->labels->singular_name, 'geodirectory');
274 
+										$items .= '<li class="' . $sub_li_class . '">
275 275 
 														<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '">
276 276 
 															' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '
277 277 
 														</a>
278 278 
 													</li>';
279 
-                                    }
280 
-                                }
281 
-                            }
282 
-                        }
283 
-                    }
284 
-                }
285 
-            }
279 
+									}
280 
+								}
281 
+							}
282 
+						}
283 
+					}
284 
+				}
285 
+			}
286 286
287 
-            $items .= '	</ul> ';
288 
-            $items .= apply_filters('geodir_menu_after_sub_ul','');
289 
-            $items .= '</li>';
287 
+			$items .= '	</ul> ';
288 
+			$items .= apply_filters('geodir_menu_after_sub_ul','');
289 
+			$items .= '</li>';
290 290
291 
-        }
292 
-    }
293 
-    // apply filter to add more navigations // -Filter-Location-Manager
294 
-    return $items;
291 
+		}
292 
+	}
293 
+	// apply filter to add more navigations // -Filter-Location-Manager
294 
+	return $items;
295 295 
 }
296 296
297 297 
 

@@ -309,20 +309,20 @@  discard block
 
 block discarded – undo
309 309 
  */
310 310 
 function geodir_pagemenu_items($menu, $args)
311 311 
 {
312 
-    $locations = get_nav_menu_locations();
313 
-    $geodir_theme_location = get_option('geodir_theme_location_nav');
314 
-    $geodir_theme_location_nav = array();
315 
-    if (empty($locations) && empty($geodir_theme_location)) {
316 
-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
317 
-        $geodir_theme_location_nav[] = $args['theme_location'];
318 
-        update_option('geodir_theme_location_nav', $geodir_theme_location_nav);
319 
-    }
320 
-    //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.
312 
+	$locations = get_nav_menu_locations();
313 
+	$geodir_theme_location = get_option('geodir_theme_location_nav');
314 
+	$geodir_theme_location_nav = array();
315 
+	if (empty($locations) && empty($geodir_theme_location)) {
316 
+		$menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
317 
+		$geodir_theme_location_nav[] = $args['theme_location'];
318 
+		update_option('geodir_theme_location_nav', $geodir_theme_location_nav);
319 
+	}
320 
+	//else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.
321 321 
 //		$menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);
322 
-    else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))
323 
-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
322 
+	else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))
323 
+		$menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
324 324
325 
-    return $menu;
325 
+	return $menu;
326 326
327 327 
 }
328 328 
 

@@ -342,18 +342,18 @@  discard block
 
 block discarded – undo
342 342 
 function geodir_menu_items($items, $args)
343 343 
 {
344 344
345 
-    $location = $args->theme_location;
345 
+	$location = $args->theme_location;
346 346
347 
-    $geodir_theme_location = get_option('geodir_theme_location_nav');
347 
+	$geodir_theme_location = get_option('geodir_theme_location_nav');
348 348
349 
-    if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {
349 
+	if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {
350 350
351 
-        $items = $items . geodir_add_nav_menu_items();
352 
-        return $items;
351 
+		$items = $items . geodir_add_nav_menu_items();
352 
+		return $items;
353 353
354 
-    } else {
355 
-        return $items;
356 
-    }
354 
+	} else {
355 
+		return $items;
356 
+	}
357 357 
 }
358 358
359 359 
 /**

@@ -368,25 +368,25 @@  discard block
 
 block discarded – undo
368 368 
  */
369 369 
 function geodir_get_category_all_array()
370 370 
 {
371 
-    global $wpdb;
372 
-    $return_array = array();
373 
-
374 
-    $taxonomies = geodir_get_taxonomies();
375 
-    $taxonomies = implode("','", $taxonomies);
376 
-    $taxonomies = "'" . $taxonomies . "'";
377 
-
378 
-    $pn_categories = $wpdb->get_results(
379 
-        $wpdb->prepare(
380 
-            "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",
381 
-            array($wpdb->terms . term_id)
382 
-        )
383 
-    );
384 
-
385 
-    foreach ($pn_categories as $pn_categories_obj) {
386 
-        $return_array[] = array("id" => $pn_categories_obj->cat_ID,
387 
-            "title" => $pn_categories_obj->name,);
388 
-    }
389 
-    return $return_array;
371 
+	global $wpdb;
372 
+	$return_array = array();
373 
+
374 
+	$taxonomies = geodir_get_taxonomies();
375 
+	$taxonomies = implode("','", $taxonomies);
376 
+	$taxonomies = "'" . $taxonomies . "'";
377 
+
378 
+	$pn_categories = $wpdb->get_results(
379 
+		$wpdb->prepare(
380 
+			"SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",
381 
+			array($wpdb->terms . term_id)
382 
+		)
383 
+	);
384 
+
385 
+	foreach ($pn_categories as $pn_categories_obj) {
386 
+		$return_array[] = array("id" => $pn_categories_obj->cat_ID,
387 
+			"title" => $pn_categories_obj->name,);
388 
+	}
389 
+	return $return_array;
390 390 
 }
391 391
392 392 
 

@@ -402,49 +402,49 @@  discard block
 
 block discarded – undo
402 402 
  * @return string The post type.
403 403 
  */
404 404 
 function geodir_get_current_posttype() {
405 
-    global $wp_query, $post, $geodir_post_type;
405 
+	global $wp_query, $post, $geodir_post_type;
406 406
407 
-    $geodir_post_type = get_query_var('post_type');
407 
+	$geodir_post_type = get_query_var('post_type');
408 408
409 
-    if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
410 
-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
411 
-            $geodir_post_type = get_post_type((int)$_REQUEST['pid']);
412 
-        elseif (isset($_REQUEST['listing_type']))
413 
-            $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);
414 
-    }
409 
+	if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
410 
+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
411 
+			$geodir_post_type = get_post_type((int)$_REQUEST['pid']);
412 
+		elseif (isset($_REQUEST['listing_type']))
413 
+			$geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);
414 
+	}
415 415
416 
-    if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
417 
-        $geodir_post_type = sanitize_text_field($_REQUEST['stype']);
416 
+	if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
417 
+		$geodir_post_type = sanitize_text_field($_REQUEST['stype']);
418 418
419 
-    if (is_tax())
420 
-        $geodir_post_type = geodir_get_taxonomy_posttype();
419 
+	if (is_tax())
420 
+		$geodir_post_type = geodir_get_taxonomy_posttype();
421 421
422 
-    // Retrive post type for map marker html ajax request on preview page.
423 
-    if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {
424 
-        if (!empty($post->post_type)) {
425 
-            $geodir_post_type = $post->post_type;
426 
-        } else if (!empty($post->listing_type)) {
427 
-            $geodir_post_type = $post->listing_type;
428 
-        }
429 
-    }
422 
+	// Retrive post type for map marker html ajax request on preview page.
423 
+	if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {
424 
+		if (!empty($post->post_type)) {
425 
+			$geodir_post_type = $post->post_type;
426 
+		} else if (!empty($post->listing_type)) {
427 
+			$geodir_post_type = $post->listing_type;
428 
+		}
429 
+	}
430 430
431 
-    $all_postypes = geodir_get_posttypes();
432 
-    $all_postypes = stripslashes_deep($all_postypes);
431 
+	$all_postypes = geodir_get_posttypes();
432 
+	$all_postypes = stripslashes_deep($all_postypes);
433 433
434 
-    if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))
435 
-        $geodir_post_type = '';
434 
+	if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))
435 
+		$geodir_post_type = '';
436 436
437 
-    if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
438 
-        $geodir_post_type = sanitize_text_field($_REQUEST['stype']);
439 
-    }
437 
+	if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
438 
+		$geodir_post_type = sanitize_text_field($_REQUEST['stype']);
439 
+	}
440 440
441 441
442 
-    /**
443 
-     * Filter the default CPT return.
444 
-     *
445 
-     * @since 1.6.9
446 
-     */
447 
-    return apply_filters('geodir_get_current_posttype',$geodir_post_type);
442 
+	/**
443 
+	 * Filter the default CPT return.
444 
+	 *
445 
+	 * @since 1.6.9
446 
+	 */
447 
+	return apply_filters('geodir_get_current_posttype',$geodir_post_type);
448 448 
 }
449 449
450 450 
 /**

@@ -458,22 +458,22 @@  discard block
 
 block discarded – undo
458 458 
  */
459 459 
 function geodir_get_default_posttype()
460 460 
 {
461 
-    $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );
462 
-
463 
-    $stype = false;
464 
-    foreach ( $post_types as $post_type => $info ) {
465 
-        global $wpdb;
466 
-        $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );
467 
-        if ( $has_posts ) {
468 
-            $stype = $post_type; break;
469 
-        }
470 
-    }
471 
-
472 
-    if(!$stype){
473 
-        $stype = 'gd_place';
474 
-    }
475 
-
476 
-    return $stype;
461 
+	$post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );
462 
+
463 
+	$stype = false;
464 
+	foreach ( $post_types as $post_type => $info ) {
465 
+		global $wpdb;
466 
+		$has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );
467 
+		if ( $has_posts ) {
468 
+			$stype = $post_type; break;
469 
+		}
470 
+	}
471 
+
472 
+	if(!$stype){
473 
+		$stype = 'gd_place';
474 
+	}
475 
+
476 
+	return $stype;
477 477 
 }
478 478
479 479 
 /**

@@ -487,21 +487,21 @@  discard block
 
 block discarded – undo
487 487 
  */
488 488 
 function geodir_get_posttypes($output = 'names')
489 489 
 {
490 
-    $post_types = array();
491 
-    $post_types = get_option('geodir_post_types');
492 
-    $post_types = stripslashes_deep($post_types);
493 
-    if (!empty($post_types)) {
494 
-        switch ($output):
495 
-            case 'object':
496 
-            case 'Object':
497 
-                $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types;
498 
-                break;
499 
-            case 'array':
500 
-            case 'Array':
501 
-                $post_types = (array)$post_types;
502 
-                break;
490 
+	$post_types = array();
491 
+	$post_types = get_option('geodir_post_types');
492 
+	$post_types = stripslashes_deep($post_types);
493 
+	if (!empty($post_types)) {
494 
+		switch ($output):
495 
+			case 'object':
496 
+			case 'Object':
497 
+				$post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types;
498 
+				break;
499 
+			case 'array':
500 
+			case 'Array':
501 
+				$post_types = (array)$post_types;
502 
+				break;
503 503 
 			case 'options':
504 
-                $post_types = (array)$post_types;
504 
+				$post_types = (array)$post_types;
505 505
506 506 
 				$options = array();
507 507 
 				if (!empty($post_types)) {

@@ -510,17 +510,17 @@  discard block
 
 block discarded – undo
510 510 
 					}
511 511 
 				}
512 512 
 				$post_types = $options;
513 
-                break;
514 
-            default:
515 
-                $post_types = array_keys($post_types);
516 
-                break;
517 
-        endswitch;
518 
-    }
519 
-
520 
-    if (!empty($post_types))
521 
-        return $post_types;
522 
-    else
523 
-        return array();
513 
+				break;
514 
+			default:
515 
+				$post_types = array_keys($post_types);
516 
+				break;
517 
+		endswitch;
518 
+	}
519 
+
520 
+	if (!empty($post_types))
521 
+		return $post_types;
522 
+	else
523 
+		return array();
524 524 
 }
525 525
526 526 
 /**

@@ -533,108 +533,108 @@  discard block
 
 block discarded – undo
533 533 
  */
534 534 
 function geodir_get_posttype_info($post_type = '')
535 535 
 {
536 
-    $post_types = array();
537 
-    $post_types = get_option('geodir_post_types');
538 
-    $post_types = stripslashes_deep($post_types);
539 
-    if (!empty($post_types) && $post_type != '') {
540 
-        return $post_types[$post_type];
541 
-    } else
542 
-        return false;
536 
+	$post_types = array();
537 
+	$post_types = get_option('geodir_post_types');
538 
+	$post_types = stripslashes_deep($post_types);
539 
+	if (!empty($post_types) && $post_type != '') {
540 
+		return $post_types[$post_type];
541 
+	} else
542 
+		return false;
543 543 
 }
544 544
545 545 
 if (!function_exists('geodir_get_taxonomies')) {
546 
-    /**
547 
-     * Get all custom taxonomies.
548 
-     *
549 
-     * @since 1.0.0
550 
-     * @package GeoDirectory
551 
-     * @param string $post_type The post type.
552 
-     * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.
553 
-     * @return array|bool Taxonomies on success. false on failure.
554 
-     */
555 
-    function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false)
556 
-    {
546 
+	/**
547 
+	 * Get all custom taxonomies.
548 
+	 *
549 
+	 * @since 1.0.0
550 
+	 * @package GeoDirectory
551 
+	 * @param string $post_type The post type.
552 
+	 * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.
553 
+	 * @return array|bool Taxonomies on success. false on failure.
554 
+	 */
555 
+	function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false)
556 
+	{
557 557
558 
-        $taxonomies = array();
559 
-        $gd_taxonomies = array();
558 
+		$taxonomies = array();
559 
+		$gd_taxonomies = array();
560 560
561 
-        if ($taxonomies = get_option('geodir_taxonomies')) {
561 
+		if ($taxonomies = get_option('geodir_taxonomies')) {
562 562
563 563
564 
-            $gd_taxonomies = array_keys($taxonomies);
564 
+			$gd_taxonomies = array_keys($taxonomies);
565 565
566 566
567 
-            if ($post_type != '')
568 
-                $gd_taxonomies = array();
567 
+			if ($post_type != '')
568 
+				$gd_taxonomies = array();
569 569
570 
-            $i = 0;
571 
-            foreach ($taxonomies as $taxonomy => $args) {
570 
+			$i = 0;
571 
+			foreach ($taxonomies as $taxonomy => $args) {
572 572
573 
-                if ($post_type != '' && $args['object_type'] == $post_type)
574 
-                    $gd_taxonomies[] = $taxonomy;
573 
+				if ($post_type != '' && $args['object_type'] == $post_type)
574 
+					$gd_taxonomies[] = $taxonomy;
575 575
576 
-                if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {
577 
-                    if (array_search($taxonomy, $gd_taxonomies) !== false)
578 
-                        unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);
579 
-                }
576 
+				if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {
577 
+					if (array_search($taxonomy, $gd_taxonomies) !== false)
578 
+						unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);
579 
+				}
580 580
581 
-            }
581 
+			}
582 582
583 
-            $gd_taxonomies = array_values($gd_taxonomies);
584 
-        }
585 
-
586 
-        /**
587 
-         * Filter the taxonomies.
588 
-         *
589 
-         * @since 1.0.0
590 
-         * @param array $gd_taxonomies The taxonomy array.
591 
-         */
592 
-        $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);
593 
-
594 
-        if (!empty($taxonomies)) {
595 
-            return $taxonomies;
596 
-        } else {
597 
-            return false;
598 
-        }
599 
-    }
583 
+			$gd_taxonomies = array_values($gd_taxonomies);
584 
+		}
585 
+
586 
+		/**
587 
+		 * Filter the taxonomies.
588 
+		 *
589 
+		 * @since 1.0.0
590 
+		 * @param array $gd_taxonomies The taxonomy array.
591 
+		 */
592 
+		$taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);
593 
+
594 
+		if (!empty($taxonomies)) {
595 
+			return $taxonomies;
596 
+		} else {
597 
+			return false;
598 
+		}
599 
+	}
600 600 
 }
601 601
602 602 
 if (!function_exists(' geodir_get_categories_dl')) {
603 
-    /**
604 
-     * Get categories dropdown HTML.
605 
-     *
606 
-     * @since 1.0.0
607 
-     * @package GeoDirectory
608 
-     * @param string $post_type The post type.
609 
-     * @param string $selected The selected value.
610 
-     * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.
611 
-     * @param bool $echo Prints the HTML when set to true. Default: true.
612 
-     * @return void|string Dropdown HTML.
613 
-     */
614 
-    function  geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true)
615 
-    {
616 
-
617 
-        $html = '';
618 
-        $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies);
619 
-
620 
-        $categories = get_terms($taxonomies);
621 
-
622 
-        $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
623 
-
624 
-        foreach ($categories as $category_obj) {
625 
-            $select_opt = '';
626 
-            if ($selected == $category_obj->term_id) {
627 
-                $select_opt = 'selected="selected"';
628 
-            }
629 
-            $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'
630 
-                . geodir_utf8_ucfirst($category_obj->name) . '</option>';
631 
-        }
632 
-
633 
-        if ($echo)
634 
-            echo $html;
635 
-        else
636 
-            return $html;
637 
-    }
603 
+	/**
604 
+	 * Get categories dropdown HTML.
605 
+	 *
606 
+	 * @since 1.0.0
607 
+	 * @package GeoDirectory
608 
+	 * @param string $post_type The post type.
609 
+	 * @param string $selected The selected value.
610 
+	 * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.
611 
+	 * @param bool $echo Prints the HTML when set to true. Default: true.
612 
+	 * @return void|string Dropdown HTML.
613 
+	 */
614 
+	function  geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true)
615 
+	{
616 
+
617 
+		$html = '';
618 
+		$taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies);
619 
+
620 
+		$categories = get_terms($taxonomies);
621 
+
622 
+		$html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';
623 
+
624 
+		foreach ($categories as $category_obj) {
625 
+			$select_opt = '';
626 
+			if ($selected == $category_obj->term_id) {
627 
+				$select_opt = 'selected="selected"';
628 
+			}
629 
+			$html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'
630 
+				. geodir_utf8_ucfirst($category_obj->name) . '</option>';
631 
+		}
632 
+
633 
+		if ($echo)
634 
+			echo $html;
635 
+		else
636 
+			return $html;
637 
+	}
638 638 
 }
639 639
640 640 
 

@@ -649,28 +649,28 @@  discard block
 
 block discarded – undo
649 649 
 function geodir_get_listing_slug($object_type = '')
650 650 
 {
651 651
652 
-    $listing_slug = '';
652 
+	$listing_slug = '';
653 653
654 
-    $post_types = get_option('geodir_post_types');
655 
-    $taxonomies = get_option('geodir_taxonomies');
654 
+	$post_types = get_option('geodir_post_types');
655 
+	$taxonomies = get_option('geodir_taxonomies');
656 656
657 657
658 
-    if ($object_type != '') {
659 
-        if (!empty($post_types) && array_key_exists($object_type, $post_types)) {
658 
+	if ($object_type != '') {
659 
+		if (!empty($post_types) && array_key_exists($object_type, $post_types)) {
660 660
661 
-            $object_info = $post_types[$object_type];
662 
-            $listing_slug = $object_info['listing_slug'];
663 
-        } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {
664 
-            $object_info = $taxonomies[$object_type];
665 
-            $listing_slug = $object_info['listing_slug'];
666 
-        }
661 
+			$object_info = $post_types[$object_type];
662 
+			$listing_slug = $object_info['listing_slug'];
663 
+		} elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {
664 
+			$object_info = $taxonomies[$object_type];
665 
+			$listing_slug = $object_info['listing_slug'];
666 
+		}
667 667
668 
-    }
668 
+	}
669 669
670 
-    if (!empty($listing_slug))
671 
-        return $listing_slug;
672 
-    else
673 
-        return false;
670 
+	if (!empty($listing_slug))
671 
+		return $listing_slug;
672 
+	else
673 
+		return false;
674 674 
 }
675 675
676 676 
 

@@ -685,212 +685,212 @@  discard block
 
 block discarded – undo
685 685 
  */
686 686 
 function geodir_get_taxonomy_posttype($taxonomy = '')
687 687 
 {
688 
-    global $wp_query;
689 
-
690 
-    $post_type = array();
691 
-    $taxonomies = array();
692 
-
693 
-    if (!empty($taxonomy)) {
694 
-        $taxonomies[] = $taxonomy;
695 
-    } elseif (isset($wp_query->tax_query->queries)) {
696 
-        $tax_arr = $wp_query->tax_query->queries;
697 
-        //if tax query has 'relation' set then it will break wp_list_pluck so we remove it
698 
-        if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
699 
-        $taxonomies = wp_list_pluck($tax_arr, 'taxonomy');
700 
-    }
701 
-
702 
-    if (!empty($taxonomies)) {
703 
-        foreach (geodir_get_posttypes() as $pt) {
704 
-            $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);
705 
-            if (array_intersect($taxonomies, $object_taxonomies))
706 
-                $post_type[] = $pt;
707 
-        }
708 
-    }
709 
-
710 
-    if (!empty($post_type))
711 
-        return $post_type[0];
712 
-    else
713 
-        return false;
688 
+	global $wp_query;
689 
+
690 
+	$post_type = array();
691 
+	$taxonomies = array();
692 
+
693 
+	if (!empty($taxonomy)) {
694 
+		$taxonomies[] = $taxonomy;
695 
+	} elseif (isset($wp_query->tax_query->queries)) {
696 
+		$tax_arr = $wp_query->tax_query->queries;
697 
+		//if tax query has 'relation' set then it will break wp_list_pluck so we remove it
698 
+		if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}
699 
+		$taxonomies = wp_list_pluck($tax_arr, 'taxonomy');
700 
+	}
701 
+
702 
+	if (!empty($taxonomies)) {
703 
+		foreach (geodir_get_posttypes() as $pt) {
704 
+			$object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);
705 
+			if (array_intersect($taxonomies, $object_taxonomies))
706 
+				$post_type[] = $pt;
707 
+		}
708 
+	}
709 
+
710 
+	if (!empty($post_type))
711 
+		return $post_type[0];
712 
+	else
713 
+		return false;
714 714 
 }
715 715
716 716 
 if (!function_exists('geodir_custom_taxonomy_walker')) {
717 
-    /**
718 
-     * Custom taxonomy walker function.
719 
-     *
720 
-     * @since 1.0.0
721 
-     * @package GeoDirectory
722 
-     * @param string $cat_taxonomy The taxonomy name.
723 
-     * @param int $cat_parent The parent term ID.
724 
-     * @param bool $hide_empty Hide empty taxonomies? Default: false.
725 
-     * @param int $pading CSS padding in pixels.
726 
-     * @return string|void taxonomy HTML.
727 
-     */
728 
-    function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0)
729 
-    {
730 
-        global $cat_display, $post_cat, $exclude_cats;
731 
-
732 
-        $search_terms = trim($post_cat, ",");
733 
-
734 
-        $search_terms = explode(",", $search_terms);
735 
-
736 
-        $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));
737 
-
738 
-        $display = '';
739 
-        $onchange = '';
740 
-        $term_check = '';
741 
-        $main_list_class = '';
742 
-        $out = '';
743 
-        //If there are terms, start displaying
744 
-        if (count($cat_terms) > 0) {
745 
-            //Displaying as a list
746 
-            $p = $pading * 20;
747 
-            $pading++;
748 
-
749 
-
750 
-            if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
751 
-                if ($cat_parent == 0) {
752 
-                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;
753 
-                    $main_list_class = 'class="main_list_selecter"';
754 
-                } else {
755 
-                    //$display = 'display:none';
756 
-                    $list_class = 'sub_list gd-sub-cats-list';
757 
-                }
758 
-            }
717 
+	/**
718 
+	 * Custom taxonomy walker function.
719 
+	 *
720 
+	 * @since 1.0.0
721 
+	 * @package GeoDirectory
722 
+	 * @param string $cat_taxonomy The taxonomy name.
723 
+	 * @param int $cat_parent The parent term ID.
724 
+	 * @param bool $hide_empty Hide empty taxonomies? Default: false.
725 
+	 * @param int $pading CSS padding in pixels.
726 
+	 * @return string|void taxonomy HTML.
727 
+	 */
728 
+	function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0)
729 
+	{
730 
+		global $cat_display, $post_cat, $exclude_cats;
731 
+
732 
+		$search_terms = trim($post_cat, ",");
733 
+
734 
+		$search_terms = explode(",", $search_terms);
735 
+
736 
+		$cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));
737 
+
738 
+		$display = '';
739 
+		$onchange = '';
740 
+		$term_check = '';
741 
+		$main_list_class = '';
742 
+		$out = '';
743 
+		//If there are terms, start displaying
744 
+		if (count($cat_terms) > 0) {
745 
+			//Displaying as a list
746 
+			$p = $pading * 20;
747 
+			$pading++;
748 
+
749 
+
750 
+			if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {
751 
+				if ($cat_parent == 0) {
752 
+					$list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;
753 
+					$main_list_class = 'class="main_list_selecter"';
754 
+				} else {
755 
+					//$display = 'display:none';
756 
+					$list_class = 'sub_list gd-sub-cats-list';
757 
+				}
758 
+			}
759 759
760 
-            if ($cat_display == 'checkbox' || $cat_display == 'radio') {
761 
-                $p = 0;
762 
-                $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';
763 
-            }
760 
+			if ($cat_display == 'checkbox' || $cat_display == 'radio') {
761 
+				$p = 0;
762 
+				$out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';
763 
+			}
764 764
765 
-            foreach ($cat_terms as $cat_term) {
765 
+			foreach ($cat_terms as $cat_term) {
766 766
767 
-                $checked = '';
767 
+				$checked = '';
768 768
769 
-                if (in_array($cat_term->term_id, $search_terms)) {
770 
-                    if ($cat_display == 'select' || $cat_display == 'multiselect')
771 
-                        $checked = 'selected="selected"';
772 
-                    else
773 
-                        $checked = 'checked="checked"';
774 
-                }
769 
+				if (in_array($cat_term->term_id, $search_terms)) {
770 
+					if ($cat_display == 'select' || $cat_display == 'multiselect')
771 
+						$checked = 'selected="selected"';
772 
+					else
773 
+						$checked = 'checked="checked"';
774 
+				}
775 775
776 
-                if ($cat_display == 'radio')
777 
-                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';
778 
-                elseif ($cat_display == 'select' || $cat_display == 'multiselect')
779 
-                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>';
776 
+				if ($cat_display == 'radio')
777 
+					$out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';
778 
+				elseif ($cat_display == 'select' || $cat_display == 'multiselect')
779 
+					$out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>';
780 780
781 
-                else {
782 
-                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';
783 
-                }
781 
+				else {
782 
+					$out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';
783 
+				}
784 784
785 
-                // Call recurson to print sub cats
786 
-                $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading);
785 
+				// Call recurson to print sub cats
786 
+				$out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading);
787 787
788 
-            }
788 
+			}
789 789
790 
-            if ($cat_display == 'checkbox' || $cat_display == 'radio')
791 
-                $out .= '</div>';
790 
+			if ($cat_display == 'checkbox' || $cat_display == 'radio')
791 
+				$out .= '</div>';
792 792
793 
-            return $out;
794 
-        }
795 
-        return;
796 
-    }
793 
+			return $out;
794 
+		}
795 
+		return;
796 
+	}
797 797 
 }
798 798
799 799 
 if (!function_exists('geodir_custom_taxonomy_walker2')) {
800 
-    /**
801 
-     * Custom taxonomy walker function.
802 
-     *
803 
-     * @since 1.0.0
804 
-     * @package GeoDirectory
805 
-     * @global object $post WordPress Post object.
806 
-     * @global object $gd_session GeoDirectory Session object.
807 
-     * @param string $cat_taxonomy The taxonomy name.
808 
-     * @param string $cat_limit Number of categories to display.
809 
-     */
810 
-    function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '')
811 
-    {
812 
-        $post_category = '';
813 
-        $post_category_str = '';
814 
-        global $exclude_cats, $gd_session;
815 
-
816 
-        $cat_exclude = '';
817 
-        if (is_array($exclude_cats) && !empty($exclude_cats))
818 
-            $cat_exclude = serialize($exclude_cats);
819 
-
820 
-        if (isset($_REQUEST['backandedit'])) {
821 
-            $post = (object)$gd_session->get('listing');
822 
-
823 
-            if (!is_array($post->post_category[$cat_taxonomy]))
824 
-                $post_category = $post->post_category[$cat_taxonomy];
825 
-
826 
-            $post_categories = $post->post_category_str;
827 
-            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories))
828 
-                $post_category_str = $post_categories[$cat_taxonomy];
829 
-
830 
-        } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
831 
-            global $post;
832 
-
833 
-            $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true);
834 
-            if (empty($post_category) && isset($post->{$cat_taxonomy})) {
835 
-                $post_category = $post->{$cat_taxonomy};
836 
-            }
800 
+	/**
801 
+	 * Custom taxonomy walker function.
802 
+	 *
803 
+	 * @since 1.0.0
804 
+	 * @package GeoDirectory
805 
+	 * @global object $post WordPress Post object.
806 
+	 * @global object $gd_session GeoDirectory Session object.
807 
+	 * @param string $cat_taxonomy The taxonomy name.
808 
+	 * @param string $cat_limit Number of categories to display.
809 
+	 */
810 
+	function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '')
811 
+	{
812 
+		$post_category = '';
813 
+		$post_category_str = '';
814 
+		global $exclude_cats, $gd_session;
815 
+
816 
+		$cat_exclude = '';
817 
+		if (is_array($exclude_cats) && !empty($exclude_cats))
818 
+			$cat_exclude = serialize($exclude_cats);
819 
+
820 
+		if (isset($_REQUEST['backandedit'])) {
821 
+			$post = (object)$gd_session->get('listing');
822 
+
823 
+			if (!is_array($post->post_category[$cat_taxonomy]))
824 
+				$post_category = $post->post_category[$cat_taxonomy];
825 
+
826 
+			$post_categories = $post->post_category_str;
827 
+			if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories))
828 
+				$post_category_str = $post_categories[$cat_taxonomy];
829 
+
830 
+		} elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
831 
+			global $post;
832 
+
833 
+			$post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true);
834 
+			if (empty($post_category) && isset($post->{$cat_taxonomy})) {
835 
+				$post_category = $post->{$cat_taxonomy};
836 
+			}
837 837
838 
-            $post_categories = get_post_meta($post->ID, 'post_categories', true);
838 
+			$post_categories = get_post_meta($post->ID, 'post_categories', true);
839 839
840 
-            if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {
841 
-                foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {
842 
-                    if (is_numeric($cat_part)) {
843 
-                        $cat_part_arr[] = $cat_part;
844 
-                    }
845 
-                }
846 
-                if (is_array($cat_part_arr)) {
847 
-                    $post_category = implode(',', $cat_part_arr);
848 
-                }
849 
-            }
840 
+			if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {
841 
+				foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {
842 
+					if (is_numeric($cat_part)) {
843 
+						$cat_part_arr[] = $cat_part;
844 
+					}
845 
+				}
846 
+				if (is_array($cat_part_arr)) {
847 
+					$post_category = implode(',', $cat_part_arr);
848 
+				}
849 
+			}
850 850
851 
-            if (!empty($post_category)) {
852 
-                $cat1 = array_filter(explode(',', $post_category));
853 
-                $post_category = ',' . implode(',', $cat1) . ',';
851 
+			if (!empty($post_category)) {
852 
+				$cat1 = array_filter(explode(',', $post_category));
853 
+				$post_category = ',' . implode(',', $cat1) . ',';
854 854
855 
-            }
855 
+			}
856 856
857 
-            if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {
857 
+			if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {
858 858
859 
-                $post_category_upd = explode(',', $post_category);
860 
-                $post_category_change = '';
861 
-                foreach ($post_category_upd as $cat) {
859 
+				$post_category_upd = explode(',', $post_category);
860 
+				$post_category_change = '';
861 
+				foreach ($post_category_upd as $cat) {
862 862
863 
-                    if (!in_array($cat, $exclude_cats) && $cat != '') {
864 
-                        $post_category_change .= ',' . $cat;
865 
-                    }
866 
-                }
867 
-                $post_category = $post_category_change;
868 
-            }
863 
+					if (!in_array($cat, $exclude_cats) && $cat != '') {
864 
+						$post_category_change .= ',' . $cat;
865 
+					}
866 
+				}
867 
+				$post_category = $post_category_change;
868 
+			}
869 869
870 870
871 
-            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
872 
-                $post_category_str = $post_categories[$cat_taxonomy];
873 
-            }
874 
-        }
871 
+			if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
872 
+				$post_category_str = $post_categories[$cat_taxonomy];
873 
+			}
874 
+		}
875 875
876 
-        echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';
876 
+		echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';
877 877
878 
-        echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';
878 
+		echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';
879 879
880 
-        echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';
880 
+		echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';
881 881
882 882
883 
-        ?>
883 
+		?>
884 884 
         <div class="cat_sublist">
885 885 
             <?php
886 886
887 
-            $post_id = isset($post->ID) ? $post->ID : '';
887 
+			$post_id = isset($post->ID) ? $post->ID : '';
888 888
889 
-            if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {
889 
+			if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {
890 890
891 
-                geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories);
892 
-            }
893 
-            ?>
891 
+				geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories);
892 
+			}
893 
+			?>
894 894 
         </div>
895 895 
         <script type="text/javascript">
896 896 
 

@@ -1013,22 +1013,22 @@  discard block
 
 block discarded – undo
1013 1013
1014 1014 
         </script>
1015 1015 
         <?php
1016 
-        if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
1017 
-            $post_cat_str = $post_categories[$cat_taxonomy];
1018 
-            $post_cat_array = explode("#", $post_cat_str);
1019 
-            if (count($post_cat_array) >= $cat_limit && $cat_limit != 0)
1020 
-                $style = "display:none;";
1021 
-        }
1022 
-        ?>
1016 
+		if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
1017 
+			$post_cat_str = $post_categories[$cat_taxonomy];
1018 
+			$post_cat_array = explode("#", $post_cat_str);
1019 
+			if (count($post_cat_array) >= $cat_limit && $cat_limit != 0)
1020 
+				$style = "display:none;";
1021 
+		}
1022 
+		?>
1023 1023 
         <div class="main_cat_list" style=" <?php if (isset($style)) {
1024 
-            echo $style;
1025 
-        }?> ">
1024 
+			echo $style;
1025 
+		}?> ">
1026 1026 
             <?php geodir_get_catlist($cat_taxonomy, 0);  // print main categories list
1027 
-            ?>
1027 
+			?>
1028 1028 
         </div>
1029 1029 
     <?php
1030 1030
1031 
-    }
1031 
+	}
1032 1032 
 }
1033 1033
1034 1034 
 /**

@@ -1045,23 +1045,23 @@  discard block
 
 block discarded – undo
1045 1045 
  */
1046 1046 
 function geodir_addpost_categories_html($request_taxonomy, $parrent, $selected = false, $main_selected = true, $default = false, $exclude = '')
1047 1047 
 {
1048 
-    global $exclude_cats;
1048 
+	global $exclude_cats;
1049 1049
1050 
-    if ($exclude != '') {
1051 
-        $exclude_cats = maybe_unserialize(base64_decode($exclude));
1050 
+	if ($exclude != '') {
1051 
+		$exclude_cats = maybe_unserialize(base64_decode($exclude));
1052 1052
1053 
-        if(is_array( $exclude_cats)){
1054 
-            $exclude_cats = array_map( 'intval', $exclude_cats );
1055 
-        }else{
1056 
-            $exclude_cats = intval($exclude_cats);
1057 
-        }
1053 
+		if(is_array( $exclude_cats)){
1054 
+			$exclude_cats = array_map( 'intval', $exclude_cats );
1055 
+		}else{
1056 
+			$exclude_cats = intval($exclude_cats);
1057 
+		}
1058 1058
1059 
-    }
1059 
+	}
1060 1060
1061 
-    if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) ||
1062 
-        (!is_array($exclude_cats) || empty($exclude_cats))
1063 
-    ) {
1064 
-        ?>
1061 
+	if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) ||
1062 
+		(!is_array($exclude_cats) || empty($exclude_cats))
1063 
+	) {
1064 
+		?>
1065 1065
1066 1066 
         <?php $main_cat = get_term($parrent, $request_taxonomy); ?>
1067 1067 
 

@@ -1090,8 +1090,8 @@  discard block
 
 block discarded – undo
1090 1090
1091 1091 
             <br/>
1092 1092 
             <?php
1093 
-            $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));
1094 
-            if (!empty($cat_terms)) { ?>
1093 
+			$cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));
1094 
+			if (!empty($cat_terms)) { ?>
1095 1095 
                 <span> <?php printf(__('Add listing in category', 'geodirectory')); ?></span>
1096 1096 
                 <?php geodir_get_catlist($request_taxonomy, $parrent, $selected) ?>
1097 1097 
             <?php } ?>

@@ -1113,53 +1113,53 @@  discard block
 
 block discarded – undo
1113 1113 
 function geodir_editpost_categories_html($request_taxonomy, $request_postid, $post_categories)
1114 1114 
 {
1115 1115
1116 
-    if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {
1117 
-        $post_cat_str = $post_categories[$request_taxonomy];
1118 
-        $post_cat_array = explode("#", $post_cat_str);
1119 
-        if (is_array($post_cat_array)) {
1120 
-            $post_cat_array = array_unique( $post_cat_array );
1116 
+	if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {
1117 
+		$post_cat_str = $post_categories[$request_taxonomy];
1118 
+		$post_cat_array = explode("#", $post_cat_str);
1119 
+		if (is_array($post_cat_array)) {
1120 
+			$post_cat_array = array_unique( $post_cat_array );
1121 1121
1122 1122 
 			foreach ($post_cat_array as $post_cat_html) {
1123 1123
1124 
-                $post_cat_info = explode(":", $post_cat_html);
1125 
-                $post_maincat_str = $post_cat_info[0];
1124 
+				$post_cat_info = explode(":", $post_cat_html);
1125 
+				$post_maincat_str = $post_cat_info[0];
1126 1126
1127 
-                if (!empty($post_maincat_str)) {
1128 
-                    $post_maincat_info = explode(",", $post_maincat_str);
1129 
-                    $post_maincat_id = $post_maincat_info[0];
1130 
-                    ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;
1131 
-                    (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;
1132 
-                }
1133 
-                $post_sub_catid = '';
1134 
-                if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
1135 
-                    $post_sub_catid = (int)$post_cat_info[1];
1136 
-                }
1127 
+				if (!empty($post_maincat_str)) {
1128 
+					$post_maincat_info = explode(",", $post_maincat_str);
1129 
+					$post_maincat_id = $post_maincat_info[0];
1130 
+					($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;
1131 
+					(end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;
1132 
+				}
1133 
+				$post_sub_catid = '';
1134 
+				if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
1135 
+					$post_sub_catid = (int)$post_cat_info[1];
1136 
+				}
1137 1137
1138 
-                geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);
1138 
+				geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);
1139 1139
1140 
-            }
1141 
-        } else {
1140 
+			}
1141 
+		} else {
1142 1142
1143 
-            $post_cat_info = explode(":", $post_cat_str);
1144 
-            $post_maincat_str = $post_cat_info[0];
1143 
+			$post_cat_info = explode(":", $post_cat_str);
1144 
+			$post_maincat_str = $post_cat_info[0];
1145 1145
1146 
-            $post_sub_catid = '';
1146 
+			$post_sub_catid = '';
1147 1147
1148 
-            if (!empty($post_maincat_str)) {
1149 
-                $post_maincat_info = explode(",", $post_maincat_str);
1150 
-                $post_maincat_id = $post_maincat_info[0];
1151 
-                ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;
1152 
-                (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;
1153 
-            }
1148 
+			if (!empty($post_maincat_str)) {
1149 
+				$post_maincat_info = explode(",", $post_maincat_str);
1150 
+				$post_maincat_id = $post_maincat_info[0];
1151 
+				($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;
1152 
+				(end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;
1153 
+			}
1154 1154
1155 
-            if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
1156 
-                $post_sub_catid = (int)$post_cat_info[1];
1157 
-            }
1155 
+			if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {
1156 
+				$post_sub_catid = (int)$post_cat_info[1];
1157 
+			}
1158 1158
1159 
-            geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);
1159 
+			geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);
1160 1160
1161 
-        }
1162 
-    }
1161 
+		}
1162 
+	}
1163 1163 
 }
1164 1164
1165 1165 
 /**

@@ -1173,35 +1173,35 @@  discard block
 
 block discarded – undo
1173 1173 
  */
1174 1174 
 function geodir_get_catlist($cat_taxonomy, $parrent = 0, $selected = false)
1175 1175 
 {
1176 
-    global $exclude_cats;
1176 
+	global $exclude_cats;
1177 1177
1178 
-    $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));
1178 
+	$cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));
1179 1179
1180 
-    if (!empty($cat_terms)) {
1181 
-        $onchange = '';
1182 
-        $onchange = ' onchange="show_subcatlist(this.value, this)" ';
1180 
+	if (!empty($cat_terms)) {
1181 
+		$onchange = '';
1182 
+		$onchange = ' onchange="show_subcatlist(this.value, this)" ';
1183 1183
1184 
-        $option_selected = '';
1185 
-        if (!$selected)
1186 
-            $option_slected = ' selected="selected" ';
1184 
+		$option_selected = '';
1185 
+		if (!$selected)
1186 
+			$option_slected = ' selected="selected" ';
1187 1187
1188 
-        echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';
1188 
+		echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';
1189 1189
1190 
-        echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
1190 
+		echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';
1191 1191
1192 
-        foreach ($cat_terms as $cat_term) {
1193 
-            $option_selected = '';
1194 
-            if ($selected == $cat_term->term_id)
1195 
-                $option_selected = ' selected="selected" ';
1192 
+		foreach ($cat_terms as $cat_term) {
1193 
+			$option_selected = '';
1194 
+			if ($selected == $cat_term->term_id)
1195 
+				$option_selected = ' selected="selected" ';
1196 1196
1197 
-            // Count child terms
1198 
-            $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );
1199 
-            $has_child = !empty( $child_terms ) ? 't' : 'f';
1197 
+			// Count child terms
1198 
+			$child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );
1199 
+			$has_child = !empty( $child_terms ) ? 't' : 'f';
1200 1200
1201 
-            echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>';
1202 
-        }
1203 
-        echo '</select>';
1204 
-    }
1201 
+			echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . geodir_utf8_ucfirst($cat_term->name) . '</option>';
1202 
+		}
1203 
+		echo '</select>';
1204 
+	}
1205 1205 
 }
1206 1206
1207 1207 
 /**

@@ -1217,28 +1217,28 @@  discard block
 
 block discarded – undo
1217 1217 
  */
1218 1218 
 function geodir_custom_update_messages($messages)
1219 1219 
 {
1220 
-    global $post, $post_ID;
1221 
-
1222 
-    $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');
1223 
-
1224 
-    foreach ($post_types as $post_type => $post_object) {
1225 
-
1226 
-        $messages[$post_type] = array(
1227 
-            0 => '', // Unused. Messages start at index 1.
1228 
-            1 => sprintf(__('%s updated. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
1229 
-            2 => __('Custom field updated.', 'geodirectory'),
1230 
-            3 => __('Custom field deleted.', 'geodirectory'),
1231 
-            4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
1232 
-            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,
1233 
-            6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
1234 
-            7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
1235 
-            8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
1236 
-            9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
1237 
-            10 => sprintf(__('%s draft updated. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
1238 
-        );
1239 
-    }
1240 
-
1241 
-    return $messages;
1220 
+	global $post, $post_ID;
1221 
+
1222 
+	$post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');
1223 
+
1224 
+	foreach ($post_types as $post_type => $post_object) {
1225 
+
1226 
+		$messages[$post_type] = array(
1227 
+			0 => '', // Unused. Messages start at index 1.
1228 
+			1 => sprintf(__('%s updated. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
1229 
+			2 => __('Custom field updated.', 'geodirectory'),
1230 
+			3 => __('Custom field deleted.', 'geodirectory'),
1231 
+			4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),
1232 
+			5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,
1233 
+			6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
1234 
+			7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),
1235 
+			8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
1236 
+			9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),
1237 
+			10 => sprintf(__('%s draft updated. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),
1238 
+		);
1239 
+	}
1240 
+
1241 
+	return $messages;
1242 1242 
 }
1243 1243
1244 1244 
 

@@ -1253,182 +1253,182 @@  discard block
 
 block discarded – undo
1253 1253 
 function geodir_register_defaults()
1254 1254 
 {
1255 1255
1256 
-    global $wpdb;
1257 
-
1258 
-    $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';
1259 
-
1260 
-    if (!$listing_slug = get_option('geodir_listing_prefix'))
1261 
-        $listing_slug = 'places';
1262 
-
1263 
-    /**
1264 
-     * Taxonomies
1265 
-     **/
1266 
-    //if ( ! taxonomy_exists('gd_place_tags') )
1267 
-    {
1268 
-
1269 
-        $gd_placetags = array();
1270 
-        $gd_placetags['object_type'] = 'gd_place';
1271 
-        $gd_placetags['listing_slug'] = $listing_slug . '/tags';
1272 
-        $gd_placetags['args'] = array(
1273 
-            'public' => true,
1274 
-            'hierarchical' => false,
1275 
-            'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
1276 
-            'query_var' => true,
1277 
-
1278 
-            'labels' => array(
1279 
-                'name' => __('Place Tags', 'geodirectory'),
1280 
-                'singular_name' => __('Place Tag', 'geodirectory'),
1281 
-                'search_items' => __('Search Place Tags', 'geodirectory'),
1282 
-                'popular_items' => __('Popular Place Tags', 'geodirectory'),
1283 
-                'all_items' => __('All Place Tags', 'geodirectory'),
1284 
-                'edit_item' => __('Edit Place Tag', 'geodirectory'),
1285 
-                'update_item' => __('Update Place Tag', 'geodirectory'),
1286 
-                'add_new_item' => __('Add New Place Tag', 'geodirectory'),
1287 
-                'new_item_name' => __('New Place Tag Name', 'geodirectory'),
1288 
-                'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),
1289 
-                'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),
1290 
-                'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),
1291 
-            ),
1292 
-        );
1293 
-
1294 
-
1295 
-        $geodir_taxonomies = get_option('geodir_taxonomies');
1296 
-        $geodir_taxonomies['gd_place_tags'] = $gd_placetags;
1297 
-        update_option('geodir_taxonomies', $geodir_taxonomies);
1298 
-
1299 
-
1300 
-        // Update post types and delete tmp options
1301 
-        flush_rewrite_rules();
1302 
-
1303 
-    }
1304 
-
1305 
-    //if ( ! taxonomy_exists('gd_placecategory') )
1306 
-    {
1307 
-
1308 
-        $gd_placecategory = array();
1309 
-        $gd_placecategory['object_type'] = 'gd_place';
1310 
-        $gd_placecategory['listing_slug'] = $listing_slug;
1311 
-        $gd_placecategory['args'] = array(
1312 
-            'public' => true,
1313 
-            'hierarchical' => true,
1314 
-            'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),
1315 
-            'query_var' => true,
1316 
-            'labels' => array(
1317 
-                'name' => __('Place Categories', 'geodirectory'),
1318 
-                'singular_name' => __('Place Category', 'geodirectory'),
1319 
-                'search_items' => __('Search Place Categories', 'geodirectory'),
1320 
-                'popular_items' => __('Popular Place Categories', 'geodirectory'),
1321 
-                'all_items' => __('All Place Categories', 'geodirectory'),
1322 
-                'edit_item' => __('Edit Place Category', 'geodirectory'),
1323 
-                'update_item' => __('Update Place Category', 'geodirectory'),
1324 
-                'add_new_item' => __('Add New Place Category', 'geodirectory'),
1325 
-                'new_item_name' => __('New Place Category', 'geodirectory'),
1326 
-                'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),
1327 
-            ),
1328 
-        );
1329 
-
1330 
-
1331 
-        $geodir_taxonomies = get_option('geodir_taxonomies');
1332 
-        $geodir_taxonomies['gd_placecategory'] = $gd_placecategory;
1333 
-        update_option('geodir_taxonomies', $geodir_taxonomies);
1334 
-
1335 
-
1336 
-        flush_rewrite_rules();
1337 
-    }
1338 
-
1339 
-    /**
1340 
-     * Post Types
1341 
-     **/
1342 
-
1343 
-    //if ( ! post_type_exists('gd_place') )
1344 
-    {
1345 
-
1346 
-        $labels = array(
1347 
-            'name' => __('Places', 'geodirectory'),
1348 
-            'singular_name' => __('Place', 'geodirectory'),
1349 
-            'add_new' => __('Add New', 'geodirectory'),
1350 
-            'add_new_item' => __('Add New Place', 'geodirectory'),
1351 
-            'edit_item' => __('Edit Place', 'geodirectory'),
1352 
-            'new_item' => __('New Place', 'geodirectory'),
1353 
-            'view_item' => __('View Place', 'geodirectory'),
1354 
-            'search_items' => __('Search Places', 'geodirectory'),
1355 
-            'not_found' => __('No Place Found', 'geodirectory'),
1356 
-            'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));
1357 
-
1358 
-        $place_default = array(
1359 
-            'labels' => $labels,
1360 
-            'can_export' => true,
1361 
-            'capability_type' => 'post',
1362 
-            'description' => 'Place post type.',
1363 
-            'has_archive' => $listing_slug,
1364 
-            'hierarchical' => false,
1365 
-            'map_meta_cap' => true,
1366 
-            'menu_icon' => $menu_icon,
1367 
-            'public' => true,
1368 
-            'query_var' => true,
1369 
-            'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
1370 
-            'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
1371 
-            'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
1372 
-
1373 
-        //Update custom post types
1374 
-        $geodir_post_types = get_option('geodir_post_types');
1375 
-        $geodir_post_types['gd_place'] = $place_default;
1376 
-        update_option('geodir_post_types', $geodir_post_types);
1377 
-
1378 
-        // Update post types and delete tmp options
1379 
-        flush_rewrite_rules();
1380 
-    }
1381 
-
1382 
-
1383 
-    geodir_register_taxonomies();
1384 
-    geodir_register_post_types();
1385 
-
1386 
-    //die;
1256 
+	global $wpdb;
1257 
+
1258 
+	$menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';
1259 
+
1260 
+	if (!$listing_slug = get_option('geodir_listing_prefix'))
1261 
+		$listing_slug = 'places';
1262 
+
1263 
+	/**
1264 
+	 * Taxonomies
1265 
+	 **/
1266 
+	//if ( ! taxonomy_exists('gd_place_tags') )
1267 
+	{
1268 
+
1269 
+		$gd_placetags = array();
1270 
+		$gd_placetags['object_type'] = 'gd_place';
1271 
+		$gd_placetags['listing_slug'] = $listing_slug . '/tags';
1272 
+		$gd_placetags['args'] = array(
1273 
+			'public' => true,
1274 
+			'hierarchical' => false,
1275 
+			'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),
1276 
+			'query_var' => true,
1277 
+
1278 
+			'labels' => array(
1279 
+				'name' => __('Place Tags', 'geodirectory'),
1280 
+				'singular_name' => __('Place Tag', 'geodirectory'),
1281 
+				'search_items' => __('Search Place Tags', 'geodirectory'),
1282 
+				'popular_items' => __('Popular Place Tags', 'geodirectory'),
1283 
+				'all_items' => __('All Place Tags', 'geodirectory'),
1284 
+				'edit_item' => __('Edit Place Tag', 'geodirectory'),
1285 
+				'update_item' => __('Update Place Tag', 'geodirectory'),
1286 
+				'add_new_item' => __('Add New Place Tag', 'geodirectory'),
1287 
+				'new_item_name' => __('New Place Tag Name', 'geodirectory'),
1288 
+				'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),
1289 
+				'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),
1290 
+				'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),
1291 
+			),
1292 
+		);
1293 
+
1294 
+
1295 
+		$geodir_taxonomies = get_option('geodir_taxonomies');
1296 
+		$geodir_taxonomies['gd_place_tags'] = $gd_placetags;
1297 
+		update_option('geodir_taxonomies', $geodir_taxonomies);
1298 
+
1299 
+
1300 
+		// Update post types and delete tmp options
1301 
+		flush_rewrite_rules();
1302 
+
1303 
+	}
1304 
+
1305 
+	//if ( ! taxonomy_exists('gd_placecategory') )
1306 
+	{
1307 
+
1308 
+		$gd_placecategory = array();
1309 
+		$gd_placecategory['object_type'] = 'gd_place';
1310 
+		$gd_placecategory['listing_slug'] = $listing_slug;
1311 
+		$gd_placecategory['args'] = array(
1312 
+			'public' => true,
1313 
+			'hierarchical' => true,
1314 
+			'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true),
1315 
+			'query_var' => true,
1316 
+			'labels' => array(
1317 
+				'name' => __('Place Categories', 'geodirectory'),
1318 
+				'singular_name' => __('Place Category', 'geodirectory'),
1319 
+				'search_items' => __('Search Place Categories', 'geodirectory'),
1320 
+				'popular_items' => __('Popular Place Categories', 'geodirectory'),
1321 
+				'all_items' => __('All Place Categories', 'geodirectory'),
1322 
+				'edit_item' => __('Edit Place Category', 'geodirectory'),
1323 
+				'update_item' => __('Update Place Category', 'geodirectory'),
1324 
+				'add_new_item' => __('Add New Place Category', 'geodirectory'),
1325 
+				'new_item_name' => __('New Place Category', 'geodirectory'),
1326 
+				'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),
1327 
+			),
1328 
+		);
1329 
+
1330 
+
1331 
+		$geodir_taxonomies = get_option('geodir_taxonomies');
1332 
+		$geodir_taxonomies['gd_placecategory'] = $gd_placecategory;
1333 
+		update_option('geodir_taxonomies', $geodir_taxonomies);
1334 
+
1335 
+
1336 
+		flush_rewrite_rules();
1337 
+	}
1338 
+
1339 
+	/**
1340 
+	 * Post Types
1341 
+	 **/
1342 
+
1343 
+	//if ( ! post_type_exists('gd_place') )
1344 
+	{
1345 
+
1346 
+		$labels = array(
1347 
+			'name' => __('Places', 'geodirectory'),
1348 
+			'singular_name' => __('Place', 'geodirectory'),
1349 
+			'add_new' => __('Add New', 'geodirectory'),
1350 
+			'add_new_item' => __('Add New Place', 'geodirectory'),
1351 
+			'edit_item' => __('Edit Place', 'geodirectory'),
1352 
+			'new_item' => __('New Place', 'geodirectory'),
1353 
+			'view_item' => __('View Place', 'geodirectory'),
1354 
+			'search_items' => __('Search Places', 'geodirectory'),
1355 
+			'not_found' => __('No Place Found', 'geodirectory'),
1356 
+			'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));
1357 
+
1358 
+		$place_default = array(
1359 
+			'labels' => $labels,
1360 
+			'can_export' => true,
1361 
+			'capability_type' => 'post',
1362 
+			'description' => 'Place post type.',
1363 
+			'has_archive' => $listing_slug,
1364 
+			'hierarchical' => false,
1365 
+			'map_meta_cap' => true,
1366 
+			'menu_icon' => $menu_icon,
1367 
+			'public' => true,
1368 
+			'query_var' => true,
1369 
+			'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),
1370 
+			'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),
1371 
+			'taxonomies' => array('gd_placecategory', 'gd_place_tags'));
1372 
+
1373 
+		//Update custom post types
1374 
+		$geodir_post_types = get_option('geodir_post_types');
1375 
+		$geodir_post_types['gd_place'] = $place_default;
1376 
+		update_option('geodir_post_types', $geodir_post_types);
1377 
+
1378 
+		// Update post types and delete tmp options
1379 
+		flush_rewrite_rules();
1380 
+	}
1381 
+
1382 
+
1383 
+	geodir_register_taxonomies();
1384 
+	geodir_register_post_types();
1385 
+
1386 
+	//die;
1387 1387
1388 1388 
 }
1389 1389
1390 1390 
 $gd_wpml_get_languages = "";
1391 1391 
 function gd_wpml_get_lang_from_url($url) {
1392 
-    global $sitepress, $gd_wpml_get_languages;
1392 
+	global $sitepress, $gd_wpml_get_languages;
1393 1393
1394 
-    if (geodir_is_wpml()) {
1395 
-        return $sitepress->get_language_from_url($url);
1396 
-    }
1394 
+	if (geodir_is_wpml()) {
1395 
+		return $sitepress->get_language_from_url($url);
1396 
+	}
1397 1397
1398 
-    if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {
1399 
-        return $_REQUEST['lang'];
1400 
-    }
1398 
+	if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {
1399 
+		return $_REQUEST['lang'];
1400 
+	}
1401 1401
1402 
-    $url = str_replace(array("http://","https://"),"",$url);
1402 
+	$url = str_replace(array("http://","https://"),"",$url);
1403 1403
1404 
-    // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
1405 
-    $site_url = str_replace(array("http://","https://"),"",site_url());
1404 
+	// site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.
1405 
+	$site_url = str_replace(array("http://","https://"),"",site_url());
1406 1406
1407 
-    $url = str_replace($site_url,"",$url);
1407 
+	$url = str_replace($site_url,"",$url);
1408 1408
1409 
-    $segments = explode('/', trim($url, '/'));
1409 
+	$segments = explode('/', trim($url, '/'));
1410 1410
1411 
-    if ($gd_wpml_get_languages) {
1412 
-        $langs = $gd_wpml_get_languages;
1413 
-    } else {
1414 
-        $gd_wpml_get_languages = $sitepress->get_active_languages();
1415 
-    }
1411 
+	if ($gd_wpml_get_languages) {
1412 
+		$langs = $gd_wpml_get_languages;
1413 
+	} else {
1414 
+		$gd_wpml_get_languages = $sitepress->get_active_languages();
1415 
+	}
1416 1416
1417 
-    if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {
1418 
-        return $segments[0];
1419 
-    }
1417 
+	if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {
1418 
+		return $segments[0];
1419 
+	}
1420 1420
1421 
-    return false;
1421 
+	return false;
1422 1422 
 }
1423 1423
1424 1424 
 function gd_wpml_slug_translation_turned_on($post_type) {
1425 1425
1426 
-    global $sitepress;
1427 
-    $settings = $sitepress->get_settings();
1428 
-    return isset($settings['posts_slug_translation']['types'][$post_type])
1429 
-    && $settings['posts_slug_translation']['types'][$post_type]
1430 
-    && isset($settings['posts_slug_translation']['on'])
1431 
-    && $settings['posts_slug_translation']['on'];
1426 
+	global $sitepress;
1427 
+	$settings = $sitepress->get_settings();
1428 
+	return isset($settings['posts_slug_translation']['types'][$post_type])
1429 
+	&& $settings['posts_slug_translation']['types'][$post_type]
1430 
+	&& isset($settings['posts_slug_translation']['on'])
1431 
+	&& $settings['posts_slug_translation']['on'];
1432 1432 
 }
1433 1433
1434 1434 
 

@@ -1455,158 +1455,158 @@  discard block
 
 block discarded – undo
1455 1455 
  */
1456 1456 
 function geodir_listing_permalink_structure($post_link, $post_obj, $leavename, $sample)
1457 1457 
 {
1458 
-    //echo $post_link."<br />".$sample ;
1458 
+	//echo $post_link."<br />".$sample ;
1459 1459
1460 1460
1461 
-    global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache;
1462 
-    if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {
1463 
-    } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {
1464 
-        return $post_link;
1465 
-    } else {
1466 
-        $orig_post = $post;
1467 
-        $post = $post_obj;
1468 
-    }
1461 
+	global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache;
1462 
+	if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {
1463 
+	} elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {
1464 
+		return $post_link;
1465 
+	} else {
1466 
+		$orig_post = $post;
1467 
+		$post = $post_obj;
1468 
+	}
1469 1469
1470 
-    if (in_array($post->post_type, geodir_get_posttypes())) {
1470 
+	if (in_array($post->post_type, geodir_get_posttypes())) {
1471 1471
1472 
-        // if we dont have a GD post then try to grab it
1473 
-        if(!isset($post->default_category)){
1474 
-            $gd_post = geodir_get_post_info($post->ID);
1475 
-            if(!empty($gd_post)){
1476 
-                $post = $gd_post;
1477 
-            }
1478 
-        }
1472 
+		// if we dont have a GD post then try to grab it
1473 
+		if(!isset($post->default_category)){
1474 
+			$gd_post = geodir_get_post_info($post->ID);
1475 
+			if(!empty($gd_post)){
1476 
+				$post = $gd_post;
1477 
+			}
1478 
+		}
1479 1479
1480 1480
1481 
-        $post_types = get_option('geodir_post_types');
1482 
-        $slug = $post_types[$post->post_type]['rewrite']['slug'];
1481 
+		$post_types = get_option('geodir_post_types');
1482 
+		$slug = $post_types[$post->post_type]['rewrite']['slug'];
1483 1483
1484 
-        // Alter the CPT slug if WPML is set to do so
1485 
-        if(function_exists('icl_object_id')){
1486 
-            if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
1484 
+		// Alter the CPT slug if WPML is set to do so
1485 
+		if(function_exists('icl_object_id')){
1486 
+			if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {
1487 1487
1488 
-                $org_slug = $slug;
1489 
-                $slug = apply_filters( 'wpml_translate_single_string',
1490 
-                    $slug,
1491 
-                    'WordPress',
1492 
-                    'URL slug: ' . $slug,
1493 
-                    $language_code);
1488 
+				$org_slug = $slug;
1489 
+				$slug = apply_filters( 'wpml_translate_single_string',
1490 
+					$slug,
1491 
+					'WordPress',
1492 
+					'URL slug: ' . $slug,
1493 
+					$language_code);
1494 1494
1495 
-                if(!$slug){$slug = $org_slug;}
1495 
+				if(!$slug){$slug = $org_slug;}
1496 1496
1497 
-            }
1498 
-        }
1497 
+			}
1498 
+		}
1499 1499
1500 
-        if (function_exists('geodir_location_geo_home_link')) {
1501 
-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
1502 
-        }
1500 
+		if (function_exists('geodir_location_geo_home_link')) {
1501 
+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);
1502 
+		}
1503 1503
1504 
-        // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.
1505 
-        $site_url = trailingslashit(get_bloginfo('url'));
1504 
+		// Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.
1505 
+		$site_url = trailingslashit(get_bloginfo('url'));
1506 1506
1507 
-        if (function_exists('geodir_location_geo_home_link')) {
1508 
-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
1509 
-        }
1510 
-
1511 
-        $fix_url = strpos($post_link, $site_url) === 0 ? true : false;
1512 
-        if ($fix_url) {
1513 
-            $post_link = str_replace($site_url, '', $post_link);
1514 
-        }
1515 
-
1516 
-        $post_link = trailingslashit(
1517 
-            preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )
1518 
-        );
1519 
-
1520 
-        if ($fix_url) {
1521 
-            $post_link = $site_url . $post_link;
1522 
-        }
1523 
-
1524 
-        if (isset($comment_post_cache[$post->ID])) {
1525 
-            $post = $comment_post_cache[$post->ID];
1526 
-        }
1527 
-        if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {
1528 
-            $post_id = $post->ID;
1529 
-            if (isset($orig_post)) {
1530 
-                $post = $orig_post;
1531 
-            }
1532 
-            return $gd_permalink_cache[$post_id];
1533 
-        }
1507 
+		if (function_exists('geodir_location_geo_home_link')) {
1508 
+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);
1509 
+		}
1534 1510
1535 
-        if (!isset($post->post_locations)) {
1536 
-            $post_type = $post->post_type;
1537 
-            $ID = $post->ID;
1538 
-            $post2 = $wpdb->get_row(
1539 
-                $wpdb->prepare(
1540 
-                    "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",
1541 
-                    array($post->ID)
1542 
-                )
1543 
-            );
1511 
+		$fix_url = strpos($post_link, $site_url) === 0 ? true : false;
1512 
+		if ($fix_url) {
1513 
+			$post_link = str_replace($site_url, '', $post_link);
1514 
+		}
1544 1515
1545 
-            $post = (object)array_merge((array)$post, (array)$post2);
1516 
+		$post_link = trailingslashit(
1517 
+			preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )
1518 
+		);
1546 1519
1547 
-            $comment_post_cache[$post->ID] = $post;
1548 
-        }
1520 
+		if ($fix_url) {
1521 
+			$post_link = $site_url . $post_link;
1522 
+		}
1549 1523
1524 
+		if (isset($comment_post_cache[$post->ID])) {
1525 
+			$post = $comment_post_cache[$post->ID];
1526 
+		}
1527 
+		if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {
1528 
+			$post_id = $post->ID;
1529 
+			if (isset($orig_post)) {
1530 
+				$post = $orig_post;
1531 
+			}
1532 
+			return $gd_permalink_cache[$post_id];
1533 
+		}
1550 1534
1535 
+		if (!isset($post->post_locations)) {
1536 
+			$post_type = $post->post_type;
1537 
+			$ID = $post->ID;
1538 
+			$post2 = $wpdb->get_row(
1539 
+				$wpdb->prepare(
1540 
+					"SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",
1541 
+					array($post->ID)
1542 
+				)
1543 
+			);
1551 1544
1552 
-        if (false !== strpos($post_link, '%gd_taxonomy%')) {
1545 
+			$post = (object)array_merge((array)$post, (array)$post2);
1553 1546
1554 
-            if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
1555 
-                $location_request = '';
1547 
+			$comment_post_cache[$post->ID] = $post;
1548 
+		}
1556 1549
1557 1550
1558 
-                if (!empty($post->post_locations)) {
1559 
-                    $geodir_arr_locations = explode(',', $post->post_locations);
1560 
-                    if (count($geodir_arr_locations) == 3) {
1561 
-                        $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
1562 
-                        $post->city_slug = str_replace(']', '', $post->city_slug);
1563 
-                        $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
1564 
-                        $post->region_slug = str_replace(']', '', $post->region_slug);
1565 
-                        $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
1566 
-                        $post->country_slug = str_replace(']', '', $post->country_slug);
1567 1551
1568 
-                        $post_location = (object)array('country_slug' => $post->country_slug,
1569 
-                            'region_slug' => $post->region_slug,
1570 
-                            'city_slug' => $post->city_slug
1571 
-                        );
1552 
+		if (false !== strpos($post_link, '%gd_taxonomy%')) {
1572 1553
1573 
-                    } else
1574 
-                        $post_location = geodir_get_location();
1554 
+			if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {
1555 
+				$location_request = '';
1575 1556
1576 1557
1577 
-                } else {
1558 
+				if (!empty($post->post_locations)) {
1559 
+					$geodir_arr_locations = explode(',', $post->post_locations);
1560 
+					if (count($geodir_arr_locations) == 3) {
1561 
+						$post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
1562 
+						$post->city_slug = str_replace(']', '', $post->city_slug);
1563 
+						$post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
1564 
+						$post->region_slug = str_replace(']', '', $post->region_slug);
1565 
+						$post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
1566 
+						$post->country_slug = str_replace(']', '', $post->country_slug);
1578 1567
1579 
-                    $post_location_sql = $wpdb->get_results(
1580 
-                        $wpdb->prepare(
1581 
-                            "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",
1582 
-                            array($post->ID)
1583 
-                        )
1584 
-                    );
1585 
-
1586 
-                    if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {
1587 
-
1588 
-                        $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);
1589 
-                        if (count($geodir_arr_locations) == 3) {
1590 
-                            $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
1591 
-                            $post->city_slug = str_replace(']', '', $post->city_slug);
1592 
-                            $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
1593 
-                            $post->region_slug = str_replace(']', '', $post->region_slug);
1594 
-                            $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
1595 
-                            $post->country_slug = str_replace(']', '', $post->country_slug);
1596 
-
1597 
-                            $post_location = (object)array('country_slug' => $post->country_slug,
1598 
-                                'region_slug' => $post->region_slug,
1599 
-                                'city_slug' => $post->city_slug
1600 
-                            );
1568 
+						$post_location = (object)array('country_slug' => $post->country_slug,
1569 
+							'region_slug' => $post->region_slug,
1570 
+							'city_slug' => $post->city_slug
1571 
+						);
1572 
+
1573 
+					} else
1574 
+						$post_location = geodir_get_location();
1601 1575
1602 
-                        }
1603 
-                    } else
1604 
-                        $post_location = geodir_get_location();
1605 
-                }
1606 1576
1577 
+				} else {
1607 1578
1608 
-                if (!empty($post_location)) {
1609 
-                    $country_slug = isset($post_location->country_slug) ? $post_location->country_slug : '';
1579 
+					$post_location_sql = $wpdb->get_results(
1580 
+						$wpdb->prepare(
1581 
+							"SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",
1582 
+							array($post->ID)
1583 
+						)
1584 
+					);
1585 
+
1586 
+					if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {
1587 
+
1588 
+						$geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);
1589 
+						if (count($geodir_arr_locations) == 3) {
1590 
+							$post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);
1591 
+							$post->city_slug = str_replace(']', '', $post->city_slug);
1592 
+							$post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);
1593 
+							$post->region_slug = str_replace(']', '', $post->region_slug);
1594 
+							$post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);
1595 
+							$post->country_slug = str_replace(']', '', $post->country_slug);
1596 
+
1597 
+							$post_location = (object)array('country_slug' => $post->country_slug,
1598 
+								'region_slug' => $post->region_slug,
1599 
+								'city_slug' => $post->city_slug
1600 
+							);
1601 
+
1602 
+						}
1603 
+					} else
1604 
+						$post_location = geodir_get_location();
1605 
+				}
1606 
+
1607 
+
1608 
+				if (!empty($post_location)) {
1609 
+					$country_slug = isset($post_location->country_slug) ? $post_location->country_slug : '';
1610 1610 
 					$region_slug = isset($post_location->region_slug) ? $post_location->region_slug : '';
1611 1611 
 					$city_slug = isset($post_location->city_slug) ? $post_location->city_slug : '';
1612 1612 
 					

@@ -1624,89 +1624,89 @@  discard block
 
 block discarded – undo
1624 1624 
 					$location_slug[] = $city_slug;
1625 1625
1626 1626 
 					$location_request .= implode('/', $location_slug) . '/';
1627 
-                }
1628 
-            }
1627 
+				}
1628 
+			}
1629 1629
1630 
-            if (get_option('geodir_add_categories_url')) {
1630 
+			if (get_option('geodir_add_categories_url')) {
1631 1631
1632 
-                $term_request = '';
1633 
-                $taxonomies = geodir_get_taxonomies($post->post_type);
1632 
+				$term_request = '';
1633 
+				$taxonomies = geodir_get_taxonomies($post->post_type);
1634 1634
1635 
-                $taxonomies = end($taxonomies);
1635 
+				$taxonomies = end($taxonomies);
1636 1636
1637 
-                if (!empty($post->default_category)) {
1638 
-                    $post_terms = $post->default_category;
1639 
-                } else {
1640 
-                    $post_terms = '';
1641 
-
1642 
-                    if(isset($_POST['post_default_category']) && $_POST['post_default_category']){
1643 
-                        $post_terms = absint($_POST['post_default_category']);
1644 
-                    }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]){
1645 
-                        $post_terms = explode(",", trim($_POST['post_category'][$taxonomies], ","));
1646 
-                        $post_terms = absint($post_terms[0]);
1647 
-                    }elseif (isset($post->{$taxonomies})) {
1648 
-                        $post_terms = explode(",", trim($post->{$taxonomies}, ","));
1649 
-                        $post_terms = $post_terms[0];
1650 
-                    }
1637 
+				if (!empty($post->default_category)) {
1638 
+					$post_terms = $post->default_category;
1639 
+				} else {
1640 
+					$post_terms = '';
1641 
+
1642 
+					if(isset($_POST['post_default_category']) && $_POST['post_default_category']){
1643 
+						$post_terms = absint($_POST['post_default_category']);
1644 
+					}elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]){
1645 
+						$post_terms = explode(",", trim($_POST['post_category'][$taxonomies], ","));
1646 
+						$post_terms = absint($post_terms[0]);
1647 
+					}elseif (isset($post->{$taxonomies})) {
1648 
+						$post_terms = explode(",", trim($post->{$taxonomies}, ","));
1649 
+						$post_terms = $post_terms[0];
1650 
+					}
1651 1651
1652 
-                    if (!$post_terms)
1653 
-                        $post_terms = geodir_get_post_meta($post->ID, 'default_category', true);
1652 
+					if (!$post_terms)
1653 
+						$post_terms = geodir_get_post_meta($post->ID, 'default_category', true);
1654 1654
1655 
-                    if (!$post_terms) {
1656 
-                        $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true);
1655 
+					if (!$post_terms) {
1656 
+						$post_terms = geodir_get_post_meta($post->ID, $taxonomies, true);
1657 1657
1658 
-                        if ($post_terms) {
1659 
-                            $post_terms = explode(",", trim($post_terms, ","));
1660 
-                            $post_terms = $post_terms[0];
1661 
-                        }
1662 
-                    }
1663 
-                }
1658 
+						if ($post_terms) {
1659 
+							$post_terms = explode(",", trim($post_terms, ","));
1660 
+							$post_terms = $post_terms[0];
1661 
+						}
1662 
+					}
1663 
+				}
1664 1664
1665 
-                $term = get_term_by('id', $post_terms, $taxonomies);
1665 
+				$term = get_term_by('id', $post_terms, $taxonomies);
1666 1666
1667 
-                if (!empty($term))
1668 
-                    $term_request = $term->slug;
1669 
-                //$term_request = $term->slug.'/';
1670 
-            }
1667 
+				if (!empty($term))
1668 
+					$term_request = $term->slug;
1669 
+				//$term_request = $term->slug.'/';
1670 
+			}
1671 1671
1672 
-            $request_term = '';
1673 
-            $listingurl_separator = '';
1674 
-            //$detailurl_separator = get_option('geodir_detailurl_separator');
1675 
-            $detailurl_separator = '';
1676 
-            if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {
1677 
-                $request_term = $location_request;
1678 
-                //$listingurl_separator = get_option('geodir_listingurl_separator');
1679 
-                //$request_term .= $listingurl_separator.'/'.$term_request;
1680 
-                $request_term .= $term_request;
1672 
+			$request_term = '';
1673 
+			$listingurl_separator = '';
1674 
+			//$detailurl_separator = get_option('geodir_detailurl_separator');
1675 
+			$detailurl_separator = '';
1676 
+			if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {
1677 
+				$request_term = $location_request;
1678 
+				//$listingurl_separator = get_option('geodir_listingurl_separator');
1679 
+				//$request_term .= $listingurl_separator.'/'.$term_request;
1680 
+				$request_term .= $term_request;
1681 1681
1682 
-            } else {
1683 
-                if (isset($location_request) && $location_request != '') $request_term = $location_request;
1682 
+			} else {
1683 
+				if (isset($location_request) && $location_request != '') $request_term = $location_request;
1684 1684
1685 
-                if (isset($term_request) && $term_request != '') $request_term .= $term_request;
1686 
-            }
1687 
-            $request_term = trim($request_term, '/');
1685 
+				if (isset($term_request) && $term_request != '') $request_term .= $term_request;
1686 
+			}
1687 
+			$request_term = trim($request_term, '/');
1688 1688
1689 
-            // Fix with WPML the location terms added twice when CPT slug is translated.
1690 
-            if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {
1691 
-                $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
1692 
-            }
1689 
+			// Fix with WPML the location terms added twice when CPT slug is translated.
1690 
+			if ($sample && !empty($location_request) && geodir_is_wpml() && strpos($post_link, '%gd_taxonomy%/' . $request_term . $detailurl_separator) !== false) {
1691 
+				$post_link = str_replace('%gd_taxonomy%/', '', $post_link);
1692 
+			}
1693 1693
1694 
-            if (!empty($request_term))
1695 
-                $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
1696 
-            else
1697 
-                $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
1698 
-            //echo $post_link ;
1699 
-        }
1700 
-        // temp cache the permalink
1701 
-        if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {
1702 
-            $gd_permalink_cache[$post->ID] = $post_link;
1703 
-        }
1704 
-    }
1705 
-    if (isset($orig_post)) {
1706 
-        $post = $orig_post;
1707 
-    }
1708 
-
1709 
-    return $post_link;
1694 
+			if (!empty($request_term))
1695 
+				$post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
1696 
+			else
1697 
+				$post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
1698 
+			//echo $post_link ;
1699 
+		}
1700 
+		// temp cache the permalink
1701 
+		if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {
1702 
+			$gd_permalink_cache[$post->ID] = $post_link;
1703 
+		}
1704 
+	}
1705 
+	if (isset($orig_post)) {
1706 
+		$post = $orig_post;
1707 
+	}
1708 
+
1709 
+	return $post_link;
1710 1710 
 }
1711 1711
1712 1712 
 /**

@@ -1722,99 +1722,99 @@  discard block
 
 block discarded – undo
1722 1722 
  * @return string The term link.
1723 1723 
  */
1724 1724 
 function geodir_term_link($termlink, $term, $taxonomy) {
1725 
-    $geodir_taxonomies = geodir_get_taxonomies('', true);
1725 
+	$geodir_taxonomies = geodir_get_taxonomies('', true);
1726 1726
1727 
-    if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {
1728 
-        global $geodir_add_location_url, $gd_session;
1729 
-        $include_location = false;
1730 
-        $request_term = array();
1731 
-        $add_location_url = get_option('geodir_add_location_url');
1732 
-        $location_manager = defined('POST_LOCATION_TABLE') ? true : false;
1727 
+	if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {
1728 
+		global $geodir_add_location_url, $gd_session;
1729 
+		$include_location = false;
1730 
+		$request_term = array();
1731 
+		$add_location_url = get_option('geodir_add_location_url');
1732 
+		$location_manager = defined('POST_LOCATION_TABLE') ? true : false;
1733 1733
1734 
-        $listing_slug = geodir_get_listing_slug($taxonomy);
1734 
+		$listing_slug = geodir_get_listing_slug($taxonomy);
1735 1735
1736 
-        if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {
1737 
-            if ($geodir_add_location_url && $add_location_url) {
1738 
-                $include_location = true;
1739 
-            }
1740 
-        } elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {
1741 
-            $include_location = true;
1742 
-        } elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {
1743 
-            $include_location = true;
1744 
-        }
1745 
-
1746 
-        if ($include_location) {
1747 
-            global $post;
1736 
+		if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {
1737 
+			if ($geodir_add_location_url && $add_location_url) {
1738 
+				$include_location = true;
1739 
+			}
1740 
+		} elseif ($add_location_url && $gd_session->get('gd_multi_location') == 1) {
1741 
+			$include_location = true;
1742 
+		} elseif ($add_location_url && $location_manager && geodir_is_page('detail')) {
1743 
+			$include_location = true;
1744 
+		}
1745 
+
1746 
+		if ($include_location) {
1747 
+			global $post;
1748 1748
1749 
-            $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
1749 
+			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
1750 1750
1751 
-            if (geodir_is_page('detail') && isset($post->country_slug)) {
1752 
-                $location_terms = array(
1753 
-                    'gd_country' => $post->country_slug,
1754 
-                    'gd_region' => $post->region_slug,
1755 
-                    'gd_city' => $post->city_slug
1756 
-                );
1751 
+			if (geodir_is_page('detail') && isset($post->country_slug)) {
1752 
+				$location_terms = array(
1753 
+					'gd_country' => $post->country_slug,
1754 
+					'gd_region' => $post->region_slug,
1755 
+					'gd_city' => $post->city_slug
1756 
+				);
1757 1757
1758 
-                if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
1759 
-                    $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;
1760 
-                }
1761 
-            } else {
1762 
-                $location_terms = geodir_get_current_location_terms('query_vars');
1763 
-            }
1758 
+				if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {
1759 
+					$location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;
1760 
+				}
1761 
+			} else {
1762 
+				$location_terms = geodir_get_current_location_terms('query_vars');
1763 
+			}
1764 1764
1765 
-            $geodir_show_location_url = get_option('geodir_show_location_url');
1766 
-            $location_terms = geodir_remove_location_terms($location_terms);
1765 
+			$geodir_show_location_url = get_option('geodir_show_location_url');
1766 
+			$location_terms = geodir_remove_location_terms($location_terms);
1767 1767
1768 
-            if (!empty($location_terms)) {
1769 
-                $url_separator = '';
1768 
+			if (!empty($location_terms)) {
1769 
+				$url_separator = '';
1770 1770
1771 
-                if (get_option('permalink_structure') != '') {
1772 
-                    $old_listing_slug = '/' . $listing_slug . '/';
1773 
-                    $request_term = implode("/", $location_terms);
1774 
-                    $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';
1771 
+				if (get_option('permalink_structure') != '') {
1772 
+					$old_listing_slug = '/' . $listing_slug . '/';
1773 
+					$request_term = implode("/", $location_terms);
1774 
+					$new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';
1775 1775
1776 
-                    $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));
1777 
-                } else {
1778 
-                    $termlink = geodir_getlink($termlink, $request_term);
1779 
-                }
1780 
-            }
1781 
-        }
1776 
+					$termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));
1777 
+				} else {
1778 
+					$termlink = geodir_getlink($termlink, $request_term);
1779 
+				}
1780 
+			}
1781 
+		}
1782 1782
1783 
-        // Alter the CPT slug is WPML is set to do so
1784 
-        /* we can replace this with the below function
1783 
+		// Alter the CPT slug is WPML is set to do so
1784 
+		/* we can replace this with the below function
1785 1785 
         if(function_exists('icl_object_id')){
1786 1786 
             global $sitepress;
1787 1787 
             $post_type = str_replace("category","",$taxonomy);
1788 1788 
             $termlink = $sitepress->post_type_archive_link_filter( $termlink, $post_type);
1789 1789 
         }*/
1790 1790
1791 
-        // Alter the CPT slug if WPML is set to do so
1792 
-        if (function_exists('icl_object_id')) {
1793 
-            $post_types = get_option('geodir_post_types');
1794 
-            $post_type = str_replace("category","",$taxonomy);
1795 
-            $post_type = str_replace("_tags","",$post_type);
1796 
-            $slug = $post_types[$post_type]['rewrite']['slug'];
1797 
-            if (gd_wpml_slug_translation_turned_on($post_type)) {
1798 
-                global $sitepress;
1799 
-                $default_lang = $sitepress->get_default_language();
1800 
-                $language_code = gd_wpml_get_lang_from_url($termlink);
1801 
-                if (!$language_code ) {
1802 
-                    $language_code  = $default_lang;
1803 
-                }
1791 
+		// Alter the CPT slug if WPML is set to do so
1792 
+		if (function_exists('icl_object_id')) {
1793 
+			$post_types = get_option('geodir_post_types');
1794 
+			$post_type = str_replace("category","",$taxonomy);
1795 
+			$post_type = str_replace("_tags","",$post_type);
1796 
+			$slug = $post_types[$post_type]['rewrite']['slug'];
1797 
+			if (gd_wpml_slug_translation_turned_on($post_type)) {
1798 
+				global $sitepress;
1799 
+				$default_lang = $sitepress->get_default_language();
1800 
+				$language_code = gd_wpml_get_lang_from_url($termlink);
1801 
+				if (!$language_code ) {
1802 
+					$language_code  = $default_lang;
1803 
+				}
1804 1804
1805 
-                $org_slug = $slug;
1806 
-                $slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);
1805 
+				$org_slug = $slug;
1806 
+				$slug = apply_filters('wpml_translate_single_string', $slug, 'WordPress', 'URL slug: ' . $slug, $language_code);
1807 1807
1808 
-                if (!$slug) {
1809 
-                    $slug = $org_slug;
1810 
-                }
1808 
+				if (!$slug) {
1809 
+					$slug = $org_slug;
1810 
+				}
1811 1811
1812 
-                $termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug  ,$termlink, 1));
1813 
-            }
1814 
-        }
1815 
-    }
1812 
+				$termlink = trailingslashit(preg_replace("/" . preg_quote($org_slug, "/") . "/", $slug  ,$termlink, 1));
1813 
+			}
1814 
+		}
1815 
+	}
1816 1816
1817 
-    return $termlink;
1817 
+	return $termlink;
1818 1818 
 }
1819 1819
1820 1820 
 /**

@@ -1840,14 +1840,14 @@  discard block
 
 block discarded – undo
1840 1840 
 	if (in_array($post_type, geodir_get_posttypes())) {
1841 1841 
 		if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {
1842 1842 
 			if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {
1843 
-                $location_terms = array(
1844 
-                    'gd_country' => $post->country_slug,
1845 
-                    'gd_region' => $post->region_slug,
1846 
-                    'gd_city' => $post->city_slug
1847 
-                );
1848 
-            } else {
1849 
-                $location_terms = geodir_get_current_location_terms('query_vars');
1850 
-            }
1843 
+				$location_terms = array(
1844 
+					'gd_country' => $post->country_slug,
1845 
+					'gd_region' => $post->region_slug,
1846 
+					'gd_city' => $post->city_slug
1847 
+				);
1848 
+			} else {
1849 
+				$location_terms = geodir_get_current_location_terms('query_vars');
1850 
+			}
1851 1851
1852 1852 
 			$location_terms = geodir_remove_location_terms($location_terms);
1853 1853 
 			

@@ -1879,17 +1879,17 @@  discard block
 
 block discarded – undo
1879 1879 
  * @return void|string Label.
1880 1880 
  */
1881 1881 
 function get_post_type_singular_label($post_type, $echo = false, $translate = false) {
1882 
-    $obj_post_type = get_post_type_object($post_type);
1883 
-    if (!is_object($obj_post_type)) {
1884 
-        return;
1885 
-    }
1882 
+	$obj_post_type = get_post_type_object($post_type);
1883 
+	if (!is_object($obj_post_type)) {
1884 
+		return;
1885 
+	}
1886 1886
1887 
-    $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;
1887 
+	$label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;
1888 1888
1889 
-    if ($echo)
1890 
-        echo $label;
1891 
-    else
1892 
-        return $label;
1889 
+	if ($echo)
1890 
+		echo $label;
1891 
+	else
1892 
+		return $label;
1893 1893 
 }
1894 1894
1895 1895 
 /**

@@ -1904,19 +1904,19 @@  discard block
 
 block discarded – undo
1904 1904 
  * @return void|string Label.
1905 1905 
  */
1906 1906 
 function get_post_type_plural_label($post_type, $echo = false, $translate = false) {
1907 
-    $all_postypes = geodir_get_posttypes();
1907 
+	$all_postypes = geodir_get_posttypes();
1908 1908
1909 
-    if (!in_array($post_type, $all_postypes))
1910 
-        return false;
1909 
+	if (!in_array($post_type, $all_postypes))
1910 
+		return false;
1911 1911
1912 
-    $obj_post_type = get_post_type_object($post_type);
1912 
+	$obj_post_type = get_post_type_object($post_type);
1913 1913
1914 
-    $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;
1914 
+	$label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;
1915 1915
1916 
-    if ($echo)
1917 
-        echo $label;
1918 
-    else
1919 
-        return $label;
1916 
+	if ($echo)
1917 
+		echo $label;
1918 
+	else
1919 
+		return $label;
1920 1920 
 }
1921 1921
1922 1922 
 /**

@@ -1934,51 +1934,51 @@  discard block
 
 block discarded – undo
1934 1934 
  */
1935 1935 
 function geodir_term_exists($term, $taxonomy = '', $parent = 0)
1936 1936 
 {
1937 
-    global $wpdb;
1938 
-
1939 
-    $select = "SELECT term_id FROM $wpdb->terms as t WHERE ";
1940 
-    $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";
1941 
-
1942 
-    if (is_int($term)) {
1943 
-        if (0 == $term)
1944 
-            return 0;
1945 
-        $where = 't.term_id = %d';
1946 
-        if (!empty($taxonomy))
1947 
-            return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
1948 
-        else
1949 
-            return $wpdb->get_var($wpdb->prepare($select . $where, $term));
1950 
-    }
1937 
+	global $wpdb;
1938 
+
1939 
+	$select = "SELECT term_id FROM $wpdb->terms as t WHERE ";
1940 
+	$tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";
1941 
+
1942 
+	if (is_int($term)) {
1943 
+		if (0 == $term)
1944 
+			return 0;
1945 
+		$where = 't.term_id = %d';
1946 
+		if (!empty($taxonomy))
1947 
+			return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
1948 
+		else
1949 
+			return $wpdb->get_var($wpdb->prepare($select . $where, $term));
1950 
+	}
1951 1951
1952 
-    $term = trim(wp_unslash($term));
1952 
+	$term = trim(wp_unslash($term));
1953 1953
1954 
-    if ('' === $slug = sanitize_title($term))
1955 
-        return 0;
1954 
+	if ('' === $slug = sanitize_title($term))
1955 
+		return 0;
1956 1956
1957 
-    $where = 't.slug = %s';
1957 
+	$where = 't.slug = %s';
1958 1958
1959 
-    $where_fields = array($slug);
1960 
-    if (!empty($taxonomy)) {
1961 
-        $parent = (int)$parent;
1962 
-        if ($parent > 0) {
1963 
-            $where_fields[] = $parent;
1964 
-            $else_where_fields[] = $parent;
1965 
-            $where .= ' AND tt.parent = %d';
1959 
+	$where_fields = array($slug);
1960 
+	if (!empty($taxonomy)) {
1961 
+		$parent = (int)$parent;
1962 
+		if ($parent > 0) {
1963 
+			$where_fields[] = $parent;
1964 
+			$else_where_fields[] = $parent;
1965 
+			$where .= ' AND tt.parent = %d';
1966 1966
1967 
-        }
1967 
+		}
1968 1968
1969 
-        $where_fields[] = $taxonomy;
1969 
+		$where_fields[] = $taxonomy;
1970 1970
1971 1971
1972 
-        if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))
1973 
-            return $result;
1972 
+		if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))
1973 
+			return $result;
1974 1974
1975 
-        return false;
1976 
-    }
1975 
+		return false;
1976 
+	}
1977 1977
1978 
-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
1979 
-        return $result;
1978 
+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
1979 
+		return $result;
1980 1980
1981 
-    return false;
1981 
+	return false;
1982 1982 
 }
1983 1983
1984 1984 
 /**

@@ -1990,7 +1990,7 @@  discard block
 
 block discarded – undo
1990 1990 
 function geodir_get_term_icon_rebuild()
1991 1991 
 {
1992 1992
1993 
-    update_option('gd_term_icons', '');
1993 
+	update_option('gd_term_icons', '');
1994 1994
1995 1995 
 }
1996 1996 
 

@@ -2008,61 +2008,61 @@  discard block
 
 block discarded – undo
2008 2008 
  */
2009 2009 
 function geodir_get_term_icon($term_id = false, $rebuild = false)
2010 2010 
 {
2011 
-    global $wpdb;
2012 
-    if (!$rebuild) {
2013 
-        $terms_icons = get_option('gd_term_icons');
2014 
-    } else {
2015 
-        $terms_icons = array();
2016 
-    }
2017 
-
2018 
-    if (empty($terms_icons)) {
2019 
-        $terms_icons = array();
2020 
-        $default_icon_url = get_option('geodir_default_marker_icon');
2021 
-        $taxonomy = geodir_get_taxonomies();
2022 
-        $post_types = geodir_get_posttypes();
2023 
-        $tax_arr = array();
2024 
-        foreach ($post_types as $post_type) {
2025 
-            $tax_arr[] = "'" . $post_type . "category'";
2026 
-        }
2027 
-        $tax_c = implode(',', $tax_arr);
2028 
-        $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
2029 
-        //$terms = get_terms( $taxonomy );
2030 
-
2031 
-        if($terms) {
2032 
-            foreach ($terms as $term) {
2033 
-                $post_type = str_replace("category", "", $term->taxonomy);
2034 
-                $a_terms[$post_type][] = $term;
2011 
+	global $wpdb;
2012 
+	if (!$rebuild) {
2013 
+		$terms_icons = get_option('gd_term_icons');
2014 
+	} else {
2015 
+		$terms_icons = array();
2016 
+	}
2035 2017
2036 
-            }
2037 
-        }
2018 
+	if (empty($terms_icons)) {
2019 
+		$terms_icons = array();
2020 
+		$default_icon_url = get_option('geodir_default_marker_icon');
2021 
+		$taxonomy = geodir_get_taxonomies();
2022 
+		$post_types = geodir_get_posttypes();
2023 
+		$tax_arr = array();
2024 
+		foreach ($post_types as $post_type) {
2025 
+			$tax_arr[] = "'" . $post_type . "category'";
2026 
+		}
2027 
+		$tax_c = implode(',', $tax_arr);
2028 
+		$terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");
2029 
+		//$terms = get_terms( $taxonomy );
2038 2030
2039 
-        if($a_terms) {
2040 
-            foreach ($a_terms as $pt => $t2) {
2031 
+		if($terms) {
2032 
+			foreach ($terms as $term) {
2033 
+				$post_type = str_replace("category", "", $term->taxonomy);
2034 
+				$a_terms[$post_type][] = $term;
2041 2035
2042 
-                foreach ($t2 as $term) {
2043 
-                    $term_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt);
2044 
-                    if ($term_icon) {
2045 
-                        $term_icon_url = $term_icon["src"];
2046 
-                    } else {
2047 
-                        $term_icon_url = $default_icon_url;
2048 
-                    }
2049 
-                    $terms_icons[$term->term_id] = $term_icon_url;
2050 
-                }
2051 
-            }
2052 
-        }
2036 
+			}
2037 
+		}
2053 2038
2054 
-        update_option('gd_term_icons', $terms_icons);
2055 
-    }
2039 
+		if($a_terms) {
2040 
+			foreach ($a_terms as $pt => $t2) {
2056 2041
2057 
-    if ($term_id && isset($terms_icons[$term_id])) {
2058 
-        return $terms_icons[$term_id];
2059 
-    } elseif ($term_id && !isset($terms_icons[$term_id])) {
2060 
-        return get_option('geodir_default_marker_icon');
2061 
-    }
2042 
+				foreach ($t2 as $term) {
2043 
+					$term_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt);
2044 
+					if ($term_icon) {
2045 
+						$term_icon_url = $term_icon["src"];
2046 
+					} else {
2047 
+						$term_icon_url = $default_icon_url;
2048 
+					}
2049 
+					$terms_icons[$term->term_id] = $term_icon_url;
2050 
+				}
2051 
+			}
2052 
+		}
2053 
+
2054 
+		update_option('gd_term_icons', $terms_icons);
2055 
+	}
2062 2056
2063 
-    if (is_ssl()) {
2064 
-        $terms_icons = str_replace("http:","https:",$terms_icons );
2065 
-    }
2057 
+	if ($term_id && isset($terms_icons[$term_id])) {
2058 
+		return $terms_icons[$term_id];
2059 
+	} elseif ($term_id && !isset($terms_icons[$term_id])) {
2060 
+		return get_option('geodir_default_marker_icon');
2061 
+	}
2062 
+
2063 
+	if (is_ssl()) {
2064 
+		$terms_icons = str_replace("http:","https:",$terms_icons );
2065 
+	}
2066 2066
2067 
-    return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
2067 
+	return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);
2068 2068 
 }
2069 2069 
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +170 added lines, -122 removed lines patch added patch discarded remove patch 
@@ -39,8 +39,9 @@  discard block
 
 block discarded – undo
39 39 
     if (get_option('geodir_show_listing_nav')) {
40 40
41 41 
         $menu_class = '';
42 
-        if (geodir_is_page('listing'))
43 
-            $menu_class = 'current-menu-item';
42 
+        if (geodir_is_page('listing')) {
43 
+                    $menu_class = 'current-menu-item';
44 
+        }
44 45
45 46
46 47 
         //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

@@ -52,8 +53,9 @@  discard block
 
 block discarded – undo
52 53 
                     if (in_array($post_type, $show_post_type_main_nav)) {
53 54 
                         if (get_post_type_archive_link($post_type)) {
54 55 
                             $menu_class = '';
55 
-                            if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
56 
-                                $menu_class = 'current-menu-item';
56 
+                            if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing')) {
57 
+                                                            $menu_class = 'current-menu-item';
58 
+                            }
57 59 
                             /**
58 60 
                              * Filter the menu li class.
59 61 
                              *

@@ -130,8 +132,9 @@  discard block
 
 block discarded – undo
130 132 
                             if (get_post_type_archive_link($post_type)) {
131 133
132 134 
                                 $menu_class = '';
133 
-                                if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))
134 
-                                    $menu_class = 'current-menu-item';
135 
+                                if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing')) {
136 
+                                                                    $menu_class = 'current-menu-item';
137 
+                                }
135 138
136 139 
                                 $items .= '<li class="' . $sub_li_class . '">
137 140 
 														<a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '">

@@ -159,8 +162,9 @@  discard block
 
 block discarded – undo
159 162 
     if (get_option('geodir_show_addlisting_nav')) {
160 163
161 164 
         $menu_class = '';
162 
-        if (geodir_is_page('add-listing'))
163 
-            $menu_class = 'current-menu-item';
165 
+        if (geodir_is_page('add-listing')) {
166 
+                    $menu_class = 'current-menu-item';
167 
+        }
164 168
165 169 
         //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION
166 170 
         $post_types = geodir_get_posttypes('object');

@@ -176,8 +180,9 @@  discard block
 
 block discarded – undo
176 180 
                                 if (geodir_get_addlisting_link($post_type)) {
177 181
178 182 
                                     $menu_class = '';
179 
-                                    if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
180 
-                                        $menu_class = 'current-menu-item';
183 
+                                    if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing')) {
184 
+                                                                            $menu_class = 'current-menu-item';
185 
+                                    }
181 186 
                                     /**
182 187 
                                      * Filter the menu li class.
183 188 
                                      *

@@ -261,8 +266,9 @@  discard block
 
 block discarded – undo
261 266 
                                     if (geodir_get_addlisting_link($post_type)) {
262 267
263 268 
                                         $menu_class = '';
264 
-                                        if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))
265 
-                                            $menu_class = 'current-menu-item';
269 
+                                        if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing')) {
270 
+                                                                                    $menu_class = 'current-menu-item';
271 
+                                        }
266 272 
                                         /**
267 273 
                                          * Filter the menu li class.
268 274 
                                          *

@@ -319,8 +325,9 @@  discard block
 
 block discarded – undo
319 325 
     }
320 326 
     //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.
321 327 
 //		$menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);
322 
-    else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))
323 
-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
328 
+    else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) {
329 
+            $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
330 
+    }
324 331
325 332 
     return $menu;
326 333 
 

@@ -407,17 +414,20 @@  discard block
 
 block discarded – undo
407 414 
     $geodir_post_type = get_query_var('post_type');
408 415
409 416 
     if (geodir_is_page('add-listing') || geodir_is_page('preview')) {
410 
-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
411 
-            $geodir_post_type = get_post_type((int)$_REQUEST['pid']);
412 
-        elseif (isset($_REQUEST['listing_type']))
413 
-            $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);
417 
+        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
418 
+                    $geodir_post_type = get_post_type((int)$_REQUEST['pid']);
419 
+        } elseif (isset($_REQUEST['listing_type'])) {
420 
+                    $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);
421 
+        }
414 422 
     }
415 423
416 
-    if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))
417 
-        $geodir_post_type = sanitize_text_field($_REQUEST['stype']);
424 
+    if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype'])) {
425 
+            $geodir_post_type = sanitize_text_field($_REQUEST['stype']);
426 
+    }
418 427
419 
-    if (is_tax())
420 
-        $geodir_post_type = geodir_get_taxonomy_posttype();
428 
+    if (is_tax()) {
429 
+            $geodir_post_type = geodir_get_taxonomy_posttype();
430 
+    }
421 431
422 432 
     // Retrive post type for map marker html ajax request on preview page.
423 433 
     if (empty($geodir_post_type) && defined('DOING_AJAX') && !empty($post)) {

@@ -431,8 +441,9 @@  discard block
 
 block discarded – undo
431 441 
     $all_postypes = geodir_get_posttypes();
432 442 
     $all_postypes = stripslashes_deep($all_postypes);
433 443
434 
-    if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))
435 
-        $geodir_post_type = '';
444 
+    if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) {
445 
+            $geodir_post_type = '';
446 
+    }
436 447
437 448 
     if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){
438 449 
         $geodir_post_type = sanitize_text_field($_REQUEST['stype']);

@@ -517,11 +528,12 @@  discard block
 
 block discarded – undo
517 528 
         endswitch;
518 529 
     }
519 530
520 
-    if (!empty($post_types))
521 
-        return $post_types;
522 
-    else
523 
-        return array();
524 
-}
531 
+    if (!empty($post_types)) {
532 
+            return $post_types;
533 
+    } else {
534 
+            return array();
535 
+    }
536 
+    }
525 537
526 538 
 /**
527 539 
  * Get Custom Post Type info.

@@ -538,9 +550,10 @@  discard block
 
 block discarded – undo
538 550 
     $post_types = stripslashes_deep($post_types);
539 551 
     if (!empty($post_types) && $post_type != '') {
540 552 
         return $post_types[$post_type];
541 
-    } else
542 
-        return false;
543 
-}
553 
+    } else {
554 
+            return false;
555 
+    }
556 
+    }
544 557
545 558 
 if (!function_exists('geodir_get_taxonomies')) {
546 559 
     /**

@@ -564,18 +577,21 @@  discard block
 
 block discarded – undo
564 577 
             $gd_taxonomies = array_keys($taxonomies);
565 578
566 579
567 
-            if ($post_type != '')
568 
-                $gd_taxonomies = array();
580 
+            if ($post_type != '') {
581 
+                            $gd_taxonomies = array();
582 
+            }
569 583
570 584 
             $i = 0;
571 585 
             foreach ($taxonomies as $taxonomy => $args) {
572 586
573 
-                if ($post_type != '' && $args['object_type'] == $post_type)
574 
-                    $gd_taxonomies[] = $taxonomy;
587 
+                if ($post_type != '' && $args['object_type'] == $post_type) {
588 
+                                    $gd_taxonomies[] = $taxonomy;
589 
+                }
575 590
576 591 
                 if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {
577 
-                    if (array_search($taxonomy, $gd_taxonomies) !== false)
578 
-                        unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);
592 
+                    if (array_search($taxonomy, $gd_taxonomies) !== false) {
593 
+                                            unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);
594 
+                    }
579 595 
                 }
580 596
581 597 
             }

@@ -630,10 +646,11 @@  discard block
 
 block discarded – undo
630 646 
                 . geodir_utf8_ucfirst($category_obj->name) . '</option>';
631 647 
         }
632 648
633 
-        if ($echo)
634 
-            echo $html;
635 
-        else
636 
-            return $html;
649 
+        if ($echo) {
650 
+                    echo $html;
651 
+        } else {
652 
+                    return $html;
653 
+        }
637 654 
     }
638 655 
 }
639 656 
 

@@ -667,11 +684,12 @@  discard block
 
 block discarded – undo
667 684
668 685 
     }
669 686
670 
-    if (!empty($listing_slug))
671 
-        return $listing_slug;
672 
-    else
673 
-        return false;
674 
-}
687 
+    if (!empty($listing_slug)) {
688 
+            return $listing_slug;
689 
+    } else {
690 
+            return false;
691 
+    }
692 
+    }
675 693
676 694
677 695 
 /**

@@ -702,16 +720,18 @@  discard block
 
 block discarded – undo
702 720 
     if (!empty($taxonomies)) {
703 721 
         foreach (geodir_get_posttypes() as $pt) {
704 722 
             $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);
705 
-            if (array_intersect($taxonomies, $object_taxonomies))
706 
-                $post_type[] = $pt;
723 
+            if (array_intersect($taxonomies, $object_taxonomies)) {
724 
+                            $post_type[] = $pt;
725 
+            }
707 726 
         }
708 727 
     }
709 728
710 
-    if (!empty($post_type))
711 
-        return $post_type[0];
712 
-    else
713 
-        return false;
714 
-}
729 
+    if (!empty($post_type)) {
730 
+            return $post_type[0];
731 
+    } else {
732 
+            return false;
733 
+    }
734 
+    }
715 735
716 736 
 if (!function_exists('geodir_custom_taxonomy_walker')) {
717 737 
     /**

@@ -767,18 +787,18 @@  discard block
 
 block discarded – undo
767 787 
                 $checked = '';
768 788
769 789 
                 if (in_array($cat_term->term_id, $search_terms)) {
770 
-                    if ($cat_display == 'select' || $cat_display == 'multiselect')
771 
-                        $checked = 'selected="selected"';
772 
-                    else
773 
-                        $checked = 'checked="checked"';
790 
+                    if ($cat_display == 'select' || $cat_display == 'multiselect') {
791 
+                                            $checked = 'selected="selected"';
792 
+                    } else {
793 
+                                            $checked = 'checked="checked"';
794 
+                    }
774 795 
                 }
775 796
776 
-                if ($cat_display == 'radio')
777 
-                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';
778 
-                elseif ($cat_display == 'select' || $cat_display == 'multiselect')
779 
-                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>';
780 
-
781 
-                else {
797 
+                if ($cat_display == 'radio') {
798 
+                                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';
799 
+                } elseif ($cat_display == 'select' || $cat_display == 'multiselect') {
800 
+                                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</option>';
801 
+                } else {
782 802 
                     $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . geodir_utf8_ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . geodir_utf8_ucfirst($cat_term->name) . '</span>';
783 803 
                 }
784 804 
 

@@ -787,8 +807,9 @@  discard block
 
 block discarded – undo
787 807
788 808 
             }
789 809
790 
-            if ($cat_display == 'checkbox' || $cat_display == 'radio')
791 
-                $out .= '</div>';
810 
+            if ($cat_display == 'checkbox' || $cat_display == 'radio') {
811 
+                            $out .= '</div>';
812 
+            }
792 813
793 814 
             return $out;
794 815 
         }

@@ -814,18 +835,21 @@  discard block
 
 block discarded – undo
814 835 
         global $exclude_cats, $gd_session;
815 836
816 837 
         $cat_exclude = '';
817 
-        if (is_array($exclude_cats) && !empty($exclude_cats))
818 
-            $cat_exclude = serialize($exclude_cats);
838 
+        if (is_array($exclude_cats) && !empty($exclude_cats)) {
839 
+                    $cat_exclude = serialize($exclude_cats);
840 
+        }
819 841
820 842 
         if (isset($_REQUEST['backandedit'])) {
821 843 
             $post = (object)$gd_session->get('listing');
822 844
823 
-            if (!is_array($post->post_category[$cat_taxonomy]))
824 
-                $post_category = $post->post_category[$cat_taxonomy];
845 
+            if (!is_array($post->post_category[$cat_taxonomy])) {
846 
+                            $post_category = $post->post_category[$cat_taxonomy];
847 
+            }
825 848
826 849 
             $post_categories = $post->post_category_str;
827 
-            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories))
828 
-                $post_category_str = $post_categories[$cat_taxonomy];
850 
+            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
851 
+                            $post_category_str = $post_categories[$cat_taxonomy];
852 
+            }
829 853
830 854 
         } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {
831 855 
             global $post;

@@ -1016,8 +1040,9 @@  discard block
 
 block discarded – undo
1016 1040 
         if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
1017 1041 
             $post_cat_str = $post_categories[$cat_taxonomy];
1018 1042 
             $post_cat_array = explode("#", $post_cat_str);
1019 
-            if (count($post_cat_array) >= $cat_limit && $cat_limit != 0)
1020 
-                $style = "display:none;";
1043 
+            if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) {
1044 
+                            $style = "display:none;";
1045 
+            }
1021 1046 
         }
1022 1047 
         ?>
1023 1048 
         <div class="main_cat_list" style=" <?php if (isset($style)) {

@@ -1052,7 +1077,7 @@  discard block
 
 block discarded – undo
1052 1077
1053 1078 
         if(is_array( $exclude_cats)){
1054 1079 
             $exclude_cats = array_map( 'intval', $exclude_cats );
1055 
-        }else{
1080 
+        } else{
1056 1081 
             $exclude_cats = intval($exclude_cats);
1057 1082 
         }
1058 1083 
 

@@ -1082,7 +1107,10 @@  discard block
 
 block discarded – undo
1082 1107
1083 1108 
             <div class="post_default_category">
1084 1109 
                 <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>"
1085 
-                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?>   />
1110 
+                       onchange="update_listing_cat()" <?php if ($default) {
1111 
+	echo ' checked="checked" ';
1112 
+}
1113 
+?>   />
1086 1114 
         <span>
1087 1115 
         <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>
1088 1116 
         </span>

@@ -1182,8 +1210,9 @@  discard block
 
 block discarded – undo
1182 1210 
         $onchange = ' onchange="show_subcatlist(this.value, this)" ';
1183 1211
1184 1212 
         $option_selected = '';
1185 
-        if (!$selected)
1186 
-            $option_slected = ' selected="selected" ';
1213 
+        if (!$selected) {
1214 
+                    $option_slected = ' selected="selected" ';
1215 
+        }
1187 1216
1188 1217 
         echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';
1189 1218 
 

@@ -1191,8 +1220,9 @@  discard block
 
 block discarded – undo
1191 1220
1192 1221 
         foreach ($cat_terms as $cat_term) {
1193 1222 
             $option_selected = '';
1194 
-            if ($selected == $cat_term->term_id)
1195 
-                $option_selected = ' selected="selected" ';
1223 
+            if ($selected == $cat_term->term_id) {
1224 
+                            $option_selected = ' selected="selected" ';
1225 
+            }
1196 1226
1197 1227 
             // Count child terms
1198 1228 
             $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

@@ -1257,8 +1287,9 @@  discard block
 
 block discarded – undo
1257 1287
1258 1288 
     $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';
1259 1289
1260 
-    if (!$listing_slug = get_option('geodir_listing_prefix'))
1261 
-        $listing_slug = 'places';
1290 
+    if (!$listing_slug = get_option('geodir_listing_prefix')) {
1291 
+            $listing_slug = 'places';
1292 
+    }
1262 1293
1263 1294 
     /**
1264 1295 
      * Taxonomies

@@ -1570,8 +1601,9 @@  discard block
 
 block discarded – undo
1570 1601 
                             'city_slug' => $post->city_slug
1571 1602 
                         );
1572 1603
1573 
-                    } else
1574 
-                        $post_location = geodir_get_location();
1604 
+                    } else {
1605 
+                                            $post_location = geodir_get_location();
1606 
+                    }
1575 1607
1576 1608
1577 1609 
                 } else {

@@ -1600,8 +1632,9 @@  discard block
 
 block discarded – undo
1600 1632 
                             );
1601 1633
1602 1634 
                         }
1603 
-                    } else
1604 
-                        $post_location = geodir_get_location();
1635 
+                    } else {
1636 
+                                            $post_location = geodir_get_location();
1637 
+                    }
1605 1638 
                 }
1606 1639
1607 1640 
 

@@ -1641,16 +1674,17 @@  discard block
 
 block discarded – undo
1641 1674
1642 1675 
                     if(isset($_POST['post_default_category']) && $_POST['post_default_category']){
1643 1676 
                         $post_terms = absint($_POST['post_default_category']);
1644 
-                    }elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]){
1677 
+                    } elseif(isset($_POST['post_category'][$taxonomies]) && $_POST['post_category'][$taxonomies]){
1645 1678 
                         $post_terms = explode(",", trim($_POST['post_category'][$taxonomies], ","));
1646 1679 
                         $post_terms = absint($post_terms[0]);
1647 
-                    }elseif (isset($post->{$taxonomies})) {
1680 
+                    } elseif (isset($post->{$taxonomies})) {
1648 1681 
                         $post_terms = explode(",", trim($post->{$taxonomies}, ","));
1649 1682 
                         $post_terms = $post_terms[0];
1650 1683 
                     }
1651 1684
1652 
-                    if (!$post_terms)
1653 
-                        $post_terms = geodir_get_post_meta($post->ID, 'default_category', true);
1685 
+                    if (!$post_terms) {
1686 
+                                            $post_terms = geodir_get_post_meta($post->ID, 'default_category', true);
1687 
+                    }
1654 1688
1655 1689 
                     if (!$post_terms) {
1656 1690 
                         $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true);

@@ -1664,8 +1698,9 @@  discard block
 
 block discarded – undo
1664 1698
1665 1699 
                 $term = get_term_by('id', $post_terms, $taxonomies);
1666 1700
1667 
-                if (!empty($term))
1668 
-                    $term_request = $term->slug;
1701 
+                if (!empty($term)) {
1702 
+                                    $term_request = $term->slug;
1703 
+                }
1669 1704 
                 //$term_request = $term->slug.'/';
1670 1705 
             }
1671 1706 
 

@@ -1680,9 +1715,13 @@  discard block
 
 block discarded – undo
1680 1715 
                 $request_term .= $term_request;
1681 1716
1682 1717 
             } else {
1683 
-                if (isset($location_request) && $location_request != '') $request_term = $location_request;
1718 
+                if (isset($location_request) && $location_request != '') {
1719 
+                	$request_term = $location_request;
1720 
+                }
1684 1721
1685 
-                if (isset($term_request) && $term_request != '') $request_term .= $term_request;
1722 
+                if (isset($term_request) && $term_request != '') {
1723 
+                	$request_term .= $term_request;
1724 
+                }
1686 1725 
             }
1687 1726 
             $request_term = trim($request_term, '/');
1688 1727 
             

@@ -1691,10 +1730,11 @@  discard block
 
 block discarded – undo
1691 1730 
                 $post_link = str_replace('%gd_taxonomy%/', '', $post_link);
1692 1731 
             }
1693 1732
1694 
-            if (!empty($request_term))
1695 
-                $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
1696 
-            else
1697 
-                $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
1733 
+            if (!empty($request_term)) {
1734 
+                            $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
1735 
+            } else {
1736 
+                            $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
1737 
+            }
1698 1738 
             //echo $post_link ;
1699 1739 
         }
1700 1740 
         // temp cache the permalink

@@ -1886,11 +1926,12 @@  discard block
 
 block discarded – undo
1886 1926
1887 1927 
     $label = $translate ? __($obj_post_type->labels->singular_name, 'geodirectory') : $obj_post_type->labels->singular_name;
1888 1928
1889 
-    if ($echo)
1890 
-        echo $label;
1891 
-    else
1892 
-        return $label;
1893 
-}
1929 
+    if ($echo) {
1930 
+            echo $label;
1931 
+    } else {
1932 
+            return $label;
1933 
+    }
1934 
+    }
1894 1935
1895 1936 
 /**
1896 1937 
  * Print or Get post type plural label.

@@ -1906,18 +1947,20 @@  discard block
 
 block discarded – undo
1906 1947 
 function get_post_type_plural_label($post_type, $echo = false, $translate = false) {
1907 1948 
     $all_postypes = geodir_get_posttypes();
1908 1949
1909 
-    if (!in_array($post_type, $all_postypes))
1910 
-        return false;
1950 
+    if (!in_array($post_type, $all_postypes)) {
1951 
+            return false;
1952 
+    }
1911 1953
1912 1954 
     $obj_post_type = get_post_type_object($post_type);
1913 1955
1914 1956 
     $label = $translate ? __($obj_post_type->labels->name, 'geodirectory') : $obj_post_type->labels->name;
1915 1957
1916 
-    if ($echo)
1917 
-        echo $label;
1918 
-    else
1919 
-        return $label;
1920 
-}
1958 
+    if ($echo) {
1959 
+            echo $label;
1960 
+    } else {
1961 
+            return $label;
1962 
+    }
1963 
+    }
1921 1964
1922 1965 
 /**
1923 1966 
  * Checks whether a term exists or not.

@@ -1940,19 +1983,22 @@  discard block
 
 block discarded – undo
1940 1983 
     $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";
1941 1984
1942 1985 
     if (is_int($term)) {
1943 
-        if (0 == $term)
1944 
-            return 0;
1986 
+        if (0 == $term) {
1987 
+                    return 0;
1988 
+        }
1945 1989 
         $where = 't.term_id = %d';
1946 
-        if (!empty($taxonomy))
1947 
-            return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
1948 
-        else
1949 
-            return $wpdb->get_var($wpdb->prepare($select . $where, $term));
1990 
+        if (!empty($taxonomy)) {
1991 
+                    return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
1992 
+        } else {
1993 
+                    return $wpdb->get_var($wpdb->prepare($select . $where, $term));
1994 
+        }
1950 1995 
     }
1951 1996
1952 1997 
     $term = trim(wp_unslash($term));
1953 1998
1954 
-    if ('' === $slug = sanitize_title($term))
1955 
-        return 0;
1999 
+    if ('' === $slug = sanitize_title($term)) {
2000 
+            return 0;
2001 
+    }
1956 2002
1957 2003 
     $where = 't.slug = %s';
1958 2004 
 

@@ -1969,14 +2015,16 @@  discard block
 
 block discarded – undo
1969 2015 
         $where_fields[] = $taxonomy;
1970 2016
1971 2017
1972 
-        if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))
1973 
-            return $result;
2018 
+        if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A)) {
2019 
+                    return $result;
2020 
+        }
1974 2021
1975 2022 
         return false;
1976 2023 
     }
1977 2024
1978 
-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))
1979 
-        return $result;
2025 
+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields))) {
2026 
+            return $result;
2027 
+    }
1980 2028
1981 2029 
     return false;
1982 2030 
 }
Please login to merge, or discard this patch.
geodirectory-admin/admin_functions.php 3 patches
Braces   +230 added lines, -127 removed lines patch added patch discarded remove patch 
@@ -184,8 +184,9 @@  discard block
 
 block discarded – undo
184 184
185 185 
         $thumb_img_arr = array();
186 186
187 
-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
188 
-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);
187 
+        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
188 
+                    $thumb_img_arr = geodir_get_images($_REQUEST['pid']);
189 
+        }
189 190
190 191 
         $totImg = '';
191 192 
         $image_limit = '';

@@ -236,7 +237,9 @@  discard block
 
 block discarded – undo
236 237 
     {
237 238 
         global $menu, $geodirectory;
238 239
239 
-        if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
240 
+        if (current_user_can('manage_options')) {
241 
+        	$menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
242 
+        }
240 243
241 244 
         add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
242 245 
 

@@ -300,7 +303,9 @@  discard block
 
 block discarded – undo
300 303 
      */
301 304 
     function geodir_admin_custom_menu_order()
302 305 
     {
303 
-        if (!current_user_can('manage_options')) return false;
306 
+        if (!current_user_can('manage_options')) {
307 
+        	return false;
308 
+        }
304 309 
         return true;
305 310 
     }
306 311 
 }

@@ -331,10 +336,11 @@  discard block
 
 block discarded – undo
331 336 
 			case 'fail':
332 337 
 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';
333 338
334 
-				if ($gderr == 21)
335 
-			    	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>';
336 
-				else
337 
-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
339 
+				if ($gderr == 21) {
340 
+							    	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>';
341 
+				} else {
342 
+									echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
343 
+				}
338 344 
                 break;
339 345 
         }
340 346 
     }

@@ -385,8 +391,12 @@  discard block
 
 block discarded – undo
385 391 
         include_once('option-pages/' . $current_tab . '_array.php');
386 392 
     }
387 393 
     if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :
388 
-        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
389 
-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
394 
+        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) {
395 
+        	die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
396 
+        }
397 
+        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) {
398 
+        	die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
399 
+        }
390 400
391 401 
 		/**
392 402 
 		 * Fires before updating geodirectory admin settings.

@@ -398,8 +408,9 @@  discard block
 
 block discarded – undo
398 408 
 		 */
399 409 
 		do_action('geodir_before_update_options', $current_tab, $geodir_settings);
400 410
401 
-        if (!empty($geodir_settings[$current_tab]))
402 
-            geodir_update_options($geodir_settings[$current_tab]);
411 
+        if (!empty($geodir_settings[$current_tab])) {
412 
+                    geodir_update_options($geodir_settings[$current_tab]);
413 
+        }
403 414
404 415 
         /**
405 416 
          * Called after GeoDirectory options settings are updated.

@@ -447,11 +458,14 @@  discard block
 
 block discarded – undo
447 458 
  * @return bool Returns true if saved.
448 459 
  */
449 460 
 function geodir_update_options($options, $dummy = false) {
450 
-    if ((!isset($_POST) || !$_POST) && !$dummy) return false;
461 
+    if ((!isset($_POST) || !$_POST) && !$dummy) {
462 
+    	return false;
463 
+    }
451 464
452 465 
     foreach ($options as $value) {
453 
-        if ($dummy && isset($value['std']))
454 
-            $_POST[$value['id']] = $value['std'];
466 
+        if ($dummy && isset($value['std'])) {
467 
+                    $_POST[$value['id']] = $value['std'];
468 
+        }
455 469
456 470
457 471 
         if (isset($value['type']) && $value['type'] == 'checkbox') :

@@ -460,25 +474,23 @@  discard block
 
 block discarded – undo
460 474 
                 update_option($value['id'], $_POST[$value['id']]);
461 475 
             } else {
462 476 
                 update_option($value['id'], 0);
463 
-            }
464 
-
465 
-        elseif (isset($value['type']) && $value['type'] == 'image_width') :
477 
+            } elseif (isset($value['type']) && $value['type'] == 'image_width') :
466 478
467 479 
             if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
468 480 
                 update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);
469 481 
                 update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);
470 482 
                 if (isset($_POST[$value['id'] . '_crop'])) :
471 483 
                     update_option($value['id'] . '_crop', 1);
472 
-                else :
473 
-                    update_option($value['id'] . '_crop', 0);
484 
+                else {
485 
+                	:
486 
+                    update_option($value['id'] . '_crop', 0);
487 
+                }
474 488 
                 endif;
475 489 
             } else {
476 490 
                 update_option($value['id'] . '_width', $value['std']);
477 491 
                 update_option($value['id'] . '_height', $value['std']);
478 492 
                 update_option($value['id'] . '_crop', 1);
479 
-            }
480 
-
481 
-        elseif (isset($value['type']) && $value['type'] == 'map') :
493 
+            } elseif (isset($value['type']) && $value['type'] == 'map') :
482 494 
             $post_types = array();
483 495 
             $categories = array();
484 496 
 

@@ -523,8 +535,9 @@  discard block
 
 block discarded – undo
523 535 
                     $image_name_arr = explode('/', get_option($value['id']));
524 536 
                     $noimg_name = end($image_name_arr);
525 537 
                     $img_path = $uploads['path'] . '/' . $noimg_name;
526 
-                    if (file_exists($img_path))
527 
-                        unlink($img_path);
538 
+                    if (file_exists($img_path)) {
539 
+                                            unlink($img_path);
540 
+                    }
528 541 
                 }
529 542
530 543 
                 update_option($value['id'], '');

@@ -540,8 +553,10 @@  discard block
 
 block discarded – undo
540 553 
                 foreach ($uploadedfile as $key => $uplaod):
541 554 
                     if ($key == 'name'):
542 555 
                         $uplaods[$key] = $filename;
543 
-                    else :
544 
-                        $uplaods[$key] = $uplaod;
556 
+                    else {
557 
+                    	:
558 
+                        $uplaods[$key] = $uplaod;
559 
+                    }
545 560 
                     endif;
546 561 
                 endforeach;
547 562 
 

@@ -551,8 +566,9 @@  discard block
 
 block discarded – undo
551 566 
                     $image_name_arr = explode('/', get_option($value['id']));
552 567 
                     $noimg_name = end($image_name_arr);
553 568 
                     $img_path = $uploads['path'] . '/' . $noimg_name;
554 
-                    if (file_exists($img_path))
555 
-                        unlink($img_path);
569 
+                    if (file_exists($img_path)) {
570 
+                                            unlink($img_path);
571 
+                    }
556 572 
                 }
557 573
558 574 
                 $upload_overrides = array('test_form' => false);

@@ -567,10 +583,12 @@  discard block
 
 block discarded – undo
567 583 
             endif;
568 584
569 585
570 
-        else :
586 
+        else {
587 
+        	:
571 588 
             // same menu setting per theme.
572 589 
             if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
573 
-                $theme = wp_get_theme();
590 
+                $theme = wp_get_theme();
591 
+        }
574 592 
                 update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
575 593 
             }
576 594 
 

@@ -582,8 +600,9 @@  discard block
 
 block discarded – undo
582 600
583 601 
         endif;
584 602 
     }
585 
-    if ($dummy)
586 
-        $_POST = array();
603 
+    if ($dummy) {
604 
+            $_POST = array();
605 
+    }
587 606 
     return true;
588 607
589 608 
 }

@@ -729,9 +748,12 @@  discard block
 
 block discarded – undo
729 748 
         $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
730 749 
             'categorys' => __('Categories', 'geodirectory'));
731 750
732 
-        if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
751 
+        if (($offset = array_search('author', array_keys($columns))) === false) {
752 
+        	// if the key doesn't exist
733 753 
         {
734 
-            $offset = 0; // should we prepend $array with $data?
754 
+            $offset = 0;
755 
+        }
756 
+        // should we prepend $array with $data?
735 757 
             $offset = count($columns); // or should we append $array with $data? lets pick this one...
736 758 
         }
737 759 
 

@@ -791,11 +813,13 @@  discard block
 
 block discarded – undo
791 813 
                     $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
792 814 
                 }
793 815 
                 /* If no expire_date is found, output a default message. */
794 
-                if (empty($expire_date))
795 
-                    echo __('Unknown', 'geodirectory');
816 
+                if (empty($expire_date)) {
817 
+                                    echo __('Unknown', 'geodirectory');
818 
+                }
796 819 
                 /* If there is a expire_date, append 'days left' to the text string. */
797 
-                else
798 
-                    echo $expire_date . $date_diff_text;
820 
+                else {
821 
+                                    echo $expire_date . $date_diff_text;
822 
+                }
799 823 
                 break;
800 824
801 825 
             /* If displaying the 'categorys' column. */

@@ -868,21 +892,26 @@  discard block
 
 block discarded – undo
868 892
869 893 
     $geodir_posttypes = geodir_get_posttypes();
870 894
871 
-    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
872 
-        return;
895 
+    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
896 
+            return;
897 
+    }
873 898
874 899 
     if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
875 
-        if (isset($_REQUEST['_status']))
876 
-            geodir_change_post_status($post_id, $_REQUEST['_status']);
900 
+        if (isset($_REQUEST['_status'])) {
901 
+                    geodir_change_post_status($post_id, $_REQUEST['_status']);
902 
+        }
877 903
878 
-        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))
879 
-            return;
904 
+        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) {
905 
+                    return;
906 
+        }
880 907
881 
-        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))
882 
-            return;
908 
+        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) {
909 
+                    return;
910 
+        }
883 911
884 
-        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))
885 
-            return;
912 
+        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) {
913 
+                    return;
914 
+        }
886 915
887 916 
         geodir_save_listing($_REQUEST);
888 917 
     }

@@ -907,10 +936,18 @@  discard block
 
 block discarded – undo
907 936 
     $tab_id = '';
908 937 
     $i = 0;
909 938 
     foreach ($options as $value) :
910 
-        if (!isset($value['name'])) $value['name'] = '';
911 
-        if (!isset($value['class'])) $value['class'] = '';
912 
-        if (!isset($value['css'])) $value['css'] = '';
913 
-        if (!isset($value['std'])) $value['std'] = '';
939 
+        if (!isset($value['name'])) {
940 
+        	$value['name'] = '';
941 
+        }
942 
+        if (!isset($value['class'])) {
943 
+        	$value['class'] = '';
944 
+        }
945 
+        if (!isset($value['css'])) {
946 
+        	$value['css'] = '';
947 
+        }
948 
+        if (!isset($value['std'])) {
949 
+        	$value['std'] = '';
950 
+        }
914 951 
         $desc = '';
915 952 
         switch ($value['type']) :
916 953 
             case 'dummy_installer':

@@ -926,11 +963,13 @@  discard block
 
 block discarded – undo
926 963
927 964 
                 $i++;
928 965
929 
-                if (isset($value['id']) && $value['id'])
930 
-                    $tab_id = $value['id'];
966 
+                if (isset($value['id']) && $value['id']) {
967 
+                                    $tab_id = $value['id'];
968 
+                }
931 969
932 
-                if (isset($value['desc']) && $value['desc'])
933 
-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';
970 
+                if (isset($value['desc']) && $value['desc']) {
971 
+                                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';
972 
+                }
934 973
935 974 
                 if (isset($value['name']) && $value['name']) {
936 975 
                     if ($first_title === true) {

@@ -961,10 +1000,12 @@  discard block
 
 block discarded – undo
961 1000 
                 break;
962 1001
963 1002 
             case 'sectionstart':
964 
-                if (isset($value['desc']) && $value['desc'])
965 
-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';
966 
-                if (isset($value['name']) && $value['name'])
967 
-                    echo '<h3>' . $value['name'] . $desc . '</h3>';
1003 
+                if (isset($value['desc']) && $value['desc']) {
1004 
+                                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';
1005 
+                }
1006 
+                if (isset($value['name']) && $value['name']) {
1007 
+                                    echo '<h3>' . $value['name'] . $desc . '</h3>';
1008 
+                }
968 1009 
                 /**
969 1010 
                  * Called after a GeoDirectory settings sectionstart is output in the GD settings page.
970 1011 
                  *

@@ -972,7 +1013,9 @@  discard block
 
 block discarded – undo
972 1013 
                  *
973 1014 
                  * @since 1.0.0
974 1015 
                  */
975 
-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
1016 
+                if (isset($value['id']) && $value['id']) {
1017 
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
1018 
+                }
976 1019 
                 echo '<table class="form-table">' . "\n\n";
977 1020
978 1021 
                 break;

@@ -984,7 +1027,9 @@  discard block
 
 block discarded – undo
984 1027 
                  *
985 1028 
                  * @since 1.0.0
986 1029 
                  */
987 
-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
1030 
+                if (isset($value['id']) && $value['id']) {
1031 
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
1032 
+                }
988 1033 
                 echo '</table>';
989 1034 
                 /**
990 1035 
                  * Called after a GeoDirectory settings sectionend is output in the GD settings page.

@@ -993,7 +1038,9 @@  discard block
 
 block discarded – undo
993 1038 
                  *
994 1039 
                  * @since 1.0.0
995 1040 
                  */
996 
-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
1041 
+                if (isset($value['id']) && $value['id']) {
1042 
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
1043 
+                }
997 1044 
                 break;
998 1045 
             case 'text':
999 1046 
                 ?>

@@ -1084,17 +1131,32 @@  discard block
 
 block discarded – undo
1084 1131 
                     <?php _e('Width', 'geodirectory'); ?> <input
1085 1132 
                         name="<?php echo esc_attr($value['id']); ?>_width"
1086 1133 
                         id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"
1087 
-                        value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>
1134 
+                        value="<?php if ($size = get_option($value['id'] . '_width')) {
1135 
+	echo stripslashes($size);
1136 
+} else {
1137 
+	echo $value['std'];
1138 
+}
1139 
+?>"/>
1088 1140
1089 1141 
                     <?php _e('Height', 'geodirectory'); ?> <input
1090 1142 
                         name="<?php echo esc_attr($value['id']); ?>_height"
1091 1143 
                         id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"
1092 
-                        value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>
1144 
+                        value="<?php if ($size = get_option($value['id'] . '_height')) {
1145 
+	echo stripslashes($size);
1146 
+} else {
1147 
+	echo $value['std'];
1148 
+}
1149 
+?>"/>
1093 1150
1094 1151 
                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input
1095 1152 
                             name="<?php echo esc_attr($value['id']); ?>_crop"
1096 1153 
                             id="<?php echo esc_attr($value['id']); ?>_crop"
1097 
-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>
1154 
+                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') {
1155 
+	checked(get_option($value['id'] . '_crop'), 1);
1156 
+} else {
1157 
+	checked(1);
1158 
+}
1159 
+?> /></label>
1098 1160
1099 1161 
                     <span class="description"><?php echo $value['desc'] ?></span></td>
1100 1162 
                 </tr><?php

@@ -1108,17 +1170,22 @@  discard block
 
 block discarded – undo
1108 1170 
                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"
1109 1171 
                                             id="<?php echo esc_attr($value['id']); ?>"
1110 1172 
                                             style="<?php echo esc_attr($value['css']); ?>"
1111 
-                                            class="<?php if (isset($value['class'])) echo $value['class']; ?>"
1173 
+                                            class="<?php if (isset($value['class'])) {
1174 
+	echo $value['class'];
1175 
+}
1176 
+?>"
1112 1177 
                                             option-ajaxchosen="false">
1113 1178 
                         <?php
1114 1179 
                         foreach ($value['options'] as $key => $val) {
1115 1180 
                             $geodir_select_value = '';
1116 1181 
                             if ($option_value != '') {
1117 
-                                if ($option_value != '' && $option_value == $key)
1118 
-                                    $geodir_select_value = ' selected="selected" ';
1182 
+                                if ($option_value != '' && $option_value == $key) {
1183 
+                                                                    $geodir_select_value = ' selected="selected" ';
1184 
+                                }
1119 1185 
                             } else {
1120 
-                                if ($value['std'] == $key)
1121 
-                                    $geodir_select_value = ' selected="selected" ';
1186 
+                                if ($value['std'] == $key) {
1187 
+                                                                    $geodir_select_value = ' selected="selected" ';
1188 
+                                }
1122 1189 
                             }
1123 1190 
                             ?>
1124 1191 
                             <option

@@ -1143,8 +1210,14 @@  discard block
 
 block discarded – undo
1143 1210 
                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"
1144 1211 
                                             id="<?php echo esc_attr($value['id']); ?>"
1145 1212 
                                             style="<?php echo esc_attr($value['css']); ?>"
1146 
-                                            class="<?php if (isset($value['class'])) echo $value['class']; ?>"
1147 
-                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"
1213 
+                                            class="<?php if (isset($value['class'])) {
1214 
+	echo $value['class'];
1215 
+}
1216 
+?>"
1217 
+                                            data-placeholder="<?php if (isset($value['placeholder_text'])) {
1218 
+	echo $value['placeholder_text'];
1219 
+}
1220 
+?>"
1148 1221 
                                             option-ajaxchosen="false">
1149 1222 
                         <?php
1150 1223 
                         foreach ($value['options'] as $key => $val) {

@@ -1172,7 +1245,10 @@  discard block
 
 block discarded – undo
1172 1245 
                 <td class="forminp">
1173 1246 
                     <input type="file" name="<?php echo esc_attr($value['id']); ?>"
1174 1247 
                            id="<?php echo esc_attr($value['id']); ?>" style="<?php echo esc_attr($value['css']); ?>"
1175 
-                           class="<?php if (isset($value['class'])) echo $value['class']; ?>"/>
1248 
+                           class="<?php if (isset($value['class'])) {
1249 
+	echo $value['class'];
1250 
+}
1251 
+?>"/>
1176 1252 
                     <?php if (get_option($value['id'])) { ?>
1177 1253 
                         <input type="hidden" name="<?php echo esc_attr($value['id']); ?>_remove"
1178 1254 
                                id="<?php echo esc_attr($value['id']); ?>_remove" value="0">

@@ -1253,13 +1329,15 @@  discard block
 
 block discarded – undo
1253 1329 
                                 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
1254 1330 
                             );
1255 1331 
                             $geodir_default_map_language = get_option('geodir_default_map_language');
1256 
-                            if (empty($geodir_default_map_language))
1257 
-                                $geodir_default_map_language = 'en';
1332 
+                            if (empty($geodir_default_map_language)) {
1333 
+                                                            $geodir_default_map_language = 'en';
1334 
+                            }
1258 1335 
                             foreach ($arr_map_langages as $language_key => $language_txt) {
1259 
-                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)
1260 
-                                    $geodir_default_language_selected = "selected='selected'";
1261 
-                                else
1262 
-                                    $geodir_default_language_selected = '';
1336 
+                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) {
1337 
+                                                                    $geodir_default_language_selected = "selected='selected'";
1338 
+                                } else {
1339 
+                                                                    $geodir_default_language_selected = '';
1340 
+                                }
1263 1341
1264 1342 
                                 ?>
1265 1343 
                                 <option

@@ -1279,14 +1357,16 @@  discard block
 
 block discarded – undo
1279 1357 
                             <?php
1280 1358 
                             $post_types = geodir_get_posttypes('array');
1281 1359 
                             $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
1282 
-                            if (empty($geodir_default_map_search_pt))
1283 
-                                $geodir_default_map_search_pt = 'gd_place';
1360 
+                            if (empty($geodir_default_map_search_pt)) {
1361 
+                                                            $geodir_default_map_search_pt = 'gd_place';
1362 
+                            }
1284 1363 
                             if (is_array($post_types)) {
1285 1364 
                                 foreach ($post_types as $key => $post_types_obj) {
1286 
-                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)
1287 
-                                        $geodir_search_pt_selected = "selected='selected'";
1288 
-                                    else
1289 
-                                        $geodir_search_pt_selected = '';
1365 
+                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) {
1366 
+                                                                            $geodir_search_pt_selected = "selected='selected'";
1367 
+                                    } else {
1368 
+                                                                            $geodir_search_pt_selected = '';
1369 
+                                    }
1290 1370
1291 1371 
                                     ?>
1292 1372 
                                     <option

@@ -1406,7 +1486,7 @@  discard block
 
 block discarded – undo
1406 1486 
                                id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"
1407 1487 
                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {
1408 1488 
                             echo 'checked="checked"';
1409 
-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
1489 
+                        } elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
1410 1490 
                         <?php echo $value['desc']; ?></label><br>
1411 1491 
                 </fieldset>
1412 1492 
                 <?php

@@ -1426,10 +1506,18 @@  discard block
 
 block discarded – undo
1426 1506 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1427 1507 
                 <td class="forminp">
1428 1508 
                     <textarea
1429 
-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"
1509 
+                        <?php if (isset($value['args'])) {
1510 
+	echo $value['args'] . ' ';
1511 
+}
1512 
+?>name="<?php echo esc_attr($value['id']); ?>"
1430 1513 
                         id="<?php echo esc_attr($value['id']); ?>"
1431 1514 
                         <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
1432 
-                        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
1515 
+                        style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) {
1516 
+	echo esc_textarea(stripslashes(get_option($value['id'])));
1517 
+} else {
1518 
+	echo esc_textarea($value['std']);
1519 
+}
1520 
+?></textarea><span
1433 1521 
                         class="description"><?php echo $value['desc'] ?></span>
1434 1522
1435 1523 
                 </td>

@@ -1441,10 +1529,11 @@  discard block
 
 block discarded – undo
1441 1529 
                 <tr valign="top">
1442 1530 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1443 1531 
                 <td class="forminp"><?php
1444 
-                    if (get_option($value['id']))
1445 
-                        $content = stripslashes(get_option($value['id']));
1446 
-                    else
1447 
-                        $content = $value['std'];
1532 
+                    if (get_option($value['id'])) {
1533 
+                                            $content = stripslashes(get_option($value['id']));
1534 
+                    } else {
1535 
+                                            $content = $value['std'];
1536 
+                    }
1448 1537
1449 1538 
                     $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
1450 1539 
 

@@ -1484,7 +1573,9 @@  discard block
 
 block discarded – undo
1484 1573 
                     'echo' => false,
1485 1574 
                     'selected' => $page_setting);
1486 1575
1487 
-                if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);
1576 
+                if (isset($value['args'])) {
1577 
+                	$args = wp_parse_args($value['args'], $args);
1578 
+                }
1488 1579
1489 1580 
                 ?>
1490 1581 
                 <tr valign="top" class="single_select_page">

@@ -1503,8 +1594,10 @@  discard block
 
 block discarded – undo
1503 1594 
                 if (strstr($country_setting, ':')) :
1504 1595 
                     $country = current(explode(':', $country_setting));
1505 1596 
                     $state = end(explode(':', $country_setting));
1506 
-                else :
1507 
-                    $country = $country_setting;
1597 
+                else {
1598 
+                	:
1599 
+                    $country = $country_setting;
1600 
+                }
1508 1601 
                     $state = '*';
1509 1602 
                 endif;
1510 1603 
                 ?>

@@ -1531,8 +1624,10 @@  discard block
 
 block discarded – undo
1531 1624 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"
1532 1625 
                             title="Country" class="chosen_select">
1533 1626 
                         <?php
1534 
-                        if ($countries) foreach ($countries as $key => $val) :
1535 
-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';
1627 
+                        if ($countries) {
1628 
+                        	foreach ($countries as $key => $val) :
1629 
+                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';
1630 
+                        }
1536 1631 
                         endforeach;
1537 1632 
                         ?>
1538 1633 
                     </select>

@@ -1770,8 +1865,9 @@  discard block
 
 block discarded – undo
1770 1865 
         endforeach;
1771 1866 
     endif;
1772 1867
1773 
-    if (!empty($place_img_array))
1774 
-        $curImages = implode(',', $place_img_array);
1868 
+    if (!empty($place_img_array)) {
1869 
+            $curImages = implode(',', $place_img_array);
1870 
+    }
1775 1871
1776 1872
1777 1873 
     // adjust values here

@@ -2117,16 +2213,17 @@  discard block
 
 block discarded – undo
2117 2213 
 	global $post, $typenow, $current_screen;
2118 2214
2119 2215 
 	$post_type = NULL;
2120 
-    if (isset($_REQUEST['post_type']))
2121 
-		$post_type = sanitize_key($_REQUEST['post_type']);
2122 
-    elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))
2123 
-		$post_type = get_post_type($_REQUEST['post']);
2124 
-    elseif ($post && isset($post->post_type))
2125 
-		$post_type = $post->post_type;
2126 
-	elseif ($typenow)
2127 
-		$post_type = $typenow;
2128 
-	elseif ($current_screen && isset($current_screen->post_type))
2129 
-		$post_type = $current_screen->post_type;
2216 
+    if (isset($_REQUEST['post_type'])) {
2217 
+    		$post_type = sanitize_key($_REQUEST['post_type']);
2218 
+    } elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) {
2219 
+    		$post_type = get_post_type($_REQUEST['post']);
2220 
+    } elseif ($post && isset($post->post_type)) {
2221 
+    		$post_type = $post->post_type;
2222 
+    } elseif ($typenow) {
2223 
+			$post_type = $typenow;
2224 
+	} elseif ($current_screen && isset($current_screen->post_type)) {
2225 
+			$post_type = $current_screen->post_type;
2226 
+	}
2130 2227
2131 2228
2132 2229 
 

@@ -2187,9 +2284,10 @@  discard block
 
 block discarded – undo
2187 2284 
 function geodir_hide_admin_preview_button() {
2188 2285 
     global $post_type;
2189 2286 
     $post_types = geodir_get_posttypes();
2190 
-    if(in_array($post_type, $post_types))
2191 
-        echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
2192 
-}
2287 
+    if(in_array($post_type, $post_types)) {
2288 
+            echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
2289 
+    }
2290 
+    }
2193 2291 
 add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );
2194 2292 
 add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );
2195 2293 
 

@@ -5419,8 +5517,9 @@  discard block
 
 block discarded – undo
5419 5517 
 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
5420 5518 
     global $wpdb, $plugin_prefix;
5421 5519
5422 
-    if ( ! post_type_exists( $post_type ) )
5423 
-        return new stdClass;
5520 
+    if ( ! post_type_exists( $post_type ) ) {
5521 
+            return new stdClass;
5522 
+    }
5424 5523
5425 5524 
     $table = $plugin_prefix . $post_type . '_detail';
5426 5525 
 

@@ -6077,7 +6176,9 @@  discard block
 
 block discarded – undo
6077 6176
6078 6177 
     if ($page_found) :
6079 6178 
         // Page exists
6080 
-        if (!$option_value) update_option($option, $page_found);
6179 
+        if (!$option_value) {
6180 
+        	update_option($option, $page_found);
6181 
+        }
6081 6182 
         return;
6082 6183 
     endif;
6083 6184 
 

@@ -6488,7 +6589,7 @@  discard block
 
 block discarded – undo
6488 6589
6489 6590 
         if(is_array($accounts)){
6490 6591 
             $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
6491 
-        }elseif(get_option('geodir_ga_account_id')){
6592 
+        } elseif(get_option('geodir_ga_account_id')){
6492 6593 
             $accounts = array();
6493 6594 
             $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
6494 6595 
         }

@@ -6509,14 +6610,16 @@  discard block
 
 block discarded – undo
6509 6610 
     }
6510 6611
6511 6612 
     # Create a new Gdata call
6512 
-    if ( trim(get_option('geodir_ga_auth_code')) != '' )
6513 
-        $stats = new GDGoogleAnalyticsStats();
6514 
-    else
6515 
-        return false;
6613 
+    if ( trim(get_option('geodir_ga_auth_code')) != '' ) {
6614 
+            $stats = new GDGoogleAnalyticsStats();
6615 
+    } else {
6616 
+            return false;
6617 
+    }
6516 6618
6517 6619 
     # Check if Google sucessfully logged in
6518 
-    if ( ! $stats->checkLogin() )
6519 
-        return false;
6620 
+    if ( ! $stats->checkLogin() ) {
6621 
+            return false;
6622 
+    }
6520 6623
6521 6624 
     # Get a list of accounts
6522 6625 
     try {

@@ -6533,10 +6636,10 @@  discard block
 
 block discarded – undo
6533 6636 
     if ( count($accounts) > 0 ){
6534 6637 
         update_option('geodir_gd_uids',$accounts);
6535 6638 
         return $accounts;
6639 
+    } else {
6640 
+            return false;
6641 
+    }
6536 6642 
     }
6537 
-    else
6538 
-        return false;
6539 
-}
6540 6643
6541 6644 
 add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' );
6542 6645 
 function geodir_ga_deauthorize(){
Please login to merge, or discard this patch.
Indentation   +2906 added lines, -2906 removed lines patch added patch discarded remove patch 
@@ -13,125 +13,125 @@  discard block
 
 block discarded – undo
13 13 
  * @package GeoDirectory
14 14 
  */
15 15 
 function geodir_deactivation() {
16 
-    // Update installed variable
17 
-    update_option("geodir_installed", 0);
16 
+	// Update installed variable
17 
+	update_option("geodir_installed", 0);
18 18
19 
-    // Remove rewrite rules and then recreate rewrite rules.
20 
-    flush_rewrite_rules();
19 
+	// Remove rewrite rules and then recreate rewrite rules.
20 
+	flush_rewrite_rules();
21 21 
 }
22 22
23 23 
 if (!function_exists('geodir_admin_styles')) {
24 
-    /**
25 
-     * Enqueue Admin Styles.
26 
-     *
27 
-     * @since 1.0.0
28 
-     * @package GeoDirectory
29 
-     */
30 
-    function geodir_admin_styles() {
31 
-        wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
32 
-        wp_enqueue_style('geodirectory-admin-css');
24 
+	/**
25 
+	 * Enqueue Admin Styles.
26 
+	 *
27 
+	 * @since 1.0.0
28 
+	 * @package GeoDirectory
29 
+	 */
30 
+	function geodir_admin_styles() {
31 
+		wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
32 
+		wp_enqueue_style('geodirectory-admin-css');
33 33
34 
-        wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
35 
-        wp_enqueue_style('geodirectory-frontend-style');
34 
+		wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
35 
+		wp_enqueue_style('geodirectory-frontend-style');
36 36
37 
-        wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
38 
-        wp_enqueue_style('geodir-chosen-style');
37 
+		wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
38 
+		wp_enqueue_style('geodir-chosen-style');
39 39
40 
-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
41 
-        wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
40 
+		wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
41 
+		wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
42 42
43 
-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
44 
-        wp_enqueue_style('geodirectory-jquery-ui-css');
43 
+		wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
44 
+		wp_enqueue_style('geodirectory-jquery-ui-css');
45 45
46 
-        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
47 
-        wp_enqueue_style('geodirectory-custom-fields-css');
46 
+		wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
47 
+		wp_enqueue_style('geodirectory-custom-fields-css');
48 48
49 
-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
50 
-        wp_enqueue_style('geodirectory-pluplodar-css');
49 
+		wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
50 
+		wp_enqueue_style('geodirectory-pluplodar-css');
51 51
52 
-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
53 
-        wp_enqueue_style('geodir-rating-style');
52 
+		wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
53 
+		wp_enqueue_style('geodir-rating-style');
54 54
55 
-        wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
56 
-        wp_enqueue_style('geodir-rtl-style');
57 
-    }
55 
+		wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
56 
+		wp_enqueue_style('geodir-rtl-style');
57 
+	}
58 58 
 }
59 59
60 60 
 if (!function_exists('geodir_admin_styles_req')) {
61 
-    /**
62 
-     * Loads stylesheets from CDN.
63 
-     *
64 
-     * @since 1.0.0
65 
-     * @package GeoDirectory
66 
-     */
67 
-    function geodir_admin_styles_req()
68 
-    {
61 
+	/**
62 
+	 * Loads stylesheets from CDN.
63 
+	 *
64 
+	 * @since 1.0.0
65 
+	 * @package GeoDirectory
66 
+	 */
67 
+	function geodir_admin_styles_req()
68 
+	{
69 69
70 
-        wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
71 
-        wp_enqueue_style('font-awesome');
70 
+		wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
71 
+		wp_enqueue_style('font-awesome');
72 72
73 
-        wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
74 
-        wp_enqueue_script('geodirectory-admin');
73 
+		wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
74 
+		wp_enqueue_script('geodirectory-admin');
75 75
76 
-    }
76 
+	}
77 77 
 }
78 78
79 79 
 if (!function_exists('geodir_admin_scripts')) {
80 
-    /**
81 
-     * Enqueue Admin Scripts.
82 
-     *
83 
-     * @since 1.0.0
84 
-     * @package GeoDirectory
85 
-     */
86 
-    function geodir_admin_scripts()
87 
-    {
88 
-        $geodir_map_name = geodir_map_name();
80 
+	/**
81 
+	 * Enqueue Admin Scripts.
82 
+	 *
83 
+	 * @since 1.0.0
84 
+	 * @package GeoDirectory
85 
+	 */
86 
+	function geodir_admin_scripts()
87 
+	{
88 
+		$geodir_map_name = geodir_map_name();
89 89
90 
-        wp_enqueue_script('jquery');
90 
+		wp_enqueue_script('jquery');
91 91
92 
-        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);
92 
+		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);
93 93
94 
-        wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
95 
-        wp_enqueue_script('chosen');
94 
+		wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
95 
+		wp_enqueue_script('chosen');
96 96
97 
-        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
98 
-        wp_enqueue_script('geodirectory-choose-ajax');
97 
+		wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
98 
+		wp_enqueue_script('geodirectory-choose-ajax');
99 99
100 
-        if (isset($_REQUEST['listing_type'])) {
101 
-            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
102 
-        }
100 
+		if (isset($_REQUEST['listing_type'])) {
101 
+			wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
102 
+		}
103 103
104 
-        wp_enqueue_script('geodirectory-custom-fields-script');
105 
-        $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';
104 
+		wp_enqueue_script('geodirectory-custom-fields-script');
105 
+		$plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';
106 106
107 
-        wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
107 
+		wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
108 108
109 
-        if (in_array($geodir_map_name, array('auto', 'google'))) {
110 
-            $map_lang = "&language=" . geodir_get_map_default_language();
111 
-            $map_key = "&key=" . geodir_get_map_api_key();
112 
-            /** This filter is documented in geodirectory_template_tags.php */
113 
-            $map_extra = apply_filters('geodir_googlemap_script_extra', '');
114 
-            wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
115 
-        }
109 
+		if (in_array($geodir_map_name, array('auto', 'google'))) {
110 
+			$map_lang = "&language=" . geodir_get_map_default_language();
111 
+			$map_key = "&key=" . geodir_get_map_api_key();
112 
+			/** This filter is documented in geodirectory_template_tags.php */
113 
+			$map_extra = apply_filters('geodir_googlemap_script_extra', '');
114 
+			wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
115 
+		}
116 116
117 
-        if ($geodir_map_name == 'osm') {
118 
-            // Leaflet OpenStreetMap
119 
-            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
120 
-            wp_enqueue_style('geodirectory-leaflet-style');
117 
+		if ($geodir_map_name == 'osm') {
118 
+			// Leaflet OpenStreetMap
119 
+			wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
120 
+			wp_enqueue_style('geodirectory-leaflet-style');
121 121
122 
-            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
123 
-            wp_enqueue_script('geodirectory-leaflet-script');
122 
+			wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
123 
+			wp_enqueue_script('geodirectory-leaflet-script');
124 124
125 
-            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
126 
-            wp_enqueue_script('geodirectory-leaflet-geo-script');
127 
-        }
128 
-        wp_enqueue_script( 'jquery-ui-autocomplete' );
125 
+			wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
126 
+			wp_enqueue_script('geodirectory-leaflet-geo-script');
127 
+		}
128 
+		wp_enqueue_script( 'jquery-ui-autocomplete' );
129 129
130 
-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
131 
-        wp_enqueue_script('geodirectory-goMap-script');
130 
+		wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
131 
+		wp_enqueue_script('geodirectory-goMap-script');
132 132
133 
-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
134 
-        wp_enqueue_script('geodirectory-goMap-script');
133 
+		wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
134 
+		wp_enqueue_script('geodirectory-goMap-script');
135 135
136 136 
 		// font awesome rating script
137 137 
 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

@@ -142,167 +142,167 @@  discard block
 
 block discarded – undo
142 142 
 			wp_enqueue_script('geodir-jRating-js');
143 143 
 		}
144 144
145 
-        wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
146 
-        wp_enqueue_script('geodir-on-document-load');
147 
-
148 
-
149 
-        // SCRIPT FOR UPLOAD
150 
-        wp_enqueue_script('plupload-all');
151 
-        wp_enqueue_script('jquery-ui-sortable');
152 
-
153 
-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
154 
-        wp_enqueue_script('geodirectory-plupload-script');
155 
-
156 
-        // SCRIPT FOR UPLOAD END
157 
-
158 
-
159 
-        // place js config array for plupload
160 
-        $plupload_init = array(
161 
-            'runtimes' => 'html5,silverlight,flash,html4',
162 
-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader
163 
-            'container' => 'plupload-upload-ui', // will be adjusted per uploader
164 
-            'drop_element' => 'dropbox', // will be adjusted per uploader
165 
-            'file_data_name' => 'async-upload', // will be adjusted per uploader
166 
-            'multiple_queues' => true,
167 
-            'max_file_size' => geodir_max_upload_size(),
168 
-            'url' => admin_url('admin-ajax.php'),
169 
-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
170 
-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
171 
-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
172 
-            'multipart' => true,
173 
-            'urlstream_upload' => true,
174 
-            'multi_selection' => false, // will be added per uploader
175 
-            // additional post data to send to our ajax hook
176 
-            'multipart_params' => array(
177 
-                '_ajax_nonce' => "", // will be added per uploader
178 
-                'action' => 'plupload_action', // the ajax action name
179 
-                'imgid' => 0 // will be added per uploader
180 
-            )
181 
-        );
182 
-        $base_plupload_config = json_encode($plupload_init);
183 
-
184 
-
185 
-        $thumb_img_arr = array();
186 
-
187 
-        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
188 
-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);
189 
-
190 
-        $totImg = '';
191 
-        $image_limit = '';
192 
-        if (!empty($thumb_img_arr)) {
193 
-            $totImg = count($thumb_img_arr);
194 
-        }
145 
+		wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
146 
+		wp_enqueue_script('geodir-on-document-load');
147 
+
148 
+
149 
+		// SCRIPT FOR UPLOAD
150 
+		wp_enqueue_script('plupload-all');
151 
+		wp_enqueue_script('jquery-ui-sortable');
152 
+
153 
+		wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
154 
+		wp_enqueue_script('geodirectory-plupload-script');
155 
+
156 
+		// SCRIPT FOR UPLOAD END
157 
+
158 
+
159 
+		// place js config array for plupload
160 
+		$plupload_init = array(
161 
+			'runtimes' => 'html5,silverlight,flash,html4',
162 
+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader
163 
+			'container' => 'plupload-upload-ui', // will be adjusted per uploader
164 
+			'drop_element' => 'dropbox', // will be adjusted per uploader
165 
+			'file_data_name' => 'async-upload', // will be adjusted per uploader
166 
+			'multiple_queues' => true,
167 
+			'max_file_size' => geodir_max_upload_size(),
168 
+			'url' => admin_url('admin-ajax.php'),
169 
+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),
170 
+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
171 
+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),
172 
+			'multipart' => true,
173 
+			'urlstream_upload' => true,
174 
+			'multi_selection' => false, // will be added per uploader
175 
+			// additional post data to send to our ajax hook
176 
+			'multipart_params' => array(
177 
+				'_ajax_nonce' => "", // will be added per uploader
178 
+				'action' => 'plupload_action', // the ajax action name
179 
+				'imgid' => 0 // will be added per uploader
180 
+			)
181 
+		);
182 
+		$base_plupload_config = json_encode($plupload_init);
183 
+
184 
+
185 
+		$thumb_img_arr = array();
186 
+
187 
+		if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
188 
+			$thumb_img_arr = geodir_get_images($_REQUEST['pid']);
189 
+
190 
+		$totImg = '';
191 
+		$image_limit = '';
192 
+		if (!empty($thumb_img_arr)) {
193 
+			$totImg = count($thumb_img_arr);
194 
+		}
195 195
196 
-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
197 
-            'totalImg' => $totImg,
198 
-            'image_limit' => $image_limit,
199 
-            'upload_img_size' => geodir_max_upload_size());
196 
+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,
197 
+			'totalImg' => $totImg,
198 
+			'image_limit' => $image_limit,
199 
+			'upload_img_size' => geodir_max_upload_size());
200 200
201 
-        wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
201 
+		wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);
202 202
203 
-        $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));
204 
-        wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
203 
+		$ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));
204 
+		wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
205 205
206 206
207 
-        wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
208 
-        wp_enqueue_script('geodirectory-admin-script');
207 
+		wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
208 
+		wp_enqueue_script('geodirectory-admin-script');
209 209
210 
-        wp_enqueue_style('farbtastic');
211 
-        wp_enqueue_script('farbtastic');
210 
+		wp_enqueue_style('farbtastic');
211 
+		wp_enqueue_script('farbtastic');
212 212
213 
-        $screen = get_current_screen();
214 
-        if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
215 
-            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
216 
-        }
213 
+		$screen = get_current_screen();
214 
+		if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
215 
+			wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
216 
+		}
217 217
218 
-        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
219 
-        wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
218 
+		$ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
219 
+		wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
220 220
221 
-    }
221 
+	}
222 222 
 }
223 223
224 224 
 if (!function_exists('geodir_admin_menu')) {
225 
-    /**
226 
-     * Admin Menus
227 
-     *
228 
-     * Sets up the admin menus in wordpress.
229 
-     *
230 
-     * @since 1.0.0
231 
-     * @package GeoDirectory
232 
-     * @global array $menu Menu array.
233 
-     * @global object $geodirectory GeoDirectory plugin object.
234 
-     */
235 
-    function geodir_admin_menu()
236 
-    {
237 
-        global $menu, $geodirectory;
225 
+	/**
226 
+	 * Admin Menus
227 
+	 *
228 
+	 * Sets up the admin menus in wordpress.
229 
+	 *
230 
+	 * @since 1.0.0
231 
+	 * @package GeoDirectory
232 
+	 * @global array $menu Menu array.
233 
+	 * @global object $geodirectory GeoDirectory plugin object.
234 
+	 */
235 
+	function geodir_admin_menu()
236 
+	{
237 
+		global $menu, $geodirectory;
238 238
239 
-        if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
239 
+		if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
240 240
241 
-        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
241 
+		add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
242 242
243 243
244 
-    }
244 
+	}
245 245 
 }
246 246
247 247 
 if (!function_exists('geodir_admin_menu_order')) {
248 
-    /**
249 
-     * Order admin menus.
250 
-     *
251 
-     * @since 1.0.0
252 
-     * @package GeoDirectory
253 
-     * @param array $menu_order Menu order array.
254 
-     * @return array Modified menu order array.
255 
-     */
256 
-    function geodir_admin_menu_order($menu_order)
257 
-    {
258 
-
259 
-        // Initialize our custom order array
260 
-        $geodir_menu_order = array();
261 
-
262 
-        // Get the index of our custom separator
263 
-        $geodir_separator = array_search('separator-geodirectory', $menu_order);
264 
-
265 
-        // Get index of posttype menu
266 
-        $post_types = geodir_get_posttypes();
267 
-
268 
-        // Loop through menu order and do some rearranging
269 
-        foreach ($menu_order as $index => $item) :
270 
-
271 
-            if ((('geodirectory') == $item)) :
272 
-                $geodir_menu_order[] = 'separator-geodirectory';
273 
-                if (!empty($post_types)) {
274 
-                    foreach ($post_types as $post_type) {
275 
-                        $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;
276 
-                    }
277 
-                }
278 
-                $geodir_menu_order[] = $item;
248 
+	/**
249 
+	 * Order admin menus.
250 
+	 *
251 
+	 * @since 1.0.0
252 
+	 * @package GeoDirectory
253 
+	 * @param array $menu_order Menu order array.
254 
+	 * @return array Modified menu order array.
255 
+	 */
256 
+	function geodir_admin_menu_order($menu_order)
257 
+	{
279 258
280 
-                unset($menu_order[$geodir_separator]);
281 
-            //unset( $menu_order[$geodir_places] );
282 
-            elseif (!in_array($item, array('separator-geodirectory'))) :
283 
-                $geodir_menu_order[] = $item;
284 
-            endif;
259 
+		// Initialize our custom order array
260 
+		$geodir_menu_order = array();
285 261
286 
-        endforeach;
262 
+		// Get the index of our custom separator
263 
+		$geodir_separator = array_search('separator-geodirectory', $menu_order);
287 264
288 
-        // Return order
289 
-        return $geodir_menu_order;
290 
-    }
265 
+		// Get index of posttype menu
266 
+		$post_types = geodir_get_posttypes();
267 
+
268 
+		// Loop through menu order and do some rearranging
269 
+		foreach ($menu_order as $index => $item) :
270 
+
271 
+			if ((('geodirectory') == $item)) :
272 
+				$geodir_menu_order[] = 'separator-geodirectory';
273 
+				if (!empty($post_types)) {
274 
+					foreach ($post_types as $post_type) {
275 
+						$geodir_menu_order[] = 'edit.php?post_type=' . $post_type;
276 
+					}
277 
+				}
278 
+				$geodir_menu_order[] = $item;
279 
+
280 
+				unset($menu_order[$geodir_separator]);
281 
+			//unset( $menu_order[$geodir_places] );
282 
+			elseif (!in_array($item, array('separator-geodirectory'))) :
283 
+				$geodir_menu_order[] = $item;
284 
+			endif;
285 
+
286 
+		endforeach;
287 
+
288 
+		// Return order
289 
+		return $geodir_menu_order;
290 
+	}
291 291 
 }
292 292
293 293 
 if (!function_exists('geodir_admin_custom_menu_order')) {
294 
-    /**
295 
-     * Enables custom menu order.
296 
-     *
297 
-     * @since 1.0.0
298 
-     * @package GeoDirectory
299 
-     * @return bool
300 
-     */
301 
-    function geodir_admin_custom_menu_order()
302 
-    {
303 
-        if (!current_user_can('manage_options')) return false;
304 
-        return true;
305 
-    }
294 
+	/**
295 
+	 * Enables custom menu order.
296 
+	 *
297 
+	 * @since 1.0.0
298 
+	 * @package GeoDirectory
299 
+	 * @return bool
300 
+	 */
301 
+	function geodir_admin_custom_menu_order()
302 
+	{
303 
+		if (!current_user_can('manage_options')) return false;
304 
+		return true;
305 
+	}
306 306 
 }
307 307
308 308 
 /**

@@ -313,51 +313,51 @@  discard block
 
 block discarded – undo
313 313 
  */
314 314 
 function geodir_before_admin_panel()
315 315 
 {
316 
-    if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
317 
-        echo '<div id="message" class="updated fade">
316 
+	if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
317 
+		echo '<div id="message" class="updated fade">
318 318 
                         <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>
319 319 
                         <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>
320 320 
                 </div>';
321 321
322 
-    }
322 
+	}
323 323
324 
-    if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
325 
-        switch ($_REQUEST['msg']) {
326 
-            case 'success':
327 
-                echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
328 
-                flush_rewrite_rules(false);
324 
+	if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
325 
+		switch ($_REQUEST['msg']) {
326 
+			case 'success':
327 
+				echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
328 
+				flush_rewrite_rules(false);
329 329
330 
-                break;
330 
+				break;
331 331 
 			case 'fail':
332 332 
 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';
333 333
334 334 
 				if ($gderr == 21)
335 
-			    	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>';
335 
+					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>';
336 336 
 				else
337 337 
 					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
338 
-                break;
339 
-        }
340 
-    }
338 
+				break;
339 
+		}
340 
+	}
341 341
342 
-    $geodir_load_map = get_option('geodir_load_map');
343 
-    $need_map_key = false;
344 
-    if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
345 
-        $need_map_key = true;
346 
-    }
342 
+	$geodir_load_map = get_option('geodir_load_map');
343 
+	$need_map_key = false;
344 
+	if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
345 
+		$need_map_key = true;
346 
+	}
347 347
348 
-    if (!geodir_get_map_api_key() && $need_map_key) {
349 
-        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>';
350 
-    }
348 
+	if (!geodir_get_map_api_key() && $need_map_key) {
349 
+		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>';
350 
+	}
351 351
352 
-    if (!geodir_is_default_location_set()) {
353 
-        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>';
352 
+	if (!geodir_is_default_location_set()) {
353 
+		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>';
354 354
355 
-    }
355 
+	}
356 356
357 
-    if (!function_exists('curl_init')) {
358 
-        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>';
357 
+	if (!function_exists('curl_init')) {
358 
+		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>';
359 359
360 
-    }
360 
+	}
361 361
362 362
363 363 
 

@@ -374,19 +374,19 @@  discard block
 
 block discarded – undo
374 374 
  */
375 375 
 function geodir_handle_option_form_submit($current_tab)
376 376 
 {
377 
-    global $geodir_settings;
378 
-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
379 
-        /**
380 
-         * Contains settings array for current tab.
381 
-         *
382 
-         * @since 1.0.0
383 
-         * @package GeoDirectory
384 
-         */
385 
-        include_once('option-pages/' . $current_tab . '_array.php');
386 
-    }
387 
-    if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :
388 
-        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
389 
-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
377 
+	global $geodir_settings;
378 
+	if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
379 
+		/**
380 
+		 * Contains settings array for current tab.
381 
+		 *
382 
+		 * @since 1.0.0
383 
+		 * @package GeoDirectory
384 
+		 */
385 
+		include_once('option-pages/' . $current_tab . '_array.php');
386 
+	}
387 
+	if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :
388 
+		if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
389 
+		if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
390 390
391 391 
 		/**
392 392 
 		 * Fires before updating geodirectory admin settings.

@@ -398,38 +398,38 @@  discard block
 
 block discarded – undo
398 398 
 		 */
399 399 
 		do_action('geodir_before_update_options', $current_tab, $geodir_settings);
400 400
401 
-        if (!empty($geodir_settings[$current_tab]))
402 
-            geodir_update_options($geodir_settings[$current_tab]);
401 
+		if (!empty($geodir_settings[$current_tab]))
402 
+			geodir_update_options($geodir_settings[$current_tab]);
403 403
404 
-        /**
405 
-         * Called after GeoDirectory options settings are updated.
406 
-         *
407 
-         * @since 1.0.0
408 
-         * @param array $geodir_settings The array of GeoDirectory settings.
409 
-         * @see 'geodir_before_update_options'
410 
-         */
411 
-        do_action('geodir_update_options', $geodir_settings);
404 
+		/**
405 
+		 * Called after GeoDirectory options settings are updated.
406 
+		 *
407 
+		 * @since 1.0.0
408 
+		 * @param array $geodir_settings The array of GeoDirectory settings.
409 
+		 * @see 'geodir_before_update_options'
410 
+		 */
411 
+		do_action('geodir_update_options', $geodir_settings);
412 412
413 
-        /**
414 
-         * Called after GeoDirectory options settings are updated.
415 
-         *
416 
-         * Provides tab specific settings.
417 
-         *
418 
-         * @since 1.0.0
419 
-         * @param string $current_tab The current settings tab name.
420 
-         * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.
421 
-         */
422 
-        do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
413 
+		/**
414 
+		 * Called after GeoDirectory options settings are updated.
415 
+		 *
416 
+		 * Provides tab specific settings.
417 
+		 *
418 
+		 * @since 1.0.0
419 
+		 * @param string $current_tab The current settings tab name.
420 
+		 * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.
421 
+		 */
422 
+		do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
423 423
424 
-        flush_rewrite_rules(false);
424 
+		flush_rewrite_rules(false);
425 425
426 
-        $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';
426 
+		$current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';
427 427
428 
-        $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
428 
+		$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
429 429
430 
-        wp_redirect($redirect_url);
431 
-        exit();
432 
-    endif;
430 
+		wp_redirect($redirect_url);
431 
+		exit();
432 
+	endif;
433 433
434 434
435 435 
 }

@@ -447,144 +447,144 @@  discard block
 
 block discarded – undo
447 447 
  * @return bool Returns true if saved.
448 448 
  */
449 449 
 function geodir_update_options($options, $dummy = false) {
450 
-    if ((!isset($_POST) || !$_POST) && !$dummy) return false;
450 
+	if ((!isset($_POST) || !$_POST) && !$dummy) return false;
451 451
452 
-    foreach ($options as $value) {
453 
-        if ($dummy && isset($value['std']))
454 
-            $_POST[$value['id']] = $value['std'];
452 
+	foreach ($options as $value) {
453 
+		if ($dummy && isset($value['std']))
454 
+			$_POST[$value['id']] = $value['std'];
455 455
456 456
457 
-        if (isset($value['type']) && $value['type'] == 'checkbox') :
457 
+		if (isset($value['type']) && $value['type'] == 'checkbox') :
458 458
459 
-            if (isset($value['id']) && isset($_POST[$value['id']])) {
460 
-                update_option($value['id'], $_POST[$value['id']]);
461 
-            } else {
462 
-                update_option($value['id'], 0);
463 
-            }
459 
+			if (isset($value['id']) && isset($_POST[$value['id']])) {
460 
+				update_option($value['id'], $_POST[$value['id']]);
461 
+			} else {
462 
+				update_option($value['id'], 0);
463 
+			}
464 464
465 
-        elseif (isset($value['type']) && $value['type'] == 'image_width') :
465 
+		elseif (isset($value['type']) && $value['type'] == 'image_width') :
466 466
467 
-            if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
468 
-                update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);
469 
-                update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);
470 
-                if (isset($_POST[$value['id'] . '_crop'])) :
471 
-                    update_option($value['id'] . '_crop', 1);
472 
-                else :
473 
-                    update_option($value['id'] . '_crop', 0);
474 
-                endif;
475 
-            } else {
476 
-                update_option($value['id'] . '_width', $value['std']);
477 
-                update_option($value['id'] . '_height', $value['std']);
478 
-                update_option($value['id'] . '_crop', 1);
479 
-            }
467 
+			if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
468 
+				update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);
469 
+				update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);
470 
+				if (isset($_POST[$value['id'] . '_crop'])) :
471 
+					update_option($value['id'] . '_crop', 1);
472 
+				else :
473 
+					update_option($value['id'] . '_crop', 0);
474 
+				endif;
475 
+			} else {
476 
+				update_option($value['id'] . '_width', $value['std']);
477 
+				update_option($value['id'] . '_height', $value['std']);
478 
+				update_option($value['id'] . '_crop', 1);
479 
+			}
480 480
481 
-        elseif (isset($value['type']) && $value['type'] == 'map') :
482 
-            $post_types = array();
483 
-            $categories = array();
481 
+		elseif (isset($value['type']) && $value['type'] == 'map') :
482 
+			$post_types = array();
483 
+			$categories = array();
484 484
485 
-            if (!empty($_POST['home_map_post_types'])) :
486 
-                foreach ($_POST['home_map_post_types'] as $post_type) :
487 
-                    $post_types[] = $post_type;
488 
-                endforeach;
489 
-            endif;
485 
+			if (!empty($_POST['home_map_post_types'])) :
486 
+				foreach ($_POST['home_map_post_types'] as $post_type) :
487 
+					$post_types[] = $post_type;
488 
+				endforeach;
489 
+			endif;
490 490
491 
-            update_option('geodir_exclude_post_type_on_map', $post_types);
491 
+			update_option('geodir_exclude_post_type_on_map', $post_types);
492 492
493 
-            if (!empty($_POST['post_category'])) :
494 
-                foreach ($_POST['post_category'] as $texonomy => $cat_arr) :
495 
-                    $categories[$texonomy] = array();
496 
-                    foreach ($cat_arr as $category) :
497 
-                        $categories[$texonomy][] = $category;
498 
-                    endforeach;
499 
-                    $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();
500 
-                endforeach;
501 
-            endif;
502 
-            update_option('geodir_exclude_cat_on_map', $categories);
503 
-            update_option('geodir_exclude_cat_on_map_upgrade', 1);
504 
-        elseif (isset($value['type']) && $value['type'] == 'map_default_settings') :
493 
+			if (!empty($_POST['post_category'])) :
494 
+				foreach ($_POST['post_category'] as $texonomy => $cat_arr) :
495 
+					$categories[$texonomy] = array();
496 
+					foreach ($cat_arr as $category) :
497 
+						$categories[$texonomy][] = $category;
498 
+					endforeach;
499 
+					$categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();
500 
+				endforeach;
501 
+			endif;
502 
+			update_option('geodir_exclude_cat_on_map', $categories);
503 
+			update_option('geodir_exclude_cat_on_map_upgrade', 1);
504 
+		elseif (isset($value['type']) && $value['type'] == 'map_default_settings') :
505 505
506 506
507 
-            if (!empty($_POST['geodir_default_map_language'])):
508 
-                update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);
509 
-            endif;
507 
+			if (!empty($_POST['geodir_default_map_language'])):
508 
+				update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);
509 
+			endif;
510 510
511 511
512 
-            if (!empty($_POST['geodir_default_map_search_pt'])):
513 
-                update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);
514 
-            endif;
512 
+			if (!empty($_POST['geodir_default_map_search_pt'])):
513 
+				update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);
514 
+			endif;
515 515
516 516
517 
-        elseif (isset($value['type']) && $value['type'] == 'file') :
517 
+		elseif (isset($value['type']) && $value['type'] == 'file') :
518 518
519 519
520 
-            if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
520 
+			if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
521 521
522 
-                if (get_option($value['id'])) {
523 
-                    $image_name_arr = explode('/', get_option($value['id']));
524 
-                    $noimg_name = end($image_name_arr);
525 
-                    $img_path = $uploads['path'] . '/' . $noimg_name;
526 
-                    if (file_exists($img_path))
527 
-                        unlink($img_path);
528 
-                }
522 
+				if (get_option($value['id'])) {
523 
+					$image_name_arr = explode('/', get_option($value['id']));
524 
+					$noimg_name = end($image_name_arr);
525 
+					$img_path = $uploads['path'] . '/' . $noimg_name;
526 
+					if (file_exists($img_path))
527 
+						unlink($img_path);
528 
+				}
529 529
530 
-                update_option($value['id'], '');
531 
-            }
530 
+				update_option($value['id'], '');
531 
+			}
532 532
533 
-            $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';
534 
-            $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';
535 
-
536 
-            if (!empty($filename)):
537 
-                $ext = pathinfo($filename, PATHINFO_EXTENSION);
538 
-                $uplaods = array();
539 
-
540 
-                foreach ($uploadedfile as $key => $uplaod):
541 
-                    if ($key == 'name'):
542 
-                        $uplaods[$key] = $filename;
543 
-                    else :
544 
-                        $uplaods[$key] = $uplaod;
545 
-                    endif;
546 
-                endforeach;
547 
-
548 
-                $uploads = wp_upload_dir();
549 
-
550 
-                if (get_option($value['id'])) {
551 
-                    $image_name_arr = explode('/', get_option($value['id']));
552 
-                    $noimg_name = end($image_name_arr);
553 
-                    $img_path = $uploads['path'] . '/' . $noimg_name;
554 
-                    if (file_exists($img_path))
555 
-                        unlink($img_path);
556 
-                }
533 
+			$uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';
534 
+			$filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';
535 
+
536 
+			if (!empty($filename)):
537 
+				$ext = pathinfo($filename, PATHINFO_EXTENSION);
538 
+				$uplaods = array();
539 
+
540 
+				foreach ($uploadedfile as $key => $uplaod):
541 
+					if ($key == 'name'):
542 
+						$uplaods[$key] = $filename;
543 
+					else :
544 
+						$uplaods[$key] = $uplaod;
545 
+					endif;
546 
+				endforeach;
547 
+
548 
+				$uploads = wp_upload_dir();
549 
+
550 
+				if (get_option($value['id'])) {
551 
+					$image_name_arr = explode('/', get_option($value['id']));
552 
+					$noimg_name = end($image_name_arr);
553 
+					$img_path = $uploads['path'] . '/' . $noimg_name;
554 
+					if (file_exists($img_path))
555 
+						unlink($img_path);
556 
+				}
557 557
558 
-                $upload_overrides = array('test_form' => false);
559 
-                $movefile = wp_handle_upload($uplaods, $upload_overrides);
558 
+				$upload_overrides = array('test_form' => false);
559 
+				$movefile = wp_handle_upload($uplaods, $upload_overrides);
560 560
561 
-                update_option($value['id'], $movefile['url']);
561 
+				update_option($value['id'], $movefile['url']);
562 562
563 
-            endif;
563 
+			endif;
564 564
565 
-            if (!get_option($value['id']) && isset($value['value'])):
566 
-                update_option($value['id'], $value['value']);
567 
-            endif;
565 
+			if (!get_option($value['id']) && isset($value['value'])):
566 
+				update_option($value['id'], $value['value']);
567 
+			endif;
568 568
569 569
570 
-        else :
571 
-            // same menu setting per theme.
572 
-            if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
573 
-                $theme = wp_get_theme();
574 
-                update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
575 
-            }
570 
+		else :
571 
+			// same menu setting per theme.
572 
+			if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
573 
+				$theme = wp_get_theme();
574 
+				update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
575 
+			}
576 576
577 
-            if (isset($value['id']) && isset($_POST[$value['id']])) {
578 
-                update_option($value['id'], $_POST[$value['id']]);
579 
-            } else {
580 
-                delete_option($value['id']);
581 
-            }
577 
+			if (isset($value['id']) && isset($_POST[$value['id']])) {
578 
+				update_option($value['id'], $_POST[$value['id']]);
579 
+			} else {
580 
+				delete_option($value['id']);
581 
+			}
582 582
583 
-        endif;
584 
-    }
585 
-    if ($dummy)
586 
-        $_POST = array();
587 
-    return true;
583 
+		endif;
584 
+	}
585 
+	if ($dummy)
586 
+		$_POST = array();
587 
+	return true;
588 588
589 589 
 }
590 590 
 

@@ -633,33 +633,33 @@  discard block
 
 block discarded – undo
633 633 
 function places_custom_fields_tab($tabs)
634 634 
 {
635 635
636 
-    $geodir_post_types = get_option('geodir_post_types');
636 
+	$geodir_post_types = get_option('geodir_post_types');
637 637
638 
-    if (!empty($geodir_post_types)) {
638 
+	if (!empty($geodir_post_types)) {
639 639
640 
-        foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):
640 
+		foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):
641 641
642 
-            $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory');
642 
+			$listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory');
643 643
644 
-            $tabs[$geodir_post_type . '_fields_settings'] = array(
645 
-                'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
646 
-                'subtabs' => array(
647 
-                    array('subtab' => 'custom_fields',
648 
-                        'label' => __('Custom Fields', 'geodirectory'),
649 
-                        'request' => array('listing_type' => $geodir_post_type)),
650 
-                    array('subtab' => 'sorting_options',
651 
-                        'label' => __('Sorting Options', 'geodirectory'),
652 
-                        'request' => array('listing_type' => $geodir_post_type)),
653 
-                ),
654 
-                'tab_index' => 9,
655 
-                'request' => array('listing_type' => $geodir_post_type)
656 
-            );
644 
+			$tabs[$geodir_post_type . '_fields_settings'] = array(
645 
+				'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
646 
+				'subtabs' => array(
647 
+					array('subtab' => 'custom_fields',
648 
+						'label' => __('Custom Fields', 'geodirectory'),
649 
+						'request' => array('listing_type' => $geodir_post_type)),
650 
+					array('subtab' => 'sorting_options',
651 
+						'label' => __('Sorting Options', 'geodirectory'),
652 
+						'request' => array('listing_type' => $geodir_post_type)),
653 
+				),
654 
+				'tab_index' => 9,
655 
+				'request' => array('listing_type' => $geodir_post_type)
656 
+			);
657 657
658 
-        endforeach;
658 
+		endforeach;
659 659
660 
-    }
660 
+	}
661 661
662 
-    return $tabs;
662 
+	return $tabs;
663 663 
 }
664 664
665 665 
 

@@ -675,9 +675,9 @@  discard block
 
 block discarded – undo
675 675 
  */
676 676 
 function geodir_tools_setting_tab($tabs)
677 677 
 {
678 
-    wp_enqueue_script( 'jquery-ui-progressbar' );
679 
-    $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
680 
-    return $tabs;
678 
+	wp_enqueue_script( 'jquery-ui-progressbar' );
679 
+	$tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
680 
+	return $tabs;
681 681 
 }
682 682
683 683 
 /**

@@ -692,8 +692,8 @@  discard block
 
 block discarded – undo
692 692 
  */
693 693 
 function geodir_compatibility_setting_tab($tabs)
694 694 
 {
695 
-    $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));
696 
-    return $tabs;
695 
+	$tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));
696 
+	return $tabs;
697 697 
 }
698 698
699 699 
 

@@ -709,144 +709,144 @@  discard block
 
 block discarded – undo
709 709 
  */
710 710 
 function geodir_extend_geodirectory_setting_tab($tabs)
711 711 
 {
712 
-    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
713 
-    return $tabs;
712 
+	$tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
713 
+	return $tabs;
714 714 
 }
715 715
716 716
717 717 
 if (!function_exists('geodir_edit_post_columns')) {
718 
-    /**
719 
-     * Modify admin post listing page columns.
720 
-     *
721 
-     * @since 1.0.0
722 
-     * @package GeoDirectory
723 
-     * @param array $columns The column array.
724 
-     * @return array Altered column array.
725 
-     */
726 
-    function geodir_edit_post_columns($columns)
727 
-    {
728 
-
729 
-        $new_columns = array('location' => __('Location (ID)', 'geodirectory'),
730 
-            'categorys' => __('Categories', 'geodirectory'));
731 
-
732 
-        if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
733 
-        {
734 
-            $offset = 0; // should we prepend $array with $data?
735 
-            $offset = count($columns); // or should we append $array with $data? lets pick this one...
736 
-        }
718 
+	/**
719 
+	 * Modify admin post listing page columns.
720 
+	 *
721 
+	 * @since 1.0.0
722 
+	 * @package GeoDirectory
723 
+	 * @param array $columns The column array.
724 
+	 * @return array Altered column array.
725 
+	 */
726 
+	function geodir_edit_post_columns($columns)
727 
+	{
737 728
738 
-        $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));
729 
+		$new_columns = array('location' => __('Location (ID)', 'geodirectory'),
730 
+			'categorys' => __('Categories', 'geodirectory'));
739 731
740 
-        $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));
732 
+		if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist
733 
+		{
734 
+			$offset = 0; // should we prepend $array with $data?
735 
+			$offset = count($columns); // or should we append $array with $data? lets pick this one...
736 
+		}
741 737
742 
-        return $columns;
743 
-    }
738 
+		$columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));
739 
+
740 
+		$columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));
741 
+
742 
+		return $columns;
743 
+	}
744 744 
 }
745 745
746 746
747 747 
 if (!function_exists('geodir_manage_post_columns')) {
748 
-    /**
749 
-     * Adds content to our custom post listing page columns.
750 
-     *
751 
-     * @since 1.0.0
752 
-     * @package GeoDirectory
753 
-     * @global object $wpdb WordPress Database object.
754 
-     * @global object $post WordPress Post object.
755 
-     * @param string $column The column name.
756 
-     * @param int $post_id The post ID.
757 
-     */
758 
-    function geodir_manage_post_columns($column, $post_id)
759 
-    {
760 
-        global $post, $wpdb;
761 
-
762 
-        switch ($column):
763 
-            /* If displaying the 'city' column. */
764 
-            case 'location' :
765 
-                $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);
766 
-                $location = geodir_get_location($location_id);
767 
-                /* If no city is found, output a default message. */
768 
-                if (empty($location)) {
769 
-                    _e('Unknown', 'geodirectory');
770 
-                } else {
771 
-                    /* If there is a city id, append 'city name' to the text string. */
772 
-                    $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
773 
-                    echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);
774 
-                }
775 
-                break;
776 
-
777 
-            /* If displaying the 'expire' column. */
778 
-            case 'expire' :
779 
-                $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true);
780 
-                $d1 = $expire_date; // get expire_date
781 
-                $d2 = date('Y-m-d'); // get current date
782 
-                $state = __('days left', 'geodirectory');
783 
-                $date_diff_text = '';
784 
-                $expire_class = 'expire_left';
785 
-                if ($expire_date != 'Never') {
786 
-                    if (strtotime($d1) < strtotime($d2)) {
787 
-                        $state = __('days overdue', 'geodirectory');
788 
-                        $expire_class = 'expire_over';
789 
-                    }
790 
-                    $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days
791 
-                    $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
792 
-                }
793 
-                /* If no expire_date is found, output a default message. */
794 
-                if (empty($expire_date))
795 
-                    echo __('Unknown', 'geodirectory');
796 
-                /* If there is a expire_date, append 'days left' to the text string. */
797 
-                else
798 
-                    echo $expire_date . $date_diff_text;
799 
-                break;
800 
-
801 
-            /* If displaying the 'categorys' column. */
802 
-            case 'categorys' :
803 
-
804 
-                /* Get the categorys for the post. */
805 
-
806 
-
807 
-                $terms = wp_get_object_terms($post_id, get_object_taxonomies($post));
808 
-
809 
-                /* If terms were found. */
810 
-                if (!empty($terms)) {
811 
-                    $out = array();
812 
-                    /* Loop through each term, linking to the 'edit posts' page for the specific term. */
813 
-                    foreach ($terms as $term) {
814 
-                        if (!strstr($term->taxonomy, 'tag')) {
815 
-                            $out[] = sprintf('<a href="%s">%s</a>',
816 
-                                esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),
817 
-                                esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))
818 
-                            );
819 
-                        }
820 
-                    }
821 
-                    /* Join the terms, separating them with a comma. */
822 
-                    echo(join(', ', $out));
823 
-                } /* If no terms were found, output a default message. */
824 
-                else {
825 
-                    _e('No Categories', 'geodirectory');
826 
-                }
827 
-                break;
748 
+	/**
749 
+	 * Adds content to our custom post listing page columns.
750 
+	 *
751 
+	 * @since 1.0.0
752 
+	 * @package GeoDirectory
753 
+	 * @global object $wpdb WordPress Database object.
754 
+	 * @global object $post WordPress Post object.
755 
+	 * @param string $column The column name.
756 
+	 * @param int $post_id The post ID.
757 
+	 */
758 
+	function geodir_manage_post_columns($column, $post_id)
759 
+	{
760 
+		global $post, $wpdb;
761 
+
762 
+		switch ($column):
763 
+			/* If displaying the 'city' column. */
764 
+			case 'location' :
765 
+				$location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);
766 
+				$location = geodir_get_location($location_id);
767 
+				/* If no city is found, output a default message. */
768 
+				if (empty($location)) {
769 
+					_e('Unknown', 'geodirectory');
770 
+				} else {
771 
+					/* If there is a city id, append 'city name' to the text string. */
772 
+					$add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
773 
+					echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);
774 
+				}
775 
+				break;
776 
+
777 
+			/* If displaying the 'expire' column. */
778 
+			case 'expire' :
779 
+				$expire_date = geodir_get_post_meta($post->ID, 'expire_date', true);
780 
+				$d1 = $expire_date; // get expire_date
781 
+				$d2 = date('Y-m-d'); // get current date
782 
+				$state = __('days left', 'geodirectory');
783 
+				$date_diff_text = '';
784 
+				$expire_class = 'expire_left';
785 
+				if ($expire_date != 'Never') {
786 
+					if (strtotime($d1) < strtotime($d2)) {
787 
+						$state = __('days overdue', 'geodirectory');
788 
+						$expire_class = 'expire_over';
789 
+					}
790 
+					$date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days
791 
+					$date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
792 
+				}
793 
+				/* If no expire_date is found, output a default message. */
794 
+				if (empty($expire_date))
795 
+					echo __('Unknown', 'geodirectory');
796 
+				/* If there is a expire_date, append 'days left' to the text string. */
797 
+				else
798 
+					echo $expire_date . $date_diff_text;
799 
+				break;
828 800
829 
-        endswitch;
830 
-    }
801 
+			/* If displaying the 'categorys' column. */
802 
+			case 'categorys' :
803 
+
804 
+				/* Get the categorys for the post. */
805 
+
806 
+
807 
+				$terms = wp_get_object_terms($post_id, get_object_taxonomies($post));
808 
+
809 
+				/* If terms were found. */
810 
+				if (!empty($terms)) {
811 
+					$out = array();
812 
+					/* Loop through each term, linking to the 'edit posts' page for the specific term. */
813 
+					foreach ($terms as $term) {
814 
+						if (!strstr($term->taxonomy, 'tag')) {
815 
+							$out[] = sprintf('<a href="%s">%s</a>',
816 
+								esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),
817 
+								esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))
818 
+							);
819 
+						}
820 
+					}
821 
+					/* Join the terms, separating them with a comma. */
822 
+					echo(join(', ', $out));
823 
+				} /* If no terms were found, output a default message. */
824 
+				else {
825 
+					_e('No Categories', 'geodirectory');
826 
+				}
827 
+				break;
828 
+
829 
+		endswitch;
830 
+	}
831 831 
 }
832 832
833 833
834 834 
 if (!function_exists('geodir_post_sortable_columns')) {
835 
-    /**
836 
-     * Makes admin post listing page columns sortable.
837 
-     *
838 
-     * @since 1.0.0
839 
-     * @package GeoDirectory
840 
-     * @param array $columns The column array.
841 
-     * @return array Altered column array.
842 
-     */
843 
-    function geodir_post_sortable_columns($columns)
844 
-    {
845 
-
846 
-        $columns['expire'] = 'expire';
847 
-
848 
-        return $columns;
849 
-    }
835 
+	/**
836 
+	 * Makes admin post listing page columns sortable.
837 
+	 *
838 
+	 * @since 1.0.0
839 
+	 * @package GeoDirectory
840 
+	 * @param array $columns The column array.
841 
+	 * @return array Altered column array.
842 
+	 */
843 
+	function geodir_post_sortable_columns($columns)
844 
+	{
845 
+
846 
+		$columns['expire'] = 'expire';
847 
+
848 
+		return $columns;
849 
+	}
850 850 
 }
851 851
852 852 
 /**

@@ -860,32 +860,32 @@  discard block
 
 block discarded – undo
860 860 
  * @param int $post_id The post ID.
861 861 
  */
862 862 
 function geodir_post_information_save($post_id, $post) {
863 
-    global $wpdb, $current_user;
863 
+	global $wpdb, $current_user;
864 864
865 
-    if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
866 
-        return;
867 
-    }
865 
+	if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
866 
+		return;
867 
+	}
868 868
869 
-    $geodir_posttypes = geodir_get_posttypes();
869 
+	$geodir_posttypes = geodir_get_posttypes();
870 870
871 
-    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
872 
-        return;
871 
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
872 
+		return;
873 873
874 
-    if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
875 
-        if (isset($_REQUEST['_status']))
876 
-            geodir_change_post_status($post_id, $_REQUEST['_status']);
874 
+	if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {
875 
+		if (isset($_REQUEST['_status']))
876 
+			geodir_change_post_status($post_id, $_REQUEST['_status']);
877 877
878 
-        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))
879 
-            return;
878 
+		if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))
879 
+			return;
880 880
881 
-        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))
882 
-            return;
881 
+		if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))
882 
+			return;
883 883
884 
-        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))
885 
-            return;
884 
+		if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))
885 
+			return;
886 886
887 
-        geodir_save_listing($_REQUEST);
888 
-    }
887 
+		geodir_save_listing($_REQUEST);
888 
+	}
889 889 
 }
890 890
891 891 
 /**

@@ -901,102 +901,102 @@  discard block
 
 block discarded – undo
901 901 
  */
902 902 
 function geodir_admin_fields($options)
903 903 
 {
904 
-    global $geodirectory;
905 
-
906 
-    $first_title = true;
907 
-    $tab_id = '';
908 
-    $i = 0;
909 
-    foreach ($options as $value) :
910 
-        if (!isset($value['name'])) $value['name'] = '';
911 
-        if (!isset($value['class'])) $value['class'] = '';
912 
-        if (!isset($value['css'])) $value['css'] = '';
913 
-        if (!isset($value['std'])) $value['std'] = '';
914 
-        $desc = '';
915 
-        switch ($value['type']) :
916 
-            case 'dummy_installer':
917 
-                $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';
918 
-                geodir_autoinstall_admin_header($post_type);
919 
-                break;
920 
-            case 'title':
921 
-
922 
-                if ($i == 0) {
923 
-                    echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';
924 
-                    echo '<div class="inner_content_tab_main">';
925 
-                }
904 
+	global $geodirectory;
905 
+
906 
+	$first_title = true;
907 
+	$tab_id = '';
908 
+	$i = 0;
909 
+	foreach ($options as $value) :
910 
+		if (!isset($value['name'])) $value['name'] = '';
911 
+		if (!isset($value['class'])) $value['class'] = '';
912 
+		if (!isset($value['css'])) $value['css'] = '';
913 
+		if (!isset($value['std'])) $value['std'] = '';
914 
+		$desc = '';
915 
+		switch ($value['type']) :
916 
+			case 'dummy_installer':
917 
+				$post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';
918 
+				geodir_autoinstall_admin_header($post_type);
919 
+				break;
920 
+			case 'title':
921 
+
922 
+				if ($i == 0) {
923 
+					echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';
924 
+					echo '<div class="inner_content_tab_main">';
925 
+				}
926 926
927 
-                $i++;
927 
+				$i++;
928 928
929 
-                if (isset($value['id']) && $value['id'])
930 
-                    $tab_id = $value['id'];
929 
+				if (isset($value['id']) && $value['id'])
930 
+					$tab_id = $value['id'];
931 931
932 
-                if (isset($value['desc']) && $value['desc'])
933 
-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';
932 
+				if (isset($value['desc']) && $value['desc'])
933 
+					$desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';
934 934
935 
-                if (isset($value['name']) && $value['name']) {
936 
-                    if ($first_title === true) {
937 
-                        $first_title = false;
938 
-                    } else {
939 
-                        echo '</div>';
940 
-                    }
941 
-                    echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';
935 
+				if (isset($value['name']) && $value['name']) {
936 
+					if ($first_title === true) {
937 
+						$first_title = false;
938 
+					} else {
939 
+						echo '</div>';
940 
+					}
941 
+					echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';
942 942
943 
-                    echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';
944 
-                }
943 
+					echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';
944 
+				}
945 945
946 
-                /**
947 
-                 * Called after a GeoDirectory settings title is output in the GD settings page.
948 
-                 *
949 
-                 * The action is called dynamically geodir_settings_$value['id'].
950 
-                 *
951 
-                 * @since 1.0.0
952 
-                 */
953 
-                do_action('geodir_settings_' . sanitize_title($value['id']));
954 
-                break;
955 
-
956 
-            case 'no_tabs':
957 
-
958 
-                echo '<div class="inner_content_tab_main">';
959 
-                echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';
960 
-
961 
-                break;
962 
-
963 
-            case 'sectionstart':
964 
-                if (isset($value['desc']) && $value['desc'])
965 
-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';
966 
-                if (isset($value['name']) && $value['name'])
967 
-                    echo '<h3>' . $value['name'] . $desc . '</h3>';
968 
-                /**
969 
-                 * Called after a GeoDirectory settings sectionstart is output in the GD settings page.
970 
-                 *
971 
-                 * The action is called dynamically geodir_settings_$value['id']_start.
972 
-                 *
973 
-                 * @since 1.0.0
974 
-                 */
975 
-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
976 
-                echo '<table class="form-table">' . "\n\n";
977 
-
978 
-                break;
979 
-            case 'sectionend':
980 
-                /**
981 
-                 * Called before a GeoDirectory settings sectionend is output in the GD settings page.
982 
-                 *
983 
-                 * The action is called dynamically geodir_settings_$value['id']_end.
984 
-                 *
985 
-                 * @since 1.0.0
986 
-                 */
987 
-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
988 
-                echo '</table>';
989 
-                /**
990 
-                 * Called after a GeoDirectory settings sectionend is output in the GD settings page.
991 
-                 *
992 
-                 * The action is called dynamically geodir_settings_$value['id']_end.
993 
-                 *
994 
-                 * @since 1.0.0
995 
-                 */
996 
-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
997 
-                break;
998 
-            case 'text':
999 
-                ?>
946 
+				/**
947 
+				 * Called after a GeoDirectory settings title is output in the GD settings page.
948 
+				 *
949 
+				 * The action is called dynamically geodir_settings_$value['id'].
950 
+				 *
951 
+				 * @since 1.0.0
952 
+				 */
953 
+				do_action('geodir_settings_' . sanitize_title($value['id']));
954 
+				break;
955 
+
956 
+			case 'no_tabs':
957 
+
958 
+				echo '<div class="inner_content_tab_main">';
959 
+				echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';
960 
+
961 
+				break;
962 
+
963 
+			case 'sectionstart':
964 
+				if (isset($value['desc']) && $value['desc'])
965 
+					$desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';
966 
+				if (isset($value['name']) && $value['name'])
967 
+					echo '<h3>' . $value['name'] . $desc . '</h3>';
968 
+				/**
969 
+				 * Called after a GeoDirectory settings sectionstart is output in the GD settings page.
970 
+				 *
971 
+				 * The action is called dynamically geodir_settings_$value['id']_start.
972 
+				 *
973 
+				 * @since 1.0.0
974 
+				 */
975 
+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
976 
+				echo '<table class="form-table">' . "\n\n";
977 
+
978 
+				break;
979 
+			case 'sectionend':
980 
+				/**
981 
+				 * Called before a GeoDirectory settings sectionend is output in the GD settings page.
982 
+				 *
983 
+				 * The action is called dynamically geodir_settings_$value['id']_end.
984 
+				 *
985 
+				 * @since 1.0.0
986 
+				 */
987 
+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
988 
+				echo '</table>';
989 
+				/**
990 
+				 * Called after a GeoDirectory settings sectionend is output in the GD settings page.
991 
+				 *
992 
+				 * The action is called dynamically geodir_settings_$value['id']_end.
993 
+				 *
994 
+				 * @since 1.0.0
995 
+				 */
996 
+				if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
997 
+				break;
998 
+			case 'text':
999 
+				?>
1000 1000 
                 <tr valign="top">
1001 1001 
                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>
1002 1002 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -1005,15 +1005,15 @@  discard block
 
 block discarded – undo
1005 1005 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
1006 1006 
                                            style=" <?php echo esc_attr($value['css']); ?>"
1007 1007 
                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
1008 
-                                               echo esc_attr(stripslashes(get_option($value['id'])));
1009 
-                                           } else {
1010 
-                                               echo esc_attr($value['std']);
1011 
-                                           } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>
1008 
+											   echo esc_attr(stripslashes(get_option($value['id'])));
1009 
+										   } else {
1010 
+											   echo esc_attr($value['std']);
1011 
+										   } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>
1012 1012 
                 </tr><?php
1013 
-                break;
1013 
+				break;
1014 1014
1015 
-            case 'map-key':
1016 
-                ?>
1015 
+			case 'map-key':
1016 
+				?>
1017 1017 
                 <tr valign="top">
1018 1018 
                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>
1019 1019 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -1022,17 +1022,17 @@  discard block
 
 block discarded – undo
1022 1022 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
1023 1023 
                                            style=" <?php echo esc_attr($value['css']); ?>"
1024 1024 
                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
1025 
-                                               echo esc_attr(stripslashes(get_option($value['id'])));
1026 
-                                           } else {
1027 
-                                               echo esc_attr($value['std']);
1028 
-                                           } ?>"/>
1025 
+											   echo esc_attr(stripslashes(get_option($value['id'])));
1026 
+										   } else {
1027 
+											   echo esc_attr($value['std']);
1028 
+										   } ?>"/>
1029 1029 
                     <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>
1030 1030 
                     <span class="description"><?php echo $value['desc']; ?></span></td>
1031 1031 
                 </tr><?php
1032 
-                break;
1032 
+				break;
1033 1033
1034 
-            case 'password':
1035 
-                ?>
1034 
+			case 'password':
1035 
+				?>
1036 1036 
                 <tr valign="top">
1037 1037 
                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>
1038 1038 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -1041,42 +1041,42 @@  discard block
 
 block discarded – undo
1041 1041 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
1042 1042 
                                            style="<?php echo esc_attr($value['css']); ?>"
1043 1043 
                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
1044 
-                                               echo esc_attr(stripslashes(get_option($value['id'])));
1045 
-                                           } else {
1046 
-                                               echo esc_attr($value['std']);
1047 
-                                           } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>
1044 
+											   echo esc_attr(stripslashes(get_option($value['id'])));
1045 
+										   } else {
1046 
+											   echo esc_attr($value['std']);
1047 
+										   } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>
1048 1048 
                 </tr><?php
1049 
-                break;
1049 
+				break;
1050 1050
1051 
-            case 'html_content':
1052 
-                ?>
1051 
+			case 'html_content':
1052 
+				?>
1053 1053 
                 <tr valign="top">
1054 1054 
                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>
1055 1055 
                 <td class="forminp"><span class="description"><?php echo $value['desc']; ?></span></td>
1056 1056 
                 </tr><?php
1057 
-                break;
1057 
+				break;
1058 1058
1059 
-            case 'color' :
1060 
-                ?>
1059 
+			case 'color' :
1060 
+				?>
1061 1061 
                 <tr valign="top">
1062 1062 
                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>
1063 1063 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"
1064 1064 
                                            id="<?php echo esc_attr($value['id']); ?>" type="text"
1065 1065 
                                            style="<?php echo esc_attr($value['css']); ?>"
1066 1066 
                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
1067 
-                                               echo esc_attr(stripslashes(get_option($value['id'])));
1068 
-                                           } else {
1069 
-                                               echo esc_attr($value['std']);
1070 
-                                           } ?>" class="colorpick"/> <span
1067 
+											   echo esc_attr(stripslashes(get_option($value['id'])));
1068 
+										   } else {
1069 
+											   echo esc_attr($value['std']);
1070 
+										   } ?>" class="colorpick"/> <span
1071 1071 
                         class="description"><?php echo $value['desc']; ?></span>
1072 1072
1073 1073 
                     <div id="colorPickerDiv_<?php echo esc_attr($value['id']); ?>" class="colorpickdiv"
1074 1074 
                          style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div>
1075 1075 
                 </td>
1076 1076 
                 </tr><?php
1077 
-                break;
1078 
-            case 'image_width' :
1079 
-                ?>
1077 
+				break;
1078 
+			case 'image_width' :
1079 
+				?>
1080 1080 
                 <tr valign="top">
1081 1081 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1082 1082 
                 <td class="forminp">

@@ -1098,11 +1098,11 @@  discard block
 
 block discarded – undo
1098 1098
1099 1099 
                     <span class="description"><?php echo $value['desc'] ?></span></td>
1100 1100 
                 </tr><?php
1101 
-                break;
1102 
-            case 'select':
1103 
-                $option_value = get_option($value['id']);
1104 
-                $option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value;
1105 
-                ?>
1101 
+				break;
1102 
+			case 'select':
1103 
+				$option_value = get_option($value['id']);
1104 
+				$option_value = !empty($option_value) ? stripslashes_deep($option_value) : $option_value;
1105 
+				?>
1106 1106 
                 <tr valign="top">
1107 1107 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1108 1108 
                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -1111,33 +1111,33 @@  discard block
 
 block discarded – undo
1111 1111 
                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"
1112 1112 
                                             option-ajaxchosen="false">
1113 1113 
                         <?php
1114 
-                        foreach ($value['options'] as $key => $val) {
1115 
-                            $geodir_select_value = '';
1116 
-                            if ($option_value != '') {
1117 
-                                if ($option_value != '' && $option_value == $key)
1118 
-                                    $geodir_select_value = ' selected="selected" ';
1119 
-                            } else {
1120 
-                                if ($value['std'] == $key)
1121 
-                                    $geodir_select_value = ' selected="selected" ';
1122 
-                            }
1123 
-                            ?>
1114 
+						foreach ($value['options'] as $key => $val) {
1115 
+							$geodir_select_value = '';
1116 
+							if ($option_value != '') {
1117 
+								if ($option_value != '' && $option_value == $key)
1118 
+									$geodir_select_value = ' selected="selected" ';
1119 
+							} else {
1120 
+								if ($value['std'] == $key)
1121 
+									$geodir_select_value = ' selected="selected" ';
1122 
+							}
1123 
+							?>
1124 1124 
                             <option
1125 1125 
                                 value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo geodir_utf8_ucfirst($val) ?></option>
1126 1126 
                         <?php
1127 
-                        }
1128 
-                        ?>
1127 
+						}
1128 
+						?>
1129 1129 
                     </select> <span class="description"><?php echo $value['desc'] ?></span>
1130 1130 
                 </td>
1131 1131 
                 </tr><?php
1132 
-                break;
1132 
+				break;
1133 1133
1134 
-            case 'multiselect':
1135 
-                $option_values = get_option($value['id']);
1136 
-                if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {
1137 
-                   $option_values = $value['std'];
1138 
-                }
1139 
-                $option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values;
1140 
-                ?>
1134 
+			case 'multiselect':
1135 
+				$option_values = get_option($value['id']);
1136 
+				if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {
1137 
+				   $option_values = $value['std'];
1138 
+				}
1139 
+				$option_values = !empty($option_values) ? stripslashes_deep($option_values) : $option_values;
1140 
+				?>
1141 1141 
                 <tr valign="top">
1142 1142 
                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>
1143 1143 
                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"

@@ -1147,26 +1147,26 @@  discard block
 
 block discarded – undo
1147 1147 
                                             data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"
1148 1148 
                                             option-ajaxchosen="false">
1149 1149 
                         <?php
1150 
-                        foreach ($value['options'] as $key => $val) {
1151 
-                            if (strpos($key, 'optgroup_start-') === 0) {
1152 
-                                ?><optgroup label="<?php echo geodir_utf8_ucfirst($val); ?>"><?php
1153 
-                            } else if (strpos($key, 'optgroup_end-') === 0) {
1154 
-                                ?></optgroup><?php
1155 
-                            } else {
1156 
-                                ?>
1150 
+						foreach ($value['options'] as $key => $val) {
1151 
+							if (strpos($key, 'optgroup_start-') === 0) {
1152 
+								?><optgroup label="<?php echo geodir_utf8_ucfirst($val); ?>"><?php
1153 
+							} else if (strpos($key, 'optgroup_end-') === 0) {
1154 
+								?></optgroup><?php
1155 
+							} else {
1156 
+								?>
1157 1157 
                                 <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>>
1158 1158 
                                     <?php echo geodir_utf8_ucfirst($val) ?>
1159 1159 
                                 </option>
1160 1160 
                             <?php
1161 
-                            }
1162 
-                        }
1163 
-                        ?>
1161 
+							}
1162 
+						}
1163 
+						?>
1164 1164 
                     </select> <span class="description"><?php echo $value['desc'] ?></span>
1165 1165 
                 </td>
1166 1166 
                 </tr><?php
1167 
-                break;
1168 
-            case 'file':
1169 
-                ?>
1167 
+				break;
1168 
+			case 'file':
1169 
+				?>
1170 1170 
                 <tr valign="top">
1171 1171 
                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>
1172 1172 
                 <td class="forminp">

@@ -1186,87 +1186,87 @@  discard block
 
 block discarded – undo
1186 1186 
                     <?php } ?>
1187 1187 
                 </td>
1188 1188 
                 </tr><?php
1189 
-                break;
1190 
-            case 'map_default_settings' :
1191 
-                ?>
1189 
+				break;
1190 
+			case 'map_default_settings' :
1191 
+				?>
1192 1192
1193 1193 
                 <tr valign="top">
1194 1194 
                     <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>
1195 1195 
                     <td width="60%">
1196 1196 
                         <select name="geodir_default_map_language" style="width:60%">
1197 1197 
                             <?php
1198 
-                            $arr_map_langages = array(
1199 
-                                'ar' => __('ARABIC', 'geodirectory'),
1200 
-                                'eu' => __('BASQUE', 'geodirectory'),
1201 
-                                'bg' => __('BULGARIAN', 'geodirectory'),
1202 
-                                'bn' => __('BENGALI', 'geodirectory'),
1203 
-                                'ca' => __('CATALAN', 'geodirectory'),
1204 
-                                'cs' => __('CZECH', 'geodirectory'),
1205 
-                                'da' => __('DANISH', 'geodirectory'),
1206 
-                                'de' => __('GERMAN', 'geodirectory'),
1207 
-                                'el' => __('GREEK', 'geodirectory'),
1208 
-                                'en' => __('ENGLISH', 'geodirectory'),
1209 
-                                'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),
1210 
-                                'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),
1211 
-                                'es' => __('SPANISH', 'geodirectory'),
1212 
-                                'eu' => __('BASQUE', 'geodirectory'),
1213 
-                                'fa' => __('FARSI', 'geodirectory'),
1214 
-                                'fi' => __('FINNISH', 'geodirectory'),
1215 
-                                'fil' => __('FILIPINO', 'geodirectory'),
1216 
-                                'fr' => __('FRENCH', 'geodirectory'),
1217 
-                                'gl' => __('GALICIAN', 'geodirectory'),
1218 
-                                'gu' => __('GUJARATI', 'geodirectory'),
1219 
-                                'hi' => __('HINDI', 'geodirectory'),
1220 
-                                'hr' => __('CROATIAN', 'geodirectory'),
1221 
-                                'hu' => __('HUNGARIAN', 'geodirectory'),
1222 
-                                'id' => __('INDONESIAN', 'geodirectory'),
1223 
-                                'it' => __('ITALIAN', 'geodirectory'),
1224 
-                                'iw' => __('HEBREW', 'geodirectory'),
1225 
-                                'ja' => __('JAPANESE', 'geodirectory'),
1226 
-                                'kn' => __('KANNADA', 'geodirectory'),
1227 
-                                'ko' => __('KOREAN', 'geodirectory'),
1228 
-                                'lt' => __('LITHUANIAN', 'geodirectory'),
1229 
-                                'lv' => __('LATVIAN', 'geodirectory'),
1230 
-                                'ml' => __('MALAYALAM', 'geodirectory'),
1231 
-                                'mr' => __('MARATHI', 'geodirectory'),
1232 
-                                'nl' => __('DUTCH', 'geodirectory'),
1233 
-                                'no' => __('NORWEGIAN', 'geodirectory'),
1234 
-                                'pl' => __('POLISH', 'geodirectory'),
1235 
-                                'pt' => __('PORTUGUESE', 'geodirectory'),
1236 
-                                'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),
1237 
-                                'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),
1238 
-                                'ro' => __('ROMANIAN', 'geodirectory'),
1239 
-                                'ru' => __('RUSSIAN', 'geodirectory'),
1240 
-                                'ru' => __('RUSSIAN', 'geodirectory'),
1241 
-                                'sk' => __('SLOVAK', 'geodirectory'),
1242 
-                                'sl' => __('SLOVENIAN', 'geodirectory'),
1243 
-                                'sr' => __('SERBIAN', 'geodirectory'),
1244 
-                                'sv' => __('	SWEDISH', 'geodirectory'),
1245 
-                                'tl' => __('TAGALOG', 'geodirectory'),
1246 
-                                'ta' => __('TAMIL', 'geodirectory'),
1247 
-                                'te' => __('TELUGU', 'geodirectory'),
1248 
-                                'th' => __('THAI', 'geodirectory'),
1249 
-                                'tr' => __('TURKISH', 'geodirectory'),
1250 
-                                'uk' => __('UKRAINIAN', 'geodirectory'),
1251 
-                                'vi' => __('VIETNAMESE', 'geodirectory'),
1252 
-                                'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),
1253 
-                                'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
1254 
-                            );
1255 
-                            $geodir_default_map_language = get_option('geodir_default_map_language');
1256 
-                            if (empty($geodir_default_map_language))
1257 
-                                $geodir_default_map_language = 'en';
1258 
-                            foreach ($arr_map_langages as $language_key => $language_txt) {
1259 
-                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)
1260 
-                                    $geodir_default_language_selected = "selected='selected'";
1261 
-                                else
1262 
-                                    $geodir_default_language_selected = '';
1263 
-
1264 
-                                ?>
1198 
+							$arr_map_langages = array(
1199 
+								'ar' => __('ARABIC', 'geodirectory'),
1200 
+								'eu' => __('BASQUE', 'geodirectory'),
1201 
+								'bg' => __('BULGARIAN', 'geodirectory'),
1202 
+								'bn' => __('BENGALI', 'geodirectory'),
1203 
+								'ca' => __('CATALAN', 'geodirectory'),
1204 
+								'cs' => __('CZECH', 'geodirectory'),
1205 
+								'da' => __('DANISH', 'geodirectory'),
1206 
+								'de' => __('GERMAN', 'geodirectory'),
1207 
+								'el' => __('GREEK', 'geodirectory'),
1208 
+								'en' => __('ENGLISH', 'geodirectory'),
1209 
+								'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),
1210 
+								'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),
1211 
+								'es' => __('SPANISH', 'geodirectory'),
1212 
+								'eu' => __('BASQUE', 'geodirectory'),
1213 
+								'fa' => __('FARSI', 'geodirectory'),
1214 
+								'fi' => __('FINNISH', 'geodirectory'),
1215 
+								'fil' => __('FILIPINO', 'geodirectory'),
1216 
+								'fr' => __('FRENCH', 'geodirectory'),
1217 
+								'gl' => __('GALICIAN', 'geodirectory'),
1218 
+								'gu' => __('GUJARATI', 'geodirectory'),
1219 
+								'hi' => __('HINDI', 'geodirectory'),
1220 
+								'hr' => __('CROATIAN', 'geodirectory'),
1221 
+								'hu' => __('HUNGARIAN', 'geodirectory'),
1222 
+								'id' => __('INDONESIAN', 'geodirectory'),
1223 
+								'it' => __('ITALIAN', 'geodirectory'),
1224 
+								'iw' => __('HEBREW', 'geodirectory'),
1225 
+								'ja' => __('JAPANESE', 'geodirectory'),
1226 
+								'kn' => __('KANNADA', 'geodirectory'),
1227 
+								'ko' => __('KOREAN', 'geodirectory'),
1228 
+								'lt' => __('LITHUANIAN', 'geodirectory'),
1229 
+								'lv' => __('LATVIAN', 'geodirectory'),
1230 
+								'ml' => __('MALAYALAM', 'geodirectory'),
1231 
+								'mr' => __('MARATHI', 'geodirectory'),
1232 
+								'nl' => __('DUTCH', 'geodirectory'),
1233 
+								'no' => __('NORWEGIAN', 'geodirectory'),
1234 
+								'pl' => __('POLISH', 'geodirectory'),
1235 
+								'pt' => __('PORTUGUESE', 'geodirectory'),
1236 
+								'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),
1237 
+								'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),
1238 
+								'ro' => __('ROMANIAN', 'geodirectory'),
1239 
+								'ru' => __('RUSSIAN', 'geodirectory'),
1240 
+								'ru' => __('RUSSIAN', 'geodirectory'),
1241 
+								'sk' => __('SLOVAK', 'geodirectory'),
1242 
+								'sl' => __('SLOVENIAN', 'geodirectory'),
1243 
+								'sr' => __('SERBIAN', 'geodirectory'),
1244 
+								'sv' => __('	SWEDISH', 'geodirectory'),
1245 
+								'tl' => __('TAGALOG', 'geodirectory'),
1246 
+								'ta' => __('TAMIL', 'geodirectory'),
1247 
+								'te' => __('TELUGU', 'geodirectory'),
1248 
+								'th' => __('THAI', 'geodirectory'),
1249 
+								'tr' => __('TURKISH', 'geodirectory'),
1250 
+								'uk' => __('UKRAINIAN', 'geodirectory'),
1251 
+								'vi' => __('VIETNAMESE', 'geodirectory'),
1252 
+								'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),
1253 
+								'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),
1254 
+							);
1255 
+							$geodir_default_map_language = get_option('geodir_default_map_language');
1256 
+							if (empty($geodir_default_map_language))
1257 
+								$geodir_default_map_language = 'en';
1258 
+							foreach ($arr_map_langages as $language_key => $language_txt) {
1259 
+								if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)
1260 
+									$geodir_default_language_selected = "selected='selected'";
1261 
+								else
1262 
+									$geodir_default_language_selected = '';
1263 
+
1264 
+								?>
1265 1265 
                                 <option
1266 1266 
                                     value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option>
1267 1267
1268 1268 
                             <?php }
1269 
-                            ?>
1269 
+							?>
1270 1270 
                         </select>
1271 1271 
                     </td>
1272 1272 
                 </tr>

@@ -1277,46 +1277,46 @@  discard block
 
 block discarded – undo
1277 1277 
                     <td width="60%">
1278 1278 
                         <select name="geodir_default_map_search_pt" style="width:60%">
1279 1279 
                             <?php
1280 
-                            $post_types = geodir_get_posttypes('array');
1281 
-                            $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
1282 
-                            if (empty($geodir_default_map_search_pt))
1283 
-                                $geodir_default_map_search_pt = 'gd_place';
1284 
-                            if (is_array($post_types)) {
1285 
-                                foreach ($post_types as $key => $post_types_obj) {
1286 
-                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)
1287 
-                                        $geodir_search_pt_selected = "selected='selected'";
1288 
-                                    else
1289 
-                                        $geodir_search_pt_selected = '';
1290 
-
1291 
-                                    ?>
1280 
+							$post_types = geodir_get_posttypes('array');
1281 
+							$geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');
1282 
+							if (empty($geodir_default_map_search_pt))
1283 
+								$geodir_default_map_search_pt = 'gd_place';
1284 
+							if (is_array($post_types)) {
1285 
+								foreach ($post_types as $key => $post_types_obj) {
1286 
+									if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)
1287 
+										$geodir_search_pt_selected = "selected='selected'";
1288 
+									else
1289 
+										$geodir_search_pt_selected = '';
1290 
+
1291 
+									?>
1292 1292 
                                     <option
1293 1293 
                                         value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo __($post_types_obj['labels']['singular_name'], 'geodirectory'); ?></option>
1294 1294
1295 1295 
                                 <?php }
1296 1296
1297 
-                            }
1297 
+							}
1298 1298
1299 
-                            ?>
1299 
+							?>
1300 1300 
                         </select>
1301 1301 
                     </td>
1302 1302 
                 </tr>
1303 1303
1304 1304 
                 <?php
1305 
-                break;
1305 
+				break;
1306 1306
1307 
-            case 'map':
1308 
-                ?>
1307 
+			case 'map':
1308 
+				?>
1309 1309 
                 <tr valign="top">
1310 1310 
                     <td class="forminp">
1311 1311 
                         <?php
1312 
-                        global $post_cat, $cat_display;
1313 
-                        $post_types = geodir_get_posttypes('object');
1314 
-                        $cat_display = 'checkbox';
1315 
-                        $gd_post_types = get_option('geodir_exclude_post_type_on_map');
1316 
-                        $gd_cats = get_option('geodir_exclude_cat_on_map');
1317 
-                        $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
1318 
-                        $count = 1;
1319 
-                        ?>
1312 
+						global $post_cat, $cat_display;
1313 
+						$post_types = geodir_get_posttypes('object');
1314 
+						$cat_display = 'checkbox';
1315 
+						$gd_post_types = get_option('geodir_exclude_post_type_on_map');
1316 
+						$gd_cats = get_option('geodir_exclude_cat_on_map');
1317 
+						$gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
1318 
+						$count = 1;
1319 
+						?>
1320 1320 
                         <table width="70%" class="widefat">
1321 1321 
                             <thead>
1322 1322 
                             <tr>

@@ -1325,18 +1325,18 @@  discard block
 
 block discarded – undo
1325 1325 
                                 <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th>
1326 1326 
                             </tr>
1327 1327 
                             <?php
1328 
-                            $gd_categs = $gd_cats;
1329 
-                            foreach ($post_types as $key => $post_types_obj) :
1330 
-                                $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';
1331 
-                                $gd_taxonomy = geodir_get_taxonomies($key);
1332 
-                                if ($gd_cats_upgrade) {
1333 
-                                    $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : '';
1334 
-                                    $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();
1335 
-                                    $gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array();
1336 
-                                }
1337 
-                                $post_cat = implode(',', $gd_cats);
1338 
-                                $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);
1339 
-                                ?>
1328 
+							$gd_categs = $gd_cats;
1329 
+							foreach ($post_types as $key => $post_types_obj) :
1330 
+								$checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';
1331 
+								$gd_taxonomy = geodir_get_taxonomies($key);
1332 
+								if ($gd_cats_upgrade) {
1333 
+									$gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : '';
1334 
+									$gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();
1335 
+									$gd_cats = !empty($gd_cats) && is_array($gd_cats) ? array_unique($gd_cats) : array();
1336 
+								}
1337 
+								$post_cat = implode(',', $gd_cats);
1338 
+								$gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);
1339 
+								?>
1340 1340 
                                 <tr>
1341 1341 
                                     <td valign="top" width="5%"><?php echo $count; ?></td>
1342 1342 
                                     <td valign="top" width="25%" id="td_post_types"><input type="checkbox"

@@ -1357,19 +1357,19 @@  discard block
 
 block discarded – undo
1357 1357 
                     </td>
1358 1358 
                 </tr>
1359 1359 
                 <?php
1360 
-                break;
1360 
+				break;
1361 1361
1362 
-            case 'checkbox' :
1362 
+			case 'checkbox' :
1363 1363
1364 
-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :
1365 
-                    ?>
1364 
+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :
1365 
+					?>
1366 1366 
                     <tr valign="top">
1367 1367 
                     <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1368 1368 
                     <td class="forminp">
1369 1369 
                 <?php
1370 
-                endif;
1370 
+				endif;
1371 1371
1372 
-                ?>
1372 
+				?>
1373 1373 
                 <fieldset>
1374 1374 
                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>
1375 1375 
                     <label for="<?php echo $value['id'] ?>">

@@ -1379,49 +1379,49 @@  discard block
 
 block discarded – undo
1379 1379 
                 </fieldset>
1380 1380 
                 <?php
1381 1381
1382 
-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :
1383 
-                    ?>
1382 
+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :
1383 
+					?>
1384 1384 
                     </td>
1385 1385 
                     </tr>
1386 1386 
                 <?php
1387 
-                endif;
1387 
+				endif;
1388 1388
1389 
-                break;
1389 
+				break;
1390 1390
1391 
-            case 'radio' :
1391 
+			case 'radio' :
1392 1392
1393 
-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :
1394 
-                    ?>
1393 
+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :
1394 
+					?>
1395 1395 
                     <tr valign="top">
1396 1396 
                     <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1397 1397 
                     <td class="forminp">
1398 1398 
                 <?php
1399 
-                endif;
1399 
+				endif;
1400 1400
1401 
-                ?>
1401 
+				?>
1402 1402 
                 <fieldset>
1403 1403 
                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>
1404 1404 
                     <label for="<?php echo $value['id'];?>">
1405 1405 
                         <input name="<?php echo esc_attr($value['id']); ?>"
1406 1406 
                                id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"
1407 1407 
                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {
1408 
-                            echo 'checked="checked"';
1409 
-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
1408 
+							echo 'checked="checked"';
1409 
+						}elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
1410 1410 
                         <?php echo $value['desc']; ?></label><br>
1411 1411 
                 </fieldset>
1412 1412 
                 <?php
1413 1413
1414 
-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :
1415 
-                    ?>
1414 
+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :
1415 
+					?>
1416 1416 
                     </td>
1417 1417 
                     </tr>
1418 1418 
                 <?php
1419 
-                endif;
1419 
+				endif;
1420 1420
1421 
-                break;
1421 
+				break;
1422 1422
1423 
-            case 'textarea':
1424 
-                ?>
1423 
+			case 'textarea':
1424 
+				?>
1425 1425 
                 <tr valign="top">
1426 1426 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1427 1427 
                 <td class="forminp">

@@ -1434,30 +1434,30 @@  discard block
 
 block discarded – undo
1434 1434
1435 1435 
                 </td>
1436 1436 
                 </tr><?php
1437 
-                break;
1437 
+				break;
1438 1438
1439 
-            case 'editor':
1440 
-                ?>
1439 
+			case 'editor':
1440 
+				?>
1441 1441 
                 <tr valign="top">
1442 1442 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1443 1443 
                 <td class="forminp"><?php
1444 
-                    if (get_option($value['id']))
1445 
-                        $content = stripslashes(get_option($value['id']));
1446 
-                    else
1447 
-                        $content = $value['std'];
1444 
+					if (get_option($value['id']))
1445 
+						$content = stripslashes(get_option($value['id']));
1446 
+					else
1447 
+						$content = $value['std'];
1448 1448
1449 
-                    $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
1449 
+					$editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);
1450 1450
1451 
-                    wp_editor($content, esc_attr($value['id']), $editor_settings);
1451 
+					wp_editor($content, esc_attr($value['id']), $editor_settings);
1452 1452
1453 
-                    ?> <span class="description"><?php echo $value['desc'] ?></span>
1453 
+					?> <span class="description"><?php echo $value['desc'] ?></span>
1454 1454
1455 1455 
                 </td>
1456 1456 
                 </tr><?php
1457 
-                break;
1457 
+				break;
1458 1458
1459 
-            case 'single_select_page' :
1460 
-                // WPML
1459 
+			case 'single_select_page' :
1460 
+				// WPML
1461 1461 
 				$switch_lang = false;
1462 1462 
 				$disabled = '';
1463 1463 
 				if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

@@ -1475,18 +1475,18 @@  discard block
 
 block discarded – undo
1475 1475 
 				//
1476 1476 
 				$page_setting = (int)get_option($value['id']);
1477 1477
1478 
-                $args = array('name' => $value['id'],
1479 
-                    'id' => $value['id'],
1480 
-                    'sort_column' => 'menu_order',
1481 
-                    'sort_order' => 'ASC',
1482 
-                    'show_option_none' => ' ',
1483 
-                    'class' => $value['class'],
1484 
-                    'echo' => false,
1485 
-                    'selected' => $page_setting);
1478 
+				$args = array('name' => $value['id'],
1479 
+					'id' => $value['id'],
1480 
+					'sort_column' => 'menu_order',
1481 
+					'sort_order' => 'ASC',
1482 
+					'show_option_none' => ' ',
1483 
+					'class' => $value['class'],
1484 
+					'echo' => false,
1485 
+					'selected' => $page_setting);
1486 1486
1487 
-                if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);
1487 
+				if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);
1488 1488
1489 
-                ?>
1489 
+				?>
1490 1490 
                 <tr valign="top" class="single_select_page">
1491 1491 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1492 1492 
                 <td class="forminp">

@@ -1497,17 +1497,17 @@  discard block
 
 block discarded – undo
1497 1497 
 				if ($switch_lang) {
1498 1498 
 					$sitepress->switch_lang($switch_lang, true);
1499 1499 
 				}
1500 
-                break;
1501 
-            case 'single_select_country' :
1502 
-                $country_setting = (string)get_option($value['id']);
1503 
-                if (strstr($country_setting, ':')) :
1504 
-                    $country = current(explode(':', $country_setting));
1505 
-                    $state = end(explode(':', $country_setting));
1506 
-                else :
1507 
-                    $country = $country_setting;
1508 
-                    $state = '*';
1509 
-                endif;
1510 
-                ?>
1500 
+				break;
1501 
+			case 'single_select_country' :
1502 
+				$country_setting = (string)get_option($value['id']);
1503 
+				if (strstr($country_setting, ':')) :
1504 
+					$country = current(explode(':', $country_setting));
1505 
+					$state = end(explode(':', $country_setting));
1506 
+				else :
1507 
+					$country = $country_setting;
1508 
+					$state = '*';
1509 
+				endif;
1510 
+				?>
1511 1511 
                 <tr valign="top">
1512 1512 
                 <th scope="rpw" class="titledesc"><?php echo $value['name'] ?></th>
1513 1513 
                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -1518,12 +1518,12 @@  discard block
 
 block discarded – undo
1518 1518 
                     </select> <span class="description"><?php echo $value['desc'] ?></span>
1519 1519 
                 </td>
1520 1520 
                 </tr><?php
1521 
-                break;
1522 
-            case 'multi_select_countries' :
1523 
-                $countries = $geodirectory->countries->countries;
1524 
-                asort($countries);
1525 
-                $selections = (array)get_option($value['id']);
1526 
-                ?>
1521 
+				break;
1522 
+			case 'multi_select_countries' :
1523 
+				$countries = $geodirectory->countries->countries;
1524 
+				asort($countries);
1525 
+				$selections = (array)get_option($value['id']);
1526 
+				?>
1527 1527 
                 <tr valign="top">
1528 1528 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1529 1529 
                 <td class="forminp">

@@ -1531,21 +1531,21 @@  discard block
 
 block discarded – undo
1531 1531 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"
1532 1532 
                             title="Country" class="chosen_select">
1533 1533 
                         <?php
1534 
-                        if ($countries) foreach ($countries as $key => $val) :
1535 
-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';
1536 
-                        endforeach;
1537 
-                        ?>
1534 
+						if ($countries) foreach ($countries as $key => $val) :
1535 
+							echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';
1536 
+						endforeach;
1537 
+						?>
1538 1538 
                     </select>
1539 1539 
                 </td>
1540 1540 
                 </tr>
1541 1541
1542 1542 
                 <?php
1543 1543
1544 
-                break;
1544 
+				break;
1545 1545
1546 
-            case 'google_analytics' :
1547 
-                $selections = (array)get_option($value['id']);
1548 
-                    ?>
1546 
+			case 'google_analytics' :
1547 
+				$selections = (array)get_option($value['id']);
1548 
+					?>
1549 1549 
                     <tr valign="top">
1550 1550 
                         <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1551 1551 
                         <td class="forminp">

@@ -1553,62 +1553,62 @@  discard block
 
 block discarded – undo
1553 1553
1554 1554 
                             <?php
1555 1555
1556 
-                            $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";
1557 
-                            $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";
1558 
-                            $state = "&state=123";//any string
1559 
-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
1560 
-                            $response_type = "&response_type=code";
1561 
-                            $client_id = "&client_id=".get_option('geodir_ga_client_id');
1562 
-                            $access_type = "&access_type=offline";
1563 
-                            $approval_prompt = "&approval_prompt=force";
1556 
+							$oAuthURL = "https://accounts.google.com/o/oauth2/auth?";
1557 
+							$scope = "scope=https://www.googleapis.com/auth/analytics.readonly";
1558 
+							$state = "&state=123";//any string
1559 
+							$redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
1560 
+							$response_type = "&response_type=code";
1561 
+							$client_id = "&client_id=".get_option('geodir_ga_client_id');
1562 
+							$access_type = "&access_type=offline";
1563 
+							$approval_prompt = "&approval_prompt=force";
1564 1564
1565 
-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;
1565 
+							$auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;
1566 1566
1567 1567
1568 
-                            if (get_option('geodir_ga_auth_token')) {
1569 
-                                ?>
1568 
+							if (get_option('geodir_ga_auth_token')) {
1569 
+								?>
1570 1570 
                                 <span class="button-primary"
1571 1571 
                                       onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
1572 1572 
                                 <span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>
1573 1573 
                             <?php
1574 
-                                global $gd_ga_errors;
1575 
-                                if(!empty($gd_ga_errors)){
1576 
-                                    print_r($gd_ga_errors);
1577 
-                                }
1578 
-                            } else {
1579 
-                                ?>
1574 
+								global $gd_ga_errors;
1575 
+								if(!empty($gd_ga_errors)){
1576 
+									print_r($gd_ga_errors);
1577 
+								}
1578 
+							} else {
1579 
+								?>
1580 1580 
                                 <span class="button-primary"
1581 1581 
                                       onclick="window.open('<?php echo  geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span>
1582 1582 
                             <?php
1583 
-                            }
1584 
-                            ?>
1583 
+							}
1584 
+							?>
1585 1585 
                         </td>
1586 1586 
                     </tr>
1587 1587
1588 1588 
                 <?php
1589 1589
1590 1590
1591 
-                break;
1591 
+				break;
1592 1592
1593 
-            case 'field_seperator' :
1593 
+			case 'field_seperator' :
1594 1594
1595 
-                ?>
1595 
+				?>
1596 1596 
                 <tr valign="top">
1597 1597 
                     <td colspan="2" class="forminp geodir_line_seperator"></td>
1598 1598 
                 </tr>
1599 1599 
                 <?php
1600 1600
1601 
-                break;
1601 
+				break;
1602 1602
1603 
-        endswitch;
1603 
+		endswitch;
1604 1604
1605 
-    endforeach;
1605 
+	endforeach;
1606 1606
1607 
-    if ($first_title === false) {
1608 
-        echo "</div>";
1609 
-    }
1607 
+	if ($first_title === false) {
1608 
+		echo "</div>";
1609 
+	}
1610 1610
1611 
-    ?>
1611 
+	?>
1612 1612
1613 1613 
     <script type="text/javascript">
1614 1614 
 

@@ -1668,33 +1668,33 @@  discard block
 
 block discarded – undo
1668 1668 
  */
1669 1669 
 function geodir_post_info_setting()
1670 1670 
 {
1671 
-    global $post, $post_id;
1672 
-
1673 
-    $post_type = get_post_type();
1674 
-
1675 
-    $package_info = array();
1676 
-
1677 
-    $package_info = geodir_post_package_info($package_info, $post, $post_type);
1678 
-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');
1679 
-    echo '<div id="geodir_wrapper">';
1680 
-    /**
1681 
-     * Called before the GD custom fields are output in the wp-admin area.
1682 
-     *
1683 
-     * @since 1.0.0
1684 
-     * @see 'geodir_after_default_field_in_meta_box'
1685 
-     */
1686 
-    do_action('geodir_before_default_field_in_meta_box');
1687 
-    //geodir_get_custom_fields_html($package_info->pid,'default',$post_type);
1688 
-    // to display all fields in one information box
1689 
-    geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);
1690 
-    /**
1691 
-     * Called after the GD custom fields are output in the wp-admin area.
1692 
-     *
1693 
-     * @since 1.0.0
1694 
-     * @see 'geodir_before_default_field_in_meta_box'
1695 
-     */
1696 
-    do_action('geodir_after_default_field_in_meta_box');
1697 
-    echo '</div>';
1671 
+	global $post, $post_id;
1672 
+
1673 
+	$post_type = get_post_type();
1674 
+
1675 
+	$package_info = array();
1676 
+
1677 
+	$package_info = geodir_post_package_info($package_info, $post, $post_type);
1678 
+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');
1679 
+	echo '<div id="geodir_wrapper">';
1680 
+	/**
1681 
+	 * Called before the GD custom fields are output in the wp-admin area.
1682 
+	 *
1683 
+	 * @since 1.0.0
1684 
+	 * @see 'geodir_after_default_field_in_meta_box'
1685 
+	 */
1686 
+	do_action('geodir_before_default_field_in_meta_box');
1687 
+	//geodir_get_custom_fields_html($package_info->pid,'default',$post_type);
1688 
+	// to display all fields in one information box
1689 
+	geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);
1690 
+	/**
1691 
+	 * Called after the GD custom fields are output in the wp-admin area.
1692 
+	 *
1693 
+	 * @since 1.0.0
1694 
+	 * @see 'geodir_before_default_field_in_meta_box'
1695 
+	 */
1696 
+	do_action('geodir_after_default_field_in_meta_box');
1697 
+	echo '</div>';
1698 1698 
 }
1699 1699
1700 1700 
 /**

@@ -1707,18 +1707,18 @@  discard block
 
 block discarded – undo
1707 1707 
  */
1708 1708 
 function geodir_post_addinfo_setting()
1709 1709 
 {
1710 
-    global $post, $post_id;
1710 
+	global $post, $post_id;
1711 1711
1712 
-    $post_type = get_post_type();
1712 
+	$post_type = get_post_type();
1713 1713
1714 
-    $package_info = array();
1714 
+	$package_info = array();
1715 1715
1716 
-    $package_info = geodir_post_package_info($package_info, $post, $post_type);
1716 
+	$package_info = geodir_post_package_info($package_info, $post, $post_type);
1717 1717
1718 
-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');
1719 
-    echo '<div id="geodir_wrapper">';
1720 
-    geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);
1721 
-    echo '</div>';
1718 
+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');
1719 
+	echo '<div id="geodir_wrapper">';
1720 
+	geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);
1721 
+	echo '</div>';
1722 1722
1723 1723 
 }
1724 1724 
 

@@ -1732,60 +1732,60 @@  discard block
 
 block discarded – undo
1732 1732 
  */
1733 1733 
 function geodir_post_attachments()
1734 1734 
 {
1735 
-    global $post, $post_id;
1735 
+	global $post, $post_id;
1736 1736
1737 
-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');
1737 
+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');
1738 1738
1739 
-    if (geodir_get_featured_image($post_id, 'thumbnail')) {
1740 
-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
1741 
-        geodir_show_featured_image($post_id, 'thumbnail');
1742 
-    }
1739 
+	if (geodir_get_featured_image($post_id, 'thumbnail')) {
1740 
+		echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
1741 
+		geodir_show_featured_image($post_id, 'thumbnail');
1742 
+	}
1743 1743
1744 
-    $image_limit = 0;
1744 
+	$image_limit = 0;
1745 1745
1746 
-    ?>
1746 
+	?>
1747 1747
1748 1748
1749 1749 
     <h5 class="form_title">
1750 1750 
         <?php if ($image_limit != 0 && $image_limit == 1) {
1751 
-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
1752 
-        } ?>
1751 
+			echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
1752 
+		} ?>
1753 1753 
         <?php if ($image_limit != 0 && $image_limit > 1) {
1754 
-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
1755 
-        } ?>
1754 
+			echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
1755 
+		} ?>
1756 1756 
         <?php if ($image_limit == 0) {
1757 
-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
1758 
-        } ?>
1757 
+			echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
1758 
+		} ?>
1759 1759 
     </h5>
1760 1760
1761 1761
1762 1762 
     <?php
1763 1763
1764 
-    $curImages = geodir_get_images($post_id);
1765 
-    $place_img_array = array();
1764 
+	$curImages = geodir_get_images($post_id);
1765 
+	$place_img_array = array();
1766 1766
1767 
-    if (!empty($curImages)):
1768 
-        foreach ($curImages as $p_img):
1769 
-            $place_img_array[] = $p_img->src;
1770 
-        endforeach;
1771 
-    endif;
1767 
+	if (!empty($curImages)):
1768 
+		foreach ($curImages as $p_img):
1769 
+			$place_img_array[] = $p_img->src;
1770 
+		endforeach;
1771 
+	endif;
1772 1772
1773 
-    if (!empty($place_img_array))
1774 
-        $curImages = implode(',', $place_img_array);
1773 
+	if (!empty($place_img_array))
1774 
+		$curImages = implode(',', $place_img_array);
1775 1775
1776 1776
1777 
-    // adjust values here
1778 
-    $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
1777 
+	// adjust values here
1778 
+	$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
1779 1779
1780 
-    $svalue = $curImages; // this will be initial value of the above form field. Image urls.
1780 
+	$svalue = $curImages; // this will be initial value of the above form field. Image urls.
1781 1781
1782 
-    $multiple = true; // allow multiple files upload
1782 
+	$multiple = true; // allow multiple files upload
1783 1783
1784 
-    $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)
1784 
+	$width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)
1785 1785
1786 
-    $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)
1786 
+	$height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)
1787 1787
1788 
-    ?>
1788 
+	?>
1789 1789
1790 1790 
     <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;">
1791 1791 
         <input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $svalue; ?>"/>

@@ -1827,13 +1827,13 @@  discard block
 
 block discarded – undo
1827 1827 
  */
1828 1828 
 function geodir_action_post_updated($post_ID, $post_after, $post_before)
1829 1829 
 {
1830 
-    $post_type = get_post_type($post_ID);
1830 
+	$post_type = get_post_type($post_ID);
1831 1831
1832 
-    if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
1833 
-        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) {
1834 
-            geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);
1835 
-        }
1836 
-    }
1832 
+	if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {
1833 
+		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) {
1834 
+			geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);
1835 
+		}
1836 
+	}
1837 1837 
 }
1838 1838
1839 1839 
 /**

@@ -1848,39 +1848,39 @@  discard block
 
 block discarded – undo
1848 1848 
  */
1849 1849 
 function geodir_notification_add_bcc_option($settings)
1850 1850 
 {
1851 
-    if (!empty($settings)) {
1852 
-        $new_settings = array();
1853 
-        foreach ($settings as $setting) {
1854 
-            if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {
1855 
-                $geodir_bcc_listing_published_yes = array(
1856 
-                    'name' => __('Listing published', 'geodirectory'),
1857 
-                    'desc' => __('Yes', 'geodirectory'),
1858 
-                    'id' => 'geodir_bcc_listing_published',
1859 
-                    'std' => 'yes',
1860 
-                    'type' => 'radio',
1861 
-                    'value' => '1',
1862 
-                    'radiogroup' => 'start'
1863 
-                );
1864 
-
1865 
-                $geodir_bcc_listing_published_no = array(
1866 
-                    'name' => __('Listing published', 'geodirectory'),
1867 
-                    'desc' => __('No', 'geodirectory'),
1868 
-                    'id' => 'geodir_bcc_listing_published',
1869 
-                    'std' => 'yes',
1870 
-                    'type' => 'radio',
1871 
-                    'value' => '0',
1872 
-                    'radiogroup' => 'end'
1873 
-                );
1874 
-
1875 
-                $new_settings[] = $geodir_bcc_listing_published_yes;
1876 
-                $new_settings[] = $geodir_bcc_listing_published_no;
1877 
-            }
1878 
-            $new_settings[] = $setting;
1879 
-        }
1880 
-        $settings = $new_settings;
1881 
-    }
1851 
+	if (!empty($settings)) {
1852 
+		$new_settings = array();
1853 
+		foreach ($settings as $setting) {
1854 
+			if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {
1855 
+				$geodir_bcc_listing_published_yes = array(
1856 
+					'name' => __('Listing published', 'geodirectory'),
1857 
+					'desc' => __('Yes', 'geodirectory'),
1858 
+					'id' => 'geodir_bcc_listing_published',
1859 
+					'std' => 'yes',
1860 
+					'type' => 'radio',
1861 
+					'value' => '1',
1862 
+					'radiogroup' => 'start'
1863 
+				);
1864 
+
1865 
+				$geodir_bcc_listing_published_no = array(
1866 
+					'name' => __('Listing published', 'geodirectory'),
1867 
+					'desc' => __('No', 'geodirectory'),
1868 
+					'id' => 'geodir_bcc_listing_published',
1869 
+					'std' => 'yes',
1870 
+					'type' => 'radio',
1871 
+					'value' => '0',
1872 
+					'radiogroup' => 'end'
1873 
+				);
1874 
+
1875 
+				$new_settings[] = $geodir_bcc_listing_published_yes;
1876 
+				$new_settings[] = $geodir_bcc_listing_published_no;
1877 
+			}
1878 
+			$new_settings[] = $setting;
1879 
+		}
1880 
+		$settings = $new_settings;
1881 
+	}
1882 1882
1883 
-    return $settings;
1883 
+	return $settings;
1884 1884 
 }
1885 1885
1886 1886 
 

@@ -1895,19 +1895,19 @@  discard block
 
 block discarded – undo
1895 1895 
  */
1896 1896 
 function get_gd_theme_compat_callback()
1897 1897 
 {
1898 
-    global $wpdb;
1899 
-    $themes = get_option('gd_theme_compats');
1900 
-
1901 
-    if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {
1902 
-        if (isset($_POST['export'])) {
1903 
-            echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));
1904 
-        } else {
1905 
-            echo json_encode($themes[$_POST['theme']]);
1906 
-        }
1898 
+	global $wpdb;
1899 
+	$themes = get_option('gd_theme_compats');
1907 1900
1908 
-    }
1901 
+	if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {
1902 
+		if (isset($_POST['export'])) {
1903 
+			echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));
1904 
+		} else {
1905 
+			echo json_encode($themes[$_POST['theme']]);
1906 
+		}
1907 
+
1908 
+	}
1909 1909
1910 
-    die();
1910 
+	die();
1911 1911 
 }
1912 1912
1913 1913 
 add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback');

@@ -1921,20 +1921,20 @@  discard block
 
 block discarded – undo
1921 1921 
  */
1922 1922 
 function get_gd_theme_compat_import_callback()
1923 1923 
 {
1924 
-    global $wpdb;
1925 
-    $themes = get_option('gd_theme_compats');
1926 
-    if (isset($_POST['theme']) && !empty($_POST['theme'])) {
1927 
-        $json = json_decode(stripslashes($_POST['theme']), true);
1928 
-        if (!empty($json) && is_array($json)) {
1929 
-            $key = sanitize_text_field(key($json));
1930 
-            $themes[$key] = $json[$key];
1931 
-            update_option('gd_theme_compats', $themes);
1932 
-            echo $key;
1933 
-            die();
1934 
-        }
1935 
-    }
1936 
-    echo '0';
1937 
-    die();
1924 
+	global $wpdb;
1925 
+	$themes = get_option('gd_theme_compats');
1926 
+	if (isset($_POST['theme']) && !empty($_POST['theme'])) {
1927 
+		$json = json_decode(stripslashes($_POST['theme']), true);
1928 
+		if (!empty($json) && is_array($json)) {
1929 
+			$key = sanitize_text_field(key($json));
1930 
+			$themes[$key] = $json[$key];
1931 
+			update_option('gd_theme_compats', $themes);
1932 
+			echo $key;
1933 
+			die();
1934 
+		}
1935 
+	}
1936 
+	echo '0';
1937 
+	die();
1938 1938 
 }
1939 1939
1940 1940 
 

@@ -1947,39 +1947,39 @@  discard block
 
 block discarded – undo
1947 1947 
  */
1948 1948 
 function gd_set_theme_compat()
1949 1949 
 {
1950 
-    global $wpdb;
1951 
-    $theme = wp_get_theme();
1950 
+	global $wpdb;
1951 
+	$theme = wp_get_theme();
1952 1952
1953 
-    if ($theme->parent()) {
1954 
-        $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));
1955 
-    } else {
1956 
-        $theme_name = str_replace(" ", "_", $theme->get('Name'));
1957 
-    }
1953 
+	if ($theme->parent()) {
1954 
+		$theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));
1955 
+	} else {
1956 
+		$theme_name = str_replace(" ", "_", $theme->get('Name'));
1957 
+	}
1958 1958
1959 
-    $theme_compats = get_option('gd_theme_compats');
1960 
-    $current_compat = get_option('gd_theme_compat');
1961 
-    $current_compat = str_replace("_custom", "", $current_compat);
1959 
+	$theme_compats = get_option('gd_theme_compats');
1960 
+	$current_compat = get_option('gd_theme_compat');
1961 
+	$current_compat = str_replace("_custom", "", $current_compat);
1962 1962
1963 
-    if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {
1964 
-        return;
1965 
-    }// if already running correct compat then bail
1963 
+	if ($current_compat == $theme_name && strpos(get_option('gd_theme_compat'), "_custom") !== false) {
1964 
+		return;
1965 
+	}// if already running correct compat then bail
1966 1966
1967 
-    if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it
1968 
-        update_option('gd_theme_compat', $theme_name);
1969 
-        update_option('theme_compatibility_setting', $theme_compats[$theme_name]);
1967 
+	if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it
1968 
+		update_option('gd_theme_compat', $theme_name);
1969 
+		update_option('theme_compatibility_setting', $theme_compats[$theme_name]);
1970 1970
1971 
-        // if there are default options to set then set them
1972 
-        if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {
1971 
+		// if there are default options to set then set them
1972 
+		if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {
1973 1973
1974 
-            foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {
1975 
-                update_option($key, $val);
1976 
-            }
1977 
-        }
1974 
+			foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {
1975 
+				update_option($key, $val);
1976 
+			}
1977 
+		}
1978 1978
1979 
-    } else {
1980 
-        update_option('gd_theme_compat', '');
1981 
-        update_option('theme_compatibility_setting', '');
1982 
-    }
1979 
+	} else {
1980 
+		update_option('gd_theme_compat', '');
1981 
+		update_option('theme_compatibility_setting', '');
1982 
+	}
1983 1983
1984 1984
1985 1985 
 }

@@ -1994,9 +1994,9 @@  discard block
 
 block discarded – undo
1994 1994 
  */
1995 1995 
 function gd_check_avada_compat()
1996 1996 
 {
1997 
-    if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {
1998 
-        add_action('admin_notices', 'gd_avada_compat_warning');
1999 
-    }
1997 
+	if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {
1998 
+		add_action('admin_notices', 'gd_avada_compat_warning');
1999 
+	}
2000 2000 
 }
2001 2001
2002 2002 
 

@@ -2009,22 +2009,22 @@  discard block
 
 block discarded – undo
2009 2009 
 function gd_avada_compat_warning()
2010 2010 
 {
2011 2011
2012 
-    /*
2012 
+	/*
2013 2013 
     $msg_type = error
2014 2014 
     $msg_type = updated fade
2015 2015 
     $msg_type = update-nag
2016 2016 
     */
2017 2017
2018 
-    $plugin = 'avada-nag';
2019 
-    $timestamp = 'avada-nag1234';
2020 
-    $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');
2021 
-    echo '<div id="' . $timestamp . '"  class="error">';
2022 
-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';
2023 
-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
2024 
-    echo "<p>$message</p>";
2025 
-    echo "</div>";
2018 
+	$plugin = 'avada-nag';
2019 
+	$timestamp = 'avada-nag1234';
2020 
+	$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');
2021 
+	echo '<div id="' . $timestamp . '"  class="error">';
2022 
+	echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';
2023 
+	echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
2024 
+	echo "<p>$message</p>";
2025 
+	echo "</div>";
2026 2026
2027 
-    ?>
2027 
+	?>
2028 2028 
     <script>
2029 2029 
         function gdRemoveANotification($plugin, $timestamp) {
2030 2030 
 

@@ -2092,10 +2092,10 @@  discard block
 
 block discarded – undo
2092 2092 
  */
2093 2093 
 function geodir_avada_remove_notification()
2094 2094 
 {
2095 
-    update_option('avada_nag', TRUE);
2095 
+	update_option('avada_nag', TRUE);
2096 2096
2097 
-    // Always die in functions echoing ajax content
2098 
-    die();
2097 
+	// Always die in functions echoing ajax content
2098 
+	die();
2099 2099 
 }
2100 2100
2101 2101 
 

@@ -2117,11 +2117,11 @@  discard block
 
 block discarded – undo
2117 2117 
 	global $post, $typenow, $current_screen;
2118 2118
2119 2119 
 	$post_type = NULL;
2120 
-    if (isset($_REQUEST['post_type']))
2120 
+	if (isset($_REQUEST['post_type']))
2121 2121 
 		$post_type = sanitize_key($_REQUEST['post_type']);
2122 
-    elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))
2122 
+	elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))
2123 2123 
 		$post_type = get_post_type($_REQUEST['post']);
2124 
-    elseif ($post && isset($post->post_type))
2124 
+	elseif ($post && isset($post->post_type))
2125 2125 
 		$post_type = $post->post_type;
2126 2126 
 	elseif ($typenow)
2127 2127 
 		$post_type = $typenow;

@@ -2155,7 +2155,7 @@  discard block
 
 block discarded – undo
2155 2155 
 		// Don't allow same slug url for listing and location
2156 2156 
 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {
2157 2157 
 			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');
2158 
-        	wp_redirect($redirect_url);
2158 
+			wp_redirect($redirect_url);
2159 2159 
 			exit;
2160 2160 
 		}
2161 2161 
 		

@@ -2185,10 +2185,10 @@  discard block
 
 block discarded – undo
2185 2185 
  * @package GeoDirectory
2186 2186 
  */
2187 2187 
 function geodir_hide_admin_preview_button() {
2188 
-    global $post_type;
2189 
-    $post_types = geodir_get_posttypes();
2190 
-    if(in_array($post_type, $post_types))
2191 
-        echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
2188 
+	global $post_type;
2189 
+	$post_types = geodir_get_posttypes();
2190 
+	if(in_array($post_type, $post_types))
2191 
+		echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
2192 2192 
 }
2193 2193 
 add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );
2194 2194 
 add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

@@ -2203,7 +2203,7 @@  discard block
 
 block discarded – undo
2203 2203 
  */
2204 2204 
 function geodir_import_export_tab( $tabs ) {
2205 2205 
 	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );
2206 
-    return $tabs;
2206 
+	return $tabs;
2207 2207 
 }
2208 2208
2209 2209 
 /**

@@ -2218,26 +2218,26 @@  discard block
 
 block discarded – undo
2218 2218 
 function geodir_import_export_page() {
2219 2219 
 	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );
2220 2220 
 	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';
2221 
-    /**
2222 
-     * Filter sample category data csv file url.
2223 
-     *
2224 
-     * @since 1.0.0
2225 
-     * @package GeoDirectory
2226 
-     *
2227 
-     * @param string $gd_cats_sample_csv Sample category data csv file url.
2228 
-     */
2221 
+	/**
2222 
+	 * Filter sample category data csv file url.
2223 
+	 *
2224 
+	 * @since 1.0.0
2225 
+	 * @package GeoDirectory
2226 
+	 *
2227 
+	 * @param string $gd_cats_sample_csv Sample category data csv file url.
2228 
+	 */
2229 2229 
 	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );
2230 2230
2231 2231 
 	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';
2232 
-    /**
2233 
-     * Filter sample post data csv file url.
2234 
-     *
2235 
-     * @since 1.0.0
2236 
-     * @package GeoDirectory
2237 
-     *
2238 
-     * @param string $gd_posts_sample_csv Sample post data csv file url.
2239 
-     */
2240 
-    $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );
2232 
+	/**
2233 
+	 * Filter sample post data csv file url.
2234 
+	 *
2235 
+	 * @since 1.0.0
2236 
+	 * @package GeoDirectory
2237 
+	 *
2238 
+	 * @param string $gd_posts_sample_csv Sample post data csv file url.
2239 
+	 */
2240 
+	$gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );
2241 2241
2242 2242 
 	$gd_posttypes = geodir_get_posttypes( 'array' );
2243 2243 
 	

@@ -2260,14 +2260,14 @@  discard block
 
 block discarded – undo
2260 2260 
 	$gd_chunksize_options[100000] = 100000;
2261 2261
2262 2262 
 	 /**
2263 
-     * Filter max entries per export csv file.
2264 
-     *
2265 
-     * @since 1.5.6
2266 
-     * @package GeoDirectory
2267 
-     *
2268 
-     * @param string $gd_chunksize_options Entries options.
2269 
-     */
2270 
-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );
2263 
+	  * Filter max entries per export csv file.
2264 
+	  *
2265 
+	  * @since 1.5.6
2266 
+	  * @package GeoDirectory
2267 
+	  *
2268 
+	  * @param string $gd_chunksize_options Entries options.
2269 
+	  */
2270 
+	$gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );
2271 2271
2272 2272 
 	$gd_chunksize_option = '';
2273 2273 
 	foreach ($gd_chunksize_options as $value => $title) {

@@ -2284,12 +2284,12 @@  discard block
 
 block discarded – undo
2284 2284 
   <div class="gd-content-heading">
2285 2285
2286 2286 
   <?php
2287 
-    ini_set('max_execution_time', 999999);
2288 
-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );
2289 
-    ini_restore('max_execution_time');
2287 
+	ini_set('max_execution_time', 999999);
2288 
+	$ini_max_execution_time_check = @ini_get( 'max_execution_time' );
2289 
+	ini_restore('max_execution_time');
2290 2290
2291 
-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
2292 
-        ?>
2291 
+	if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
2292 
+		?>
2293 2293 
 	<div id="gd_ie_reqs" class="metabox-holder">
2294 2294 
       <div class="meta-box-sortables ui-sortable">
2295 2295 
         <div class="postbox">

@@ -2464,7 +2464,7 @@  discard block
 
 block discarded – undo
2464 2464 
 						 * Called just after the sample CSV download link.
2465 2465 
 						 *
2466 2466 
 						 * @since 1.0.0
2467 
-                         * @package GeoDirectory
2467 
+						 * @package GeoDirectory
2468 2468 
 						 */
2469 2469 
 						do_action('geodir_sample_cats_csv_download_link');
2470 2470 
 						?>

@@ -2549,11 +2549,11 @@  discard block
 
 block discarded – undo
2549 2549 
 	 *
2550 2550 
 	 * Called after the last setting on the GD > Import & Export page.
2551 2551 
 	 * @since 1.4.6
2552 
-     * @package GeoDirectory
2552 
+	 * @package GeoDirectory
2553 2553 
 	 *
2554 2554 
 	 * @param array $gd_posttypes GD post types.
2555 
-     * @param array $gd_chunksize_options File chunk size options.
2556 
-     * @param string $nonce Wordpress security token for GD import & export.
2555 
+	 * @param array $gd_chunksize_options File chunk size options.
2556 
+	 * @param string $nonce Wordpress security token for GD import & export.
2557 2557 
 	 */
2558 2558 
 	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );
2559 2559 
 	?>

@@ -3240,44 +3240,44 @@  discard block
 
 block discarded – undo
3240 3240 
 function geodir_init_filesystem()
3241 3241 
 {
3242 3242
3243 
-    if(!function_exists('get_filesystem_method')){
3244 
-        require_once(ABSPATH."/wp-admin/includes/file.php");
3245 
-    }
3246 
-    $access_type = get_filesystem_method();
3247 
-    if ($access_type === 'direct') {
3248 
-        /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
3249 
-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
3250 
-
3251 
-        /* initialize the API */
3252 
-        if (!WP_Filesystem($creds)) {
3253 
-            /* any problems and we exit */
3254 
-            //return '@@@3';
3255 
-            return false;
3256 
-        }
3243 
+	if(!function_exists('get_filesystem_method')){
3244 
+		require_once(ABSPATH."/wp-admin/includes/file.php");
3245 
+	}
3246 
+	$access_type = get_filesystem_method();
3247 
+	if ($access_type === 'direct') {
3248 
+		/* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
3249 
+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
3250 
+
3251 
+		/* initialize the API */
3252 
+		if (!WP_Filesystem($creds)) {
3253 
+			/* any problems and we exit */
3254 
+			//return '@@@3';
3255 
+			return false;
3256 
+		}
3257 3257
3258 
-        global $wp_filesystem;
3259 
-        return $wp_filesystem;
3260 
-        /* do our file manipulations below */
3261 
-    } elseif (defined('FTP_USER')) {
3262 
-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
3258 
+		global $wp_filesystem;
3259 
+		return $wp_filesystem;
3260 
+		/* do our file manipulations below */
3261 
+	} elseif (defined('FTP_USER')) {
3262 
+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
3263 
+
3264 
+		/* initialize the API */
3265 
+		if (!WP_Filesystem($creds)) {
3266 
+			/* any problems and we exit */
3267 
+			//return '@@@33';
3268 
+			return false;
3269 
+		}
3263 3270
3264 
-        /* initialize the API */
3265 
-        if (!WP_Filesystem($creds)) {
3266 
-            /* any problems and we exit */
3267 
-            //return '@@@33';
3268 
-            return false;
3269 
-        }
3271 
+		global $wp_filesystem;
3272 
+		//return '@@@1';
3273 
+		return $wp_filesystem;
3270 3274
3271 
-        global $wp_filesystem;
3272 
-        //return '@@@1';
3273 
-        return $wp_filesystem;
3274 
-
3275 
-    } else {
3276 
-        //return '@@@2';
3277 
-        /* don't have direct write access. Prompt user with our notice */
3278 
-        add_action('admin_notice', 'geodir_filesystem_notice');
3279 
-        return false;
3280 
-    }
3275 
+	} else {
3276 
+		//return '@@@2';
3277 
+		/* don't have direct write access. Prompt user with our notice */
3278 
+		add_action('admin_notice', 'geodir_filesystem_notice');
3279 
+		return false;
3280 
+	}
3281 3281
3282 3282 
 }
3283 3283 
 

@@ -3295,10 +3295,10 @@  discard block
 
 block discarded – undo
3295 3295 
  */
3296 3296 
 function geodir_filesystem_notice()
3297 3297 
 {   if ( defined( 'DOING_AJAX' ) ){return;}
3298 
-    $access_type = get_filesystem_method();
3299 
-    if ($access_type === 'direct') {
3300 
-    } elseif (!defined('FTP_USER')) {
3301 
-        ?>
3298 
+	$access_type = get_filesystem_method();
3299 
+	if ($access_type === 'direct') {
3300 
+	} elseif (!defined('FTP_USER')) {
3301 
+		?>
3302 3302 
         <div class="error">
3303 3303 
             <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'); ?>
3304 3304 
                 <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>

@@ -3325,1267 +3325,1267 @@  discard block
 
 block discarded – undo
3325 3325 
  * @return string Json data.
3326 3326 
  */
3327 3327 
 function geodir_ajax_import_export() {
3328 
-    global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;
3328 
+	global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;
3329 3329
3330 
-    error_reporting(0);
3330 
+	error_reporting(0);
3331 3331
3332 
-    $xstart = microtime(true);
3332 
+	$xstart = microtime(true);
3333 3333
3334 
-    // try to set higher limits for import
3335 
-    $max_input_time = ini_get('max_input_time');
3336 
-    $max_execution_time = ini_get('max_execution_time');
3337 
-    $memory_limit= ini_get('memory_limit');
3334 
+	// try to set higher limits for import
3335 
+	$max_input_time = ini_get('max_input_time');
3336 
+	$max_execution_time = ini_get('max_execution_time');
3337 
+	$memory_limit= ini_get('memory_limit');
3338 3338
3339 
-    if(!$max_input_time || $max_input_time<3000){
3340 
-        ini_set('max_input_time', 3000);
3341 
-    }
3339 
+	if(!$max_input_time || $max_input_time<3000){
3340 
+		ini_set('max_input_time', 3000);
3341 
+	}
3342 3342
3343 
-    if(!$max_execution_time || $max_execution_time<3000){
3344 
-        ini_set('max_execution_time', 3000);
3345 
-    }
3343 
+	if(!$max_execution_time || $max_execution_time<3000){
3344 
+		ini_set('max_execution_time', 3000);
3345 
+	}
3346 3346
3347 
-    if($memory_limit && str_replace('M','',$memory_limit)){
3348 
-        if(str_replace('M','',$memory_limit)<256){
3349 
-            ini_set('memory_limit', '256M');
3350 
-        }
3351 
-    }
3347 
+	if($memory_limit && str_replace('M','',$memory_limit)){
3348 
+		if(str_replace('M','',$memory_limit)<256){
3349 
+			ini_set('memory_limit', '256M');
3350 
+		}
3351 
+	}
3352 3352
3353 
-    $json = array();
3353 
+	$json = array();
3354 3354
3355 
-    if ( !current_user_can( 'manage_options' ) ) {
3356 
-        wp_send_json( $json );
3357 
-    }
3355 
+	if ( !current_user_can( 'manage_options' ) ) {
3356 
+		wp_send_json( $json );
3357 
+	}
3358 3358
3359 
-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;
3360 
-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;
3361 
-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;
3359 
+	$task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;
3360 
+	$nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;
3361 
+	$stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;
3362 3362
3363 
-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
3364 
-        wp_send_json( $json );
3365 
-    }
3363 
+	if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
3364 
+		wp_send_json( $json );
3365 
+	}
3366 3366
3367 
-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;
3368 
-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;
3369 
-    $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;
3370 
-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;
3367 
+	$post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;
3368 
+	$chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;
3369 
+	$chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;
3370 
+	$chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;
3371 3371
3372 
-    $wp_filesystem = geodir_init_filesystem();
3373 
-    if (!$wp_filesystem) {
3374 
-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );
3375 
-        wp_send_json( $json );
3376 
-    }
3372 
+	$wp_filesystem = geodir_init_filesystem();
3373 
+	if (!$wp_filesystem) {
3374 
+		$json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );
3375 
+		wp_send_json( $json );
3376 
+	}
3377 3377
3378 
-    if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
3379 
-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );
3380 
-        wp_send_json( $json );
3381 
-    }
3378 
+	if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
3379 
+		$json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );
3380 
+		wp_send_json( $json );
3381 
+	}
3382 3382
3383 
-    $csv_file_dir = geodir_path_import_export( false );
3384 
-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
3385 
-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
3386 
-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );
3387 
-            wp_send_json( $json );
3388 
-        }
3389 
-    }
3383 
+	$csv_file_dir = geodir_path_import_export( false );
3384 
+	if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
3385 
+		if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
3386 
+			$json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );
3387 
+			wp_send_json( $json );
3388 
+		}
3389 
+	}
3390 3390
3391 
-    $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
3392 
-    $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
3393 
-
3394 
-    switch ( $task ) {
3395 
-        case 'export_posts': {
3396 
-            // WPML
3397 
-            $is_wpml = geodir_is_wpml();
3398 
-            if ($is_wpml) {
3399 
-                global $sitepress;
3400 
-                $active_lang = ICL_LANGUAGE_CODE;
3391 
+	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
3392 
+	$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
3393 
+
3394 
+	switch ( $task ) {
3395 
+		case 'export_posts': {
3396 
+			// WPML
3397 
+			$is_wpml = geodir_is_wpml();
3398 
+			if ($is_wpml) {
3399 
+				global $sitepress;
3400 
+				$active_lang = ICL_LANGUAGE_CODE;
3401 3401
3402 
-                $sitepress->switch_lang('all', true);
3403 
-            }
3404 
-            // WPML
3405 
-            if ( $post_type == 'gd_event' ) {
3406 
-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );
3407 
-            }
3408 
-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;
3402 
+				$sitepress->switch_lang('all', true);
3403 
+			}
3404 
+			// WPML
3405 
+			if ( $post_type == 'gd_event' ) {
3406 
+				add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );
3407 
+			}
3408 
+			$filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;
3409 3409
3410 
-            $file_name = $post_type . '_' . date( 'dmyHi' );
3411 
-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
3412 
-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );
3413 
-            }
3414 
-            $posts_count = geodir_get_posts_count( $post_type );
3415 
-            $file_url_base = geodir_path_import_export() . '/';
3416 
-            $file_url = $file_url_base . $file_name . '.csv';
3417 
-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';
3418 
-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';
3410 
+			$file_name = $post_type . '_' . date( 'dmyHi' );
3411 
+			if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
3412 
+				$file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );
3413 
+			}
3414 
+			$posts_count = geodir_get_posts_count( $post_type );
3415 
+			$file_url_base = geodir_path_import_export() . '/';
3416 
+			$file_url = $file_url_base . $file_name . '.csv';
3417 
+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';
3418 
+			$file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';
3419 3419
3420 
-            $chunk_file_paths = array();
3420 
+			$chunk_file_paths = array();
3421 3421
3422 
-            if ( isset( $_REQUEST['_c'] ) ) {
3423 
-                $json['total'] = $posts_count;
3424 
-                // WPML
3425 
-                if ($is_wpml) {
3426 
-                    $sitepress->switch_lang($active_lang, true);
3427 
-                }
3428 
-                // WPML
3429 
-                wp_send_json( $json );
3430 
-                gd_die();
3431 
-            } else if ( isset( $_REQUEST['_st'] ) ) {
3432 
-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );
3433 
-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;
3434 
-                $percentage = min( $percentage, 100 );
3422 
+			if ( isset( $_REQUEST['_c'] ) ) {
3423 
+				$json['total'] = $posts_count;
3424 
+				// WPML
3425 
+				if ($is_wpml) {
3426 
+					$sitepress->switch_lang($active_lang, true);
3427 
+				}
3428 
+				// WPML
3429 
+				wp_send_json( $json );
3430 
+				gd_die();
3431 
+			} else if ( isset( $_REQUEST['_st'] ) ) {
3432 
+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );
3433 
+				$percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;
3434 
+				$percentage = min( $percentage, 100 );
3435 3435
3436 
-                $json['percentage'] = $percentage;
3437 
-                // WPML
3438 
-                if ($is_wpml) {
3439 
-                    $sitepress->switch_lang($active_lang, true);
3440 
-                }
3441 
-                // WPML
3442 
-                wp_send_json( $json );
3443 
-                gd_die();
3444 
-            } else {
3445 
-                if ( !$posts_count > 0 ) {
3446 
-                    $json['error'] = __( 'No records to export.', 'geodirectory' );
3447 
-                } else {
3448 
-                    $total_posts = $posts_count;
3449 
-                    if ($chunk_per_page > $total_posts) {
3450 
-                        $chunk_per_page = $total_posts;
3451 
-                    }
3452 
-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );
3436 
+				$json['percentage'] = $percentage;
3437 
+				// WPML
3438 
+				if ($is_wpml) {
3439 
+					$sitepress->switch_lang($active_lang, true);
3440 
+				}
3441 
+				// WPML
3442 
+				wp_send_json( $json );
3443 
+				gd_die();
3444 
+			} else {
3445 
+				if ( !$posts_count > 0 ) {
3446 
+					$json['error'] = __( 'No records to export.', 'geodirectory' );
3447 
+				} else {
3448 
+					$total_posts = $posts_count;
3449 
+					if ($chunk_per_page > $total_posts) {
3450 
+						$chunk_per_page = $total_posts;
3451 
+					}
3452 
+					$chunk_total_pages = ceil( $total_posts / $chunk_per_page );
3453 3453
3454 
-                    $j = $chunk_page_no;
3455 
-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );
3454 
+					$j = $chunk_page_no;
3455 
+					$chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );
3456 3456
3457 
-                    $per_page = 500;
3458 
-                    if ($per_page > $chunk_per_page) {
3459 
-                        $per_page = $chunk_per_page;
3460 
-                    }
3461 
-                    $total_pages = ceil( $chunk_per_page / $per_page );
3457 
+					$per_page = 500;
3458 
+					if ($per_page > $chunk_per_page) {
3459 
+						$per_page = $chunk_per_page;
3460 
+					}
3461 
+					$total_pages = ceil( $chunk_per_page / $per_page );
3462 3462
3463 
-                    for ( $i = 0; $i <= $total_pages; $i++ ) {
3464 
-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );
3463 
+					for ( $i = 0; $i <= $total_pages; $i++ ) {
3464 
+						$save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );
3465 3465
3466 
-                        $clear = $i == 0 ? true : false;
3467 
-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );
3468 
-                    }
3466 
+						$clear = $i == 0 ? true : false;
3467 
+						geodir_save_csv_data( $file_path_temp, $save_posts, $clear );
3468 
+					}
3469 3469
3470 
-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {
3471 
-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
3472 
-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';
3473 
-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;
3474 
-                        $wp_filesystem->move( $file_path_temp, $file_path, true );
3470 
+					if ( $wp_filesystem->exists( $file_path_temp ) ) {
3471 
+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
3472 
+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';
3473 
+						$file_path = $csv_file_dir . '/' . $chunk_file_name;
3474 
+						$wp_filesystem->move( $file_path_temp, $file_path, true );
3475 3475
3476 
-                        $file_url = $file_url_base . $chunk_file_name;
3477 
-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3478 
-                    }
3476 
+						$file_url = $file_url_base . $chunk_file_name;
3477 
+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3478 
+					}
3479 3479
3480 
-                    if ( !empty($chunk_file_paths) ) {
3481 
-                        $json['total'] = $posts_count;
3482 
-                        $json['files'] = $chunk_file_paths;
3483 
-                    } else {
3484 
-                        if ($j > 1) {
3485 
-                            $json['total'] = $posts_count;
3486 
-                            $json['files'] = array();
3487 
-                        } else {
3488 
-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );
3489 
-                        }
3490 
-                    }
3491 
-                }
3492 
-                // WPML
3493 
-                if ($is_wpml) {
3494 
-                    $sitepress->switch_lang($active_lang, true);
3495 
-                }
3496 
-                // WPML
3497 
-                wp_send_json( $json );
3498 
-            }
3499 
-        }
3500 
-        break;
3501 
-        case 'export_cats': {
3502 
-            // WPML
3503 
-            $is_wpml = geodir_is_wpml();
3504 
-            if ($is_wpml) {
3505 
-                global $sitepress;
3506 
-                $active_lang = ICL_LANGUAGE_CODE;
3480 
+					if ( !empty($chunk_file_paths) ) {
3481 
+						$json['total'] = $posts_count;
3482 
+						$json['files'] = $chunk_file_paths;
3483 
+					} else {
3484 
+						if ($j > 1) {
3485 
+							$json['total'] = $posts_count;
3486 
+							$json['files'] = array();
3487 
+						} else {
3488 
+							$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );
3489 
+						}
3490 
+					}
3491 
+				}
3492 
+				// WPML
3493 
+				if ($is_wpml) {
3494 
+					$sitepress->switch_lang($active_lang, true);
3495 
+				}
3496 
+				// WPML
3497 
+				wp_send_json( $json );
3498 
+			}
3499 
+		}
3500 
+		break;
3501 
+		case 'export_cats': {
3502 
+			// WPML
3503 
+			$is_wpml = geodir_is_wpml();
3504 
+			if ($is_wpml) {
3505 
+				global $sitepress;
3506 
+				$active_lang = ICL_LANGUAGE_CODE;
3507 3507
3508 
-                $sitepress->switch_lang('all', true);
3509 
-            }
3510 
-            // WPML
3511 
-            $file_name = $post_type . 'category_' . date( 'dmyHi' );
3508 
+				$sitepress->switch_lang('all', true);
3509 
+			}
3510 
+			// WPML
3511 
+			$file_name = $post_type . 'category_' . date( 'dmyHi' );
3512 3512
3513 
-            $terms_count = geodir_get_terms_count( $post_type );
3514 
-            $file_url_base = geodir_path_import_export() . '/';
3515 
-            $file_url = $file_url_base . $file_name . '.csv';
3516 
-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';
3517 
-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';
3513 
+			$terms_count = geodir_get_terms_count( $post_type );
3514 
+			$file_url_base = geodir_path_import_export() . '/';
3515 
+			$file_url = $file_url_base . $file_name . '.csv';
3516 
+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';
3517 
+			$file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';
3518 3518
3519 
-            $chunk_file_paths = array();
3519 
+			$chunk_file_paths = array();
3520 3520
3521 
-            if ( isset( $_REQUEST['_st'] ) ) {
3522 
-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );
3523 
-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;
3524 
-                $percentage = min( $percentage, 100 );
3521 
+			if ( isset( $_REQUEST['_st'] ) ) {
3522 
+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );
3523 
+				$percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;
3524 
+				$percentage = min( $percentage, 100 );
3525 3525
3526 
-                $json['percentage'] = $percentage;
3527 
-                // WPML
3528 
-                if ($is_wpml) {
3529 
-                    $sitepress->switch_lang($active_lang, true);
3530 
-                }
3531 
-                // WPML
3532 
-                wp_send_json( $json );
3533 
-            } else {
3534 
-                if ( !$terms_count > 0 ) {
3535 
-                    $json['error'] = __( 'No records to export.', 'geodirectory' );
3536 
-                } else {
3537 
-                    $total_terms = $terms_count;
3538 
-                    if ($chunk_per_page > $terms_count) {
3539 
-                        $chunk_per_page = $terms_count;
3540 
-                    }
3541 
-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );
3526 
+				$json['percentage'] = $percentage;
3527 
+				// WPML
3528 
+				if ($is_wpml) {
3529 
+					$sitepress->switch_lang($active_lang, true);
3530 
+				}
3531 
+				// WPML
3532 
+				wp_send_json( $json );
3533 
+			} else {
3534 
+				if ( !$terms_count > 0 ) {
3535 
+					$json['error'] = __( 'No records to export.', 'geodirectory' );
3536 
+				} else {
3537 
+					$total_terms = $terms_count;
3538 
+					if ($chunk_per_page > $terms_count) {
3539 
+						$chunk_per_page = $terms_count;
3540 
+					}
3541 
+					$chunk_total_pages = ceil( $total_terms / $chunk_per_page );
3542 3542
3543 
-                    $j = $chunk_page_no;
3544 
-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );
3543 
+					$j = $chunk_page_no;
3544 
+					$chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );
3545 3545
3546 
-                    $per_page = 500;
3547 
-                    if ($per_page > $chunk_per_page) {
3548 
-                        $per_page = $chunk_per_page;
3549 
-                    }
3550 
-                    $total_pages = ceil( $chunk_per_page / $per_page );
3546 
+					$per_page = 500;
3547 
+					if ($per_page > $chunk_per_page) {
3548 
+						$per_page = $chunk_per_page;
3549 
+					}
3550 
+					$total_pages = ceil( $chunk_per_page / $per_page );
3551 3551
3552 
-                    for ( $i = 0; $i <= $total_pages; $i++ ) {
3553 
-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );
3552 
+					for ( $i = 0; $i <= $total_pages; $i++ ) {
3553 
+						$save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );
3554 3554
3555 
-                        $clear = $i == 0 ? true : false;
3556 
-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );
3557 
-                    }
3555 
+						$clear = $i == 0 ? true : false;
3556 
+						geodir_save_csv_data( $file_path_temp, $save_terms, $clear );
3557 
+					}
3558 3558
3559 
-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {
3560 
-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
3561 
-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';
3562 
-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;
3563 
-                        $wp_filesystem->move( $file_path_temp, $file_path, true );
3559 
+					if ( $wp_filesystem->exists( $file_path_temp ) ) {
3560 
+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
3561 
+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';
3562 
+						$file_path = $csv_file_dir . '/' . $chunk_file_name;
3563 
+						$wp_filesystem->move( $file_path_temp, $file_path, true );
3564 3564
3565 
-                        $file_url = $file_url_base . $chunk_file_name;
3566 
-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3567 
-                    }
3565 
+						$file_url = $file_url_base . $chunk_file_name;
3566 
+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3567 
+					}
3568 3568
3569 
-                    if ( !empty($chunk_file_paths) ) {
3570 
-                        $json['total'] = $terms_count;
3571 
-                        $json['files'] = $chunk_file_paths;
3572 
-                    } else {
3573 
-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );
3574 
-                    }
3575 
-                }
3576 
-                // WPML
3577 
-                if ($is_wpml) {
3578 
-                    $sitepress->switch_lang($active_lang, true);
3579 
-                }
3580 
-                // WPML
3581 
-                wp_send_json( $json );
3582 
-            }
3583 
-        }
3584 
-        break;
3585 
-        case 'export_locations': {
3586 
-            $file_url_base = geodir_path_import_export() . '/';
3587 
-            $file_name = 'gd_locations_' . date( 'dmyHi' );
3588 
-            $file_url = $file_url_base . $file_name . '.csv';
3589 
-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';
3590 
-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';
3569 
+					if ( !empty($chunk_file_paths) ) {
3570 
+						$json['total'] = $terms_count;
3571 
+						$json['files'] = $chunk_file_paths;
3572 
+					} else {
3573 
+						$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );
3574 
+					}
3575 
+				}
3576 
+				// WPML
3577 
+				if ($is_wpml) {
3578 
+					$sitepress->switch_lang($active_lang, true);
3579 
+				}
3580 
+				// WPML
3581 
+				wp_send_json( $json );
3582 
+			}
3583 
+		}
3584 
+		break;
3585 
+		case 'export_locations': {
3586 
+			$file_url_base = geodir_path_import_export() . '/';
3587 
+			$file_name = 'gd_locations_' . date( 'dmyHi' );
3588 
+			$file_url = $file_url_base . $file_name . '.csv';
3589 
+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';
3590 
+			$file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';
3591 3591
3592 
-            $items_count = (int)geodir_location_imex_count_locations();
3592 
+			$items_count = (int)geodir_location_imex_count_locations();
3593 3593
3594 
-            if ( isset( $_REQUEST['_st'] ) ) {
3595 
-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );
3596 
-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;
3597 
-                $percentage = min( $percentage, 100 );
3594 
+			if ( isset( $_REQUEST['_st'] ) ) {
3595 
+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );
3596 
+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;
3597 
+				$percentage = min( $percentage, 100 );
3598 3598
3599 
-                $json['percentage'] = $percentage;
3600 
-                wp_send_json( $json );
3601 
-            } else {
3602 
-                $chunk_file_paths = array();
3599 
+				$json['percentage'] = $percentage;
3600 
+				wp_send_json( $json );
3601 
+			} else {
3602 
+				$chunk_file_paths = array();
3603 3603
3604 
-                if ( !$items_count > 0 ) {
3605 
-                    $json['error'] = __( 'No records to export.', 'geodirectory' );
3606 
-                } else {
3607 
-                    $chunk_per_page = min( $chunk_per_page, $items_count );
3608 
-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );
3604 
+				if ( !$items_count > 0 ) {
3605 
+					$json['error'] = __( 'No records to export.', 'geodirectory' );
3606 
+				} else {
3607 
+					$chunk_per_page = min( $chunk_per_page, $items_count );
3608 
+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );
3609 3609
3610 
-                    $j = $chunk_page_no;
3611 
-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );
3610 
+					$j = $chunk_page_no;
3611 
+					$chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );
3612 3612
3613 
-                    $per_page = 500;
3614 
-                    $per_page = min( $per_page, $chunk_per_page );
3615 
-                    $total_pages = ceil( $chunk_per_page / $per_page );
3613 
+					$per_page = 500;
3614 
+					$per_page = min( $per_page, $chunk_per_page );
3615 
+					$total_pages = ceil( $chunk_per_page / $per_page );
3616 3616
3617 
-                    for ( $i = 0; $i <= $total_pages; $i++ ) {
3618 
-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );
3617 
+					for ( $i = 0; $i <= $total_pages; $i++ ) {
3618 
+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );
3619 3619
3620 
-                        $clear = $i == 0 ? true : false;
3621 
-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );
3622 
-                    }
3620 
+						$clear = $i == 0 ? true : false;
3621 
+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );
3622 
+					}
3623 3623
3624 
-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {
3625 
-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
3626 
-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';
3627 
-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;
3628 
-                        $wp_filesystem->move( $file_path_temp, $file_path, true );
3624 
+					if ( $wp_filesystem->exists( $file_path_temp ) ) {
3625 
+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
3626 
+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';
3627 
+						$file_path = $csv_file_dir . '/' . $chunk_file_name;
3628 
+						$wp_filesystem->move( $file_path_temp, $file_path, true );
3629 3629
3630 
-                        $file_url = $file_url_base . $chunk_file_name;
3631 
-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3632 
-                    }
3630 
+						$file_url = $file_url_base . $chunk_file_name;
3631 
+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3632 
+					}
3633 3633
3634 
-                    if ( !empty($chunk_file_paths) ) {
3635 
-                        $json['total'] = $items_count;
3636 
-                        $json['files'] = $chunk_file_paths;
3637 
-                    } else {
3638 
-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );
3639 
-                    }
3640 
-                }
3641 
-                wp_send_json( $json );
3642 
-            }
3643 
-        }
3644 
-        break;
3645 
-        case 'export_hoods': {
3646 
-            $file_url_base = geodir_path_import_export() . '/';
3647 
-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );
3648 
-            $file_url = $file_url_base . $file_name . '.csv';
3649 
-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';
3650 
-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';
3634 
+					if ( !empty($chunk_file_paths) ) {
3635 
+						$json['total'] = $items_count;
3636 
+						$json['files'] = $chunk_file_paths;
3637 
+					} else {
3638 
+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );
3639 
+					}
3640 
+				}
3641 
+				wp_send_json( $json );
3642 
+			}
3643 
+		}
3644 
+		break;
3645 
+		case 'export_hoods': {
3646 
+			$file_url_base = geodir_path_import_export() . '/';
3647 
+			$file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );
3648 
+			$file_url = $file_url_base . $file_name . '.csv';
3649 
+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';
3650 
+			$file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';
3651 3651
3652 
-            $items_count = (int)geodir_location_imex_count_neighbourhoods();
3652 
+			$items_count = (int)geodir_location_imex_count_neighbourhoods();
3653 3653
3654 
-            if ( isset( $_REQUEST['_st'] ) ) {
3655 
-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );
3656 
-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;
3657 
-                $percentage = min( $percentage, 100 );
3654 
+			if ( isset( $_REQUEST['_st'] ) ) {
3655 
+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );
3656 
+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;
3657 
+				$percentage = min( $percentage, 100 );
3658 3658
3659 
-                $json['percentage'] = $percentage;
3660 
-                wp_send_json( $json );
3661 
-            } else {
3662 
-                $chunk_file_paths = array();
3659 
+				$json['percentage'] = $percentage;
3660 
+				wp_send_json( $json );
3661 
+			} else {
3662 
+				$chunk_file_paths = array();
3663 3663
3664 
-                if ( !$items_count > 0 ) {
3665 
-                    $json['error'] = __( 'No records to export.', 'geodirectory' );
3666 
-                } else {
3667 
-                    $chunk_per_page = min( $chunk_per_page, $items_count );
3668 
-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );
3664 
+				if ( !$items_count > 0 ) {
3665 
+					$json['error'] = __( 'No records to export.', 'geodirectory' );
3666 
+				} else {
3667 
+					$chunk_per_page = min( $chunk_per_page, $items_count );
3668 
+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );
3669 3669
3670 
-                    $j = $chunk_page_no;
3671 
-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );
3670 
+					$j = $chunk_page_no;
3671 
+					$chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );
3672 3672
3673 
-                    $per_page = 500;
3674 
-                    $per_page = min( $per_page, $chunk_per_page );
3675 
-                    $total_pages = ceil( $chunk_per_page / $per_page );
3673 
+					$per_page = 500;
3674 
+					$per_page = min( $per_page, $chunk_per_page );
3675 
+					$total_pages = ceil( $chunk_per_page / $per_page );
3676 3676
3677 
-                    for ( $i = 0; $i <= $total_pages; $i++ ) {
3678 
-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );
3677 
+					for ( $i = 0; $i <= $total_pages; $i++ ) {
3678 
+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );
3679 3679
3680 
-                        $clear = $i == 0 ? true : false;
3681 
-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );
3682 
-                    }
3680 
+						$clear = $i == 0 ? true : false;
3681 
+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );
3682 
+					}
3683 3683
3684 
-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {
3685 
-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
3686 
-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';
3687 
-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;
3688 
-                        $wp_filesystem->move( $file_path_temp, $file_path, true );
3684 
+					if ( $wp_filesystem->exists( $file_path_temp ) ) {
3685 
+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
3686 
+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';
3687 
+						$file_path = $csv_file_dir . '/' . $chunk_file_name;
3688 
+						$wp_filesystem->move( $file_path_temp, $file_path, true );
3689 3689
3690 
-                        $file_url = $file_url_base . $chunk_file_name;
3691 
-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3692 
-                    }
3690 
+						$file_url = $file_url_base . $chunk_file_name;
3691 
+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3692 
+					}
3693 3693
3694 
-                    if ( !empty($chunk_file_paths) ) {
3695 
-                        $json['total'] = $items_count;
3696 
-                        $json['files'] = $chunk_file_paths;
3697 
-                    } else {
3698 
-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );
3699 
-                    }
3700 
-                }
3701 
-                wp_send_json( $json );
3702 
-            }
3703 
-        }
3704 
-        break;
3705 
-        case 'prepare_import':
3706 
-        case 'import_cat':
3707 
-        case 'import_post':
3708 
-        case 'import_loc':
3709 
-        case 'import_hood': {
3710 
-            // WPML
3711 
-            $is_wpml = geodir_is_wpml();
3712 
-            if ($is_wpml) {
3713 
-                global $sitepress;
3714 
-                $active_lang = ICL_LANGUAGE_CODE;
3715 
-            }
3716 
-            // WPML
3694 
+					if ( !empty($chunk_file_paths) ) {
3695 
+						$json['total'] = $items_count;
3696 
+						$json['files'] = $chunk_file_paths;
3697 
+					} else {
3698 
+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );
3699 
+					}
3700 
+				}
3701 
+				wp_send_json( $json );
3702 
+			}
3703 
+		}
3704 
+		break;
3705 
+		case 'prepare_import':
3706 
+		case 'import_cat':
3707 
+		case 'import_post':
3708 
+		case 'import_loc':
3709 
+		case 'import_hood': {
3710 
+			// WPML
3711 
+			$is_wpml = geodir_is_wpml();
3712 
+			if ($is_wpml) {
3713 
+				global $sitepress;
3714 
+				$active_lang = ICL_LANGUAGE_CODE;
3715 
+			}
3716 
+			// WPML
3717 3717
3718 
-            ini_set( 'auto_detect_line_endings', true );
3718 
+			ini_set( 'auto_detect_line_endings', true );
3719 3719
3720 
-            $uploads = wp_upload_dir();
3721 
-            $uploads_dir = $uploads['path'];
3722 
-            $uploads_subdir = $uploads['subdir'];
3720 
+			$uploads = wp_upload_dir();
3721 
+			$uploads_dir = $uploads['path'];
3722 
+			$uploads_subdir = $uploads['subdir'];
3723 3723
3724 
-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;
3725 
-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';
3724 
+			$csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;
3725 
+			$import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';
3726 3726
3727 
-            $csv_file_arr = explode( '/', $csv_file );
3728 
-            $csv_filename = end( $csv_file_arr );
3729 
-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;
3727 
+			$csv_file_arr = explode( '/', $csv_file );
3728 
+			$csv_filename = end( $csv_file_arr );
3729 
+			$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;
3730 3730
3731 
-            $json['file'] = $csv_file;
3732 
-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );
3733 
-            $file = array();
3731 
+			$json['file'] = $csv_file;
3732 
+			$json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );
3733 
+			$file = array();
3734 3734
3735 
-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
3736 
-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );
3735 
+			if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
3736 
+				$wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );
3737 3737
3738 
-                if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
3739 
-                    $json['error'] = NULL;
3740 
-                    $json['rows'] = 0;
3738 
+				if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
3739 
+					$json['error'] = NULL;
3740 
+					$json['rows'] = 0;
3741 3741
3742 
-                    $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line
3743 
-                    setlocale(LC_ALL, 'en_US.UTF-8');
3744 
-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
3745 
-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
3746 
-                            if ( !empty( $data ) ) {
3747 
-                                $file[] = $data;
3748 
-                            }
3749 
-                        }
3750 
-                        fclose($handle);
3751 
-                    }
3752 
-                    setlocale(LC_ALL, $lc_all);
3742 
+					$lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line
3743 
+					setlocale(LC_ALL, 'en_US.UTF-8');
3744 
+					if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
3745 
+						while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
3746 
+							if ( !empty( $data ) ) {
3747 
+								$file[] = $data;
3748 
+							}
3749 
+						}
3750 
+						fclose($handle);
3751 
+					}
3752 
+					setlocale(LC_ALL, $lc_all);
3753 3753
3754 
-                    $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;
3754 
+					$json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;
3755 3755
3756 
-                    if (!$json['rows'] > 0) {
3757 
-                        $json['error'] = __('No data found in csv file.', 'geodirectory');
3758 
-                    }
3759 
-                } else {
3760 
-                    wp_send_json( $json );
3761 
-                }
3762 
-            } else {
3763 
-                wp_send_json( $json );
3764 
-            }
3756 
+					if (!$json['rows'] > 0) {
3757 
+						$json['error'] = __('No data found in csv file.', 'geodirectory');
3758 
+					}
3759 
+				} else {
3760 
+					wp_send_json( $json );
3761 
+				}
3762 
+			} else {
3763 
+				wp_send_json( $json );
3764 
+			}
3765 3765
3766 
-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
3767 
-                wp_send_json( $json );
3768 
-            }
3766 
+			if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
3767 
+				wp_send_json( $json );
3768 
+			}
3769 3769
3770 
-            $total = $json['rows'];
3771 
-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;
3772 
-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;
3770 
+			$total = $json['rows'];
3771 
+			$limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;
3772 
+			$processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;
3773 3773
3774 
-            $count = $limit;
3774 
+			$count = $limit;
3775 3775
3776 
-            if ($count < $total) {
3777 
-                $count = $processed + $count;
3778 
-                if ($count > $total) {
3779 
-                    $count = $total;
3780 
-                }
3781 
-            } else {
3782 
-                $count = $total;
3783 
-            }
3776 
+			if ($count < $total) {
3777 
+				$count = $processed + $count;
3778 
+				if ($count > $total) {
3779 
+					$count = $total;
3780 
+				}
3781 
+			} else {
3782 
+				$count = $total;
3783 
+			}
3784 3784
3785 
-            $created = 0;
3786 
-            $updated = 0;
3787 
-            $skipped = 0;
3788 
-            $invalid = 0;
3789 
-            $invalid_addr = 0;
3790 
-            $images = 0;
3785 
+			$created = 0;
3786 
+			$updated = 0;
3787 
+			$skipped = 0;
3788 
+			$invalid = 0;
3789 
+			$invalid_addr = 0;
3790 
+			$images = 0;
3791 3791
3792 
-            $gd_post_info = array();
3793 
-            $countpost = 0;
3792 
+			$gd_post_info = array();
3793 
+			$countpost = 0;
3794 3794
3795 
-            $post_types = geodir_get_posttypes();
3795 
+			$post_types = geodir_get_posttypes();
3796 3796
3797 
-            if ( $task == 'import_cat' ) {
3798 
-                if (!empty($file)) {
3799 
-                    $columns = isset($file[0]) ? $file[0] : NULL;
3797 
+			if ( $task == 'import_cat' ) {
3798 
+				if (!empty($file)) {
3799 
+					$columns = isset($file[0]) ? $file[0] : NULL;
3800 3800
3801 
-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
3802 
-                        $json['error'] = CSV_INVAILD_FILE;
3803 
-                        wp_send_json( $json );
3804 
-                        exit;
3805 
-                    }
3801 
+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
3802 
+						$json['error'] = CSV_INVAILD_FILE;
3803 
+						wp_send_json( $json );
3804 
+						exit;
3805 
+					}
3806 3806
3807 
-                    $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');
3807 
+					$gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');
3808 3808
3809 
-                    for ($i = 1; $i <= $limit; $i++) {
3810 
-                        $index = $processed + $i;
3809 
+					for ($i = 1; $i <= $limit; $i++) {
3810 
+						$index = $processed + $i;
3811 3811
3812 
-                        if (isset($file[$index])) {
3813 
-                            $row = $file[$index];
3814 
-                            $row = array_map( 'trim', $row );
3815 
-                            //$row = array_map( 'utf8_encode', $row );
3812 
+						if (isset($file[$index])) {
3813 
+							$row = $file[$index];
3814 
+							$row = array_map( 'trim', $row );
3815 
+							//$row = array_map( 'utf8_encode', $row );
3816 3816
3817 
-                            $cat_id = '';
3818 
-                            $cat_name = '';
3819 
-                            $cat_slug = '';
3820 
-                            $cat_posttype = '';
3821 
-                            $cat_parent = '';
3822 
-                            $cat_description = '';
3823 
-                            $cat_schema = '';
3824 
-                            $cat_top_description = '';
3825 
-                            $cat_image = '';
3826 
-                            $cat_icon = '';
3827 
-                            $cat_language = '';
3828 
-                            $cat_id_original = '';
3817 
+							$cat_id = '';
3818 
+							$cat_name = '';
3819 
+							$cat_slug = '';
3820 
+							$cat_posttype = '';
3821 
+							$cat_parent = '';
3822 
+							$cat_description = '';
3823 
+							$cat_schema = '';
3824 
+							$cat_top_description = '';
3825 
+							$cat_image = '';
3826 
+							$cat_icon = '';
3827 
+							$cat_language = '';
3828 
+							$cat_id_original = '';
3829 3829
3830 
-                            $c = 0;
3831 
-                            foreach ($columns as $column ) {
3832 
-                                if ( $column == 'cat_id' ) {
3833 
-                                    $cat_id = (int)$row[$c];
3834 
-                                } else if ( $column == 'cat_name' ) {
3835 
-                                    $cat_name = $row[$c];
3836 
-                                } else if ( $column == 'cat_slug' ) {
3837 
-                                    $cat_slug = $row[$c];
3838 
-                                } else if ( $column == 'cat_posttype' ) {
3839 
-                                    $cat_posttype = $row[$c];
3840 
-                                } else if ( $column == 'cat_parent' ) {
3841 
-                                    $cat_parent = trim($row[$c]);
3842 
-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
3843 
-                                    $cat_schema = $row[$c];
3844 
-                                } else if ( $column == 'cat_description' ) {
3845 
-                                    $cat_description = $row[$c];
3846 
-                                } else if ( $column == 'cat_top_description' ) {
3847 
-                                    $cat_top_description = $row[$c];
3848 
-                                } else if ( $column == 'cat_image' ) {
3849 
-                                    $cat_image = $row[$c];
3850 
-                                } else if ( $column == 'cat_icon' ) {
3851 
-                                    $cat_icon = $row[$c];
3852 
-                                }
3853 
-                                // WPML
3854 
-                                if ( $is_wpml ) {
3855 
-                                    if ( $column == 'cat_language' ) {
3856 
-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );
3857 
-                                    } else if ( $column == 'cat_id_original' ) {
3858 
-                                        $cat_id_original = (int)$row[$c];
3859 
-                                    }
3860 
-                                }
3861 
-                                // WPML
3862 
-                                $c++;
3863 
-                            }
3830 
+							$c = 0;
3831 
+							foreach ($columns as $column ) {
3832 
+								if ( $column == 'cat_id' ) {
3833 
+									$cat_id = (int)$row[$c];
3834 
+								} else if ( $column == 'cat_name' ) {
3835 
+									$cat_name = $row[$c];
3836 
+								} else if ( $column == 'cat_slug' ) {
3837 
+									$cat_slug = $row[$c];
3838 
+								} else if ( $column == 'cat_posttype' ) {
3839 
+									$cat_posttype = $row[$c];
3840 
+								} else if ( $column == 'cat_parent' ) {
3841 
+									$cat_parent = trim($row[$c]);
3842 
+								} else if ( $column == 'cat_schema' && $row[$c] != '' ) {
3843 
+									$cat_schema = $row[$c];
3844 
+								} else if ( $column == 'cat_description' ) {
3845 
+									$cat_description = $row[$c];
3846 
+								} else if ( $column == 'cat_top_description' ) {
3847 
+									$cat_top_description = $row[$c];
3848 
+								} else if ( $column == 'cat_image' ) {
3849 
+									$cat_image = $row[$c];
3850 
+								} else if ( $column == 'cat_icon' ) {
3851 
+									$cat_icon = $row[$c];
3852 
+								}
3853 
+								// WPML
3854 
+								if ( $is_wpml ) {
3855 
+									if ( $column == 'cat_language' ) {
3856 
+										$cat_language = geodir_strtolower( trim( $row[$c] ) );
3857 
+									} else if ( $column == 'cat_id_original' ) {
3858 
+										$cat_id_original = (int)$row[$c];
3859 
+									}
3860 
+								}
3861 
+								// WPML
3862 
+								$c++;
3863 
+							}
3864 3864
3865 
-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
3866 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );
3865 
+							if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
3866 
+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );
3867 3867
3868 
-                                $invalid++;
3869 
-                                continue;
3870 
-                            }
3868 
+								$invalid++;
3869 
+								continue;
3870 
+							}
3871 3871
3872 
-                            // WPML
3873 
-                            if ($is_wpml && $cat_language != '') {
3874 
-                                $sitepress->switch_lang($cat_language, true);
3875 
-                            }
3876 
-                            // WPML
3872 
+							// WPML
3873 
+							if ($is_wpml && $cat_language != '') {
3874 
+								$sitepress->switch_lang($cat_language, true);
3875 
+							}
3876 
+							// WPML
3877 3877
3878 
-                            $term_data = array();
3879 
-                            $term_data['name'] = $cat_name;
3880 
-                            $term_data['slug'] = $cat_slug;
3881 
-                            $term_data['description'] = $cat_description;
3882 
-                            $term_data['cat_schema'] = $cat_schema;
3883 
-                            $term_data['top_description'] = $cat_top_description;
3884 
-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';
3885 
-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';
3878 
+							$term_data = array();
3879 
+							$term_data['name'] = $cat_name;
3880 
+							$term_data['slug'] = $cat_slug;
3881 
+							$term_data['description'] = $cat_description;
3882 
+							$term_data['cat_schema'] = $cat_schema;
3883 
+							$term_data['top_description'] = $cat_top_description;
3884 
+							$term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';
3885 
+							$term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';
3886 3886
3887 
-                            //$term_data = array_map( 'utf8_encode', $term_data );
3887 
+							//$term_data = array_map( 'utf8_encode', $term_data );
3888 3888
3889 
-                            $taxonomy = $cat_posttype . 'category';
3889 
+							$taxonomy = $cat_posttype . 'category';
3890 3890
3891 
-                            $term_data['taxonomy'] = $taxonomy;
3891 
+							$term_data['taxonomy'] = $taxonomy;
3892 3892
3893 
-                            $term_parent_id = 0;
3894 
-                            if ($cat_parent != "" || (int)$cat_parent > 0) {
3895 
-                                $term_parent = '';
3893 
+							$term_parent_id = 0;
3894 
+							if ($cat_parent != "" || (int)$cat_parent > 0) {
3895 
+								$term_parent = '';
3896 3896
3897 
-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
3898 
-                                    //
3899 
-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
3900 
-                                    //
3901 
-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
3902 
-                                    //
3903 
-                                } else {
3904 
-                                    $term_parent_data = array();
3905 
-                                    $term_parent_data['name'] = $cat_parent;
3906 
-                                    //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );
3907 
-                                    $term_parent_data['taxonomy'] = $taxonomy;
3897 
+								if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
3898 
+									//
3899 
+								} else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
3900 
+									//
3901 
+								} else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
3902 
+									//
3903 
+								} else {
3904 
+									$term_parent_data = array();
3905 
+									$term_parent_data['name'] = $cat_parent;
3906 
+									//$term_parent_data = array_map( 'utf8_encode', $term_parent_data );
3907 
+									$term_parent_data['taxonomy'] = $taxonomy;
3908 3908
3909 
-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );
3910 
-                                }
3909 
+									$term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );
3910 
+								}
3911 3911
3912 
-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
3913 
-                                    $term_parent_id = (int)$term_parent->term_id;
3914 
-                                }
3915 
-                            }
3916 
-                            $term_data['parent'] = (int)$term_parent_id;
3912 
+								if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
3913 
+									$term_parent_id = (int)$term_parent->term_id;
3914 
+								}
3915 
+							}
3916 
+							$term_data['parent'] = (int)$term_parent_id;
3917 3917
3918 
-                            $term_id = NULL;
3919 
-                            if ( $import_choice == 'update' ) {
3920 
-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
3921 
-                                    $term_data['term_id'] = $term['term_id'];
3918 
+							$term_id = NULL;
3919 
+							if ( $import_choice == 'update' ) {
3920 
+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
3921 
+									$term_data['term_id'] = $term['term_id'];
3922 3922
3923 
-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
3924 
-                                        $updated++;
3925 
-                                    } else {
3926 
-                                        $invalid++;
3927 
-                                        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' ) );
3928 
-                                    }
3929 
-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
3930 
-                                    $term_data['term_id'] = $term['term_id'];
3923 
+									if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
3924 
+										$updated++;
3925 
+									} else {
3926 
+										$invalid++;
3927 
+										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' ) );
3928 
+									}
3929 
+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
3930 
+									$term_data['term_id'] = $term['term_id'];
3931 3931
3932 
-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
3933 
-                                        $updated++;
3934 
-                                    } else {
3935 
-                                        $invalid++;
3936 
-                                        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' ) );
3937 
-                                    }
3938 
-                                } else {
3939 
-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
3940 
-                                        $created++;
3941 
-                                    } else {
3942 
-                                        $invalid++;
3943 
-                                        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' ) );
3944 
-                                    }
3945 
-                                }
3946 
-                            } else if ( $import_choice == 'skip' ) {
3947 
-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
3948 
-                                    $skipped++;
3949 
-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
3950 
-                                    $skipped++;
3951 
-                                } else {
3952 
-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
3953 
-                                        $created++;
3954 
-                                    } else {
3955 
-                                        $invalid++;
3956 
-                                        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' ) );
3957 
-                                    }
3958 
-                                }
3959 
-                            } else {
3960 
-                                $invalid++;
3961 
-                                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' ) );
3962 
-                            }
3932 
+									if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
3933 
+										$updated++;
3934 
+									} else {
3935 
+										$invalid++;
3936 
+										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' ) );
3937 
+									}
3938 
+								} else {
3939 
+									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
3940 
+										$created++;
3941 
+									} else {
3942 
+										$invalid++;
3943 
+										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' ) );
3944 
+									}
3945 
+								}
3946 
+							} else if ( $import_choice == 'skip' ) {
3947 
+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
3948 
+									$skipped++;
3949 
+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
3950 
+									$skipped++;
3951 
+								} else {
3952 
+									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
3953 
+										$created++;
3954 
+									} else {
3955 
+										$invalid++;
3956 
+										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' ) );
3957 
+									}
3958 
+								}
3959 
+							} else {
3960 
+								$invalid++;
3961 
+								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' ) );
3962 
+							}
3963 3963
3964 
-                            if ( $term_id ) {
3965 
-                                // WPML
3966 
-                                if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {
3967 
-                                    $wpml_element_type = 'tax_' . $taxonomy;
3968 
-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );
3969 
-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();
3970 
-
3971 
-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );
3964 
+							if ( $term_id ) {
3965 
+								// WPML
3966 
+								if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {
3967 
+									$wpml_element_type = 'tax_' . $taxonomy;
3968 
+									$source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );
3969 
+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();
3970 
+
3971 
+									$trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );
3972 3972
3973 
-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );
3974 
-                                }
3975 
-                                // WPML
3973 
+									$sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );
3974 
+								}
3975 
+								// WPML
3976 3976
3977 
-                                if ( isset( $term_data['top_description'] ) ) {
3978 
-                                    update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );
3979 
-                                }
3977 
+								if ( isset( $term_data['top_description'] ) ) {
3978 
+									update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );
3979 
+								}
3980 3980
3981 
-                                if ( isset( $term_data['cat_schema'] ) ) {
3982 
-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );
3983 
-                                }
3981 
+								if ( isset( $term_data['cat_schema'] ) ) {
3982 
+									update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );
3983 
+								}
3984 3984
3985 
-                                $attachment = false;
3986 
-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
3987 
-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );
3988 
-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';
3985 
+								$attachment = false;
3986 
+								if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
3987 
+									$cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );
3988 
+									$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';
3989 3989
3990 
-                                    if ( basename($cat_image) != $term_data['image'] ) {
3991 
-                                        $attachment = true;
3992 
-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );
3993 
-                                    }
3994 
-                                }
3990 
+									if ( basename($cat_image) != $term_data['image'] ) {
3991 
+										$attachment = true;
3992 
+										update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );
3993 
+									}
3994 
+								}
3995 3995
3996 
-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
3997 
-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );
3998 
-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';
3999 
-
4000 
-                                    if ( basename($cat_icon) != $term_data['icon'] ) {
4001 
-                                        $attachment = true;
4002 
-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );
4003 
-                                    }
4004 
-                                }
3996 
+								if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
3997 
+									$cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );
3998 
+									$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';
3999 
+
4000 
+									if ( basename($cat_icon) != $term_data['icon'] ) {
4001 
+										$attachment = true;
4002 
+										update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );
4003 
+									}
4004 
+								}
4005 4005
4006 
-                                if ( $attachment ) {
4007 
-                                    $images++;
4008 
-                                }
4009 
-                            }
4006 
+								if ( $attachment ) {
4007 
+									$images++;
4008 
+								}
4009 
+							}
4010 4010
4011 
-                            // WPML
4012 
-                            if ($is_wpml && $cat_language != '') {
4013 
-                                $sitepress->switch_lang($active_lang, true);
4014 
-                            }
4015 
-                            // WPML
4016 
-                        }
4017 
-                    }
4018 
-                }
4011 
+							// WPML
4012 
+							if ($is_wpml && $cat_language != '') {
4013 
+								$sitepress->switch_lang($active_lang, true);
4014 
+							}
4015 
+							// WPML
4016 
+						}
4017 
+					}
4018 
+				}
4019 4019
4020 
-                $json = array();
4021 
-                $json['processed'] = $limit;
4022 
-                $json['created'] = $created;
4023 
-                $json['updated'] = $updated;
4024 
-                $json['skipped'] = $skipped;
4025 
-                $json['invalid'] = $invalid;
4026 
-                $json['images'] = $images;
4020 
+				$json = array();
4021 
+				$json['processed'] = $limit;
4022 
+				$json['created'] = $created;
4023 
+				$json['updated'] = $updated;
4024 
+				$json['skipped'] = $skipped;
4025 
+				$json['invalid'] = $invalid;
4026 
+				$json['images'] = $images;
4027 4027
4028 
-                wp_send_json( $json );
4029 
-                exit;
4030 
-            } else if ( $task == 'import_post' ) {
4031 
-                $xtimings['###1'] = microtime(true)-$xstart;
4032 
-                //run some stuff to make the import quicker
4033 
-                wp_defer_term_counting( true );
4034 
-                wp_defer_comment_counting( true );
4035 
-                $wpdb->query( 'SET autocommit = 0;' );
4028 
+				wp_send_json( $json );
4029 
+				exit;
4030 
+			} else if ( $task == 'import_post' ) {
4031 
+				$xtimings['###1'] = microtime(true)-$xstart;
4032 
+				//run some stuff to make the import quicker
4033 
+				wp_defer_term_counting( true );
4034 
+				wp_defer_comment_counting( true );
4035 
+				$wpdb->query( 'SET autocommit = 0;' );
4036 4036 
 //
4037 4037 
 //                remove_all_actions('publish_post');
4038 4038 
 //                remove_all_actions('transition_post_status');
4039 4039 
 //                remove_all_actions('publish_future_post');
4040 4040
4041 
-                if (!empty($file)) {
4042 
-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
4043 
-                    $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.
4044 
-                    $default_status = 'publish';
4045 
-                    $current_date = date_i18n( 'Y-m-d', time() );
4041 
+				if (!empty($file)) {
4042 
+					$is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
4043 
+					$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.
4044 
+					$default_status = 'publish';
4045 
+					$current_date = date_i18n( 'Y-m-d', time() );
4046 4046
4047 
-                    $columns = isset($file[0]) ? $file[0] : NULL;
4047 
+					$columns = isset($file[0]) ? $file[0] : NULL;
4048 4048
4049 
-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
4050 
-                        $json['error'] = CSV_INVAILD_FILE;
4051 
-                        wp_send_json( $json );
4052 
-                        exit;
4053 
-                    }
4054 
-                    $xtimings['###2'] = microtime(true)-$xstart;
4055 
-                    $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
4056 
-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );
4057 
-                    $processed_actual = 0;
4058 
-                    for ($i = 1; $i <= $limit; $i++) {
4059 
-                        $index = $processed + $i;
4060 
-                        $gd_post = array();
4049 
+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
4050 
+						$json['error'] = CSV_INVAILD_FILE;
4051 
+						wp_send_json( $json );
4052 
+						exit;
4053 
+					}
4054 
+					$xtimings['###2'] = microtime(true)-$xstart;
4055 
+					$gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
4056 
+					$wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );
4057 
+					$processed_actual = 0;
4058 
+					for ($i = 1; $i <= $limit; $i++) {
4059 
+						$index = $processed + $i;
4060 
+						$gd_post = array();
4061 4061
4062 
-                        if (isset($file[$index])) {
4063 
-                            $processed_actual++;
4064 
-                            $row = $file[$index];
4065 
-                            $row = array_map( 'trim', $row );
4066 
-                            //$row = array_map( 'utf8_encode', $row );
4067 
-                            $row = array_map( 'addslashes_gpc', $row );
4062 
+						if (isset($file[$index])) {
4063 
+							$processed_actual++;
4064 
+							$row = $file[$index];
4065 
+							$row = array_map( 'trim', $row );
4066 
+							//$row = array_map( 'utf8_encode', $row );
4067 
+							$row = array_map( 'addslashes_gpc', $row );
4068 4068
4069 
-                            $post_id = '';
4070 
-                            $post_title = '';
4071 
-                            $post_date = '';
4072 
-                            $post_author = '';
4073 
-                            $post_content = '';
4074 
-                            $post_category_arr = array();
4075 
-                            $default_category = '';
4076 
-                            $post_tags = array();
4077 
-                            $post_type = '';
4078 
-                            $post_status = '';
4079 
-                            $geodir_video = '';
4080 
-                            $post_address = '';
4081 
-                            $post_city = '';
4082 
-                            $post_region = '';
4083 
-                            $post_country = '';
4084 
-                            $post_zip = '';
4085 
-                            $post_latitude = '';
4086 
-                            $post_longitude = '';
4087 
-                            $post_neighbourhood = '';
4088 
-                            $neighbourhood_latitude = '';
4089 
-                            $neighbourhood_longitude = '';
4090 
-                            $geodir_timing = '';
4091 
-                            $geodir_contact = '';
4092 
-                            $geodir_email = '';
4093 
-                            $geodir_website = '';
4094 
-                            $geodir_twitter = '';
4095 
-                            $geodir_facebook = '';
4096 
-                            $geodir_twitter = '';
4097 
-                            $post_images = array();
4069 
+							$post_id = '';
4070 
+							$post_title = '';
4071 
+							$post_date = '';
4072 
+							$post_author = '';
4073 
+							$post_content = '';
4074 
+							$post_category_arr = array();
4075 
+							$default_category = '';
4076 
+							$post_tags = array();
4077 
+							$post_type = '';
4078 
+							$post_status = '';
4079 
+							$geodir_video = '';
4080 
+							$post_address = '';
4081 
+							$post_city = '';
4082 
+							$post_region = '';
4083 
+							$post_country = '';
4084 
+							$post_zip = '';
4085 
+							$post_latitude = '';
4086 
+							$post_longitude = '';
4087 
+							$post_neighbourhood = '';
4088 
+							$neighbourhood_latitude = '';
4089 
+							$neighbourhood_longitude = '';
4090 
+							$geodir_timing = '';
4091 
+							$geodir_contact = '';
4092 
+							$geodir_email = '';
4093 
+							$geodir_website = '';
4094 
+							$geodir_twitter = '';
4095 
+							$geodir_facebook = '';
4096 
+							$geodir_twitter = '';
4097 
+							$post_images = array();
4098 4098
4099 
-                            $expire_date = 'Never';
4099 
+							$expire_date = 'Never';
4100 4100
4101 
-                            $language = '';
4102 
-                            $original_post_id = '';
4101 
+							$language = '';
4102 
+							$original_post_id = '';
4103 4103
4104 
-                            $c = 0;
4105 
-                            foreach ($columns as $column ) {
4106 
-                                $gd_post[$column] = $row[$c];
4104 
+							$c = 0;
4105 
+							foreach ($columns as $column ) {
4106 
+								$gd_post[$column] = $row[$c];
4107 4107
4108 
-                                if ( $column == 'post_id' ) {
4109 
-                                    $post_id = $row[$c];
4110 
-                                } else if ( $column == 'post_title' ) {
4111 
-                                    $post_title = sanitize_text_field($row[$c]);
4112 
-                                } else if ( $column == 'post_author' ) {
4113 
-                                    $post_author = $row[$c];
4114 
-                                } else if ( $column == 'post_date' ) {
4115 
-                                    $post_date = $row[$c];
4116 
-                                } else if ( $column == 'post_content' ) {
4117 
-                                    $post_content = $row[$c];
4118 
-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {
4119 
-                                    $post_category_arr = explode( ',', $row[$c] );
4120 
-                                } else if ( $column == 'default_category' ) {
4121 
-                                    $default_category = wp_kses_normalize_entities($row[$c]);
4122 
-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {
4123 
-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );
4124 
-                                } else if ( $column == 'post_type' ) {
4125 
-                                    $post_type = $row[$c];
4126 
-                                } else if ( $column == 'post_status' ) {
4127 
-                                    $post_status = sanitize_key( $row[$c] );
4128 
-                                } else if ( $column == 'is_featured' ) {
4129 
-                                    $is_featured = (int)$row[$c];
4130 
-                                } else if ( $column == 'geodir_video' ) {
4131 
-                                    $geodir_video = $row[$c];
4132 
-                                } else if ( $column == 'post_address' ) {
4133 
-                                    $post_address = sanitize_text_field($row[$c]);
4134 
-                                } else if ( $column == 'post_city' ) {
4135 
-                                    $post_city = sanitize_text_field($row[$c]);
4136 
-                                } else if ( $column == 'post_region' ) {
4137 
-                                    $post_region = sanitize_text_field($row[$c]);
4138 
-                                } else if ( $column == 'post_country' ) {
4139 
-                                    $post_country = sanitize_text_field($row[$c]);
4140 
-                                } else if ( $column == 'post_zip' ) {
4141 
-                                    $post_zip = sanitize_text_field($row[$c]);
4142 
-                                } else if ( $column == 'post_latitude' ) {
4143 
-                                    $post_latitude = sanitize_text_field($row[$c]);
4144 
-                                } else if ( $column == 'post_longitude' ) {
4145 
-                                    $post_longitude = sanitize_text_field($row[$c]);
4146 
-                                } else if ( $column == 'post_neighbourhood' ) {
4147 
-                                    $post_neighbourhood = sanitize_text_field($row[$c]);
4148 
-                                    unset($gd_post[$column]);
4149 
-                                } else if ( $column == 'neighbourhood_latitude' ) {
4150 
-                                    $neighbourhood_latitude = sanitize_text_field($row[$c]);
4151 
-                                } else if ( $column == 'neighbourhood_longitude' ) {
4152 
-                                    $neighbourhood_longitude = sanitize_text_field($row[$c]);
4153 
-                                } else if ( $column == 'geodir_timing' ) {
4154 
-                                    $geodir_timing = sanitize_text_field($row[$c]);
4155 
-                                } else if ( $column == 'geodir_contact' ) {
4156 
-                                    $geodir_contact = sanitize_text_field($row[$c]);
4157 
-                                } else if ( $column == 'geodir_email' ) {
4158 
-                                    $geodir_email = sanitize_email($row[$c]);
4159 
-                                } else if ( $column == 'geodir_website' ) {
4160 
-                                    $geodir_website = sanitize_text_field($row[$c]);
4161 
-                                } else if ( $column == 'geodir_twitter' ) {
4162 
-                                    $geodir_twitter = sanitize_text_field($row[$c]);
4163 
-                                } else if ( $column == 'geodir_facebook' ) {
4164 
-                                    $geodir_facebook = sanitize_text_field($row[$c]);
4165 
-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
4166 
-                                    $post_images[] = $row[$c];
4167 
-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
4168 
-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );
4169 
-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
4170 
-                                    $row[$c] = str_replace('/', '-', $row[$c]);
4171 
-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );
4172 
-                                }
4173 
-                                // WPML
4174 
-                                if ($is_wpml) {
4175 
-                                    if ($column == 'language') {
4176 
-                                        $language = geodir_strtolower(trim($row[$c]));
4177 
-                                    } else if ($column == 'original_post_id') {
4178 
-                                        $original_post_id = (int)$row[$c];
4179 
-                                    }
4180 
-                                }
4181 
-                                // WPML
4182 
-                                $c++;
4183 
-                            }
4184 
-                            // listing claimed or not
4185 
-                            if ($is_claim_active && isset($gd_post['claimed'])) {
4186 
-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;
4187 
-                            }
4108 
+								if ( $column == 'post_id' ) {
4109 
+									$post_id = $row[$c];
4110 
+								} else if ( $column == 'post_title' ) {
4111 
+									$post_title = sanitize_text_field($row[$c]);
4112 
+								} else if ( $column == 'post_author' ) {
4113 
+									$post_author = $row[$c];
4114 
+								} else if ( $column == 'post_date' ) {
4115 
+									$post_date = $row[$c];
4116 
+								} else if ( $column == 'post_content' ) {
4117 
+									$post_content = $row[$c];
4118 
+								} else if ( $column == 'post_category' && $row[$c] != '' ) {
4119 
+									$post_category_arr = explode( ',', $row[$c] );
4120 
+								} else if ( $column == 'default_category' ) {
4121 
+									$default_category = wp_kses_normalize_entities($row[$c]);
4122 
+								} else if ( $column == 'post_tags' && $row[$c] != '' ) {
4123 
+									$post_tags = explode( ',', sanitize_text_field($row[$c]) );
4124 
+								} else if ( $column == 'post_type' ) {
4125 
+									$post_type = $row[$c];
4126 
+								} else if ( $column == 'post_status' ) {
4127 
+									$post_status = sanitize_key( $row[$c] );
4128 
+								} else if ( $column == 'is_featured' ) {
4129 
+									$is_featured = (int)$row[$c];
4130 
+								} else if ( $column == 'geodir_video' ) {
4131 
+									$geodir_video = $row[$c];
4132 
+								} else if ( $column == 'post_address' ) {
4133 
+									$post_address = sanitize_text_field($row[$c]);
4134 
+								} else if ( $column == 'post_city' ) {
4135 
+									$post_city = sanitize_text_field($row[$c]);
4136 
+								} else if ( $column == 'post_region' ) {
4137 
+									$post_region = sanitize_text_field($row[$c]);
4138 
+								} else if ( $column == 'post_country' ) {
4139 
+									$post_country = sanitize_text_field($row[$c]);
4140 
+								} else if ( $column == 'post_zip' ) {
4141 
+									$post_zip = sanitize_text_field($row[$c]);
4142 
+								} else if ( $column == 'post_latitude' ) {
4143 
+									$post_latitude = sanitize_text_field($row[$c]);
4144 
+								} else if ( $column == 'post_longitude' ) {
4145 
+									$post_longitude = sanitize_text_field($row[$c]);
4146 
+								} else if ( $column == 'post_neighbourhood' ) {
4147 
+									$post_neighbourhood = sanitize_text_field($row[$c]);
4148 
+									unset($gd_post[$column]);
4149 
+								} else if ( $column == 'neighbourhood_latitude' ) {
4150 
+									$neighbourhood_latitude = sanitize_text_field($row[$c]);
4151 
+								} else if ( $column == 'neighbourhood_longitude' ) {
4152 
+									$neighbourhood_longitude = sanitize_text_field($row[$c]);
4153 
+								} else if ( $column == 'geodir_timing' ) {
4154 
+									$geodir_timing = sanitize_text_field($row[$c]);
4155 
+								} else if ( $column == 'geodir_contact' ) {
4156 
+									$geodir_contact = sanitize_text_field($row[$c]);
4157 
+								} else if ( $column == 'geodir_email' ) {
4158 
+									$geodir_email = sanitize_email($row[$c]);
4159 
+								} else if ( $column == 'geodir_website' ) {
4160 
+									$geodir_website = sanitize_text_field($row[$c]);
4161 
+								} else if ( $column == 'geodir_twitter' ) {
4162 
+									$geodir_twitter = sanitize_text_field($row[$c]);
4163 
+								} else if ( $column == 'geodir_facebook' ) {
4164 
+									$geodir_facebook = sanitize_text_field($row[$c]);
4165 
+								} else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
4166 
+									$post_images[] = $row[$c];
4167 
+								} else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
4168 
+									$expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );
4169 
+								} else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
4170 
+									$row[$c] = str_replace('/', '-', $row[$c]);
4171 
+									$expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );
4172 
+								}
4173 
+								// WPML
4174 
+								if ($is_wpml) {
4175 
+									if ($column == 'language') {
4176 
+										$language = geodir_strtolower(trim($row[$c]));
4177 
+									} else if ($column == 'original_post_id') {
4178 
+										$original_post_id = (int)$row[$c];
4179 
+									}
4180 
+								}
4181 
+								// WPML
4182 
+								$c++;
4183 
+							}
4184 
+							// listing claimed or not
4185 
+							if ($is_claim_active && isset($gd_post['claimed'])) {
4186 
+								$gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;
4187 
+							}
4188 4188
4189 
-                            // WPML
4190 
-                            if ($is_wpml && $language != '') {
4191 
-                                $sitepress->switch_lang($language, true);
4192 
-                            }
4193 
-                            // WPML
4189 
+							// WPML
4190 
+							if ($is_wpml && $language != '') {
4191 
+								$sitepress->switch_lang($language, true);
4192 
+							}
4193 
+							// WPML
4194 4194
4195 
-                            $gd_post['IMAGE'] = $post_images;
4195 
+							$gd_post['IMAGE'] = $post_images;
4196 4196
4197 
-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;
4198 
-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;
4197 
+							$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;
4198 
+							$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;
4199 4199
4200 
-                            $valid = true;
4200 
+							$valid = true;
4201 4201
4202 
-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
4203 
-                                $invalid++;
4204 
-                                $valid = false;
4205 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );
4206 
-                            }
4207 
-                            $xtimings['###3'] = microtime(true)-$xstart;
4208 
-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;
4209 
-                            if ( $location_allowed ) {
4210 
-                                $location_result = geodir_get_default_location();
4211 
-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
4212 
-                                    $invalid_addr++;
4213 
-                                    $valid = false;
4214 
-                                    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' ) );
4215 
-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
4216 
-                                    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 ) ) ) {
4217 
-                                        $invalid_addr++;
4218 
-                                        $valid = false;
4219 
-                                        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' ) );
4220 
-                                    } else {
4221 
-                                        if (!$location_manager) {
4222 
-                                            $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.
4223 
-                                        }
4224 
-                                    }
4225 
-                                }
4226 
-                            }
4227 
-                            $xtimings['###4']   = microtime(true)-$xstart;
4228 
-                            if ( !$valid ) {
4229 
-                                continue;
4230 
-                            }
4202 
+							if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
4203 
+								$invalid++;
4204 
+								$valid = false;
4205 
+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );
4206 
+							}
4207 
+							$xtimings['###3'] = microtime(true)-$xstart;
4208 
+							$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;
4209 
+							if ( $location_allowed ) {
4210 
+								$location_result = geodir_get_default_location();
4211 
+								if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
4212 
+									$invalid_addr++;
4213 
+									$valid = false;
4214 
+									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' ) );
4215 
+								} else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
4216 
+									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 ) ) ) {
4217 
+										$invalid_addr++;
4218 
+										$valid = false;
4219 
+										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' ) );
4220 
+									} else {
4221 
+										if (!$location_manager) {
4222 
+											$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.
4223 
+										}
4224 
+									}
4225 
+								}
4226 
+							}
4227 
+							$xtimings['###4']   = microtime(true)-$xstart;
4228 
+							if ( !$valid ) {
4229 
+								continue;
4230 
+							}
4231 4231
4232 
-                            $cat_taxonomy = $post_type . 'category';
4233 
-                            $tags_taxonomy = $post_type . '_tags';
4232 
+							$cat_taxonomy = $post_type . 'category';
4233 
+							$tags_taxonomy = $post_type . '_tags';
4234 4234
4235 
-                            if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
4236 
-                                $post_category_arr = array_merge(array($default_category), $post_category_arr);
4237 
-                            }
4235 
+							if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
4236 
+								$post_category_arr = array_merge(array($default_category), $post_category_arr);
4237 
+							}
4238 4238
4239 
-                            $post_category = array();
4240 
-                            $default_category_id = NULL;
4241 
-                            if ( !empty( $post_category_arr ) ) {
4242 
-                                foreach ( $post_category_arr as $value ) {
4243 
-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );
4239 
+							$post_category = array();
4240 
+							$default_category_id = NULL;
4241 
+							if ( !empty( $post_category_arr ) ) {
4242 
+								foreach ( $post_category_arr as $value ) {
4243 
+									$category_name = wp_kses_normalize_entities( trim( $value ) );
4244 4244
4245 
-                                    if ( $category_name != '' ) {
4246 
-                                        $term_category = array();
4245 
+									if ( $category_name != '' ) {
4246 
+										$term_category = array();
4247 4247
4248 
-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
4249 
-                                            $term_category = $term;
4250 
-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
4251 
-                                            $term_category = $term;
4252 
-                                        } else {
4253 
-                                            $term_data = array();
4254 
-                                            $term_data['name'] = $category_name;
4255 
-                                            $term_data['taxonomy'] = $cat_taxonomy;
4248 
+										if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
4249 
+											$term_category = $term;
4250 
+										} else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
4251 
+											$term_category = $term;
4252 
+										} else {
4253 
+											$term_data = array();
4254 
+											$term_data['name'] = $category_name;
4255 
+											$term_data['taxonomy'] = $cat_taxonomy;
4256 4256
4257 
-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );
4258 
-                                            if ( $term_id ) {
4259 
-                                                $term_category = get_term( $term_id, $cat_taxonomy );
4260 
-                                            }
4261 
-                                        }
4257 
+											$term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );
4258 
+											if ( $term_id ) {
4259 
+												$term_category = get_term( $term_id, $cat_taxonomy );
4260 
+											}
4261 
+										}
4262 4262
4263 
-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
4264 
-                                            $post_category[] = intval($term_category->term_id);
4263 
+										if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
4264 
+											$post_category[] = intval($term_category->term_id);
4265 4265
4266 
-                                            if ($category_name == $default_category) {
4267 
-                                                $default_category_id = intval($term_category->term_id);
4268 
-                                            }
4269 
-                                        }
4270 
-                                    }
4271 
-                                }
4272 
-                            }
4273 
-                            $xtimings['###5'] = microtime(true)-$xstart;
4274 
-                            $save_post = array();
4275 
-                            $save_post['post_title'] = $post_title;
4276 
-                            if (!empty($post_date)) {
4277 
-                                $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format.
4266 
+											if ($category_name == $default_category) {
4267 
+												$default_category_id = intval($term_category->term_id);
4268 
+											}
4269 
+										}
4270 
+									}
4271 
+								}
4272 
+							}
4273 
+							$xtimings['###5'] = microtime(true)-$xstart;
4274 
+							$save_post = array();
4275 
+							$save_post['post_title'] = $post_title;
4276 
+							if (!empty($post_date)) {
4277 
+								$post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format.
4278 4278
4279 
-                                $save_post['post_date'] = $post_date;
4280 
-                                $save_post['post_date_gmt'] = get_gmt_from_date( $post_date );
4281 
-                            }
4282 
-                            $save_post['post_content'] = $post_content;
4283 
-                            $save_post['post_type'] = $post_type;
4284 
-                            $save_post['post_author'] = $post_author;
4285 
-                            $save_post['post_status'] = $post_status;
4286 
-                            $save_post['post_category'] = $post_category;
4287 
-                            $save_post['post_tags'] = $post_tags;
4288 
-
4289 
-                            $saved_post_id = NULL;
4290 
-                            if ( $import_choice == 'update' ) {
4291 
-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );
4279 
+								$save_post['post_date'] = $post_date;
4280 
+								$save_post['post_date_gmt'] = get_gmt_from_date( $post_date );
4281 
+							}
4282 
+							$save_post['post_content'] = $post_content;
4283 
+							$save_post['post_type'] = $post_type;
4284 
+							$save_post['post_author'] = $post_author;
4285 
+							$save_post['post_status'] = $post_status;
4286 
+							$save_post['post_category'] = $post_category;
4287 
+							$save_post['post_tags'] = $post_tags;
4288 
+
4289 
+							$saved_post_id = NULL;
4290 
+							if ( $import_choice == 'update' ) {
4291 
+								$gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );
4292 4292
4293 
-                                if ( $post_id > 0 && get_post( $post_id ) ) {
4294 
-                                    $save_post['ID'] = $post_id;
4293 
+								if ( $post_id > 0 && get_post( $post_id ) ) {
4294 
+									$save_post['ID'] = $post_id;
4295 4295
4296 
-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
4297 
-                                        if ( is_wp_error( $saved_post_id ) ) {
4298 
-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;
4299 
-                                            $saved_post_id = 0;
4300 
-                                        } else {
4301 
-                                            $saved_post_id = $post_id;
4302 
-                                            $updated++;
4303 
-                                        }
4304 
-                                    }
4305 
-                                } else {
4306 
-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
4307 
-                                        if ( is_wp_error( $saved_post_id ) ) {
4308 
-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;
4309 
-                                            $saved_post_id = 0;
4310 
-                                        } else {
4311 
-                                            $created++;
4312 
-                                        }
4313 
-                                    }
4314 
-                                }
4296 
+									if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
4297 
+										if ( is_wp_error( $saved_post_id ) ) {
4298 
+											$gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;
4299 
+											$saved_post_id = 0;
4300 
+										} else {
4301 
+											$saved_post_id = $post_id;
4302 
+											$updated++;
4303 
+										}
4304 
+									}
4305 
+								} else {
4306 
+									if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
4307 
+										if ( is_wp_error( $saved_post_id ) ) {
4308 
+											$gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;
4309 
+											$saved_post_id = 0;
4310 
+										} else {
4311 
+											$created++;
4312 
+										}
4313 
+									}
4314 
+								}
4315 4315
4316 
-                                if ( !$saved_post_id > 0 ) {
4317 
-                                    $invalid++;
4318 
-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );
4319 
-                                }
4320 
-                            } else if ( $import_choice == 'skip' ) {
4321 
-                                if ( $post_id > 0 && get_post( $post_id ) ) {
4322 
-                                    $skipped++;
4323 
-                                } else {
4324 
-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
4325 
-                                        if ( is_wp_error( $saved_post_id ) ) {
4326 
-                                            $invalid++;
4316 
+								if ( !$saved_post_id > 0 ) {
4317 
+									$invalid++;
4318 
+									geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );
4319 
+								}
4320 
+							} else if ( $import_choice == 'skip' ) {
4321 
+								if ( $post_id > 0 && get_post( $post_id ) ) {
4322 
+									$skipped++;
4323 
+								} else {
4324 
+									if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
4325 
+										if ( is_wp_error( $saved_post_id ) ) {
4326 
+											$invalid++;
4327 4327
4328 
-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );
4329 
-                                            $saved_post_id = 0;
4330 
-                                        } else {
4331 
-                                            $created++;
4332 
-                                        }
4333 
-                                    } else {
4334 
-                                        $invalid++;
4328 
+											geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );
4329 
+											$saved_post_id = 0;
4330 
+										} else {
4331 
+											$created++;
4332 
+										}
4333 
+									} else {
4334 
+										$invalid++;
4335 4335
4336 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );
4337 
-                                    }
4338 
-                                }
4339 
-                            } else {
4340 
-                                $invalid++;
4336 
+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );
4337 
+									}
4338 
+								}
4339 
+							} else {
4340 
+								$invalid++;
4341 4341
4342 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );
4343 
-                            }
4344 
-                            $xtimings['###6'] = microtime(true)-$xstart;
4345 
-                            if ( (int)$saved_post_id > 0 ) {
4346 
-                                // WPML
4347 
-                                if ($is_wpml && $original_post_id > 0 && $language != '') {
4348 
-                                    $wpml_post_type = 'post_' . $post_type;
4349 
-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );
4350 
-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();
4351 
-
4352 
-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );
4342 
+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );
4343 
+							}
4344 
+							$xtimings['###6'] = microtime(true)-$xstart;
4345 
+							if ( (int)$saved_post_id > 0 ) {
4346 
+								// WPML
4347 
+								if ($is_wpml && $original_post_id > 0 && $language != '') {
4348 
+									$wpml_post_type = 'post_' . $post_type;
4349 
+									$source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );
4350 
+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();
4351 
+
4352 
+									$trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );
4353 4353
4354 
-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );
4355 
-                                }
4356 
-                                // WPML
4357 
-                                $gd_post_info = geodir_get_post_info( $saved_post_id );
4354 
+									$sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );
4355 
+								}
4356 
+								// WPML
4357 
+								$gd_post_info = geodir_get_post_info( $saved_post_id );
4358 4358
4359 
-                                $gd_post['post_id'] = $saved_post_id;
4360 
-                                $gd_post['ID'] = $saved_post_id;
4361 
-                                $gd_post['post_tags'] = $post_tags;
4362 
-                                $gd_post['post_title'] = $post_title;
4363 
-                                $gd_post['post_status'] = $post_status;
4364 
-                                $gd_post['submit_time'] = time();
4365 
-                                $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];
4359 
+								$gd_post['post_id'] = $saved_post_id;
4360 
+								$gd_post['ID'] = $saved_post_id;
4361 
+								$gd_post['post_tags'] = $post_tags;
4362 
+								$gd_post['post_title'] = $post_title;
4363 
+								$gd_post['post_status'] = $post_status;
4364 
+								$gd_post['submit_time'] = time();
4365 
+								$gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];
4366 4366
4367 
-                                // post location
4368 
-                                $post_location_id = 0;
4369 
-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
4370 
-                                    $gd_post['post_neighbourhood'] = '';
4367 
+								// post location
4368 
+								$post_location_id = 0;
4369 
+								if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
4370 
+									$gd_post['post_neighbourhood'] = '';
4371 4371
4372 
-                                    $post_location_info = array(
4373 
-                                                                'city' => $post_city,
4374 
-                                                                'region' => $post_region,
4375 
-                                                                'country' => $post_country,
4376 
-                                                                'geo_lat' => $post_latitude,
4377 
-                                                                'geo_lng' => $post_longitude
4378 
-                                                            );
4379 
-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
4380 
-                                        $post_location_id = $location_id;
4381 
-                                    }
4372 
+									$post_location_info = array(
4373 
+																'city' => $post_city,
4374 
+																'region' => $post_region,
4375 
+																'country' => $post_country,
4376 
+																'geo_lat' => $post_latitude,
4377 
+																'geo_lng' => $post_longitude
4378 
+															);
4379 
+									if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
4380 
+										$post_location_id = $location_id;
4381 
+									}
4382 4382
4383 
-                                    if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {
4384 
-                                        $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id);
4383 
+									if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {
4384 
+										$neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id);
4385 4385
4386 
-                                        $hood_data = array();
4387 
-                                        $hood_data['hood_location_id'] = $post_location_id;
4388 
-                                        $hood_data['hood_name'] = $post_neighbourhood;
4386 
+										$hood_data = array();
4387 
+										$hood_data['hood_location_id'] = $post_location_id;
4388 
+										$hood_data['hood_name'] = $post_neighbourhood;
4389 4389
4390 
-                                        if (!empty($neighbourhood_info)) {
4391 
-                                            $hood_data['hood_id'] = $neighbourhood_info->hood_id;
4392 
-                                            $hood_data['hood_slug'] = $neighbourhood_info->hood_slug;
4390 
+										if (!empty($neighbourhood_info)) {
4391 
+											$hood_data['hood_id'] = $neighbourhood_info->hood_id;
4392 
+											$hood_data['hood_slug'] = $neighbourhood_info->hood_slug;
4393 4393
4394 
-                                            if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
4395 
-                                                $neighbourhood_latitude = $neighbourhood_info->hood_latitude;
4396 
-                                                $neighbourhood_longitude = $neighbourhood_info->hood_longitude;
4397 
-                                            }
4398 
-                                        }
4394 
+											if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
4395 
+												$neighbourhood_latitude = $neighbourhood_info->hood_latitude;
4396 
+												$neighbourhood_longitude = $neighbourhood_info->hood_longitude;
4397 
+											}
4398 
+										}
4399 4399
4400 
-                                        if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
4401 
-                                            $neighbourhood_latitude = $neighbourhood_info->hood_latitude;
4402 
-                                            $neighbourhood_longitude = $neighbourhood_info->hood_longitude;
4403 
-                                        }
4400 
+										if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {
4401 
+											$neighbourhood_latitude = $neighbourhood_info->hood_latitude;
4402 
+											$neighbourhood_longitude = $neighbourhood_info->hood_longitude;
4403 
+										}
4404 4404
4405 
-                                        $hood_data['hood_latitude'] = $post_latitude;
4406 
-                                        $hood_data['hood_longitude'] = $post_longitude;
4407 
-
4408 
-                                        $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data);
4409 
-                                        if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {
4410 
-                                            $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug;
4411 
-                                        }
4412 
-                                    }
4413 
-                                }
4414 
-                                $gd_post['post_location_id'] = $post_location_id;
4405 
+										$hood_data['hood_latitude'] = $post_latitude;
4406 
+										$hood_data['hood_longitude'] = $post_longitude;
4407 
+
4408 
+										$neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data);
4409 
+										if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {
4410 
+											$gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug;
4411 
+										}
4412 
+									}
4413 
+								}
4414 
+								$gd_post['post_location_id'] = $post_location_id;
4415 4415
4416 
-                                // post package info
4417 
-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;
4418 
-                                if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
4419 
-                                    $package_id = $gd_post_info->package_id;
4420 
-                                }
4416 
+								// post package info
4417 
+								$package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;
4418 
+								if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
4419 
+									$package_id = $gd_post_info->package_id;
4420 
+								}
4421 4421
4422 
-                                $package_info = array();
4423 
-                                if ($package_id && function_exists('geodir_get_package_info_by_id')) {
4424 
-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);
4422 
+								$package_info = array();
4423 
+								if ($package_id && function_exists('geodir_get_package_info_by_id')) {
4424 
+									$package_info = (array)geodir_get_package_info_by_id($package_id);
4425 4425
4426 
-                                    if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
4427 
-                                        $package_info = array();
4428 
-                                    }
4429 
-                                }
4426 
+									if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
4427 
+										$package_info = array();
4428 
+									}
4429 
+								}
4430 4430
4431 
-                                if (empty($package_info)) {
4432 
-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );
4433 
-                                }
4431 
+								if (empty($package_info)) {
4432 
+									$package_info = (array)geodir_post_package_info( array(), '', $post_type );
4433 
+								}
4434 4434
4435 
-                                if (!empty($package_info))	 {
4436 
-                                    $package_id = $package_info['pid'];
4435 
+								if (!empty($package_info))	 {
4436 
+									$package_id = $package_info['pid'];
4437 4437
4438 
-                                    if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
4439 
-                                        $gd_post['expire_date'] = $expire_date;
4440 
-                                    } else {
4441 
-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
4442 
-                                            $gd_post['alive_days'] = (int)$package_info['days'];
4443 
-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );
4444 
-                                        } else {
4445 
-                                            $gd_post['expire_date'] = 'Never';
4446 
-                                        }
4447 
-                                    }
4438 
+									if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
4439 
+										$gd_post['expire_date'] = $expire_date;
4440 
+									} else {
4441 
+										if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
4442 
+											$gd_post['alive_days'] = (int)$package_info['days'];
4443 
+											$gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );
4444 
+										} else {
4445 
+											$gd_post['expire_date'] = 'Never';
4446 
+										}
4447 
+									}
4448 4448
4449 
-                                    $gd_post['package_id'] = $package_id;
4450 
-                                }
4449 
+									$gd_post['package_id'] = $package_id;
4450 
+								}
4451 4451
4452 
-                                $table = $plugin_prefix . $post_type . '_detail';
4452 
+								$table = $plugin_prefix . $post_type . '_detail';
4453 4453
4454 
-                                if ($post_type == 'gd_event') {
4455 
-                                    $gd_post = geodir_imex_process_event_data($gd_post);
4456 
-                                }
4454 
+								if ($post_type == 'gd_event') {
4455 
+									$gd_post = geodir_imex_process_event_data($gd_post);
4456 
+								}
4457 4457
4458 
-                                if (isset($gd_post['post_id'])) {
4459 
-                                    unset($gd_post['post_id']);
4460 
-                                }
4458 
+								if (isset($gd_post['post_id'])) {
4459 
+									unset($gd_post['post_id']);
4460 
+								}
4461 4461
4462 
-                                // Export franchise fields
4463 
-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;
4464 
-                                if ($is_franchise_active) {
4465 
-                                    if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {
4466 
-                                        $gd_franchise_lock = array();
4462 
+								// Export franchise fields
4463 
+								$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;
4464 
+								if ($is_franchise_active) {
4465 
+									if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {
4466 
+										$gd_franchise_lock = array();
4467 4467
4468 
-                                        if ( isset( $gd_post['gd_franchise_lock'] ) ) {
4469 
-                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
4470 
-                                            $gd_franchise_lock = trim( $gd_franchise_lock );
4471 
-                                            $gd_franchise_lock = explode( ",", $gd_franchise_lock );
4472 
-                                        }
4468 
+										if ( isset( $gd_post['gd_franchise_lock'] ) ) {
4469 
+											$gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
4470 
+											$gd_franchise_lock = trim( $gd_franchise_lock );
4471 
+											$gd_franchise_lock = explode( ",", $gd_franchise_lock );
4472 
+										}
4473 4473
4474 
-                                        update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );
4475 
-                                        update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );
4476 
-                                    } else {
4477 
-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
4478 
-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );
4479 
-                                        }
4480 
-                                    }
4481 
-                                }
4474 
+										update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );
4475 
+										update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );
4476 
+									} else {
4477 
+										if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
4478 
+											geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );
4479 
+										}
4480 
+									}
4481 
+								}
4482 4482
4483 
-                                if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
4484 
-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );
4485 
-                                    if ($default_category_id) {
4486 
-                                        $save_post['post_default_category'] = $default_category_id;
4487 
-                                        $gd_post['default_category'] = $default_category_id;
4488 
-                                    }
4489 
-                                    $gd_post[$cat_taxonomy] = $save_post['post_category'];
4490 
-                                }
4491 
-                                $xtimings['###7'] = microtime(true)-$xstart;
4492 
-                                // Save post info
4493 
-                                geodir_save_post_info( $saved_post_id, $gd_post );
4494 
-                                $xtimings['###8'] = microtime(true)-$xstart;
4495 
-                                // post taxonomies
4496 
-                                if ( !empty( $save_post['post_category'] ) ) {
4497 
-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );
4483 
+								if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
4484 
+									$save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );
4485 
+									if ($default_category_id) {
4486 
+										$save_post['post_default_category'] = $default_category_id;
4487 
+										$gd_post['default_category'] = $default_category_id;
4488 
+									}
4489 
+									$gd_post[$cat_taxonomy] = $save_post['post_category'];
4490 
+								}
4491 
+								$xtimings['###7'] = microtime(true)-$xstart;
4492 
+								// Save post info
4493 
+								geodir_save_post_info( $saved_post_id, $gd_post );
4494 
+								$xtimings['###8'] = microtime(true)-$xstart;
4495 
+								// post taxonomies
4496 
+								if ( !empty( $save_post['post_category'] ) ) {
4497 
+									wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );
4498 4498
4499 
-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';
4500 
-                                    if ($default_category_id) {
4501 
-                                        $post_default_category = $default_category_id;
4502 
-                                    }
4503 
-                                    $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);
4504 
-                                    $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
4505 
-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
4499 
+									$post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';
4500 
+									if ($default_category_id) {
4501 
+										$post_default_category = $default_category_id;
4502 
+									}
4503 
+									$post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);
4504 
+									$save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
4505 
+									$post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
4506 4506
4507 
-                                    if ($post_category_str != '' && $post_default_category) {
4508 
-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);
4509 
-                                    }
4507 
+									if ($post_category_str != '' && $post_default_category) {
4508 
+										$post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);
4509 
+									}
4510 4510
4511 
-                                    $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';
4511 
+									$post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';
4512 4512
4513 
-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );
4514 
-                                }
4515 
-                                $xtimings['###8.1'] = microtime(true)-$xstart;
4516 
-                                if ( !empty( $save_post['post_tags'] ) ) {
4517 
-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );
4518 
-                                }
4519 
-                                $xtimings['###9'] = microtime(true)-$xstart;
4520 
-                                // Post images
4521 
-                                if ( !empty( $post_images ) ) {
4522 
-                                    $post_images = array_unique($post_images);
4513 
+									geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );
4514 
+								}
4515 
+								$xtimings['###8.1'] = microtime(true)-$xstart;
4516 
+								if ( !empty( $save_post['post_tags'] ) ) {
4517 
+									wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );
4518 
+								}
4519 
+								$xtimings['###9'] = microtime(true)-$xstart;
4520 
+								// Post images
4521 
+								if ( !empty( $post_images ) ) {
4522 
+									$post_images = array_unique($post_images);
4523 4523
4524 
-                                    $old_post_images_arr = array();
4525 
-                                    $saved_post_images_arr = array();
4524 
+									$old_post_images_arr = array();
4525 
+									$saved_post_images_arr = array();
4526 4526
4527 
-                                    $order = 1;
4527 
+									$order = 1;
4528 4528
4529 
-                                    $old_post_images = geodir_get_images( $saved_post_id );
4530 
-                                    $xtimings['###9.1'] = microtime(true)-$xstart;
4531 
-                                    if (!empty($old_post_images)) {
4532 
-                                        foreach( $old_post_images as $old_post_image ) {
4533 
-                                            if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
4534 
-                                                $old_post_images_arr[] = $old_post_image->file;
4535 
-                                            }
4536 
-                                        }
4537 
-                                    }
4529 
+									$old_post_images = geodir_get_images( $saved_post_id );
4530 
+									$xtimings['###9.1'] = microtime(true)-$xstart;
4531 
+									if (!empty($old_post_images)) {
4532 
+										foreach( $old_post_images as $old_post_image ) {
4533 
+											if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
4534 
+												$old_post_images_arr[] = $old_post_image->file;
4535 
+											}
4536 
+										}
4537 
+									}
4538 4538
4539 
-                                    foreach ( $post_images as $post_image ) {
4540 
-                                        $image_name = basename( $post_image );
4541 
-                                        $saved_post_images_arr[] = $image_name;
4539 
+									foreach ( $post_images as $post_image ) {
4540 
+										$image_name = basename( $post_image );
4541 
+										$saved_post_images_arr[] = $image_name;
4542 4542
4543 
-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
4544 
-                                            continue; // Skip if image already exists.
4545 
-                                        }
4543 
+										if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
4544 
+											continue; // Skip if image already exists.
4545 
+										}
4546 4546
4547 
-                                        $image_name_parts = explode( '.', $image_name );
4548 
-                                        array_pop( $image_name_parts );
4549 
-                                        $proper_image_name = implode( '.', $image_name_parts );
4550 
-                                        $xtimings['###9.2'] = microtime(true)-$xstart;
4551 
-                                        $arr_file_type = wp_check_filetype( $image_name );
4552 
-                                        $xtimings['###9.3'] = microtime(true)-$xstart;
4553 
-                                        if ( !empty( $arr_file_type ) ) {
4554 
-                                            $uploaded_file_type = $arr_file_type['type'];
4547 
+										$image_name_parts = explode( '.', $image_name );
4548 
+										array_pop( $image_name_parts );
4549 
+										$proper_image_name = implode( '.', $image_name_parts );
4550 
+										$xtimings['###9.2'] = microtime(true)-$xstart;
4551 
+										$arr_file_type = wp_check_filetype( $image_name );
4552 
+										$xtimings['###9.3'] = microtime(true)-$xstart;
4553 
+										if ( !empty( $arr_file_type ) ) {
4554 
+											$uploaded_file_type = $arr_file_type['type'];
4555 4555
4556 
-                                            $attachment = array();
4557 
-                                            $attachment['post_id'] = $saved_post_id;
4558 
-                                            $attachment['title'] = $proper_image_name;
4559 
-                                            $attachment['content'] = '';
4560 
-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;
4561 
-                                            $attachment['mime_type'] = $uploaded_file_type;
4562 
-                                            $attachment['menu_order'] = $order;
4563 
-                                            $attachment['is_featured'] = 0;
4564 
-
4565 
-                                            $attachment_set = '';
4566 
-                                            foreach ( $attachment as $key => $val ) {
4567 
-                                                if ( $val != '' ) {
4568 
-                                                    $attachment_set .= $key . " = '" . $val . "', ";
4569 
-                                                }
4570 
-                                            }
4571 
-                                            $attachment_set = trim( $attachment_set, ", " );
4556 
+											$attachment = array();
4557 
+											$attachment['post_id'] = $saved_post_id;
4558 
+											$attachment['title'] = $proper_image_name;
4559 
+											$attachment['content'] = '';
4560 
+											$attachment['file'] = $uploads_subdir . '/' . $image_name;
4561 
+											$attachment['mime_type'] = $uploaded_file_type;
4562 
+											$attachment['menu_order'] = $order;
4563 
+											$attachment['is_featured'] = 0;
4564 
+
4565 
+											$attachment_set = '';
4566 
+											foreach ( $attachment as $key => $val ) {
4567 
+												if ( $val != '' ) {
4568 
+													$attachment_set .= $key . " = '" . $val . "', ";
4569 
+												}
4570 
+											}
4571 
+											$attachment_set = trim( $attachment_set, ", " );
4572 4572
4573 
-                                            // Add new attachment
4574 
-                                            $xtimings['###9.4'] = microtime(true)-$xstart;
4575 
-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );
4576 
-                                            $xtimings['###9.5'] = microtime(true)-$xstart;
4577 
-                                            $order++;
4578 
-                                        }
4579 
-                                    }
4580 
-
4581 
-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';
4582 
-                                    // Remove previous attachment
4583 
-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );
4584 
-                                    $xtimings['###9.6'] = microtime(true)-$xstart;
4585 
-                                    if ( !empty( $saved_post_images_arr ) ) {
4586 
-                                        geodir_set_wp_featured_image($saved_post_id);
4587 
-                                        $xtimings['###9.7'] = microtime(true)-$xstart;
4588 
-                                        /*
4573 
+											// Add new attachment
4574 
+											$xtimings['###9.4'] = microtime(true)-$xstart;
4575 
+											$wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );
4576 
+											$xtimings['###9.5'] = microtime(true)-$xstart;
4577 
+											$order++;
4578 
+										}
4579 
+									}
4580 
+
4581 
+									$saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';
4582 
+									// Remove previous attachment
4583 
+									$wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );
4584 
+									$xtimings['###9.6'] = microtime(true)-$xstart;
4585 
+									if ( !empty( $saved_post_images_arr ) ) {
4586 
+										geodir_set_wp_featured_image($saved_post_id);
4587 
+										$xtimings['###9.7'] = microtime(true)-$xstart;
4588 
+										/*
4589 4589 
                                         $menu_order = 1;
4590 4590
4591 4591 
                                         foreach ( $saved_post_images_arr as $img_name ) {

@@ -4598,288 +4598,288 @@  discard block
 
 block discarded – undo
4598 4598 
                                             }
4599 4599 
                                             $menu_order++;
4600 4600 
                                         }*/
4601 
-                                    }
4601 
+									}
4602 4602
4603 
-                                    if ( $order > 1 ) {
4604 
-                                        $images++;
4605 
-                                    }
4606 
-                                }
4607 
-                                $xtimings['###10'] = microtime(true)-$xstart;
4608 
-                                /** This action is documented in geodirectory-functions/post-functions.php */
4609 
-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );
4610 
-                                $xtimings['###11'] = microtime(true)-$xstart;
4611 
-                                if (isset($is_featured)) {
4612 
-                                    geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);
4613 
-                                }
4614 
-                                if (isset($gd_post['alive_days'])) {
4615 
-                                    geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']);
4616 
-                                }
4617 
-                                if (isset($gd_post['expire_date'])) {
4618 
-                                    geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);
4619 
-                                }
4620 
-                                $xtimings['###12'] = microtime(true)-$xstart;
4621 
-                            }
4603 
+									if ( $order > 1 ) {
4604 
+										$images++;
4605 
+									}
4606 
+								}
4607 
+								$xtimings['###10'] = microtime(true)-$xstart;
4608 
+								/** This action is documented in geodirectory-functions/post-functions.php */
4609 
+								do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );
4610 
+								$xtimings['###11'] = microtime(true)-$xstart;
4611 
+								if (isset($is_featured)) {
4612 
+									geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);
4613 
+								}
4614 
+								if (isset($gd_post['alive_days'])) {
4615 
+									geodir_save_post_meta($saved_post_id, 'alive_days', $gd_post['alive_days']);
4616 
+								}
4617 
+								if (isset($gd_post['expire_date'])) {
4618 
+									geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);
4619 
+								}
4620 
+								$xtimings['###12'] = microtime(true)-$xstart;
4621 
+							}
4622 4622
4623 
-                            // WPML
4624 
-                            if ($is_wpml && $language != '') {
4625 
-                                $sitepress->switch_lang($active_lang, true);
4626 
-                            }
4627 
-                            // WPML
4628 
-                        }
4629 
-                    }
4630 
-                }
4623 
+							// WPML
4624 
+							if ($is_wpml && $language != '') {
4625 
+								$sitepress->switch_lang($active_lang, true);
4626 
+							}
4627 
+							// WPML
4628 
+						}
4629 
+					}
4630 
+				}
4631 4631
4632 
-                //undo some stuff to make the import quicker
4633 
-                wp_defer_term_counting( false );
4634 
-                wp_defer_comment_counting( false );
4635 
-                $wpdb->query( 'COMMIT;' );
4636 
-                $wpdb->query( 'SET autocommit = 1;' );
4637 
-                $xtimings['###13'] = microtime(true)-$xstart;
4638 
-                $json = array();
4639 
-                $json['processed'] = $processed_actual;
4640 
-                $json['created'] = $created;
4641 
-                $json['updated'] = $updated;
4642 
-                $json['skipped'] = $skipped;
4643 
-                $json['invalid'] = $invalid;
4644 
-                $json['invalid_addr'] = $invalid_addr;
4645 
-                $json['images'] = $images;
4646 
-                $json['timing'] = microtime(true)-$xstart;
4647 
-                $json['timings'] = $xtimings;
4632 
+				//undo some stuff to make the import quicker
4633 
+				wp_defer_term_counting( false );
4634 
+				wp_defer_comment_counting( false );
4635 
+				$wpdb->query( 'COMMIT;' );
4636 
+				$wpdb->query( 'SET autocommit = 1;' );
4637 
+				$xtimings['###13'] = microtime(true)-$xstart;
4638 
+				$json = array();
4639 
+				$json['processed'] = $processed_actual;
4640 
+				$json['created'] = $created;
4641 
+				$json['updated'] = $updated;
4642 
+				$json['skipped'] = $skipped;
4643 
+				$json['invalid'] = $invalid;
4644 
+				$json['invalid_addr'] = $invalid_addr;
4645 
+				$json['images'] = $images;
4646 
+				$json['timing'] = microtime(true)-$xstart;
4647 
+				$json['timings'] = $xtimings;
4648 4648
4649 4649
4650 
-                wp_send_json( $json );
4651 
-                exit;
4652 
-            } else if ( $task == 'import_loc' ) {
4653 
-                global $gd_post_types;
4654 
-                $gd_post_types = $post_types;
4650 
+				wp_send_json( $json );
4651 
+				exit;
4652 
+			} else if ( $task == 'import_loc' ) {
4653 
+				global $gd_post_types;
4654 
+				$gd_post_types = $post_types;
4655 4655
4656 
-                if (!empty($file)) {
4657 
-                    $columns = isset($file[0]) ? $file[0] : NULL;
4656 
+				if (!empty($file)) {
4657 
+					$columns = isset($file[0]) ? $file[0] : NULL;
4658 4658
4659 
-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
4660 
-                        $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
4661 
-                        wp_send_json( $json );
4662 
-                    }
4659 
+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
4660 
+						$json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
4661 
+						wp_send_json( $json );
4662 
+					}
4663 4663
4664 
-                    $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
4665 
-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );
4666 
-                    for ($i = 1; $i <= $limit; $i++) {
4667 
-                        $index = $processed + $i;
4664 
+					$gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
4665 
+					$gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );
4666 
+					for ($i = 1; $i <= $limit; $i++) {
4667 
+						$index = $processed + $i;
4668 4668
4669 
-                        if (isset($file[$index])) {
4670 
-                            $row = $file[$index];
4671 
-                            $row = array_map( 'trim', $row );
4672 
-                            $data = array();
4669 
+						if (isset($file[$index])) {
4670 
+							$row = $file[$index];
4671 
+							$row = array_map( 'trim', $row );
4672 
+							$data = array();
4673 4673
4674 
-                            foreach ($columns as $c => $column ) {
4675 
-                                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'))) {
4676 
-                                    $data[$column] = $row[$c];
4677 
-                                }
4678 
-                            }
4674 
+							foreach ($columns as $c => $column ) {
4675 
+								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'))) {
4676 
+									$data[$column] = $row[$c];
4677 
+								}
4678 
+							}
4679 4679
4680 
-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
4681 
-                                $invalid++;
4682 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4683 
-                                continue;
4684 
-                            }
4680 
+							if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
4681 
+								$invalid++;
4682 
+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4683 
+								continue;
4684 
+							}
4685 4685
4686 
-                            $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;
4686 
+							$data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;
4687 4687
4688 
-                            if ( $import_choice == 'update' ) {
4689 
-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
4690 
-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
4691 
-                                        $updated++;
4692 
-                                    } else {
4693 
-                                        $invalid++;
4694 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4695 
-                                    }
4696 
-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
4697 
-                                    $data['location_id'] = (int)$location->location_id;
4688 
+							if ( $import_choice == 'update' ) {
4689 
+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
4690 
+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
4691 
+										$updated++;
4692 
+									} else {
4693 
+										$invalid++;
4694 
+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4695 
+									}
4696 
+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
4697 
+									$data['location_id'] = (int)$location->location_id;
4698 4698
4699 
-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
4700 
-                                        $data['location_id'] = (int)$location->location_id;
4701 
-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
4702 
-                                        $data['location_id'] = (int)$location->location_id;
4703 
-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
4704 
-                                        $data['location_id'] = (int)$location->location_id;
4705 
-                                    }
4699 
+									if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
4700 
+										$data['location_id'] = (int)$location->location_id;
4701 
+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
4702 
+										$data['location_id'] = (int)$location->location_id;
4703 
+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
4704 
+										$data['location_id'] = (int)$location->location_id;
4705 
+									}
4706 4706
4707 
-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
4708 
-                                        $updated++;
4709 
-                                    } else {
4710 
-                                        $invalid++;
4711 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4712 
-                                    }
4713 
-                                } else {
4714 
-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {
4715 
-                                        $created++;
4716 
-                                    } else {
4717 
-                                        $invalid++;
4718 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4719 
-                                    }
4720 
-                                }
4721 
-                            } elseif ( $import_choice == 'skip' ) {
4722 
-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
4723 
-                                    $skipped++;
4724 
-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
4725 
-                                    $skipped++;
4726 
-                                } else {
4727 
-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {
4728 
-                                        $created++;
4729 
-                                    } else {
4730 
-                                        $invalid++;
4731 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4732 
-                                    }
4733 
-                                }
4734 
-                            } else {
4735 
-                                $invalid++;
4736 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4737 
-                            }
4738 
-                        }
4739 
-                    }
4740 
-                }
4707 
+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
4708 
+										$updated++;
4709 
+									} else {
4710 
+										$invalid++;
4711 
+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4712 
+									}
4713 
+								} else {
4714 
+									if ( $location_id = geodir_location_insert_city( $data, true ) ) {
4715 
+										$created++;
4716 
+									} else {
4717 
+										$invalid++;
4718 
+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4719 
+									}
4720 
+								}
4721 
+							} elseif ( $import_choice == 'skip' ) {
4722 
+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
4723 
+									$skipped++;
4724 
+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
4725 
+									$skipped++;
4726 
+								} else {
4727 
+									if ( $location_id = geodir_location_insert_city( $data, true ) ) {
4728 
+										$created++;
4729 
+									} else {
4730 
+										$invalid++;
4731 
+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4732 
+									}
4733 
+								}
4734 
+							} else {
4735 
+								$invalid++;
4736 
+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4737 
+							}
4738 
+						}
4739 
+					}
4740 
+				}
4741 4741
4742 
-                $json = array();
4743 
-                $json['processed'] = $limit;
4744 
-                $json['created'] = $created;
4745 
-                $json['updated'] = $updated;
4746 
-                $json['skipped'] = $skipped;
4747 
-                $json['invalid'] = $invalid;
4748 
-                $json['images'] = $images;
4742 
+				$json = array();
4743 
+				$json['processed'] = $limit;
4744 
+				$json['created'] = $created;
4745 
+				$json['updated'] = $updated;
4746 
+				$json['skipped'] = $skipped;
4747 
+				$json['invalid'] = $invalid;
4748 
+				$json['images'] = $images;
4749 4749
4750 
-                wp_send_json( $json );
4751 
-            } else if ( $task == 'import_hood' ) {
4752 
-                if (!empty($file)) {
4753 
-                    $columns = isset($file[0]) ? $file[0] : NULL;
4750 
+				wp_send_json( $json );
4751 
+			} else if ( $task == 'import_hood' ) {
4752 
+				if (!empty($file)) {
4753 
+					$columns = isset($file[0]) ? $file[0] : NULL;
4754 4754
4755 
-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
4756 
-                        $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
4757 
-                        wp_send_json( $json );
4758 
-                    }
4755 
+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
4756 
+						$json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
4757 
+						wp_send_json( $json );
4758 
+					}
4759 4759
4760 
-                    $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
4761 
-                    $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' );
4762 
-                    for ($i = 1; $i <= $limit; $i++) {
4763 
-                        $index = $processed + $i;
4760 
+					$gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
4761 
+					$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' );
4762 
+					for ($i = 1; $i <= $limit; $i++) {
4763 
+						$index = $processed + $i;
4764 4764
4765 
-                        if (isset($file[$index])) {
4766 
-                            $row = $file[$index];
4767 
-                            $row = array_map( 'trim', $row );
4768 
-                            $data = array();
4765 
+						if (isset($file[$index])) {
4766 
+							$row = $file[$index];
4767 
+							$row = array_map( 'trim', $row );
4768 
+							$data = array();
4769 4769
4770 
-                            foreach ($columns as $c => $column) {
4771 
-                                if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {
4772 
-                                    $data[$column] = sanitize_text_field($row[$c]);
4773 
-                                }
4774 
-                            }
4770 
+							foreach ($columns as $c => $column) {
4771 
+								if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {
4772 
+									$data[$column] = sanitize_text_field($row[$c]);
4773 
+								}
4774 
+							}
4775 4775
4776 
-                            if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
4777 
-                                $invalid++;
4778 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4779 
-                                continue;
4780 
-                            }
4776 
+							if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
4777 
+								$invalid++;
4778 
+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4779 
+								continue;
4780 
+							}
4781 4781
4782 
-                            $location_info = array();
4783 
-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
4784 
-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
4785 
-                            } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
4786 
-                                $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
4787 
-                            }
4782 
+							$location_info = array();
4783 
+							if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
4784 
+								$location_info = geodir_get_location_by_id('', (int)$data['location_id']);
4785 
+							} else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
4786 
+								$location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
4787 
+							}
4788 4788
4789 
-                            if (empty($location_info)) {
4790 
-                                $invalid++;
4791 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4792 
-                                continue;
4793 
-                            }
4789 
+							if (empty($location_info)) {
4790 
+								$invalid++;
4791 
+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4792 
+								continue;
4793 
+							}
4794 4794
4795 
-                            $location_id = $location_info->location_id;
4795 
+							$location_id = $location_info->location_id;
4796 4796
4797 
-                            $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0;
4797 
+							$data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0;
4798 4798
4799 
-                            $hood_data = array();
4800 
-                            $hood_data['hood_name'] = $data['neighbourhood_name'];
4801 
-                            $hood_data['hood_slug'] = $data['neighbourhood_slug'];
4802 
-                            $hood_data['hood_latitude'] = $data['latitude'];
4803 
-                            $hood_data['hood_longitude'] = $data['longitude'];
4804 
-                            $hood_data['hood_location_id'] = $location_id;
4799 
+							$hood_data = array();
4800 
+							$hood_data['hood_name'] = $data['neighbourhood_name'];
4801 
+							$hood_data['hood_slug'] = $data['neighbourhood_slug'];
4802 
+							$hood_data['hood_latitude'] = $data['latitude'];
4803 
+							$hood_data['hood_longitude'] = $data['longitude'];
4804 
+							$hood_data['hood_location_id'] = $location_id;
4805 4805
4806 
-                            if ( $import_choice == 'update' ) {
4807 
-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
4808 
-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];
4806 
+							if ( $import_choice == 'update' ) {
4807 
+								if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
4808 
+									$hood_data['hood_id'] = (int)$data['neighbourhood_id'];
4809 4809
4810 
-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
4811 
-                                        $updated++;
4812 
-                                    } else {
4813 
-                                        $invalid++;
4814 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4815 
-                                    }
4816 
-                                } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
4817 
-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;
4810 
+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
4811 
+										$updated++;
4812 
+									} else {
4813 
+										$invalid++;
4814 
+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4815 
+									}
4816 
+								} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
4817 
+									$hood_data['hood_id'] = (int)$neighbourhood->hood_id;
4818 4818
4819 
-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
4820 
-                                        $updated++;
4821 
-                                    } else {
4822 
-                                        $invalid++;
4823 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4824 
-                                    }
4825 
-                                } else {
4826 
-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
4827 
-                                        $created++;
4828 
-                                    } else {
4829 
-                                        $invalid++;
4830 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4831 
-                                    }
4832 
-                                }
4833 
-                            } elseif ( $import_choice == 'skip' ) {
4834 
-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
4835 
-                                    $skipped++;
4836 
-                                } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
4837 
-                                    $skipped++;
4838 
-                                } else {
4819 
+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
4820 
+										$updated++;
4821 
+									} else {
4822 
+										$invalid++;
4823 
+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4824 
+									}
4825 
+								} else {
4826 
+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
4827 
+										$created++;
4828 
+									} else {
4829 
+										$invalid++;
4830 
+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4831 
+									}
4832 
+								}
4833 
+							} elseif ( $import_choice == 'skip' ) {
4834 
+								if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
4835 
+									$skipped++;
4836 
+								} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
4837 
+									$skipped++;
4838 
+								} else {
4839 4839
4840 
-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
4841 
-                                        $created++;
4842 
-                                    } else {
4843 
-                                        $invalid++;
4844 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4845 
-                                    }
4846 
-                                }
4847 
-                            } else {
4848 
-                                $invalid++;
4849 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4850 
-                            }
4851 
-                        }
4852 
-                    }
4853 
-                }
4840 
+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
4841 
+										$created++;
4842 
+									} else {
4843 
+										$invalid++;
4844 
+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4845 
+									}
4846 
+								}
4847 
+							} else {
4848 
+								$invalid++;
4849 
+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4850 
+							}
4851 
+						}
4852 
+					}
4853 
+				}
4854 4854
4855 
-                $json = array();
4856 
-                $json['processed'] = $limit;
4857 
-                $json['created'] = $created;
4858 
-                $json['updated'] = $updated;
4859 
-                $json['skipped'] = $skipped;
4860 
-                $json['invalid'] = $invalid;
4861 
-                $json['images'] = $images;
4855 
+				$json = array();
4856 
+				$json['processed'] = $limit;
4857 
+				$json['created'] = $created;
4858 
+				$json['updated'] = $updated;
4859 
+				$json['skipped'] = $skipped;
4860 
+				$json['invalid'] = $invalid;
4861 
+				$json['images'] = $images;
4862 4862
4863 
-                wp_send_json( $json );
4864 
-            }
4865 
-        }
4866 
-        break;
4867 
-        case 'import_finish':{
4868 
-            /**
4869 
-             * Run an action when an import finishes.
4870 
-             *
4871 
-             * This action can be used to fire functions after an import ends.
4872 
-             *
4873 
-             * @since 1.5.3
4874 
-             * @package GeoDirectory
4875 
-             */
4876 
-            do_action('geodir_import_finished');
4877 
-        }
4878 
-        break;
4863 
+				wp_send_json( $json );
4864 
+			}
4865 
+		}
4866 
+		break;
4867 
+		case 'import_finish':{
4868 
+			/**
4869 
+			 * Run an action when an import finishes.
4870 
+			 *
4871 
+			 * This action can be used to fire functions after an import ends.
4872 
+			 *
4873 
+			 * @since 1.5.3
4874 
+			 * @package GeoDirectory
4875 
+			 */
4876 
+			do_action('geodir_import_finished');
4877 
+		}
4878 
+		break;
4879 4879
4880 
-    }
4881 
-    echo '0';
4882 
-    gd_die();
4880 
+	}
4881 
+	echo '0';
4882 
+	gd_die();
4883 4883 
 }
4884 4884
4885 4885 
 /**

@@ -4923,12 +4923,12 @@  discard block
 
 block discarded – undo
4923 4923 
 		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );
4924 4924 
 	}
4925 4925
4926 
-    if( !empty( $term ) ) {
4926 
+	if( !empty( $term ) ) {
4927 4927 
 		$result = wp_insert_term( $term, $taxonomy, $args );
4928 
-        if( !is_wp_error( $result ) ) {
4929 
-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;
4930 
-        }
4931 
-    }
4928 
+		if( !is_wp_error( $result ) ) {
4929 
+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;
4930 
+		}
4931 
+	}
4932 4932
4933 4933 
 	return false;
4934 4934 
 }

@@ -4974,16 +4974,16 @@  discard block
 
 block discarded – undo
4974 4974 
 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );
4975 4975
4976 4976 
 		if( !is_wp_error( $result ) ) {
4977 
-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;
4978 
-        }
4977 
+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;
4978 
+		}
4979 4979 
 	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
4980 4980 
 		$term_data['term_id'] = $term_info['term_id'];
4981 4981
4982 4982 
 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );
4983 4983
4984 4984 
 		if( !is_wp_error( $result ) ) {
4985 
-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;
4986 
-        }
4985 
+			return isset( $result['term_id'] ) ? $result['term_id'] : 0;
4986 
+		}
4987 4987 
 	} else {
4988 4988 
 		return geodir_imex_insert_term( $taxonomy, $term_data );
4989 4989 
 	}

@@ -5005,47 +5005,47 @@  discard block
 
 block discarded – undo
5005 5005 
  * @return int Posts count.
5006 5006 
  */
5007 5007 
 function geodir_get_posts_count( $post_type ) {
5008 
-    global $wpdb, $plugin_prefix;
5008 
+	global $wpdb, $plugin_prefix;
5009 5009
5010 
-    if ( !post_type_exists( $post_type ) ) {
5011 
-        return 0;
5012 
-    }
5010 
+	if ( !post_type_exists( $post_type ) ) {
5011 
+		return 0;
5012 
+	}
5013 5013
5014 
-    $table = $plugin_prefix . $post_type . '_detail';
5014 
+	$table = $plugin_prefix . $post_type . '_detail';
5015 5015
5016 
-    // Skip listing with statuses trash, auto-draft etc...
5017 
-    $skip_statuses = geodir_imex_export_skip_statuses();
5018 
-    $where_statuses = '';
5019 
-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
5020 
-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
5021 
-    }
5016 
+	// Skip listing with statuses trash, auto-draft etc...
5017 
+	$skip_statuses = geodir_imex_export_skip_statuses();
5018 
+	$where_statuses = '';
5019 
+	if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
5020 
+		$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
5021 
+	}
5022 5022
5023 
-    /**
5024 
-     * Filter the SQL where clause part to filter posts count in import/export.
5025 
-     *
5026 
-     * @since 1.6.4
5027 
-     * @package GeoDirectory
5028 
-     *
5029 
-     * @param string $where SQL where clause part.
5030 
-     */
5031 
-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );
5032 
-
5033 
-    $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 );
5034 
-
5035 
-    $posts_count = (int)$wpdb->get_var( $query );
5023 
+	/**
5024 
+	 * Filter the SQL where clause part to filter posts count in import/export.
5025 
+	 *
5026 
+	 * @since 1.6.4
5027 
+	 * @package GeoDirectory
5028 
+	 *
5029 
+	 * @param string $where SQL where clause part.
5030 
+	 */
5031 
+	$where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );
5032 
+
5033 
+	$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 );
5034 
+
5035 
+	$posts_count = (int)$wpdb->get_var( $query );
5036 5036
5037 
-    /**
5038 
-     * Modify returned post counts for the current post type.
5039 
-     *
5040 
-     * @since 1.4.6
5041 
-     * @package GeoDirectory
5042 
-     *
5043 
-     * @param int $posts_count Post counts.
5044 
-     * @param string $post_type Post type.
5045 
-     */
5046 
-    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );
5047 
-
5048 
-    return $posts_count;
5037 
+	/**
5038 
+	 * Modify returned post counts for the current post type.
5039 
+	 *
5040 
+	 * @since 1.4.6
5041 
+	 * @package GeoDirectory
5042 
+	 *
5043 
+	 * @param int $posts_count Post counts.
5044 
+	 * @param string $post_type Post type.
5045 
+	 */
5046 
+	$posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );
5047 
+
5048 
+	return $posts_count;
5049 5049 
 }
5050 5050
5051 5051 
 /**

@@ -5074,10 +5074,10 @@  discard block
 
 block discarded – undo
5074 5074
5075 5075 
 	if ( !empty( $posts ) ) {
5076 5076 
 		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );
5077 
-        $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
5078 
-        $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;
5079 
-        $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;
5080 
-        $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
5077 
+		$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
5078 
+		$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;
5079 
+		$neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;
5080 
+		$is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
5081 5081
5082 5082 
 		$csv_row = array();
5083 5083 
 		$csv_row[] = 'post_id';

@@ -5109,7 +5109,7 @@  discard block
 
 block discarded – undo
5109 5109 
 		}
5110 5110 
 		$csv_row[] = 'post_status';
5111 5111 
 		$csv_row[] = 'is_featured';
5112 
-        // Export claim listing field
5112 
+		// Export claim listing field
5113 5113 
 		if ($is_claim_active) {
5114 5114 
 			$csv_row[] = 'claimed';
5115 5115 
 		}

@@ -5118,7 +5118,7 @@  discard block
 
 block discarded – undo
5118 5118 
 			$csv_row[] = 'alive_days';
5119 5119 
 			$csv_row[] = 'expire_date';
5120 5120 
 		}
5121 
-        $csv_row[] = 'post_date';
5121 
+		$csv_row[] = 'post_date';
5122 5122 
 		$csv_row[] = 'post_address';
5123 5123 
 		$csv_row[] = 'post_city';
5124 5124 
 		$csv_row[] = 'post_region';

@@ -5126,11 +5126,11 @@  discard block
 
 block discarded – undo
5126 5126 
 		$csv_row[] = 'post_zip';
5127 5127 
 		$csv_row[] = 'post_latitude';
5128 5128 
 		$csv_row[] = 'post_longitude';
5129 
-        if ($neighbourhood_active) {
5130 
-            $csv_row[] = 'post_neighbourhood';
5131 
-            $csv_row[] = 'neighbourhood_latitude';
5132 
-            $csv_row[] = 'neighbourhood_longitude';
5133 
-        }
5129 
+		if ($neighbourhood_active) {
5130 
+			$csv_row[] = 'post_neighbourhood';
5131 
+			$csv_row[] = 'neighbourhood_latitude';
5132 
+			$csv_row[] = 'neighbourhood_longitude';
5133 
+		}
5134 5134 
 		$csv_row[] = 'geodir_timing';
5135 5135 
 		$csv_row[] = 'geodir_contact';
5136 5136 
 		$csv_row[] = 'geodir_email';

@@ -5162,21 +5162,21 @@  discard block
 
 block discarded – undo
5162 5162 
 			$csv_row[] = 'franchise';
5163 5163 
 		}
5164 5164
5165 
-        /**
5166 
-         * Filter columns field names of gd export listings csv.
5167 
-         *
5168 
-         * @since 1.6.5
5169 
-         * @package GeoDirectory
5170 
-         *
5171 
-         * @param array $csv_row Column names being exported in csv.
5172 
-         * @param string $post_type The post type.
5173 
-         */
5174 
-        $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);
5165 
+		/**
5166 
+		 * Filter columns field names of gd export listings csv.
5167 
+		 *
5168 
+		 * @since 1.6.5
5169 
+		 * @package GeoDirectory
5170 
+		 *
5171 
+		 * @param array $csv_row Column names being exported in csv.
5172 
+		 * @param string $post_type The post type.
5173 
+		 */
5174 
+		$csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);
5175 5175
5176 5176 
 		$csv_rows[] = $csv_row;
5177 5177
5178 5178 
 		$images_count = 5;
5179 
-        $xx=0;
5179 
+		$xx=0;
5180 5180 
 		foreach ( $posts as $post ) {$xx++;
5181 5181 
 			$post_id = $post['ID'];
5182 5182 
 			

@@ -5307,15 +5307,15 @@  discard block
 
 block discarded – undo
5307 5307 
 			}
5308 5308 
 			$csv_row[] = $post_info['post_status']; // post_status
5309 5309 
 			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured
5310 
-            if ($is_claim_active) {
5311 
-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed
5312 
-            }
5310 
+			if ($is_claim_active) {
5311 
+				$csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed
5312 
+			}
5313 5313 
 			if ($is_payment_plugin) {
5314 5314 
 				$csv_row[] = (int)$post_info['package_id']; // package_id
5315 5315 
 				$csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days
5316 5316 
 				$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
5317 5317 
 			}
5318 
-            $csv_row[] = $post_info['post_date']; // post_date
5318 
+			$csv_row[] = $post_info['post_date']; // post_date
5319 5319 
 			$csv_row[] = stripslashes($post_info['post_address']); // post_address
5320 5320 
 			$csv_row[] = stripslashes($post_info['post_city']); // post_city
5321 5321 
 			$csv_row[] = stripslashes($post_info['post_region']); // post_region

@@ -5323,21 +5323,21 @@  discard block
 
 block discarded – undo
5323 5323 
 			$csv_row[] = stripslashes($post_info['post_zip']); // post_zip
5324 5324 
 			$csv_row[] = $post_info['post_latitude']; // post_latitude
5325 5325 
 			$csv_row[] = $post_info['post_longitude']; // post_longitude
5326 
-            if ($neighbourhood_active) {
5327 
-                $post_neighbourhood = '';
5328 
-                $neighbourhood_latitude = '';
5329 
-                $neighbourhood_longitude = '';
5330 
-                if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {
5331 
-                    if (!empty($hood_info)) {
5332 
-                        $post_neighbourhood = $hood_info->hood_name;
5333 
-                        $neighbourhood_latitude = $hood_info->hood_latitude;
5334 
-                        $neighbourhood_longitude = $hood_info->hood_longitude;
5335 
-                    }
5336 
-                }
5337 
-                $csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood
5338 
-                $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude
5339 
-                $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude
5340 
-            }
5326 
+			if ($neighbourhood_active) {
5327 
+				$post_neighbourhood = '';
5328 
+				$neighbourhood_latitude = '';
5329 
+				$neighbourhood_longitude = '';
5330 
+				if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {
5331 
+					if (!empty($hood_info)) {
5332 
+						$post_neighbourhood = $hood_info->hood_name;
5333 
+						$neighbourhood_latitude = $hood_info->hood_latitude;
5334 
+						$neighbourhood_longitude = $hood_info->hood_longitude;
5335 
+					}
5336 
+				}
5337 
+				$csv_row[] = stripslashes($post_neighbourhood); // post_neighbourhood
5338 
+				$csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude
5339 
+				$csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude
5340 
+			}
5341 5341 
 			$csv_row[] = stripslashes($post_info['geodir_timing']); // geodir_timing
5342 5342 
 			$csv_row[] = stripslashes($post_info['geodir_contact']); // geodir_contact
5343 5343 
 			$csv_row[] = stripslashes($post_info['geodir_email']); // geodir_email

@@ -5377,16 +5377,16 @@  discard block
 
 block discarded – undo
5377 5377 
 				$csv_row[] = (int)$franchise; // franchise id
5378 5378 
 			}
5379 5379
5380 
-            /**
5381 
-             * Filter columns values of gd export listings csv file
5382 
-             *
5383 
-             * @since 1.6.5
5384 
-             * @package GeoDirectory
5385 
-             *
5386 
-             * @param array $csv_row Field values being exported in csv.
5387 
-             * @param array $post_info The post info.
5388 
-             */
5389 
-            $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
5380 
+			/**
5381 
+			 * Filter columns values of gd export listings csv file
5382 
+			 *
5383 
+			 * @since 1.6.5
5384 
+			 * @package GeoDirectory
5385 
+			 *
5386 
+			 * @param array $csv_row Field values being exported in csv.
5387 
+			 * @param array $post_info The post info.
5388 
+			 */
5389 
+			$csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
5390 5390
5391 5391 
 			for ( $c = 0; $c < $images_count; $c++ ) {
5392 5392 
 				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

@@ -5419,64 +5419,64 @@  discard block
 
 block discarded – undo
5419 5419 
  * @return array Array of posts data.
5420 5420 
  */
5421 5421 
 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
5422 
-    global $wpdb, $plugin_prefix;
5422 
+	global $wpdb, $plugin_prefix;
5423 5423
5424 
-    if ( ! post_type_exists( $post_type ) )
5425 
-        return new stdClass;
5424 
+	if ( ! post_type_exists( $post_type ) )
5425 
+		return new stdClass;
5426 5426
5427 
-    $table = $plugin_prefix . $post_type . '_detail';
5427 
+	$table = $plugin_prefix . $post_type . '_detail';
5428 5428
5429 
-    $limit = '';
5430 
-    if ( $per_page > 0 && $page_no > 0 ) {
5431 
-        $offset = ( $page_no - 1 ) * $per_page;
5429 
+	$limit = '';
5430 
+	if ( $per_page > 0 && $page_no > 0 ) {
5431 
+		$offset = ( $page_no - 1 ) * $per_page;
5432 5432
5433 
-        if ( $offset > 0 ) {
5434 
-            $limit = " LIMIT " . $offset . "," . $per_page;
5435 
-        } else {
5436 
-            $limit = " LIMIT " . $per_page;
5437 
-        }
5438 
-    }
5433 
+		if ( $offset > 0 ) {
5434 
+			$limit = " LIMIT " . $offset . "," . $per_page;
5435 
+		} else {
5436 
+			$limit = " LIMIT " . $per_page;
5437 
+		}
5438 
+	}
5439 5439
5440 
-    // Skip listing with statuses trash, auto-draft etc...
5441 
-    $skip_statuses = geodir_imex_export_skip_statuses();
5442 
-    $where_statuses = '';
5443 
-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
5444 
-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
5445 
-    }
5440 
+	// Skip listing with statuses trash, auto-draft etc...
5441 
+	$skip_statuses = geodir_imex_export_skip_statuses();
5442 
+	$where_statuses = '';
5443 
+	if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
5444 
+		$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
5445 
+	}
5446 5446
5447 
-    /**
5448 
-     * Filter the SQL where clause part to filter posts in import/export.
5449 
-     *
5450 
-     * @since 1.6.4
5451 
-     * @package GeoDirectory
5452 
-     *
5453 
-     * @param string $where SQL where clause part.
5454 
-     */
5455 
-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );
5456 
-
5457 
-    $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 );
5458 
-    /**
5459 
-     * Modify returned posts SQL query for the current post type.
5460 
-     *
5461 
-     * @since 1.4.6
5462 
-     * @package GeoDirectory
5463 
-     *
5464 
-     * @param int $query The SQL query.
5465 
-     * @param string $post_type Post type.
5466 
-     */
5467 
-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );
5468 
-    $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );
5469 
-
5470 
-    /**
5471 
-     * Modify returned post results for the current post type.
5472 
-     *
5473 
-     * @since 1.4.6
5474 
-     * @package GeoDirectory
5475 
-     *
5476 
-     * @param object $results An object containing all post ids.
5477 
-     * @param string $post_type Post type.
5478 
-     */
5479 
-    return apply_filters( 'geodir_export_posts', $results, $post_type );
5447 
+	/**
5448 
+	 * Filter the SQL where clause part to filter posts in import/export.
5449 
+	 *
5450 
+	 * @since 1.6.4
5451 
+	 * @package GeoDirectory
5452 
+	 *
5453 
+	 * @param string $where SQL where clause part.
5454 
+	 */
5455 
+	$where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );
5456 
+
5457 
+	$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 );
5458 
+	/**
5459 
+	 * Modify returned posts SQL query for the current post type.
5460 
+	 *
5461 
+	 * @since 1.4.6
5462 
+	 * @package GeoDirectory
5463 
+	 *
5464 
+	 * @param int $query The SQL query.
5465 
+	 * @param string $post_type Post type.
5466 
+	 */
5467 
+	$query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );
5468 
+	$results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );
5469 
+
5470 
+	/**
5471 
+	 * Modify returned post results for the current post type.
5472 
+	 *
5473 
+	 * @since 1.4.6
5474 
+	 * @package GeoDirectory
5475 
+	 *
5476 
+	 * @param object $results An object containing all post ids.
5477 
+	 * @param string $post_type Post type.
5478 
+	 */
5479 
+	return apply_filters( 'geodir_export_posts', $results, $post_type );
5480 5480 
 }
5481 5481
5482 5482 
 /**

@@ -5495,26 +5495,26 @@  discard block
 
 block discarded – undo
5495 5495 
  * @return string The SQL query.
5496 5496 
  */
5497 5497 
 function geodir_imex_get_events_query( $query, $post_type ) {
5498 
-    if ( $post_type == 'gd_event' ) {
5499 
-        global $wpdb, $plugin_prefix;
5498 
+	if ( $post_type == 'gd_event' ) {
5499 
+		global $wpdb, $plugin_prefix;
5500 5500
5501 
-        $table = $plugin_prefix . $post_type . '_detail';
5502 
-        $schedule_table = EVENT_SCHEDULE;
5501 
+		$table = $plugin_prefix . $post_type . '_detail';
5502 
+		$schedule_table = EVENT_SCHEDULE;
5503 5503
5504 
-        // Skip listing with statuses trash, auto-draft etc...
5505 
-        $skip_statuses = geodir_imex_export_skip_statuses();
5506 
-        $where_statuses = '';
5507 
-        if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
5508 
-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
5509 
-        }
5504 
+		// Skip listing with statuses trash, auto-draft etc...
5505 
+		$skip_statuses = geodir_imex_export_skip_statuses();
5506 
+		$where_statuses = '';
5507 
+		if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
5508 
+			$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
5509 
+		}
5510 5510
5511 
-        /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */
5512 
-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );
5511 
+		/** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */
5512 
+		$where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );
5513 5513
5514 
-        $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 );
5515 
-    }
5514 
+		$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 );
5515 
+	}
5516 5516
5517 
-    return $query;
5517 
+	return $query;
5518 5518 
 }
5519 5519
5520 5520 
 /**

@@ -5536,36 +5536,36 @@  discard block
 
 block discarded – undo
5536 5536 
  * @return int Total terms count.
5537 5537 
  */
5538 5538 
 function geodir_get_terms_count( $post_type ) {
5539 
-    $args = array( 'hide_empty' => 0 );
5539 
+	$args = array( 'hide_empty' => 0 );
5540 5540
5541 
-    remove_all_filters( 'get_terms' );
5541 
+	remove_all_filters( 'get_terms' );
5542 5542
5543 
-    $taxonomy = $post_type . 'category';
5543 
+	$taxonomy = $post_type . 'category';
5544 5544
5545 
-    // WPML
5546 
-    $is_wpml = geodir_is_wpml();
5547 
-    $active_lang = 'all';
5548 
-    if ( $is_wpml ) {
5549 
-        global $sitepress;
5550 
-        $active_lang = $sitepress->get_current_language();
5545 
+	// WPML
5546 
+	$is_wpml = geodir_is_wpml();
5547 
+	$active_lang = 'all';
5548 
+	if ( $is_wpml ) {
5549 
+		global $sitepress;
5550 
+		$active_lang = $sitepress->get_current_language();
5551 5551
5552 
-        if ( $active_lang != 'all' ) {
5553 
-            $sitepress->switch_lang( 'all', true );
5554 
-        }
5555 
-    }
5556 
-    // WPML
5552 
+		if ( $active_lang != 'all' ) {
5553 
+			$sitepress->switch_lang( 'all', true );
5554 
+		}
5555 
+	}
5556 
+	// WPML
5557 5557
5558 
-    $count_terms = wp_count_terms( $taxonomy, $args );
5558 
+	$count_terms = wp_count_terms( $taxonomy, $args );
5559 5559
5560 
-    // WPML
5561 
-    if ( $is_wpml && $active_lang !== 'all' ) {
5562 
-        global $sitepress;
5563 
-        $sitepress->switch_lang( $active_lang, true );
5564 
-    }
5565 
-    // WPML
5566 
-    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;
5560 
+	// WPML
5561 
+	if ( $is_wpml && $active_lang !== 'all' ) {
5562 
+		global $sitepress;
5563 
+		$sitepress->switch_lang( $active_lang, true );
5564 
+	}
5565 
+	// WPML
5566 
+	$count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;
5567 5567
5568 
-    return $count_terms;
5568 
+	return $count_terms;
5569 5569 
 }
5570 5570
5571 5571 
 /**

@@ -5604,11 +5604,11 @@  discard block
 
 block discarded – undo
5604 5604 
 		$csv_row[] = 'cat_posttype';
5605 5605 
 		$csv_row[] = 'cat_parent';
5606 5606 
 		$csv_row[] = 'cat_schema';
5607 
-        // WPML
5607 
+		// WPML
5608 5608 
 		$is_wpml = geodir_is_wpml();
5609 5609 
 		if ($is_wpml) {
5610 5610 
 			$csv_row[] = 'cat_language';
5611 
-            $csv_row[] = 'cat_id_original';
5611 
+			$csv_row[] = 'cat_id_original';
5612 5612 
 		}
5613 5613 
 		// WPML
5614 5614 
 		$csv_row[] = 'cat_description';

@@ -5638,10 +5638,10 @@  discard block
 
 block discarded – undo
5638 5638 
 			$csv_row[] = $post_type;
5639 5639 
 			$csv_row[] = $cat_parent;
5640 5640 
 			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );
5641 
-            // WPML
5641 
+			// WPML
5642 5642 
 			if ($is_wpml) {
5643 5643 
 				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );
5644 
-                $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );
5644 
+				$csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );
5645 5645 
 			}
5646 5646 
 			// WPML
5647 5647 
 			$csv_row[] = $term->description;

@@ -6059,43 +6059,43 @@  discard block
 
 block discarded – undo
6059 6059 
  * @param string $status Post status.
6060 6060 
  */
6061 6061 
 function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish') {
6062 
-    global $wpdb, $current_user;
6063 
-
6064 
-    $option_value = get_option($option);
6065 
-
6066 
-    if ($option_value > 0) :
6067 
-        if (get_post($option_value)) :
6068 
-            // Page exists
6069 
-            return;
6070 
-        endif;
6071 
-    endif;
6072 
-
6073 
-    $page_found = $wpdb->get_var(
6074 
-        $wpdb->prepare(
6075 
-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",
6076 
-            array($slug)
6077 
-        )
6078 
-    );
6079 
-
6080 
-    if ($page_found) :
6081 
-        // Page exists
6082 
-        if (!$option_value) update_option($option, $page_found);
6083 
-        return;
6084 
-    endif;
6085 
-
6086 
-    $page_data = array(
6087 
-        'post_status' => $status,
6088 
-        'post_type' => 'page',
6089 
-        'post_author' => $current_user->ID,
6090 
-        'post_name' => $slug,
6091 
-        'post_title' => $page_title,
6092 
-        'post_content' => $page_content,
6093 
-        'post_parent' => $post_parent,
6094 
-        'comment_status' => 'closed'
6095 
-    );
6096 
-    $page_id = wp_insert_post($page_data);
6097 
-
6098 
-    add_option($option, $page_id);
6062 
+	global $wpdb, $current_user;
6063 
+
6064 
+	$option_value = get_option($option);
6065 
+
6066 
+	if ($option_value > 0) :
6067 
+		if (get_post($option_value)) :
6068 
+			// Page exists
6069 
+			return;
6070 
+		endif;
6071 
+	endif;
6072 
+
6073 
+	$page_found = $wpdb->get_var(
6074 
+		$wpdb->prepare(
6075 
+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",
6076 
+			array($slug)
6077 
+		)
6078 
+	);
6079 
+
6080 
+	if ($page_found) :
6081 
+		// Page exists
6082 
+		if (!$option_value) update_option($option, $page_found);
6083 
+		return;
6084 
+	endif;
6085 
+
6086 
+	$page_data = array(
6087 
+		'post_status' => $status,
6088 
+		'post_type' => 'page',
6089 
+		'post_author' => $current_user->ID,
6090 
+		'post_name' => $slug,
6091 
+		'post_title' => $page_title,
6092 
+		'post_content' => $page_content,
6093 
+		'post_parent' => $post_parent,
6094 
+		'comment_status' => 'closed'
6095 
+	);
6096 
+	$page_id = wp_insert_post($page_data);
6097 
+
6098 
+	add_option($option, $page_id);
6099 6099
6100 6100 
 }
6101 6101 
 

@@ -6126,9 +6126,9 @@  discard block
 
 block discarded – undo
6126 6126 
  * @package GeoDirectory
6127 6127 
  */
6128 6128 
 function geodir_admin_upgrade_notice() {
6129 
-    $class = "error";
6130 
-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
6131 
-    echo"<div class=\"$class\"> <p>$message</p></div>";
6129 
+	$class = "error";
6130 
+	$message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
6131 
+	echo"<div class=\"$class\"> <p>$message</p></div>";
6132 6132 
 }
6133 6133
6134 6134 
 /**

@@ -6141,18 +6141,18 @@  discard block
 
 block discarded – undo
6141 6141 
  */
6142 6142 
 function geodire_admin_upgrade_notice( $plugin_data, $r )
6143 6143 
 {
6144 
-    // readme contents
6145 
-    $args = array(
6146 
-        'timeout'     => 15,
6147 
-        'redirection' => 5
6148 
-    );
6149 
-    $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";
6150 
-    $data       = wp_remote_get( $url, $args );
6144 
+	// readme contents
6145 
+	$args = array(
6146 
+		'timeout'     => 15,
6147 
+		'redirection' => 5
6148 
+	);
6149 
+	$url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";
6150 
+	$data       = wp_remote_get( $url, $args );
6151 6151
6152 
-    if (!is_wp_error($data) && $data['response']['code'] == 200) {
6152 
+	if (!is_wp_error($data) && $data['response']['code'] == 200) {
6153 6153
6154 
-        geodir_in_plugin_update_message($data['body']);
6155 
-    }
6154 
+		geodir_in_plugin_update_message($data['body']);
6155 
+	}
6156 6156 
 }
6157 6157
6158 6158 
 

@@ -6160,28 +6160,28 @@  discard block
 
 block discarded – undo
6160 6160 
 * @param string $content http response body
6161 6161 
 */
6162 6162 
 function geodir_in_plugin_update_message($content) {
6163 
-    // Output Upgrade Notice
6164 
-    $matches        = null;
6165 
-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';
6166 
-    $upgrade_notice = '';
6167 
-    if ( preg_match( $regexp, $content, $matches ) ) {
6168 
-        if(empty($matches)){return;}
6169 
-
6170 
-        $version = trim( $matches[1] );
6171 
-        if($version && $version>GEODIRECTORY_VERSION){
6172 
-
6173 
-
6174 
-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
6175 
-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
6176 
-            $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';
6177 
-            foreach ( $notices as $index => $line ) {
6178 
-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
6179 
-            }
6180 
-            $upgrade_notice .= '</div> ';
6181 
-        }
6182 
-        }
6183 
-    }
6184 
-    echo $upgrade_notice;
6163 
+	// Output Upgrade Notice
6164 
+	$matches        = null;
6165 
+	$regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';
6166 
+	$upgrade_notice = '';
6167 
+	if ( preg_match( $regexp, $content, $matches ) ) {
6168 
+		if(empty($matches)){return;}
6169 
+
6170 
+		$version = trim( $matches[1] );
6171 
+		if($version && $version>GEODIRECTORY_VERSION){
6172 
+
6173 
+
6174 
+		$notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
6175 
+		if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
6176 
+			$upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';
6177 
+			foreach ( $notices as $index => $line ) {
6178 
+				$upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
6179 
+			}
6180 
+			$upgrade_notice .= '</div> ';
6181 
+		}
6182 
+		}
6183 
+	}
6184 
+	echo $upgrade_notice;
6185 6185 
 }
6186 6186
6187 6187 
 /**

@@ -6214,19 +6214,19 @@  discard block
 
 block discarded – undo
6214 6214 
  * @param array Listing statuses to be skipped.
6215 6215 
  */
6216 6216 
 function geodir_imex_export_skip_statuses() {
6217 
-    $statuses = array( 'trash', 'auto-draft' );
6217 
+	$statuses = array( 'trash', 'auto-draft' );
6218 6218
6219 
-    /**
6220 
-     * Filter the statuses to skip during GD export listings.
6221 
-     *
6222 
-     * @since 1.6.0
6223 
-     * @package GeoDirectory
6224 
-     *
6225 
-     * @param array $statuses Listing statuses to be skipped.
6226 
-     */
6227 
-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );
6219 
+	/**
6220 
+	 * Filter the statuses to skip during GD export listings.
6221 
+	 *
6222 
+	 * @since 1.6.0
6223 
+	 * @package GeoDirectory
6224 
+	 *
6225 
+	 * @param array $statuses Listing statuses to be skipped.
6226 
+	 */
6227 
+	$statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );
6228 6228
6229 
-    return $statuses;
6229 
+	return $statuses;
6230 6230 
 }
6231 6231
6232 6232 
 /**

@@ -6242,42 +6242,42 @@  discard block
 
 block discarded – undo
6242 6242 
  * @global string $typenow Current post type.
6243 6243 
  */
6244 6244 
 function geodir_admin_dequeue_scripts() {
6245 
-    global $typenow;
6245 
+	global $typenow;
6246 6246
6247 
-    // EDD
6248 
-    if (wp_script_is('jquery-chosen', 'enqueued')) {
6249 
-        wp_dequeue_script('jquery-chosen');
6250 
-    }
6247 
+	// EDD
6248 
+	if (wp_script_is('jquery-chosen', 'enqueued')) {
6249 
+		wp_dequeue_script('jquery-chosen');
6250 
+	}
6251 6251
6252 
-    // Ultimate Addons for Visual Composer
6253 
-    if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {
6254 
-        wp_dequeue_script('ultimate-vc-backend-script');
6255 
-    }
6252 
+	// Ultimate Addons for Visual Composer
6253 
+	if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {
6254 
+		wp_dequeue_script('ultimate-vc-backend-script');
6255 
+	}
6256 6256
6257 
-    // VC editor conflicts
6258 
-    if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) {
6259 
-        wp_dequeue_script('dfd_vc_damin_scripts');
6260 
-    }
6257 
+	// VC editor conflicts
6258 
+	if (class_exists('Vc_Role_Access_Controller') && wp_script_is('dfd_vc_damin_scripts', 'enqueued')) {
6259 
+		wp_dequeue_script('dfd_vc_damin_scripts');
6260 
+	}
6261 6261
6262 
-    // Ultimate chosen
6263 
-    if (wp_script_is('ultimate-chosen-script', 'enqueued')) {
6264 
-        wp_dequeue_script('ultimate-chosen-script');
6265 
-    }
6262 
+	// Ultimate chosen
6263 
+	if (wp_script_is('ultimate-chosen-script', 'enqueued')) {
6264 
+		wp_dequeue_script('ultimate-chosen-script');
6265 
+	}
6266 6266
6267 
-    // Crum composer choosen
6268 
-    if (wp_script_is('crum-composer-choosen', 'enqueued')) {
6269 
-        wp_dequeue_script('crum-composer-choosen');
6270 
-    }
6267 
+	// Crum composer choosen
6268 
+	if (wp_script_is('crum-composer-choosen', 'enqueued')) {
6269 
+		wp_dequeue_script('crum-composer-choosen');
6270 
+	}
6271 6271
6272 
-    // Fix conflict Fusion Builder jquery chosen with GD jquery chosen.
6273 
-    if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) {
6274 
-        wp_dequeue_script('fusion_builder_chosen_js');
6275 
-    }
6272 
+	// Fix conflict Fusion Builder jquery chosen with GD jquery chosen.
6273 
+	if (class_exists('FusionBuilder') && wp_script_is('fusion_builder_chosen_js', 'enqueued')) {
6274 
+		wp_dequeue_script('fusion_builder_chosen_js');
6275 
+	}
6276 6276
6277 
-    // Fix conflicts timepicker & setting date value.
6278 
-    if (class_exists('acf') && wp_script_is('acf-timepicker', 'enqueued')) {
6279 
-        wp_dequeue_script('acf-timepicker');
6280 
-    }
6277 
+	// Fix conflicts timepicker & setting date value.
6278 
+	if (class_exists('acf') && wp_script_is('acf-timepicker', 'enqueued')) {
6279 
+		wp_dequeue_script('acf-timepicker');
6280 
+	}
6281 6281 
 }
6282 6282
6283 6283 
 /**

@@ -6293,48 +6293,48 @@  discard block
 
 block discarded – undo
6293 6293 
  * @return string SQL where clause part.
6294 6294 
  */
6295 6295 
 function geodir_imex_get_filter_where($where = '', $post_type = '') {
6296 
-    global $wpdb;
6296 
+	global $wpdb;
6297 6297
6298 
-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;
6298 
+	$filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;
6299 6299
6300 
-    if ( !empty( $filters ) ) {
6301 
-        foreach ( $filters as $field => $value ) {
6302 
-            switch ($field) {
6303 
-                case 'start_date':
6304 
-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";
6305 
-                break;
6306 
-                case 'end_date':
6307 
-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";
6308 
-                break;
6309 
-            }
6310 
-        }
6311 
-    }
6300 
+	if ( !empty( $filters ) ) {
6301 
+		foreach ( $filters as $field => $value ) {
6302 
+			switch ($field) {
6303 
+				case 'start_date':
6304 
+					$where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";
6305 
+				break;
6306 
+				case 'end_date':
6307 
+					$where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";
6308 
+				break;
6309 
+			}
6310 
+		}
6311 
+	}
6312 6312
6313 
-    return $where;
6313 
+	return $where;
6314 6314 
 }
6315 6315 
 add_filter('geodir_get_posts_count', 'geodir_imex_get_filter_where', 10, 2);
6316 6316 
 add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);
6317 6317
6318 6318
6319 6319 
 function geodir_fix_for_primer_theme(){
6320 
-    if(!defined( 'PRIMER_VERSION' )){return;}
6321 
-    global $pagenow;
6320 
+	if(!defined( 'PRIMER_VERSION' )){return;}
6321 
+	global $pagenow;
6322 6322
6323 
-    if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) )  ){
6323 
+	if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) )  ){
6324 6324
6325 
-        $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );
6325 
+		$post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );
6326 6326
6327 
-        $post_types = geodir_get_posttypes();
6328 
-        if ($post_type && in_array($post_type, $post_types) ) {
6329 
-            global $primer_customizer_layouts;
6330 
-            remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);
6331 
-        }
6332 
-    }
6327 
+		$post_types = geodir_get_posttypes();
6328 
+		if ($post_type && in_array($post_type, $post_types) ) {
6329 
+			global $primer_customizer_layouts;
6330 
+			remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);
6331 
+		}
6332 
+	}
6333 6333
6334 6334 
 }
6335 6335
6336 6336 
 if(is_admin()){
6337 
-    add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
6337 
+	add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
6338 6338 
 }
6339 6339
6340 6340 
 

@@ -6467,96 +6467,96 @@  discard block
 
 block discarded – undo
6467 6467
6468 6468 
 function geodir_ga_activation_url() {
6469 6469
6470 
-    return add_query_arg( array(
6471 
-        'next'          => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
6472 
-        'scope'         => GEODIR_GA_SCOPE,
6473 
-        'response_type' => 'code',
6474 
-        'redirect_uri'  => GEODIR_GA_REDIRECT,
6475 
-        'client_id'     => GEODIR_GA_CLIENTID,
6476 
-    ), 'https://accounts.google.com/o/oauth2/auth' );
6470 
+	return add_query_arg( array(
6471 
+		'next'          => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
6472 
+		'scope'         => GEODIR_GA_SCOPE,
6473 
+		'response_type' => 'code',
6474 
+		'redirect_uri'  => GEODIR_GA_REDIRECT,
6475 
+		'client_id'     => GEODIR_GA_CLIENTID,
6476 
+	), 'https://accounts.google.com/o/oauth2/auth' );
6477 6477
6478 
-    return $url;
6478 
+	return $url;
6479 6479 
 }
6480 6480
6481 6481 
 function geodir_gd_accounts(){
6482 
-    $accounts = array();
6483 
-    $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true );
6484 
-    if($useAuth){
6485 
-        try {
6486 
-            $accounts = geodir_ga_get_analytics_accounts();
6487 
-        } catch (Exception $e) {
6488 
-            geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );
6489 
-        }
6482 
+	$accounts = array();
6483 
+	$useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true );
6484 
+	if($useAuth){
6485 
+		try {
6486 
+			$accounts = geodir_ga_get_analytics_accounts();
6487 
+		} catch (Exception $e) {
6488 
+			geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );
6489 
+		}
6490 6490
6491 
-        if(is_array($accounts)){
6492 
-            $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
6493 
-        }elseif(get_option('geodir_ga_account_id')){
6494 
-            $accounts = array();
6495 
-            $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
6496 
-        }
6497 
-    }
6498 
-    return $accounts;
6491 
+		if(is_array($accounts)){
6492 
+			$accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
6493 
+		}elseif(get_option('geodir_ga_account_id')){
6494 
+			$accounts = array();
6495 
+			$accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
6496 
+		}
6497 
+	}
6498 
+	return $accounts;
6499 6499 
 }
6500 6500
6501 6501 
 function geodir_ga_get_analytics_accounts()
6502 6502 
 {
6503 
-    global $gd_ga_errors;
6504 
-    $accounts = array();
6503 
+	global $gd_ga_errors;
6504 
+	$accounts = array();
6505 6505
6506 
-    if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
6506 
+	if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
6507 6507
6508 6508
6509 
-    if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
6510 
-      return get_option('geodir_gd_uids');
6511 
-    }
6509 
+	if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
6510 
+	  return get_option('geodir_gd_uids');
6511 
+	}
6512 6512
6513 
-    # Create a new Gdata call
6514 
-    if ( trim(get_option('geodir_ga_auth_code')) != '' )
6515 
-        $stats = new GDGoogleAnalyticsStats();
6516 
-    else
6517 
-        return false;
6513 
+	# Create a new Gdata call
6514 
+	if ( trim(get_option('geodir_ga_auth_code')) != '' )
6515 
+		$stats = new GDGoogleAnalyticsStats();
6516 
+	else
6517 
+		return false;
6518 6518
6519 
-    # Check if Google sucessfully logged in
6520 
-    if ( ! $stats->checkLogin() )
6521 
-        return false;
6519 
+	# Check if Google sucessfully logged in
6520 
+	if ( ! $stats->checkLogin() )
6521 
+		return false;
6522 6522
6523 
-    # Get a list of accounts
6524 
-    try {
6525 
-        $accounts = $stats->getAllProfiles();
6526 
-    } catch (Exception $e) {
6527 
-        $gd_ga_errors[] = $e->getMessage();
6528 
-        return false;
6529 
-    }
6523 
+	# Get a list of accounts
6524 
+	try {
6525 
+		$accounts = $stats->getAllProfiles();
6526 
+	} catch (Exception $e) {
6527 
+		$gd_ga_errors[] = $e->getMessage();
6528 
+		return false;
6529 
+	}
6530 6530
6531 6531
6532 
-    natcasesort ($accounts);
6532 
+	natcasesort ($accounts);
6533 6533
6534 
-    # Return the account array if there are accounts
6535 
-    if ( count($accounts) > 0 ){
6536 
-        update_option('geodir_gd_uids',$accounts);
6537 
-        return $accounts;
6538 
-    }
6539 
-    else
6540 
-        return false;
6534 
+	# Return the account array if there are accounts
6535 
+	if ( count($accounts) > 0 ){
6536 
+		update_option('geodir_gd_uids',$accounts);
6537 
+		return $accounts;
6538 
+	}
6539 
+	else
6540 
+		return false;
6541 6541 
 }
6542 6542
6543 6543 
 add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' );
6544 6544 
 function geodir_ga_deauthorize(){
6545 6545
6546 
-    if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
6546 
+	if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
6547 6547
6548 
-        die( 'Security check' );
6548 
+		die( 'Security check' );
6549 6549
6550 
-    } else {
6551 
-        update_option('geodir_ga_auth_token','');
6552 
-        update_option('geodir_ga_auth_code','');
6553 
-        update_option('geodir_gd_uids','');
6550 
+	} else {
6551 
+		update_option('geodir_ga_auth_token','');
6552 
+		update_option('geodir_ga_auth_code','');
6553 
+		update_option('geodir_gd_uids','');
6554 6554
6555 6555
6556 
-        echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
6557 
-    }
6556 
+		echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
6557 
+	}
6558 6558
6559 
-    die();
6559 
+	die();
6560 6560 
 }
6561 6561
6562 6562 
 

@@ -6567,12 +6567,12 @@  discard block
 
 block discarded – undo
6567 6567 
  * @package GeoDirectory
6568 6568 
  */
6569 6569 
 function geodir_post_type_setting_fun() {
6570 
-    $post_type_arr = array();
6570 
+	$post_type_arr = array();
6571 6571
6572 
-    $post_types = geodir_get_posttypes('object');
6572 
+	$post_types = geodir_get_posttypes('object');
6573 6573
6574 
-    foreach ($post_types as $key => $post_types_obj) {
6575 
-        $post_type_arr[$key] = $post_types_obj->labels->singular_name;
6576 
-    }
6577 
-    return $post_type_arr;
6574 
+	foreach ($post_types as $key => $post_types_obj) {
6575 
+		$post_type_arr[$key] = $post_types_obj->labels->singular_name;
6576 
+	}
6577 
+	return $post_type_arr;
6578 6578 
 }
6579 6579 
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +935 added lines, -935 removed lines patch added patch discarded remove patch 
@@ -28,31 +28,31 @@  discard block
 
 block discarded – undo
28 28 
      * @package GeoDirectory
29 29 
      */
30 30 
     function geodir_admin_styles() {
31 
-        wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
31 
+        wp_register_style('geodirectory-admin-css', geodir_plugin_url().'/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);
32 32 
         wp_enqueue_style('geodirectory-admin-css');
33 33
34 
-        wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
34 
+        wp_register_style('geodirectory-frontend-style', geodir_plugin_url().'/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);
35 35 
         wp_enqueue_style('geodirectory-frontend-style');
36 36
37 
-        wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
37 
+        wp_register_style('geodir-chosen-style', geodir_plugin_url().'/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);
38 38 
         wp_enqueue_style('geodir-chosen-style');
39 39
40 
-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
40 
+        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url().'/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);
41 41 
         wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');
42 42
43 
-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
43 
+        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url().'/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);
44 44 
         wp_enqueue_style('geodirectory-jquery-ui-css');
45 45
46 
-        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
46 
+        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url().'/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);
47 47 
         wp_enqueue_style('geodirectory-custom-fields-css');
48 48
49 
-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
49 
+        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url().'/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);
50 50 
         wp_enqueue_style('geodirectory-pluplodar-css');
51 51
52 
-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
52 
+        wp_register_style('geodir-rating-style', geodir_plugin_url().'/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);
53 53 
         wp_enqueue_style('geodir-rating-style');
54 54
55 
-        wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
55 
+        wp_register_style('geodir-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);
56 56 
         wp_enqueue_style('geodir-rtl-style');
57 57 
     }
58 58 
 }

@@ -70,7 +70,7 @@  discard block
 
 block discarded – undo
70 70 
         wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);
71 71 
         wp_enqueue_style('font-awesome');
72 72
73 
-        wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
73 
+        wp_register_script('geodirectory-admin', geodir_plugin_url().'/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);
74 74 
         wp_enqueue_script('geodirectory-admin');
75 75
76 76 
     }

@@ -89,60 +89,60 @@  discard block
 
 block discarded – undo
89 89
90 90 
         wp_enqueue_script('jquery');
91 91
92 
-        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);
92 
+        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);
93 93
94 
-        wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
94 
+        wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);
95 95 
         wp_enqueue_script('chosen');
96 96
97 
-        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
97 
+        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);
98 98 
         wp_enqueue_script('geodirectory-choose-ajax');
99 99
100 100 
         if (isset($_REQUEST['listing_type'])) {
101 
-            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
101 
+            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url().'/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);
102 102 
         }
103 103
104 104 
         wp_enqueue_script('geodirectory-custom-fields-script');
105 
-        $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';
105 
+        $plugin_path = geodir_plugin_url().'/geodirectory-functions/cat-meta-functions';
106 106
107 
-        wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);
107 
+        wp_enqueue_script('tax-meta-clss', $plugin_path.'/js/tax-meta-clss.js', array('jquery'), null, true);
108 108
109 109 
         if (in_array($geodir_map_name, array('auto', 'google'))) {
110 
-            $map_lang = "&language=" . geodir_get_map_default_language();
111 
-            $map_key = "&key=" . geodir_get_map_api_key();
110 
+            $map_lang = "&language=".geodir_get_map_default_language();
111 
+            $map_key = "&key=".geodir_get_map_api_key();
112 112 
             /** This filter is documented in geodirectory_template_tags.php */
113 113 
             $map_extra = apply_filters('geodir_googlemap_script_extra', '');
114 
-            wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);
114 
+            wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);
115 115 
         }
116 116
117 117 
         if ($geodir_map_name == 'osm') {
118 118 
             // Leaflet OpenStreetMap
119 
-            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
119 
+            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);
120 120 
             wp_enqueue_style('geodirectory-leaflet-style');
121 121
122 
-            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
122 
+            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);
123 123 
             wp_enqueue_script('geodirectory-leaflet-script');
124 124
125 
-            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
125 
+            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);
126 126 
             wp_enqueue_script('geodirectory-leaflet-geo-script');
127 127 
         }
128 
-        wp_enqueue_script( 'jquery-ui-autocomplete' );
128 
+        wp_enqueue_script('jquery-ui-autocomplete');
129 129
130 
-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);
130 
+        wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);
131 131 
         wp_enqueue_script('geodirectory-goMap-script');
132 132
133 
-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
133 
+        wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);
134 134 
         wp_enqueue_script('geodirectory-goMap-script');
135 135
136 136 
 		// font awesome rating script
137 137 
 		if (get_option('geodir_reviewrating_enable_font_awesome')) {
138 
-			wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);
138 
+			wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);
139 139 
 			wp_enqueue_script('geodir-barrating-js');
140 140 
 		} else { // default rating script
141 
-			wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);
141 
+			wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);
142 142 
 			wp_enqueue_script('geodir-jRating-js');
143 143 
 		}
144 144
145 
-        wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
145 
+        wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js', array(), GEODIRECTORY_VERSION);
146 146 
         wp_enqueue_script('geodir-on-document-load');
147 147
148 148 
 

@@ -150,7 +150,7 @@  discard block
 
 block discarded – undo
150 150 
         wp_enqueue_script('plupload-all');
151 151 
         wp_enqueue_script('jquery-ui-sortable');
152 152
153 
-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
153 
+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);
154 154 
         wp_enqueue_script('geodirectory-plupload-script');
155 155
156 156 
         // SCRIPT FOR UPLOAD END

@@ -204,7 +204,7 @@  discard block
 
 block discarded – undo
204 204 
         wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);
205 205
206 206
207 
-        wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
207 
+        wp_register_script('geodirectory-admin-script', geodir_plugin_url().'/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);
208 208 
         wp_enqueue_script('geodirectory-admin-script');
209 209
210 210 
         wp_enqueue_style('farbtastic');

@@ -212,10 +212,10 @@  discard block
 
 block discarded – undo
212 212
213 213 
         $screen = get_current_screen();
214 214 
         if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {
215 
-            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');
215 
+            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation_admin.js');
216 216 
         }
217 217
218 
-        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));
218 
+        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl').'?geodir_ajax=true')));
219 219 
         wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);
220 220
221 221 
     }

@@ -238,7 +238,7 @@  discard block
 
 block discarded – undo
238 238
239 239 
         if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');
240 240
241 
-        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');
241 
+        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url().'/geodirectory-assets/images/favicon.ico', '55.1984');
242 242
243 243
244 244 
     }

@@ -272,7 +272,7 @@  discard block
 
 block discarded – undo
272 272 
                 $geodir_menu_order[] = 'separator-geodirectory';
273 273 
                 if (!empty($post_types)) {
274 274 
                     foreach ($post_types as $post_type) {
275 
-                        $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;
275 
+                        $geodir_menu_order[] = 'edit.php?post_type='.$post_type;
276 276 
                     }
277 277 
                 }
278 278 
                 $geodir_menu_order[] = $item;

@@ -315,8 +315,8 @@  discard block
 
 block discarded – undo
315 315 
 {
316 316 
     if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {
317 317 
         echo '<div id="message" class="updated fade">
318 
-                        <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>
319 
-                        <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>
318 
+                        <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>
319 
+                        <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory').'</strong></p>
320 320 
                 </div>';
321 321
322 322 
     }

@@ -324,7 +324,7 @@  discard block
 
 block discarded – undo
324 324 
     if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {
325 325 
         switch ($_REQUEST['msg']) {
326 326 
             case 'success':
327 
-                echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';
327 
+                echo '<div id="message" class="updated fade"><p><strong>'.__('Your settings have been saved.', 'geodirectory').'</strong></p></div>';
328 328 
                 flush_rewrite_rules(false);
329 329
330 330 
                 break;

@@ -332,30 +332,30 @@  discard block
 
 block discarded – undo
332 332 
 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';
333 333
334 334 
 				if ($gderr == 21)
335 
-			    	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>';
335 
+			    	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>';
336 336 
 				else
337 
-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
337 
+					echo '<div id="message" class="error fade"><p><strong>'.__('Error: Your settings have not been saved, please try again.', 'geodirectory').'</strong></p></div>';
338 338 
                 break;
339 339 
         }
340 340 
     }
341 341
342 342 
     $geodir_load_map = get_option('geodir_load_map');
343 343 
     $need_map_key = false;
344 
-    if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){
344 
+    if ($geodir_load_map == '' || $geodir_load_map == 'google' || $geodir_load_map == 'auto') {
345 345 
         $need_map_key = true;
346 346 
     }
347 347
348 348 
     if (!geodir_get_map_api_key() && $need_map_key) {
349 
-        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>';
349 
+        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>';
350 350 
     }
351 351
352 352 
     if (!geodir_is_default_location_set()) {
353 
-        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>';
353 
+        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>';
354 354
355 355 
     }
356 356
357 357 
     if (!function_exists('curl_init')) {
358 
-        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>';
358 
+        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>';
359 359
360 360 
     }
361 361 
 

@@ -375,18 +375,18 @@  discard block
 
 block discarded – undo
375 375 
 function geodir_handle_option_form_submit($current_tab)
376 376 
 {
377 377 
     global $geodir_settings;
378 
-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {
378 
+    if (file_exists(dirname(__FILE__).'/option-pages/'.$current_tab.'_array.php')) {
379 379 
         /**
380 380 
          * Contains settings array for current tab.
381 381 
          *
382 382 
          * @since 1.0.0
383 383 
          * @package GeoDirectory
384 384 
          */
385 
-        include_once('option-pages/' . $current_tab . '_array.php');
385 
+        include_once('option-pages/'.$current_tab.'_array.php');
386 386 
     }
387 387 
     if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :
388 388 
         if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
389 
-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
389 
+        if (!wp_verify_nonce($_REQUEST['_wpnonce-'.$current_tab], 'geodir-settings-'.$current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
390 390
391 391 
 		/**
392 392 
 		 * Fires before updating geodirectory admin settings.

@@ -419,13 +419,13 @@  discard block
 
 block discarded – undo
419 419 
          * @param string $current_tab The current settings tab name.
420 420 
          * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.
421 421 
          */
422 
-        do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);
422 
+        do_action('geodir_update_options_'.$current_tab, $geodir_settings[$current_tab]);
423 423
424 424 
         flush_rewrite_rules(false);
425 425
426 426 
         $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';
427 427
428 
-        $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');
428 
+        $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$_REQUEST['active_tab'].'&msg=success');
429 429
430 430 
         wp_redirect($redirect_url);
431 431 
         exit();

@@ -464,18 +464,18 @@  discard block
 
 block discarded – undo
464 464
465 465 
         elseif (isset($value['type']) && $value['type'] == 'image_width') :
466 466
467 
-            if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {
468 
-                update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);
469 
-                update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);
470 
-                if (isset($_POST[$value['id'] . '_crop'])) :
471 
-                    update_option($value['id'] . '_crop', 1);
467 
+            if (isset($value['id']) && isset($_POST[$value['id'].'_width'])) {
468 
+                update_option($value['id'].'_width', $_POST[$value['id'].'_width']);
469 
+                update_option($value['id'].'_height', $_POST[$value['id'].'_height']);
470 
+                if (isset($_POST[$value['id'].'_crop'])) :
471 
+                    update_option($value['id'].'_crop', 1);
472 472 
                 else :
473 
-                    update_option($value['id'] . '_crop', 0);
473 
+                    update_option($value['id'].'_crop', 0);
474 474 
                 endif;
475 475 
             } else {
476 
-                update_option($value['id'] . '_width', $value['std']);
477 
-                update_option($value['id'] . '_height', $value['std']);
478 
-                update_option($value['id'] . '_crop', 1);
476 
+                update_option($value['id'].'_width', $value['std']);
477 
+                update_option($value['id'].'_height', $value['std']);
478 
+                update_option($value['id'].'_crop', 1);
479 479 
             }
480 480
481 481 
         elseif (isset($value['type']) && $value['type'] == 'map') :

@@ -517,12 +517,12 @@  discard block
 
 block discarded – undo
517 517 
         elseif (isset($value['type']) && $value['type'] == 'file') :
518 518
519 519
520 
-            if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file
520 
+            if (isset($_POST[$value['id'].'_remove']) && $_POST[$value['id'].'_remove']) {// if remove is set then remove the file
521 521
522 522 
                 if (get_option($value['id'])) {
523 523 
                     $image_name_arr = explode('/', get_option($value['id']));
524 524 
                     $noimg_name = end($image_name_arr);
525 
-                    $img_path = $uploads['path'] . '/' . $noimg_name;
525 
+                    $img_path = $uploads['path'].'/'.$noimg_name;
526 526 
                     if (file_exists($img_path))
527 527 
                         unlink($img_path);
528 528 
                 }

@@ -550,7 +550,7 @@  discard block
 
 block discarded – undo
550 550 
                 if (get_option($value['id'])) {
551 551 
                     $image_name_arr = explode('/', get_option($value['id']));
552 552 
                     $noimg_name = end($image_name_arr);
553 
-                    $img_path = $uploads['path'] . '/' . $noimg_name;
553 
+                    $img_path = $uploads['path'].'/'.$noimg_name;
554 554 
                     if (file_exists($img_path))
555 555 
                         unlink($img_path);
556 556 
                 }

@@ -571,7 +571,7 @@  discard block
 
 block discarded – undo
571 571 
             // same menu setting per theme.
572 572 
             if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {
573 573 
                 $theme = wp_get_theme();
574 
-                update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);
574 
+                update_option('geodir_theme_location_nav_'.$theme->name, $_POST[$value['id']]);
575 575 
             }
576 576
577 577 
             if (isset($value['id']) && isset($_POST[$value['id']])) {

@@ -641,7 +641,7 @@  discard block
 
 block discarded – undo
641 641
642 642 
             $listing_slug = __($geodir_posttype_info['labels']['singular_name'], 'geodirectory');
643 643
644 
-            $tabs[$geodir_post_type . '_fields_settings'] = array(
644 
+            $tabs[$geodir_post_type.'_fields_settings'] = array(
645 645 
                 'label' => wp_sprintf(__('%s Settings', 'geodirectory'), $listing_slug),
646 646 
                 'subtabs' => array(
647 647 
                     array('subtab' => 'custom_fields',

@@ -675,7 +675,7 @@  discard block
 
 block discarded – undo
675 675 
  */
676 676 
 function geodir_tools_setting_tab($tabs)
677 677 
 {
678 
-    wp_enqueue_script( 'jquery-ui-progressbar' );
678 
+    wp_enqueue_script('jquery-ui-progressbar');
679 679 
     $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));
680 680 
     return $tabs;
681 681 
 }

@@ -709,7 +709,7 @@  discard block
 
 block discarded – undo
709 709 
  */
710 710 
 function geodir_extend_geodirectory_setting_tab($tabs)
711 711 
 {
712 
-    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
712 
+    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory').' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');
713 713 
     return $tabs;
714 714 
 }
715 715 
 

@@ -769,8 +769,8 @@  discard block
 
 block discarded – undo
769 769 
                     _e('Unknown', 'geodirectory');
770 770 
                 } else {
771 771 
                     /* If there is a city id, append 'city name' to the text string. */
772 
-                    $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';
773 
-                    echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);
772 
+                    $add_location_id = $location_id > 0 ? ' ('.$location_id.')' : '';
773 
+                    echo(__($location->country, 'geodirectory').'-'.$location->region.'-'.$location->city.$add_location_id);
774 774 
                 }
775 775 
                 break;
776 776 
 

@@ -788,14 +788,14 @@  discard block
 
 block discarded – undo
788 788 
                         $expire_class = 'expire_over';
789 789 
                     }
790 790 
                     $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days
791 
-                    $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';
791 
+                    $date_diff_text = '<br /><span class="'.$expire_class.'">('.$date_diff.' '.$state.')</span>';
792 792 
                 }
793 793 
                 /* If no expire_date is found, output a default message. */
794 794 
                 if (empty($expire_date))
795 795 
                     echo __('Unknown', 'geodirectory');
796 796 
                 /* If there is a expire_date, append 'days left' to the text string. */
797 797 
                 else
798 
-                    echo $expire_date . $date_diff_text;
798 
+                    echo $expire_date.$date_diff_text;
799 799 
                 break;
800 800
801 801 
             /* If displaying the 'categorys' column. */

@@ -862,7 +862,7 @@  discard block
 
 block discarded – undo
862 862 
 function geodir_post_information_save($post_id, $post) {
863 863 
     global $wpdb, $current_user;
864 864
865 
-    if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {
865 
+    if (isset($post->post_type) && ($post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post')) {
866 866 
         return;
867 867 
     }
868 868 
 

@@ -930,7 +930,7 @@  discard block
 
 block discarded – undo
930 930 
                     $tab_id = $value['id'];
931 931
932 932 
                 if (isset($value['desc']) && $value['desc'])
933 
-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';
933 
+                    $desc = '<span style=" text-transform:none;">:- '.$value['desc'].'</span>';
934 934
935 935 
                 if (isset($value['name']) && $value['name']) {
936 936 
                     if ($first_title === true) {

@@ -938,9 +938,9 @@  discard block
 
 block discarded – undo
938 938 
                     } else {
939 939 
                         echo '</div>';
940 940 
                     }
941 
-                    echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';
941 
+                    echo '<dd id="'.trim($tab_id).'" class="geodir_option_tabs" ><a href="javascript:void(0);">'.$value['name'].'</a></dd>';
942 942
943 
-                    echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';
943 
+                    echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';
944 944 
                 }
945 945
946 946 
                 /**

@@ -950,21 +950,21 @@  discard block
 
 block discarded – undo
950 950 
                  *
951 951 
                  * @since 1.0.0
952 952 
                  */
953 
-                do_action('geodir_settings_' . sanitize_title($value['id']));
953 
+                do_action('geodir_settings_'.sanitize_title($value['id']));
954 954 
                 break;
955 955
956 956 
             case 'no_tabs':
957 957
958 958 
                 echo '<div class="inner_content_tab_main">';
959 
-                echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';
959 
+                echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';
960 960
961 961 
                 break;
962 962
963 963 
             case 'sectionstart':
964 964 
                 if (isset($value['desc']) && $value['desc'])
965 
-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';
965 
+                    $desc = '<span style=" text-transform:none;"> - '.$value['desc'].'</span>';
966 966 
                 if (isset($value['name']) && $value['name'])
967 
-                    echo '<h3>' . $value['name'] . $desc . '</h3>';
967 
+                    echo '<h3>'.$value['name'].$desc.'</h3>';
968 968 
                 /**
969 969 
                  * Called after a GeoDirectory settings sectionstart is output in the GD settings page.
970 970 
                  *

@@ -972,8 +972,8 @@  discard block
 
 block discarded – undo
972 972 
                  *
973 973 
                  * @since 1.0.0
974 974 
                  */
975 
-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
976 
-                echo '<table class="form-table">' . "\n\n";
975 
+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_start');
976 
+                echo '<table class="form-table">'."\n\n";
977 977
978 978 
                 break;
979 979 
             case 'sectionend':

@@ -984,7 +984,7 @@  discard block
 
 block discarded – undo
984 984 
                  *
985 985 
                  * @since 1.0.0
986 986 
                  */
987 
-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
987 
+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_end');
988 988 
                 echo '</table>';
989 989 
                 /**
990 990 
                  * Called after a GeoDirectory settings sectionend is output in the GD settings page.

@@ -993,7 +993,7 @@  discard block
 
 block discarded – undo
993 993 
                  *
994 994 
                  * @since 1.0.0
995 995 
                  */
996 
-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
996 
+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_after');
997 997 
                 break;
998 998 
             case 'text':
999 999 
                 ?>

@@ -1002,7 +1002,7 @@  discard block
 
 block discarded – undo
1002 1002 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"
1003 1003 
                                            id="<?php echo esc_attr($value['id']); ?>"
1004 1004 
                                            type="<?php echo esc_attr($value['type']); ?>"
1005 
-                                           <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
1005 
+                                           <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
1006 1006 
                                            style=" <?php echo esc_attr($value['css']); ?>"
1007 1007 
                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
1008 1008 
                                                echo esc_attr(stripslashes(get_option($value['id'])));

@@ -1019,14 +1019,14 @@  discard block
 
 block discarded – undo
1019 1019 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"
1020 1020 
                                            id="<?php echo esc_attr($value['id']); ?>"
1021 1021 
                                            type="<?php echo esc_attr($value['type']); ?>"
1022 
-                                           <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
1022 
+                                           <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
1023 1023 
                                            style=" <?php echo esc_attr($value['css']); ?>"
1024 1024 
                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
1025 1025 
                                                echo esc_attr(stripslashes(get_option($value['id'])));
1026 1026 
                                            } else {
1027 1027 
                                                echo esc_attr($value['std']);
1028 1028 
                                            } ?>"/>
1029 
-                    <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )','geodirectory');?>" ><?php _e('Generate API Key','geodirectory');?></a>
1029 
+                    <a href='https://console.developers.google.com/henhouse/?pb=["hh-1","maps_backend",null,[],"https://developers.google.com",null,["static_maps_backend","street_view_image_backend","maps_embed_backend","places_backend","geocoding_backend","directions_backend","distance_matrix_backend","geolocation","elevation_backend","timezone_backend","maps_backend"],null]&TB_iframe=true&width=600&height=400' class="thickbox button-primary" name="<?php _e('Generate API Key - ( MUST be logged in to your Google account )', 'geodirectory'); ?>" ><?php _e('Generate API Key', 'geodirectory'); ?></a>
1030 1030 
                     <span class="description"><?php echo $value['desc']; ?></span></td>
1031 1031 
                 </tr><?php
1032 1032 
                 break;

@@ -1038,7 +1038,7 @@  discard block
 
 block discarded – undo
1038 1038 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"
1039 1039 
                                            id="<?php echo esc_attr($value['id']); ?>"
1040 1040 
                                            type="<?php echo esc_attr($value['type']); ?>"
1041 
-                                           <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
1041 
+                                           <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
1042 1042 
                                            style="<?php echo esc_attr($value['css']); ?>"
1043 1043 
                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {
1044 1044 
                                                echo esc_attr(stripslashes(get_option($value['id'])));

@@ -1084,17 +1084,17 @@  discard block
 
 block discarded – undo
1084 1084 
                     <?php _e('Width', 'geodirectory'); ?> <input
1085 1085 
                         name="<?php echo esc_attr($value['id']); ?>_width"
1086 1086 
                         id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"
1087 
-                        value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>
1087 
+                        value="<?php if ($size = get_option($value['id'].'_width')) echo stripslashes($size); else echo $value['std']; ?>"/>
1088 1088
1089 1089 
                     <?php _e('Height', 'geodirectory'); ?> <input
1090 1090 
                         name="<?php echo esc_attr($value['id']); ?>_height"
1091 1091 
                         id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"
1092 
-                        value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>
1092 
+                        value="<?php if ($size = get_option($value['id'].'_height')) echo stripslashes($size); else echo $value['std']; ?>"/>
1093 1093
1094 1094 
                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input
1095 1095 
                             name="<?php echo esc_attr($value['id']); ?>_crop"
1096 1096 
                             id="<?php echo esc_attr($value['id']); ?>_crop"
1097 
-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>
1097 
+                            type="checkbox" <?php if (get_option($value['id'].'_crop') != '') checked(get_option($value['id'].'_crop'), 1); else checked(1); ?> /></label>
1098 1098
1099 1099 
                     <span class="description"><?php echo $value['desc'] ?></span></td>
1100 1100 
                 </tr><?php

@@ -1144,7 +1144,7 @@  discard block
 
 block discarded – undo
1144 1144 
                                             id="<?php echo esc_attr($value['id']); ?>"
1145 1145 
                                             style="<?php echo esc_attr($value['css']); ?>"
1146 1146 
                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"
1147 
-                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"
1147 
+                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text']; ?>"
1148 1148 
                                             option-ajaxchosen="false">
1149 1149 
                         <?php
1150 1150 
                         foreach ($value['options'] as $key => $val) {

@@ -1154,7 +1154,7 @@  discard block
 
 block discarded – undo
1154 1154 
                                 ?></optgroup><?php
1155 1155 
                             } else {
1156 1156 
                                 ?>
1157 
-                                <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>>
1157 
+                                <option value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values))); ?>>
1158 1158 
                                     <?php echo geodir_utf8_ucfirst($val) ?>
1159 1159 
                                 </option>
1160 1160 
                             <?php

@@ -1191,7 +1191,7 @@  discard block
 
 block discarded – undo
1191 1191 
                 ?>
1192 1192
1193 1193 
                 <tr valign="top">
1194 
-                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>
1194 
+                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory'); ?></th>
1195 1195 
                     <td width="60%">
1196 1196 
                         <select name="geodir_default_map_language" style="width:60%">
1197 1197 
                             <?php

@@ -1273,7 +1273,7 @@  discard block
 
 block discarded – undo
1273 1273
1274 1274 
                 <tr valign="top">
1275 1275 
                     <th class="titledesc"
1276 
-                        width="40%"><?php _e('Default post type search on map', 'geodirectory');?></th>
1276 
+                        width="40%"><?php _e('Default post type search on map', 'geodirectory'); ?></th>
1277 1277 
                     <td width="60%">
1278 1278 
                         <select name="geodir_default_map_search_pt" style="width:60%">
1279 1279 
                             <?php

@@ -1314,7 +1314,7 @@  discard block
 
 block discarded – undo
1314 1314 
                         $cat_display = 'checkbox';
1315 1315 
                         $gd_post_types = get_option('geodir_exclude_post_type_on_map');
1316 1316 
                         $gd_cats = get_option('geodir_exclude_cat_on_map');
1317 
-                        $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');
1317 
+                        $gd_cats_upgrade = (int) get_option('geodir_exclude_cat_on_map_upgrade');
1318 1318 
                         $count = 1;
1319 1319 
                         ?>
1320 1320 
                         <table width="70%" class="widefat">

@@ -1343,7 +1343,7 @@  discard block
 
 block discarded – undo
1343 1343 
                                                                                            name="home_map_post_types[]"
1344 1344 
                                                                                            id="<?php echo esc_attr($value['id']); ?>"
1345 1345 
                                                                                            value="<?php echo $key; ?>"
1346 
-                                                                                           class="map_post_type" <?php echo $checked;?> />
1346 
+                                                                                           class="map_post_type" <?php echo $checked; ?> />
1347 1347 
                                         <?php echo __($post_types_obj->labels->singular_name, 'geodirectory'); ?></td>
1348 1348 
                                     <td width="40%">
1349 1349 
                                         <div class="home_map_category" style="overflow:auto;width:200px;height:100px;"

@@ -1401,12 +1401,12 @@  discard block
 
 block discarded – undo
1401 1401 
                 ?>
1402 1402 
                 <fieldset>
1403 1403 
                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>
1404 
-                    <label for="<?php echo $value['id'];?>">
1404 
+                    <label for="<?php echo $value['id']; ?>">
1405 1405 
                         <input name="<?php echo esc_attr($value['id']); ?>"
1406 
-                               id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"
1406 
+                               id="<?php echo esc_attr($value['id'].$value['value']); ?>" type="radio"
1407 1407 
                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {
1408 1408 
                             echo 'checked="checked"';
1409 
-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />
1409 
+                        }elseif (get_option($value['id']) == '' && $value['std'] == $value['value']) {echo 'checked="checked"'; } ?> />
1410 1410 
                         <?php echo $value['desc']; ?></label><br>
1411 1411 
                 </fieldset>
1412 1412 
                 <?php

@@ -1426,9 +1426,9 @@  discard block
 
 block discarded – undo
1426 1426 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1427 1427 
                 <td class="forminp">
1428 1428 
                     <textarea
1429 
-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"
1429 
+                        <?php if (isset($value['args'])) echo $value['args'].' '; ?>name="<?php echo esc_attr($value['id']); ?>"
1430 1430 
                         id="<?php echo esc_attr($value['id']); ?>"
1431 
-                        <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
1431 
+                        <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>
1432 1432 
                         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
1433 1433 
                         class="description"><?php echo $value['desc'] ?></span>
1434 1434 
 

@@ -1473,7 +1473,7 @@  discard block
 
 block discarded – undo
1473 1473 
 					}
1474 1474 
 				}
1475 1475 
 				//
1476 
-				$page_setting = (int)get_option($value['id']);
1476 
+				$page_setting = (int) get_option($value['id']);
1477 1477
1478 1478 
                 $args = array('name' => $value['id'],
1479 1479 
                     'id' => $value['id'],

@@ -1490,7 +1490,7 @@  discard block
 
 block discarded – undo
1490 1490 
                 <tr valign="top" class="single_select_page">
1491 1491 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>
1492 1492 
                 <td class="forminp">
1493 
-                    <?php echo str_replace(' id=', " data-placeholder='" . __('Select a page...', 'geodirectory') . "' style='" . $value['css'] . "' class='" . $value['class'] . "' " . $disabled . " id=", wp_dropdown_pages($args)); ?>
1493 
+                    <?php echo str_replace(' id=', " data-placeholder='".__('Select a page...', 'geodirectory')."' style='".$value['css']."' class='".$value['class']."' ".$disabled." id=", wp_dropdown_pages($args)); ?>
1494 1494 
                     <span class="description"><?php echo $value['desc'] ?></span>
1495 1495 
                 </td>
1496 1496 
                 </tr><?php

@@ -1499,7 +1499,7 @@  discard block
 
 block discarded – undo
1499 1499 
 				}
1500 1500 
                 break;
1501 1501 
             case 'single_select_country' :
1502 
-                $country_setting = (string)get_option($value['id']);
1502 
+                $country_setting = (string) get_option($value['id']);
1503 1503 
                 if (strstr($country_setting, ':')) :
1504 1504 
                     $country = current(explode(':', $country_setting));
1505 1505 
                     $state = end(explode(':', $country_setting));

@@ -1522,7 +1522,7 @@  discard block
 
 block discarded – undo
1522 1522 
             case 'multi_select_countries' :
1523 1523 
                 $countries = $geodirectory->countries->countries;
1524 1524 
                 asort($countries);
1525 
-                $selections = (array)get_option($value['id']);
1525 
+                $selections = (array) get_option($value['id']);
1526 1526 
                 ?>
1527 1527 
                 <tr valign="top">
1528 1528 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

@@ -1532,7 +1532,7 @@  discard block
 
 block discarded – undo
1532 1532 
                             title="Country" class="chosen_select">
1533 1533 
                         <?php
1534 1534 
                         if ($countries) foreach ($countries as $key => $val) :
1535 
-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';
1535 
+                            echo '<option value="'.$key.'" '.selected(in_array($key, $selections), true, false).'>'.$val.'</option>';
1536 1536 
                         endforeach;
1537 1537 
                         ?>
1538 1538 
                     </select>

@@ -1544,7 +1544,7 @@  discard block
 
 block discarded – undo
1544 1544 
                 break;
1545 1545
1546 1546 
             case 'google_analytics' :
1547 
-                $selections = (array)get_option($value['id']);
1547 
+                $selections = (array) get_option($value['id']);
1548 1548 
                     ?>
1549 1549 
                     <tr valign="top">
1550 1550 
                         <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

@@ -1555,30 +1555,30 @@  discard block
 
 block discarded – undo
1555 1555
1556 1556 
                             $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";
1557 1557 
                             $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";
1558 
-                            $state = "&state=123";//any string
1559 
-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
1558 
+                            $state = "&state=123"; //any string
1559 
+                            $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";
1560 1560 
                             $response_type = "&response_type=code";
1561 1561 
                             $client_id = "&client_id=".get_option('geodir_ga_client_id');
1562 1562 
                             $access_type = "&access_type=offline";
1563 1563 
                             $approval_prompt = "&approval_prompt=force";
1564 1564
1565 
-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;
1565 
+                            $auth_url = $oAuthURL.$scope.$state.$redirect_uri.$response_type.$client_id.$access_type.$approval_prompt;
1566 1566
1567 1567
1568 1568 
                             if (get_option('geodir_ga_auth_token')) {
1569 1569 
                                 ?>
1570 1570 
                                 <span class="button-primary"
1571 
-                                      onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize');?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
1571 
+                                      onclick="gd_GA_Deauthorize('<?php echo wp_create_nonce('gd_ga_deauthorize'); ?>');"><?php _e('Deauthorize', 'geodirectory'); ?></span>
1572 1572 
                                 <span style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>
1573 1573 
                             <?php
1574 1574 
                                 global $gd_ga_errors;
1575 
-                                if(!empty($gd_ga_errors)){
1575 
+                                if (!empty($gd_ga_errors)) {
1576 1576 
                                     print_r($gd_ga_errors);
1577 1577 
                                 }
1578 1578 
                             } else {
1579 1579 
                                 ?>
1580 1580 
                                 <span class="button-primary"
1581 
-                                      onclick="window.open('<?php echo  geodir_ga_activation_url();?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory');?></span>
1581 
+                                      onclick="window.open('<?php echo  geodir_ga_activation_url(); ?>', 'activate','width=700, height=600, menubar=0, status=0, location=0, toolbar=0')"><?php _e('Authorize', 'geodirectory'); ?></span>
1582 1582 
                             <?php
1583 1583 
                             }
1584 1584 
                             ?>

@@ -1649,9 +1649,9 @@  discard block
 
 block discarded – undo
1649 1649
1650 1650 
             <?php if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] != '') { ?>
1651 1651 
             jQuery('.geodir_option_tabs').removeClass('gd-tab-active');
1652 
-            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').addClass('gd-tab-active');
1652 
+            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').addClass('gd-tab-active');
1653 1653 
             jQuery('.gd-content-heading').hide();
1654 
-            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').show();
1654 
+            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').show();
1655 1655 
             <?php } ?>
1656 1656 
         });
1657 1657 
     </script>

@@ -1737,7 +1737,7 @@  discard block
 
 block discarded – undo
1737 1737 
     wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');
1738 1738
1739 1739 
     if (geodir_get_featured_image($post_id, 'thumbnail')) {
1740 
-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';
1740 
+        echo '<h4>'.__('Featured Image', 'geodirectory').'</h4>';
1741 1741 
         geodir_show_featured_image($post_id, 'thumbnail');
1742 1742 
     }
1743 1743 
 

@@ -1748,13 +1748,13 @@  discard block
 
 block discarded – undo
1748 1748
1749 1749 
     <h5 class="form_title">
1750 1750 
         <?php if ($image_limit != 0 && $image_limit == 1) {
1751 
-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';
1751 
+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';
1752 1752 
         } ?>
1753 1753 
         <?php if ($image_limit != 0 && $image_limit > 1) {
1754 
-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';
1754 
+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';
1755 1755 
         } ?>
1756 1756 
         <?php if ($image_limit == 0) {
1757 
-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';
1757 
+            echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';
1758 1758 
         } ?>
1759 1759 
     </h5>
1760 1760 
 

@@ -1793,10 +1793,10 @@  discard block
 
 block discarded – undo
1793 1793 
         <div
1794 1794 
             class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"
1795 1795 
             id="<?php echo $id; ?>plupload-upload-ui">
1796 
-            <h4><?php _e('Drop files to upload', 'geodirectory');?></h4>
1796 
+            <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4>
1797 1797 
             <input id="<?php echo $id; ?>plupload-browse-button" type="button"
1798 1798 
                    value="<?php _e('Select Files', 'geodirectory'); ?>" class="button"/>
1799 
-            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span>
1799 
+            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span>
1800 1800 
             <?php if ($width && $height): ?>
1801 1801 
                 <span class="plupload-resize"></span>
1802 1802 
                 <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span>

@@ -1808,7 +1808,7 @@  discard block
 
 block discarded – undo
1808 1808 
              id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">
1809 1809 
         </div>
1810 1810 
         <span
1811 
-            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory');?></span>
1811 
+            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory'); ?></span>
1812 1812 
         <span id="<?php echo $id; ?>upload-error" style="display:none"></span>
1813 1813 
     </div>
1814 1814 
 

@@ -2018,9 +2018,9 @@  discard block
 
 block discarded – undo
2018 2018 
     $plugin = 'avada-nag';
2019 2019 
     $timestamp = 'avada-nag1234';
2020 2020 
     $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');
2021 
-    echo '<div id="' . $timestamp . '"  class="error">';
2022 
-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';
2023 
-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";
2021 
+    echo '<div id="'.$timestamp.'"  class="error">';
2022 
+    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\''.$plugin.'\',\''.$timestamp.'\');" ><i class="fa fa-times"></i></span>';
2023 
+    echo "<img class='gd-icon-noti' src='".plugin_dir_url('')."geodirectory/geodirectory-assets/images/favicon.ico' > ";
2024 2024 
     echo "<p>$message</p>";
2025 2025 
     echo "</div>";
2026 2026 
 

@@ -2154,7 +2154,7 @@  discard block
 
 block discarded – undo
2154 2154
2155 2155 
 		// Don't allow same slug url for listing and location
2156 2156 
 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {
2157 
-			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');
2157 
+			$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab.'&msg=fail&gderr=21');
2158 2158 
         	wp_redirect($redirect_url);
2159 2159 
 			exit;
2160 2160 
 		}

@@ -2166,7 +2166,7 @@  discard block
 
 block discarded – undo
2166 2166 
 			$default_language = $sitepress->get_default_language();
2167 2167
2168 2168 
 			if ($current_language != 'all' && $current_language != $default_language) {
2169 
-				$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab);
2169 
+				$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab);
2170 2170 
 				wp_redirect($redirect_url);
2171 2171 
 				exit;
2172 2172 
 			}

@@ -2187,11 +2187,11 @@  discard block
 
 block discarded – undo
2187 2187 
 function geodir_hide_admin_preview_button() {
2188 2188 
     global $post_type;
2189 2189 
     $post_types = geodir_get_posttypes();
2190 
-    if(in_array($post_type, $post_types))
2190 
+    if (in_array($post_type, $post_types))
2191 2191 
         echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
2192 2192 
 }
2193 
-add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );
2194 
-add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );
2193 
+add_action('admin_head-post-new.php', 'geodir_hide_admin_preview_button');
2194 
+add_action('admin_head-post.php', 'geodir_hide_admin_preview_button');
2195 2195
2196 2196 
 /**
2197 2197 
  * Add the tab in left sidebar menu fro import & export page.

@@ -2201,8 +2201,8 @@  discard block
 
 block discarded – undo
2201 2201 
  *
2202 2202 
  * @return array Array of tab data.
2203 2203 
  */
2204 
-function geodir_import_export_tab( $tabs ) {
2205 
-	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );
2204 
+function geodir_import_export_tab($tabs) {
2205 
+	$tabs['import_export'] = array('label' => __('Import & Export', 'geodirectory'));
2206 2206 
     return $tabs;
2207 2207 
 }
2208 2208 
 

@@ -2216,8 +2216,8 @@  discard block
 
 block discarded – undo
2216 2216 
  * @return string Html content.
2217 2217 
  */
2218 2218 
 function geodir_import_export_page() {
2219 
-	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );
2220 
-	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';
2219 
+	$nonce = wp_create_nonce('geodir_import_export_nonce');
2220 
+	$gd_cats_sample_csv = geodir_plugin_url().'/geodirectory-assets/gd_sample_categories.csv';
2221 2221 
     /**
2222 2222 
      * Filter sample category data csv file url.
2223 2223 
      *

@@ -2226,9 +2226,9 @@  discard block
 
 block discarded – undo
2226 2226 
      *
2227 2227 
      * @param string $gd_cats_sample_csv Sample category data csv file url.
2228 2228 
      */
2229 
-	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );
2229 
+	$gd_cats_sample_csv = apply_filters('geodir_export_cats_sample_csv', $gd_cats_sample_csv);
2230 2230
2231 
-	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';
2231 
+	$gd_posts_sample_csv = geodir_plugin_url().'/geodirectory-assets/place_listing.csv';
2232 2232 
     /**
2233 2233 
      * Filter sample post data csv file url.
2234 2234 
      *

@@ -2237,15 +2237,15 @@  discard block
 
 block discarded – undo
2237 2237 
      *
2238 2238 
      * @param string $gd_posts_sample_csv Sample post data csv file url.
2239 2239 
      */
2240 
-    $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );
2240 
+    $gd_posts_sample_csv = apply_filters('geodir_export_posts_sample_csv', $gd_posts_sample_csv);
2241 2241
2242 
-	$gd_posttypes = geodir_get_posttypes( 'array' );
2242 
+	$gd_posttypes = geodir_get_posttypes('array');
2243 2243
2244 2244 
 	$gd_posttypes_option = '';
2245 
-	foreach ( $gd_posttypes as $gd_posttype => $row ) {
2246 
-		$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>';
2245 
+	foreach ($gd_posttypes as $gd_posttype => $row) {
2246 
+		$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>';
2247 2247 
 	}
2248 
-	wp_enqueue_script( 'jquery-ui-progressbar' );
2248 
+	wp_enqueue_script('jquery-ui-progressbar');
2249 2249
2250 2250 
 	$gd_chunksize_options = array();
2251 2251 
 	$gd_chunksize_options[100] = 100;

@@ -2267,50 +2267,50 @@  discard block
 
 block discarded – undo
2267 2267 
      *
2268 2268 
      * @param string $gd_chunksize_options Entries options.
2269 2269 
      */
2270 
-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );
2270 
+    $gd_chunksize_options = apply_filters('geodir_export_csv_chunksize_options', $gd_chunksize_options);
2271 2271
2272 2272 
 	$gd_chunksize_option = '';
2273 2273 
 	foreach ($gd_chunksize_options as $value => $title) {
2274 
-		$gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>';
2274 
+		$gd_chunksize_option .= '<option value="'.$value.'" '.selected($value, 5000, false).'>'.$title.'</option>';
2275 2275 
 	}
2276 2276
2277 2277 
 	$uploads = wp_upload_dir();
2278 
-	$upload_dir = wp_sprintf( CSV_TRANSFER_IMG_FOLDER, str_replace( ABSPATH, '', $uploads['path'] ) );
2278 
+	$upload_dir = wp_sprintf(CSV_TRANSFER_IMG_FOLDER, str_replace(ABSPATH, '', $uploads['path']));
2279 2279 
 ?>
2280 2280 
 </form>
2281 2281 
 <div class="inner_content_tab_main gd-import-export">
2282 
-  <h3><?php _e( 'GD Import & Export CSV', 'geodirectory' ) ;?></h3>
2283 
-  <span class="description"><?php _e( 'Import & export csv for GD listings & categories.', 'geodirectory' ) ;?></span>
2282 
+  <h3><?php _e('GD Import & Export CSV', 'geodirectory'); ?></h3>
2283 
+  <span class="description"><?php _e('Import & export csv for GD listings & categories.', 'geodirectory'); ?></span>
2284 2284 
   <div class="gd-content-heading">
2285 2285
2286 2286 
   <?php
2287 2287 
     ini_set('max_execution_time', 999999);
2288 
-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );
2288 
+    $ini_max_execution_time_check = @ini_get('max_execution_time');
2289 2289 
     ini_restore('max_execution_time');
2290 2290
2291 
-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting
2291 
+    if ($ini_max_execution_time_check != 999999) { // only show these setting to the user if we can't change the ini setting
2292 2292 
         ?>
2293 2293 
 	<div id="gd_ie_reqs" class="metabox-holder">
2294 2294 
       <div class="meta-box-sortables ui-sortable">
2295 2295 
         <div class="postbox">
2296 
-          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'PHP Requirements for GD Import & Export CSV', 'geodirectory' );?></span></h3>
2296 
+          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __('PHP Requirements for GD Import & Export CSV', 'geodirectory'); ?></span></h3>
2297 2297 
           <div class="inside">
2298 
-            <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>
2298 
+            <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>
2299 2299 
 			<table class="form-table">
2300 2300 
 				<thead>
2301 2301 
 				  <tr>
2302 
-				  	<th><?php _e( 'PHP Settings', 'geodirectory' );?></th><th><?php _e( 'Current Value', 'geodirectory' );?></th><th><?php _e( 'Recommended Value', 'geodirectory' );?></th>
2302 
+				  	<th><?php _e('PHP Settings', 'geodirectory'); ?></th><th><?php _e('Current Value', 'geodirectory'); ?></th><th><?php _e('Recommended Value', 'geodirectory'); ?></th>
2303 2303 
 				  </tr>
2304 2304 
 				</thead>
2305 2305 
 				<tbody>
2306 2306 
 				  <tr>
2307 
-				  	<td>max_input_time</td><td><?php echo @ini_get( 'max_input_time' );?></td><td>3000</td>
2307 
+				  	<td>max_input_time</td><td><?php echo @ini_get('max_input_time'); ?></td><td>3000</td>
2308 2308 
 				  </tr>
2309 2309 
 				  <tr>
2310 
-				  	<td>max_execution_time</td><td><?php  echo @ini_get( 'max_execution_time' );?></td><td>3000</td>
2310 
+				  	<td>max_execution_time</td><td><?php  echo @ini_get('max_execution_time'); ?></td><td>3000</td>
2311 2311 
 				  </tr>
2312 2312 
 				  <tr>
2313 
-				  	<td>memory_limit</td><td><?php echo @ini_get( 'memory_limit' );?></td><td>256M</td>
2313 
+				  	<td>memory_limit</td><td><?php echo @ini_get('memory_limit'); ?></td><td>256M</td>
2314 2314 
 				  </tr>
2315 2315 
 				</tbody>
2316 2316 
 		    </table>

@@ -2322,21 +2322,21 @@  discard block
 
 block discarded – undo
2322 2322 
 	<div id="gd_ie_imposts" class="metabox-holder">
2323 2323 
       <div class="meta-box-sortables ui-sortable">
2324 2324 
         <div id="gd_ie_im_posts" class="postbox gd-hndle-pbox">
2325 
-          <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>
2326 
-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Import CSV', 'geodirectory' );?></span></h3>
2325 
+          <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>
2326 
+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Import CSV', 'geodirectory'); ?></span></h3>
2327 2327 
           <div class="inside">
2328 2328 
             <table class="form-table">
2329 2329 
 				<tbody>
2330 2330 
 				  <tr>
2331 2331 
 					<td class="gd-imex-box">
2332 2332 
 						<div class="gd-im-choices">
2333 
-						<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>
2334 
-						<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>
2333 
+						<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>
2334 
+						<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>
2335 2335 
 						</div>
2336 2336 
 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_postplupload-upload-ui">
2337 2337 
 							<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');" />
2338 
-							<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">
2339 
-						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" />
2338 
+							<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">
2339 
+						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv; ?>" />
2340 2340 
 						<input type="hidden" id="gd_im_post_allowed_types" data-exts=".csv" value="csv" />
2341 2341 
 							<?php
2342 2342 
 							/**

@@ -2346,7 +2346,7 @@  discard block
 
 block discarded – undo
2346 2346 
 							 */
2347 2347 
 							do_action('geodir_sample_csv_download_link');
2348 2348 
 							?>
2349 
-							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_postpluploadan' ); ?>"></span>
2349 
+							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_postpluploadan'); ?>"></span>
2350 2350 
 							<div class="filelist"></div>
2351 2351 
 						</div>
2352 2352 
 						<span id="gd_im_postupload-error" style="display:none"></span>

@@ -2364,7 +2364,7 @@  discard block
 
 block discarded – undo
2364 2364 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>
2365 2365 
 						</div>
2366 2366 
 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">
2367 
-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font
2367 
+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font
2368 2368 
 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font
2369 2369 
 									id="gd-import-perc">0%</font> )
2370 2370 
 								<div class="gd-fileprogress"></div>

@@ -2376,10 +2376,10 @@  discard block
 
 block discarded – undo
2376 2376 
                     	<div class="gd-imex-btns" style="display:none;">
2377 2377 
                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>
2378 2378 
                         	<input onclick="gd_imex_PrepareImport(this, 'post')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />
2379 
-                        	<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"/>
2380 
-                        	<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')"/>
2379 
+                        	<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"/>
2380 
+                        	<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')"/>
2381 2381 
 							<div id="gd_process_data" style="display:none">
2382 
-								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>
2382 
+								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>
2383 2383 
 							</div>
2384 2384 
 						</div>
2385 2385 
 					</td>

@@ -2393,30 +2393,30 @@  discard block
 
 block discarded – undo
2393 2393 
 	<div id="gd_ie_excategs" class="metabox-holder">
2394 2394 
 	  <div class="meta-box-sortables ui-sortable">
2395 2395 
 		<div id="gd_ie_ex_posts" class="postbox gd-hndle-pbox">
2396 
-		  <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>
2397 
-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Export CSV', 'geodirectory' );?></span></h3>
2396 
+		  <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>
2397 
+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Export CSV', 'geodirectory'); ?></span></h3>
2398 2398 
 		  <div class="inside">
2399 2399 
 			<table class="form-table">
2400 2400 
 			  <tbody>
2401 2401 
 				<tr>
2402 2402 
 				  <td class="fld"><label for="gd_post_type">
2403 
-					<?php _e( 'Post Type:', 'geodirectory' );?>
2403 
+					<?php _e('Post Type:', 'geodirectory'); ?>
2404 2404 
 					</label></td>
2405 2405 
 				  <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px">
2406 
-					  <?php echo $gd_posttypes_option;?>
2406 
+					  <?php echo $gd_posttypes_option; ?>
2407 2407 
 					</select></td>
2408 2408 
 				</tr>
2409 2409 
 				<tr>
2410 
-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>
2411 
-					<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>
2410 
+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>
2411 
+					<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>
2412 2412 
 				</tr>
2413 2413 
                 <tr class="gd-imex-dates">
2414 
-					<td class="fld"><label><?php _e( 'Published Date:', 'geodirectory' );?></label></td>
2415 
-					<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>
2414 
+					<td class="fld"><label><?php _e('Published Date:', 'geodirectory'); ?></label></td>
2415 
+					<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>
2416 2416 
 				</tr>
2417 2417 
 				<tr>
2418 2418 
 				  <td class="fld" style="vertical-align:top"><label>
2419 
-					<?php _e( 'Progress:', 'geodirectory' );?>
2419 
+					<?php _e('Progress:', 'geodirectory'); ?>
2420 2420 
 					</label></td>
2421 2421 
 				  <td><div id='gd_progressbar_box'>
2422 2422 
 					  <div id="gd_progressbar" class="gd_progressbar">

@@ -2424,13 +2424,13 @@  discard block
 
 block discarded – undo
2424 2424 
 					  </div>
2425 2425 
 					</div>
2426 2426 
 					<p style="display:inline-block">
2427 
-					  <?php _e( 'Elapsed Time:', 'geodirectory' );?>
2427 
+					  <?php _e('Elapsed Time:', 'geodirectory'); ?>
2428 2428 
 					</p>
2429 2429 
 					  
2430 2430 
 					<p id="gd_timer" class="gd_timer">00:00:00</p></td>
2431 2431 
 				</tr>
2432 2432 
 				<tr class="gd-ie-actions">
2433 
-				  <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">
2433 
+				  <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">
2434 2434 
 				  </td>
2435 2435 
 				  <td id="gd_ie_ex_files" class="gd-ie-files"></td>
2436 2436 
 				</tr>

@@ -2443,21 +2443,21 @@  discard block
 
 block discarded – undo
2443 2443 
 	<div id="gd_ie_imcategs" class="metabox-holder">
2444 2444 
       <div class="meta-box-sortables ui-sortable">
2445 2445 
         <div id="gd_ie_imcats" class="postbox gd-hndle-pbox">
2446 
-          <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>
2447 
-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Import CSV', 'geodirectory' );?></span></h3>
2446 
+          <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>
2447 
+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Import CSV', 'geodirectory'); ?></span></h3>
2448 2448 
           <div class="inside">
2449 2449 
             <table class="form-table">
2450 2450 
 				<tbody>
2451 2451 
 				  <tr>
2452 2452 
 					<td class="gd-imex-box">
2453 2453 
 						<div class="gd-im-choices">
2454 
-						<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>
2455 
-						<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>
2454 
+						<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>
2455 
+						<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>
2456 2456 
 						</div>
2457 2457 
 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_catplupload-upload-ui">
2458 2458 
 							<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');" />
2459 
-							<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">
2460 
-						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" />
2459 
+							<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">
2460 
+						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv; ?>" />
2461 2461 
 						<input type="hidden" id="gd_im_cat_allowed_types" data-exts=".csv" value="csv" />
2462 2462 
 						<?php
2463 2463 
 						/**

@@ -2468,7 +2468,7 @@  discard block
 
 block discarded – undo
2468 2468 
 						 */
2469 2469 
 						do_action('geodir_sample_cats_csv_download_link');
2470 2470 
 						?>
2471 
-							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_catpluploadan' ); ?>"></span>
2471 
+							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_catpluploadan'); ?>"></span>
2472 2472 
 							<div class="filelist"></div>
2473 2473 
 						</div>
2474 2474 
 						<span id="gd_im_catupload-error" style="display:none"></span>

@@ -2485,7 +2485,7 @@  discard block
 
 block discarded – undo
2485 2485 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>
2486 2486 
 						</div>
2487 2487 
 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">
2488 
-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font
2488 
+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font
2489 2489 
 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font
2490 2490 
 									id="gd-import-perc">0%</font> )
2491 2491 
 								<div class="gd-fileprogress"></div>

@@ -2497,10 +2497,10 @@  discard block
 
 block discarded – undo
2497 2497 
                     	<div class="gd-imex-btns" style="display:none;">
2498 2498 
                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>
2499 2499 
                         	<input onclick="gd_imex_PrepareImport(this, 'cat')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />
2500 
-                        	<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"/>
2501 
-                        	<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')"/>
2500 
+                        	<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"/>
2501 
+                        	<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')"/>
2502 2502 
 							<div id="gd_process_data" style="display:none">
2503 
-								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>
2503 
+								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>
2504 2504 
 							</div>
2505 2505 
 						</div>
2506 2506 
 					</td>

@@ -2514,26 +2514,26 @@  discard block
 
 block discarded – undo
2514 2514 
 	<div id="gd_ie_excategs" class="metabox-holder">
2515 2515 
       <div class="meta-box-sortables ui-sortable">
2516 2516 
         <div id="gd_ie_ex_cats" class="postbox gd-hndle-pbox">
2517 
-          <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>
2518 
-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Export CSV', 'geodirectory' );?></span></h3>
2517 
+          <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>
2518 
+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Export CSV', 'geodirectory'); ?></span></h3>
2519 2519 
           <div class="inside">
2520 2520 
             <table class="form-table">
2521 2521 
 				<tbody>
2522 2522 
 				  <tr>
2523 
-					<td class="fld"><label for="gd_post_type"><?php _e( 'Post Type:', 'geodirectory' );?></label></td>
2524 
-					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option;?></select></td>
2523 
+					<td class="fld"><label for="gd_post_type"><?php _e('Post Type:', 'geodirectory'); ?></label></td>
2524 
+					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option; ?></select></td>
2525 2525 
 				  </tr>
2526 2526 
 				   <tr>
2527 
-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>
2528 
-					<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>
2527 
+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>
2528 
+					<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>
2529 2529 
 				  </tr>
2530 2530 
 				  <tr>
2531 
-					<td class="fld" style="vertical-align:top"><label><?php _e( 'Progress:', 'geodirectory' );?></label></td>
2532 
-					<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>
2531 
+					<td class="fld" style="vertical-align:top"><label><?php _e('Progress:', 'geodirectory'); ?></label></td>
2532 
+					<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>
2533 2533 
 				  </tr>
2534 2534 
 				  <tr class="gd-ie-actions">
2535 2535 
 					<td style="vertical-align:top">
2536 
-						<input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">
2536 
+						<input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">
2537 2537 
 					</td>
2538 2538 
 					<td id="gd_ie_ex_files" class="gd-ie-files"></td>
2539 2539 
 				  </tr>

@@ -2555,7 +2555,7 @@  discard block
 
 block discarded – undo
2555 2555 
      * @param array $gd_chunksize_options File chunk size options.
2556 2556 
      * @param string $nonce Wordpress security token for GD import & export.
2557 2557 
 	 */
2558 
-	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );
2558 
+	do_action('geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce);
2559 2559 
 	?>
2560 2560 
   </div>
2561 2561 
 </div>

@@ -2574,7 +2574,7 @@  discard block
 
 block discarded – undo
2574 2574 
         jQuery.ajax({
2575 2575 
             url: ajaxurl,
2576 2576 
             type: "POST",
2577 
-            data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce;?>',
2577 
+            data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce; ?>',
2578 2578 
             dataType: 'json',
2579 2579 
             cache: false,
2580 2580 
             success: function(data) {

@@ -2626,7 +2626,7 @@  discard block
 
 block discarded – undo
2626 2626
2627 2627 
         jQuery(cont).find('.filelist .file').remove();
2628 2628
2629 
-        jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr( PLZ_SELECT_CSV_FILE );?></p>");
2629 
+        jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr(PLZ_SELECT_CSV_FILE); ?></p>");
2630 2630 
         jQuery('#gd-import-msg', cont).show();
2631 2631
2632 2632 
         return false;

@@ -2685,7 +2685,7 @@  discard block
 
 block discarded – undo
2685 2685 
     jQuery.ajax({
2686 2686 
         url: ajaxurl,
2687 2687 
         type: "POST",
2688 
-        data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce;?>',
2688 
+        data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce; ?>',
2689 2689 
         dataType : 'json',
2690 2690 
         cache: false,
2691 2691 
         success: function (data) {

@@ -2874,27 +2874,27 @@  discard block
 
 block discarded – undo
2874 2874
2875 2875 
     var gdMsg = '<p></p>';
2876 2876 
     if ( processed > 0 ) {
2877 
-        var msgParse = '<p><?php echo addslashes( sprintf( __( 'Total %s item(s) found.', 'geodirectory' ), '%s' ) );?></p>';
2877 
+        var msgParse = '<p><?php echo addslashes(sprintf(__('Total %s item(s) found.', 'geodirectory'), '%s')); ?></p>';
2878 2878 
         msgParse = msgParse.replace("%s", processed);
2879 2879 
         gdMsg += msgParse;
2880 2880 
     }
2881 2881
2882 2882 
     if ( updated > 0 ) {
2883 
-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) updated.', 'geodirectory' ), '%s', '%d' ) );?></p>';
2883 
+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) updated.', 'geodirectory'), '%s', '%d')); ?></p>';
2884 2884 
         msgParse = msgParse.replace("%s", updated);
2885 2885 
         msgParse = msgParse.replace("%d", processed);
2886 2886 
         gdMsg += msgParse;
2887 2887 
     }
2888 2888
2889 2889 
     if ( created > 0 ) {
2890 
-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) added.', 'geodirectory' ), '%s', '%d' ) );?></p>';
2890 
+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) added.', 'geodirectory'), '%s', '%d')); ?></p>';
2891 2891 
         msgParse = msgParse.replace("%s", created);
2892 2892 
         msgParse = msgParse.replace("%d", processed);
2893 2893 
         gdMsg += msgParse;
2894 2894 
     }
2895 2895
2896 2896 
     if ( skipped > 0 ) {
2897 
-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) ignored due to already exists.', 'geodirectory' ), '%s', '%d' ) );?></p>';
2897 
+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) ignored due to already exists.', 'geodirectory'), '%s', '%d')); ?></p>';
2898 2898 
         msgParse = msgParse.replace("%s", skipped);
2899 2899 
         msgParse = msgParse.replace("%d", processed);
2900 2900 
         gdMsg += msgParse;

@@ -2904,17 +2904,17 @@  discard block
 
 block discarded – undo
2904 2904 
         if (type=='loc') {
2905 2905 
             invalid_addr = invalid;
2906 2906 
         }
2907 
-        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>';
2907 
+        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>';
2908 2908 
         msgParse = msgParse.replace("%s", invalid_addr);
2909 2909 
         msgParse = msgParse.replace("%d", total);
2910 2910 
         gdMsg += msgParse;
2911 2911 
     }
2912 2912
2913 2913 
     if (invalid > 0 && type!='loc') {
2914 
-        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>';
2914 
+        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>';
2915 2915
2916 2916 
         if (type=='hood') {
2917 
-            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>';
2917 
+            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>';
2918 2918 
         }
2919 2919 
         msgParse = msgParse.replace("%s", invalid);
2920 2920 
         msgParse = msgParse.replace("%d", total);

@@ -2922,7 +2922,7 @@  discard block
 
 block discarded – undo
2922 2922 
     }
2923 2923
2924 2924 
     if (images > 0) {
2925 
-        gdMsg += '<p><?php echo addslashes( $upload_dir );?></p>';
2925 
+        gdMsg += '<p><?php echo addslashes($upload_dir); ?></p>';
2926 2926 
     }
2927 2927 
     gdMsg += '<p></p>';
2928 2928 
     jQuery('#gd-import-msg', cont).find('#message').removeClass('error').addClass('updated').html(gdMsg);

@@ -3086,9 +3086,9 @@  discard block
 
 block discarded – undo
3086 3086 
             if (typeof filters !== 'undefined' && filters && doFilter) {
3087 3087 
                 getTotal = true;
3088 3088 
                 attach += '&_c=1';
3089 
-                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Preparing...', 'geodirectory' ) );?>');
3089 
+                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Preparing...', 'geodirectory')); ?>');
3090 3090 
             } else {
3091 
-                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');
3091 
+                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
3092 3092 
             }
3093 3093 
             jQuery(el).find('#gd_timer').text('00:00:01');
3094 3094 
             jQuery('#gd_ie_ex_files', el).html('');

@@ -3097,7 +3097,7 @@  discard block
 
 block discarded – undo
3097 3097 
         jQuery.ajax({
3098 3098 
             url: ajaxurl,
3099 3099 
             type: "POST",
3100 
-            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page + attach,
3100 
+            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page + attach,
3101 3101 
             dataType : 'json',
3102 3102 
             cache: false,
3103 3103 
             beforeSend: function (jqXHR, settings) {},

@@ -3122,11 +3122,11 @@  discard block
 
 block discarded – undo
3122 3122 
                         } else {
3123 3123 
                             if (pages < page || pages == page) {
3124 3124 
                                 window.clearInterval(timer_posts);
3125 
-                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');
3125 
+                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');
3126 3126 
                             } else {
3127 3127 
                                 var percentage = Math.round(((page * chunk_size) / total_posts) * 100);
3128 3128 
                                 percentage = percentage > 100 ? 100 : percentage;
3129 
-                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');
3129 
+                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
3130 3130 
                             }
3131 3131 
                             if (typeof data.files != 'undefined' && jQuery(data.files).length ) {
3132 3132 
                                 var obj_files = data.files;

@@ -3157,7 +3157,7 @@  discard block
 
 block discarded – undo
3157 3157
3158 3158 
     function gd_process_export_cats(el, post_type, total_cats, chunk_size, pages, page) {
3159 3159 
         if (page < 2) {
3160 
-            gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');
3160 
+            gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');
3161 3161 
             jQuery(el).find('#gd_timer').text('00:00:01');
3162 3162 
             jQuery('#gd_ie_ex_files', el).html('');
3163 3163 
         }

@@ -3165,7 +3165,7 @@  discard block
 
 block discarded – undo
3165 3165 
         jQuery.ajax({
3166 3166 
             url: ajaxurl,
3167 3167 
             type: "POST",
3168 
-            data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page,
3168 
+            data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page,
3169 3169 
             dataType : 'json',
3170 3170 
             cache: false,
3171 3171 
             beforeSend: function (jqXHR, settings) {},

@@ -3179,11 +3179,11 @@  discard block
 
 block discarded – undo
3179 3179 
                     } else {
3180 3180 
                         if (pages < page || pages == page) {
3181 3181 
                             window.clearInterval(timer_cats);
3182 
-                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');
3182 
+                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');
3183 3183 
                         } else {
3184 3184 
                             var percentage = Math.round(((page * chunk_size) / total_cats) * 100);
3185 3185 
                             percentage = percentage > 100 ? 100 : percentage;
3186 
-                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e( 'Exporting...', 'geodirectory' );?>');
3186 
+                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e('Exporting...', 'geodirectory'); ?>');
3187 3187 
                         }
3188 3188 
                         if (typeof data.files != 'undefined' && jQuery(data.files).length ) {
3189 3189 
                             var obj_files = data.files;

@@ -3240,13 +3240,13 @@  discard block
 
 block discarded – undo
3240 3240 
 function geodir_init_filesystem()
3241 3241 
 {
3242 3242
3243 
-    if(!function_exists('get_filesystem_method')){
3243 
+    if (!function_exists('get_filesystem_method')) {
3244 3244 
         require_once(ABSPATH."/wp-admin/includes/file.php");
3245 3245 
     }
3246 3246 
     $access_type = get_filesystem_method();
3247 3247 
     if ($access_type === 'direct') {
3248 3248 
         /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */
3249 
-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
3249 
+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());
3250 3250
3251 3251 
         /* initialize the API */
3252 3252 
         if (!WP_Filesystem($creds)) {

@@ -3259,7 +3259,7 @@  discard block
 
 block discarded – undo
3259 3259 
         return $wp_filesystem;
3260 3260 
         /* do our file manipulations below */
3261 3261 
     } elseif (defined('FTP_USER')) {
3262 
-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());
3262 
+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());
3263 3263
3264 3264 
         /* initialize the API */
3265 3265 
         if (!WP_Filesystem($creds)) {

@@ -3294,7 +3294,7 @@  discard block
 
 block discarded – undo
3294 3294 
  * @package GeoDirectory
3295 3295 
  */
3296 3296 
 function geodir_filesystem_notice()
3297 
-{   if ( defined( 'DOING_AJAX' ) ){return;}
3297 
+{   if (defined('DOING_AJAX')) {return; }
3298 3298 
     $access_type = get_filesystem_method();
3299 3299 
     if ($access_type === 'direct') {
3300 3300 
     } elseif (!defined('FTP_USER')) {

@@ -3334,64 +3334,64 @@  discard block
 
 block discarded – undo
3334 3334 
     // try to set higher limits for import
3335 3335 
     $max_input_time = ini_get('max_input_time');
3336 3336 
     $max_execution_time = ini_get('max_execution_time');
3337 
-    $memory_limit= ini_get('memory_limit');
3337 
+    $memory_limit = ini_get('memory_limit');
3338 3338
3339 
-    if(!$max_input_time || $max_input_time<3000){
3339 
+    if (!$max_input_time || $max_input_time < 3000) {
3340 3340 
         ini_set('max_input_time', 3000);
3341 3341 
     }
3342 3342
3343 
-    if(!$max_execution_time || $max_execution_time<3000){
3343 
+    if (!$max_execution_time || $max_execution_time < 3000) {
3344 3344 
         ini_set('max_execution_time', 3000);
3345 3345 
     }
3346 3346
3347 
-    if($memory_limit && str_replace('M','',$memory_limit)){
3348 
-        if(str_replace('M','',$memory_limit)<256){
3347 
+    if ($memory_limit && str_replace('M', '', $memory_limit)) {
3348 
+        if (str_replace('M', '', $memory_limit) < 256) {
3349 3349 
             ini_set('memory_limit', '256M');
3350 3350 
         }
3351 3351 
     }
3352 3352
3353 3353 
     $json = array();
3354 3354
3355 
-    if ( !current_user_can( 'manage_options' ) ) {
3356 
-        wp_send_json( $json );
3355 
+    if (!current_user_can('manage_options')) {
3356 
+        wp_send_json($json);
3357 3357 
     }
3358 3358
3359 
-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;
3360 
-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;
3361 
-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;
3359 
+    $task = isset($_REQUEST['task']) ? $_REQUEST['task'] : NULL;
3360 
+    $nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : NULL;
3361 
+    $stat = isset($_REQUEST['_st']) ? $_REQUEST['_st'] : false;
3362 3362
3363 
-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {
3364 
-        wp_send_json( $json );
3363 
+    if (!wp_verify_nonce($nonce, 'geodir_import_export_nonce')) {
3364 
+        wp_send_json($json);
3365 3365 
     }
3366 3366
3367 
-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;
3368 
-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;
3367 
+    $post_type = isset($_REQUEST['_pt']) ? $_REQUEST['_pt'] : NULL;
3368 
+    $chunk_per_page = isset($_REQUEST['_n']) ? absint($_REQUEST['_n']) : NULL;
3369 3369 
     $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;
3370 
-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;
3370 
+    $chunk_page_no = isset($_REQUEST['_p']) ? absint($_REQUEST['_p']) : 1;
3371 3371
3372 3372 
     $wp_filesystem = geodir_init_filesystem();
3373 3373 
     if (!$wp_filesystem) {
3374 
-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );
3375 
-        wp_send_json( $json );
3374 
+        $json['error'] = __('Filesystem ERROR: Could not access filesystem.', 'geodirectory');
3375 
+        wp_send_json($json);
3376 3376 
     }
3377 3377
3378 3378 
     if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
3379 
-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );
3380 
-        wp_send_json( $json );
3379 
+        $json['error'] = __('Filesystem ERROR: '.$wp_filesystem->errors->get_error_message(), 'geodirectory');
3380 
+        wp_send_json($json);
3381 3381 
     }
3382 3382
3383 
-    $csv_file_dir = geodir_path_import_export( false );
3384 
-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {
3385 
-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {
3386 
-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );
3387 
-            wp_send_json( $json );
3383 
+    $csv_file_dir = geodir_path_import_export(false);
3384 
+    if (!$wp_filesystem->is_dir($csv_file_dir)) {
3385 
+        if (!$wp_filesystem->mkdir($csv_file_dir, FS_CHMOD_DIR)) {
3386 
+            $json['error'] = __('ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory');
3387 
+            wp_send_json($json);
3388 3388 
         }
3389 3389 
     }
3390 3390
3391 3391 
     $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
3392 3392 
     $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;
3393 3393
3394 
-    switch ( $task ) {
3394 
+    switch ($task) {
3395 3395 
         case 'export_posts': {
3396 3396 
             // WPML
3397 3397 
             $is_wpml = geodir_is_wpml();

@@ -3402,36 +3402,36 @@  discard block
 
 block discarded – undo
3402 3402 
                 $sitepress->switch_lang('all', true);
3403 3403 
             }
3404 3404 
             // WPML
3405 
-            if ( $post_type == 'gd_event' ) {
3406 
-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );
3405 
+            if ($post_type == 'gd_event') {
3406 
+                add_filter('geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2);
3407 3407 
             }
3408 
-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;
3408 
+            $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;
3409 3409
3410 
-            $file_name = $post_type . '_' . date( 'dmyHi' );
3411 
-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {
3412 
-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );
3410 
+            $file_name = $post_type.'_'.date('dmyHi');
3411 
+            if ($filters && isset($filters['start_date']) && isset($filters['end_date'])) {
3412 
+                $file_name = $post_type.'_'.date_i18n('dmy', strtotime($filters['start_date'])).'_'.date_i18n('dmy', strtotime($filters['end_date']));
3413 3413 
             }
3414 
-            $posts_count = geodir_get_posts_count( $post_type );
3415 
-            $file_url_base = geodir_path_import_export() . '/';
3416 
-            $file_url = $file_url_base . $file_name . '.csv';
3417 
-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';
3418 
-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';
3414 
+            $posts_count = geodir_get_posts_count($post_type);
3415 
+            $file_url_base = geodir_path_import_export().'/';
3416 
+            $file_url = $file_url_base.$file_name.'.csv';
3417 
+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';
3418 
+            $file_path_temp = $csv_file_dir.'/'.$post_type.'_'.$nonce.'.csv';
3419 3419
3420 3420 
             $chunk_file_paths = array();
3421 3421
3422 
-            if ( isset( $_REQUEST['_c'] ) ) {
3422 
+            if (isset($_REQUEST['_c'])) {
3423 3423 
                 $json['total'] = $posts_count;
3424 3424 
                 // WPML
3425 3425 
                 if ($is_wpml) {
3426 3426 
                     $sitepress->switch_lang($active_lang, true);
3427 3427 
                 }
3428 3428 
                 // WPML
3429 
-                wp_send_json( $json );
3429 
+                wp_send_json($json);
3430 3430 
                 gd_die();
3431 
-            } else if ( isset( $_REQUEST['_st'] ) ) {
3432 
-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );
3433 
-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;
3434 
-                $percentage = min( $percentage, 100 );
3431 
+            } else if (isset($_REQUEST['_st'])) {
3432 
+                $line_count = (int) geodir_import_export_line_count($file_path_temp);
3433 
+                $percentage = count($posts_count) > 0 && $line_count > 0 ? ceil($line_count / $posts_count) * 100 : 0;
3434 
+                $percentage = min($percentage, 100);
3435 3435
3436 3436 
                 $json['percentage'] = $percentage;
3437 3437 
                 // WPML

@@ -3439,45 +3439,45 @@  discard block
 
 block discarded – undo
3439 3439 
                     $sitepress->switch_lang($active_lang, true);
3440 3440 
                 }
3441 3441 
                 // WPML
3442 
-                wp_send_json( $json );
3442 
+                wp_send_json($json);
3443 3443 
                 gd_die();
3444 3444 
             } else {
3445 
-                if ( !$posts_count > 0 ) {
3446 
-                    $json['error'] = __( 'No records to export.', 'geodirectory' );
3445 
+                if (!$posts_count > 0) {
3446 
+                    $json['error'] = __('No records to export.', 'geodirectory');
3447 3447 
                 } else {
3448 3448 
                     $total_posts = $posts_count;
3449 3449 
                     if ($chunk_per_page > $total_posts) {
3450 3450 
                         $chunk_per_page = $total_posts;
3451 3451 
                     }
3452 
-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );
3452 
+                    $chunk_total_pages = ceil($total_posts / $chunk_per_page);
3453 3453
3454 3454 
                     $j = $chunk_page_no;
3455 
-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );
3455 
+                    $chunk_save_posts = geodir_imex_get_posts($post_type, $chunk_per_page, $j);
3456 3456
3457 3457 
                     $per_page = 500;
3458 3458 
                     if ($per_page > $chunk_per_page) {
3459 3459 
                         $per_page = $chunk_per_page;
3460 3460 
                     }
3461 
-                    $total_pages = ceil( $chunk_per_page / $per_page );
3461 
+                    $total_pages = ceil($chunk_per_page / $per_page);
3462 3462
3463 
-                    for ( $i = 0; $i <= $total_pages; $i++ ) {
3464 
-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );
3463 
+                    for ($i = 0; $i <= $total_pages; $i++) {
3464 
+                        $save_posts = array_slice($chunk_save_posts, ($i * $per_page), $per_page);
3465 3465
3466 3466 
                         $clear = $i == 0 ? true : false;
3467 
-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );
3467 
+                        geodir_save_csv_data($file_path_temp, $save_posts, $clear);
3468 3468 
                     }
3469 3469
3470 
-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {
3471 
-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
3472 
-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';
3473 
-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;
3474 
-                        $wp_filesystem->move( $file_path_temp, $file_path, true );
3470 
+                    if ($wp_filesystem->exists($file_path_temp)) {
3471 
+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';
3472 
+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';
3473 
+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;
3474 
+                        $wp_filesystem->move($file_path_temp, $file_path, true);
3475 3475
3476 
-                        $file_url = $file_url_base . $chunk_file_name;
3477 
-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3476 
+                        $file_url = $file_url_base.$chunk_file_name;
3477 
+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3478 3478 
                     }
3479 3479
3480 
-                    if ( !empty($chunk_file_paths) ) {
3480 
+                    if (!empty($chunk_file_paths)) {
3481 3481 
                         $json['total'] = $posts_count;
3482 3482 
                         $json['files'] = $chunk_file_paths;
3483 3483 
                     } else {

@@ -3485,7 +3485,7 @@  discard block
 
 block discarded – undo
3485 3485 
                             $json['total'] = $posts_count;
3486 3486 
                             $json['files'] = array();
3487 3487 
                         } else {
3488 
-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );
3488 
+                            $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');
3489 3489 
                         }
3490 3490 
                     }
3491 3491 
                 }

@@ -3494,7 +3494,7 @@  discard block
 
 block discarded – undo
3494 3494 
                     $sitepress->switch_lang($active_lang, true);
3495 3495 
                 }
3496 3496 
                 // WPML
3497 
-                wp_send_json( $json );
3497 
+                wp_send_json($json);
3498 3498 
             }
3499 3499 
         }
3500 3500 
         break;

@@ -3508,20 +3508,20 @@  discard block
 
 block discarded – undo
3508 3508 
                 $sitepress->switch_lang('all', true);
3509 3509 
             }
3510 3510 
             // WPML
3511 
-            $file_name = $post_type . 'category_' . date( 'dmyHi' );
3511 
+            $file_name = $post_type.'category_'.date('dmyHi');
3512 3512
3513 
-            $terms_count = geodir_get_terms_count( $post_type );
3514 
-            $file_url_base = geodir_path_import_export() . '/';
3515 
-            $file_url = $file_url_base . $file_name . '.csv';
3516 
-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';
3517 
-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';
3513 
+            $terms_count = geodir_get_terms_count($post_type);
3514 
+            $file_url_base = geodir_path_import_export().'/';
3515 
+            $file_url = $file_url_base.$file_name.'.csv';
3516 
+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';
3517 
+            $file_path_temp = $csv_file_dir.'/'.$post_type.'category_'.$nonce.'.csv';
3518 3518
3519 3519 
             $chunk_file_paths = array();
3520 3520
3521 
-            if ( isset( $_REQUEST['_st'] ) ) {
3522 
-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );
3523 
-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;
3524 
-                $percentage = min( $percentage, 100 );
3521 
+            if (isset($_REQUEST['_st'])) {
3522 
+                $line_count = (int) geodir_import_export_line_count($file_path_temp);
3523 
+                $percentage = count($terms_count) > 0 && $line_count > 0 ? ceil($line_count / $terms_count) * 100 : 0;
3524 
+                $percentage = min($percentage, 100);
3525 3525
3526 3526 
                 $json['percentage'] = $percentage;
3527 3527 
                 // WPML

@@ -3529,48 +3529,48 @@  discard block
 
 block discarded – undo
3529 3529 
                     $sitepress->switch_lang($active_lang, true);
3530 3530 
                 }
3531 3531 
                 // WPML
3532 
-                wp_send_json( $json );
3532 
+                wp_send_json($json);
3533 3533 
             } else {
3534 
-                if ( !$terms_count > 0 ) {
3535 
-                    $json['error'] = __( 'No records to export.', 'geodirectory' );
3534 
+                if (!$terms_count > 0) {
3535 
+                    $json['error'] = __('No records to export.', 'geodirectory');
3536 3536 
                 } else {
3537 3537 
                     $total_terms = $terms_count;
3538 3538 
                     if ($chunk_per_page > $terms_count) {
3539 3539 
                         $chunk_per_page = $terms_count;
3540 3540 
                     }
3541 
-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );
3541 
+                    $chunk_total_pages = ceil($total_terms / $chunk_per_page);
3542 3542
3543 3543 
                     $j = $chunk_page_no;
3544 
-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );
3544 
+                    $chunk_save_terms = geodir_imex_get_terms($post_type, $chunk_per_page, $j);
3545 3545
3546 3546 
                     $per_page = 500;
3547 3547 
                     if ($per_page > $chunk_per_page) {
3548 3548 
                         $per_page = $chunk_per_page;
3549 3549 
                     }
3550 
-                    $total_pages = ceil( $chunk_per_page / $per_page );
3550 
+                    $total_pages = ceil($chunk_per_page / $per_page);
3551 3551
3552 
-                    for ( $i = 0; $i <= $total_pages; $i++ ) {
3553 
-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );
3552 
+                    for ($i = 0; $i <= $total_pages; $i++) {
3553 
+                        $save_terms = array_slice($chunk_save_terms, ($i * $per_page), $per_page);
3554 3554
3555 3555 
                         $clear = $i == 0 ? true : false;
3556 
-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );
3556 
+                        geodir_save_csv_data($file_path_temp, $save_terms, $clear);
3557 3557 
                     }
3558 3558
3559 
-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {
3560 
-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
3561 
-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';
3562 
-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;
3563 
-                        $wp_filesystem->move( $file_path_temp, $file_path, true );
3559 
+                    if ($wp_filesystem->exists($file_path_temp)) {
3560 
+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';
3561 
+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';
3562 
+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;
3563 
+                        $wp_filesystem->move($file_path_temp, $file_path, true);
3564 3564
3565 
-                        $file_url = $file_url_base . $chunk_file_name;
3566 
-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3565 
+                        $file_url = $file_url_base.$chunk_file_name;
3566 
+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3567 3567 
                     }
3568 3568
3569 
-                    if ( !empty($chunk_file_paths) ) {
3569 
+                    if (!empty($chunk_file_paths)) {
3570 3570 
                         $json['total'] = $terms_count;
3571 3571 
                         $json['files'] = $chunk_file_paths;
3572 3572 
                     } else {
3573 
-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );
3573 
+                        $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');
3574 3574 
                     }
3575 3575 
                 }
3576 3576 
                 // WPML

@@ -3578,127 +3578,127 @@  discard block
 
 block discarded – undo
3578 3578 
                     $sitepress->switch_lang($active_lang, true);
3579 3579 
                 }
3580 3580 
                 // WPML
3581 
-                wp_send_json( $json );
3581 
+                wp_send_json($json);
3582 3582 
             }
3583 3583 
         }
3584 3584 
         break;
3585 3585 
         case 'export_locations': {
3586 
-            $file_url_base = geodir_path_import_export() . '/';
3587 
-            $file_name = 'gd_locations_' . date( 'dmyHi' );
3588 
-            $file_url = $file_url_base . $file_name . '.csv';
3589 
-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';
3590 
-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';
3586 
+            $file_url_base = geodir_path_import_export().'/';
3587 
+            $file_name = 'gd_locations_'.date('dmyHi');
3588 
+            $file_url = $file_url_base.$file_name.'.csv';
3589 
+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';
3590 
+            $file_path_temp = $csv_file_dir.'/gd_locations_'.$nonce.'.csv';
3591 3591
3592 
-            $items_count = (int)geodir_location_imex_count_locations();
3592 
+            $items_count = (int) geodir_location_imex_count_locations();
3593 3593
3594 
-            if ( isset( $_REQUEST['_st'] ) ) {
3595 
-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );
3596 
-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;
3597 
-                $percentage = min( $percentage, 100 );
3594 
+            if (isset($_REQUEST['_st'])) {
3595 
+                $line_count = (int) geodir_import_export_line_count($file_path_temp);
3596 
+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;
3597 
+                $percentage = min($percentage, 100);
3598 3598
3599 3599 
                 $json['percentage'] = $percentage;
3600 
-                wp_send_json( $json );
3600 
+                wp_send_json($json);
3601 3601 
             } else {
3602 3602 
                 $chunk_file_paths = array();
3603 3603
3604 
-                if ( !$items_count > 0 ) {
3605 
-                    $json['error'] = __( 'No records to export.', 'geodirectory' );
3604 
+                if (!$items_count > 0) {
3605 
+                    $json['error'] = __('No records to export.', 'geodirectory');
3606 3606 
                 } else {
3607 
-                    $chunk_per_page = min( $chunk_per_page, $items_count );
3608 
-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );
3607 
+                    $chunk_per_page = min($chunk_per_page, $items_count);
3608 
+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);
3609 3609
3610 3610 
                     $j = $chunk_page_no;
3611 
-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );
3611 
+                    $chunk_save_items = geodir_location_imex_locations_data($chunk_per_page, $j);
3612 3612
3613 3613 
                     $per_page = 500;
3614 
-                    $per_page = min( $per_page, $chunk_per_page );
3615 
-                    $total_pages = ceil( $chunk_per_page / $per_page );
3614 
+                    $per_page = min($per_page, $chunk_per_page);
3615 
+                    $total_pages = ceil($chunk_per_page / $per_page);
3616 3616
3617 
-                    for ( $i = 0; $i <= $total_pages; $i++ ) {
3618 
-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );
3617 
+                    for ($i = 0; $i <= $total_pages; $i++) {
3618 
+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);
3619 3619
3620 3620 
                         $clear = $i == 0 ? true : false;
3621 
-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );
3621 
+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);
3622 3622 
                     }
3623 3623
3624 
-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {
3625 
-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
3626 
-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';
3627 
-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;
3628 
-                        $wp_filesystem->move( $file_path_temp, $file_path, true );
3624 
+                    if ($wp_filesystem->exists($file_path_temp)) {
3625 
+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';
3626 
+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';
3627 
+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;
3628 
+                        $wp_filesystem->move($file_path_temp, $file_path, true);
3629 3629
3630 
-                        $file_url = $file_url_base . $chunk_file_name;
3631 
-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3630 
+                        $file_url = $file_url_base.$chunk_file_name;
3631 
+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3632 3632 
                     }
3633 3633
3634 
-                    if ( !empty($chunk_file_paths) ) {
3634 
+                    if (!empty($chunk_file_paths)) {
3635 3635 
                         $json['total'] = $items_count;
3636 3636 
                         $json['files'] = $chunk_file_paths;
3637 3637 
                     } else {
3638 
-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );
3638 
+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');
3639 3639 
                     }
3640 3640 
                 }
3641 
-                wp_send_json( $json );
3641 
+                wp_send_json($json);
3642 3642 
             }
3643 3643 
         }
3644 3644 
         break;
3645 3645 
         case 'export_hoods': {
3646 
-            $file_url_base = geodir_path_import_export() . '/';
3647 
-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );
3648 
-            $file_url = $file_url_base . $file_name . '.csv';
3649 
-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';
3650 
-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';
3646 
+            $file_url_base = geodir_path_import_export().'/';
3647 
+            $file_name = 'gd_neighbourhoods_'.date('dmyHi');
3648 
+            $file_url = $file_url_base.$file_name.'.csv';
3649 
+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';
3650 
+            $file_path_temp = $csv_file_dir.'/gd_neighbourhoods_'.$nonce.'.csv';
3651 3651
3652 
-            $items_count = (int)geodir_location_imex_count_neighbourhoods();
3652 
+            $items_count = (int) geodir_location_imex_count_neighbourhoods();
3653 3653
3654 
-            if ( isset( $_REQUEST['_st'] ) ) {
3655 
-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );
3656 
-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;
3657 
-                $percentage = min( $percentage, 100 );
3654 
+            if (isset($_REQUEST['_st'])) {
3655 
+                $line_count = (int) geodir_import_export_line_count($file_path_temp);
3656 
+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;
3657 
+                $percentage = min($percentage, 100);
3658 3658
3659 3659 
                 $json['percentage'] = $percentage;
3660 
-                wp_send_json( $json );
3660 
+                wp_send_json($json);
3661 3661 
             } else {
3662 3662 
                 $chunk_file_paths = array();
3663 3663
3664 
-                if ( !$items_count > 0 ) {
3665 
-                    $json['error'] = __( 'No records to export.', 'geodirectory' );
3664 
+                if (!$items_count > 0) {
3665 
+                    $json['error'] = __('No records to export.', 'geodirectory');
3666 3666 
                 } else {
3667 
-                    $chunk_per_page = min( $chunk_per_page, $items_count );
3668 
-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );
3667 
+                    $chunk_per_page = min($chunk_per_page, $items_count);
3668 
+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);
3669 3669
3670 3670 
                     $j = $chunk_page_no;
3671 
-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );
3671 
+                    $chunk_save_items = geodir_location_imex_neighbourhoods_data($chunk_per_page, $j);
3672 3672
3673 3673 
                     $per_page = 500;
3674 
-                    $per_page = min( $per_page, $chunk_per_page );
3675 
-                    $total_pages = ceil( $chunk_per_page / $per_page );
3674 
+                    $per_page = min($per_page, $chunk_per_page);
3675 
+                    $total_pages = ceil($chunk_per_page / $per_page);
3676 3676
3677 
-                    for ( $i = 0; $i <= $total_pages; $i++ ) {
3678 
-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );
3677 
+                    for ($i = 0; $i <= $total_pages; $i++) {
3678 
+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);
3679 3679
3680 3680 
                         $clear = $i == 0 ? true : false;
3681 
-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );
3681 
+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);
3682 3682 
                     }
3683 3683
3684 
-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {
3685 
-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';
3686 
-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';
3687 
-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;
3688 
-                        $wp_filesystem->move( $file_path_temp, $file_path, true );
3684 
+                    if ($wp_filesystem->exists($file_path_temp)) {
3685 
+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';
3686 
+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';
3687 
+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;
3688 
+                        $wp_filesystem->move($file_path_temp, $file_path, true);
3689 3689
3690 
-                        $file_url = $file_url_base . $chunk_file_name;
3691 
-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3690 
+                        $file_url = $file_url_base.$chunk_file_name;
3691 
+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));
3692 3692 
                     }
3693 3693
3694 
-                    if ( !empty($chunk_file_paths) ) {
3694 
+                    if (!empty($chunk_file_paths)) {
3695 3695 
                         $json['total'] = $items_count;
3696 3696 
                         $json['files'] = $chunk_file_paths;
3697 3697 
                     } else {
3698 
-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );
3698 
+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');
3699 3699 
                     }
3700 3700 
                 }
3701 
-                wp_send_json( $json );
3701 
+                wp_send_json($json);
3702 3702 
             }
3703 3703 
         }
3704 3704 
         break;

@@ -3715,25 +3715,25 @@  discard block
 
 block discarded – undo
3715 3715 
             }
3716 3716 
             // WPML
3717 3717
3718 
-            ini_set( 'auto_detect_line_endings', true );
3718 
+            ini_set('auto_detect_line_endings', true);
3719 3719
3720 3720 
             $uploads = wp_upload_dir();
3721 3721 
             $uploads_dir = $uploads['path'];
3722 3722 
             $uploads_subdir = $uploads['subdir'];
3723 3723
3724 
-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;
3725 
-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';
3724 
+            $csv_file = isset($_POST['_file']) ? $_POST['_file'] : NULL;
3725 
+            $import_choice = isset($_REQUEST['_ch']) ? $_REQUEST['_ch'] : 'skip';
3726 3726
3727 
-            $csv_file_arr = explode( '/', $csv_file );
3728 
-            $csv_filename = end( $csv_file_arr );
3729 
-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;
3727 
+            $csv_file_arr = explode('/', $csv_file);
3728 
+            $csv_filename = end($csv_file_arr);
3729 
+            $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$csv_filename;
3730 3730
3731 3731 
             $json['file'] = $csv_file;
3732 
-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );
3732 
+            $json['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
3733 3733 
             $file = array();
3734 3734
3735 
-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {
3736 
-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );
3735 
+            if ($csv_file && $wp_filesystem->is_file($target_path) && $wp_filesystem->exists($target_path)) {
3736 
+                $wp_filetype = wp_check_filetype_and_ext($target_path, $csv_filename);
3737 3737
3738 3738 
                 if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
3739 3739 
                     $json['error'] = NULL;

@@ -3741,9 +3741,9 @@  discard block
 
 block discarded – undo
3741 3741
3742 3742 
                     $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line
3743 3743 
                     setlocale(LC_ALL, 'en_US.UTF-8');
3744 
-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {
3745 
-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {
3746 
-                            if ( !empty( $data ) ) {
3744 
+                    if (($handle = fopen($target_path, "r")) !== FALSE) {
3745 
+                        while (($data = fgetcsv($handle, 100000, ",")) !== FALSE) {
3746 
+                            if (!empty($data)) {
3747 3747 
                                 $file[] = $data;
3748 3748 
                             }
3749 3749 
                         }

@@ -3757,19 +3757,19 @@  discard block
 
 block discarded – undo
3757 3757 
                         $json['error'] = __('No data found in csv file.', 'geodirectory');
3758 3758 
                     }
3759 3759 
                 } else {
3760 
-                    wp_send_json( $json );
3760 
+                    wp_send_json($json);
3761 3761 
                 }
3762 3762 
             } else {
3763 
-                wp_send_json( $json );
3763 
+                wp_send_json($json);
3764 3764 
             }
3765 3765
3766 
-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {
3767 
-                wp_send_json( $json );
3766 
+            if ($task == 'prepare_import' || !empty($json['error'])) {
3767 
+                wp_send_json($json);
3768 3768 
             }
3769 3769
3770 3770 
             $total = $json['rows'];
3771 
-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;
3772 
-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;
3771 
+            $limit = isset($_POST['limit']) ? (int) $_POST['limit'] : 1;
3772 
+            $processed = isset($_POST['processed']) ? (int) $_POST['processed'] : 0;
3773 3773
3774 3774 
             $count = $limit;
3775 3775 
             

@@ -3794,13 +3794,13 @@  discard block
 
 block discarded – undo
3794 3794
3795 3795 
             $post_types = geodir_get_posttypes();
3796 3796
3797 
-            if ( $task == 'import_cat' ) {
3797 
+            if ($task == 'import_cat') {
3798 3798 
                 if (!empty($file)) {
3799 3799 
                     $columns = isset($file[0]) ? $file[0] : NULL;
3800 3800
3801 3801 
                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
3802 3802 
                         $json['error'] = CSV_INVAILD_FILE;
3803 
-                        wp_send_json( $json );
3803 
+                        wp_send_json($json);
3804 3804 
                         exit;
3805 3805 
                     }
3806 3806 
                     

@@ -3811,7 +3811,7 @@  discard block
 
 block discarded – undo
3811 3811
3812 3812 
                         if (isset($file[$index])) {
3813 3813 
                             $row = $file[$index];
3814 
-                            $row = array_map( 'trim', $row );
3814 
+                            $row = array_map('trim', $row);
3815 3815 
                             //$row = array_map( 'utf8_encode', $row );
3816 3816
3817 3817 
                             $cat_id = '';

@@ -3828,42 +3828,42 @@  discard block
 
 block discarded – undo
3828 3828 
                             $cat_id_original = '';
3829 3829
3830 3830 
                             $c = 0;
3831 
-                            foreach ($columns as $column ) {
3832 
-                                if ( $column == 'cat_id' ) {
3833 
-                                    $cat_id = (int)$row[$c];
3834 
-                                } else if ( $column == 'cat_name' ) {
3831 
+                            foreach ($columns as $column) {
3832 
+                                if ($column == 'cat_id') {
3833 
+                                    $cat_id = (int) $row[$c];
3834 
+                                } else if ($column == 'cat_name') {
3835 3835 
                                     $cat_name = $row[$c];
3836 
-                                } else if ( $column == 'cat_slug' ) {
3836 
+                                } else if ($column == 'cat_slug') {
3837 3837 
                                     $cat_slug = $row[$c];
3838 
-                                } else if ( $column == 'cat_posttype' ) {
3838 
+                                } else if ($column == 'cat_posttype') {
3839 3839 
                                     $cat_posttype = $row[$c];
3840 
-                                } else if ( $column == 'cat_parent' ) {
3840 
+                                } else if ($column == 'cat_parent') {
3841 3841 
                                     $cat_parent = trim($row[$c]);
3842 
-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {
3842 
+                                } else if ($column == 'cat_schema' && $row[$c] != '') {
3843 3843 
                                     $cat_schema = $row[$c];
3844 
-                                } else if ( $column == 'cat_description' ) {
3844 
+                                } else if ($column == 'cat_description') {
3845 3845 
                                     $cat_description = $row[$c];
3846 
-                                } else if ( $column == 'cat_top_description' ) {
3846 
+                                } else if ($column == 'cat_top_description') {
3847 3847 
                                     $cat_top_description = $row[$c];
3848 
-                                } else if ( $column == 'cat_image' ) {
3848 
+                                } else if ($column == 'cat_image') {
3849 3849 
                                     $cat_image = $row[$c];
3850 
-                                } else if ( $column == 'cat_icon' ) {
3850 
+                                } else if ($column == 'cat_icon') {
3851 3851 
                                     $cat_icon = $row[$c];
3852 3852 
                                 }
3853 3853 
                                 // WPML
3854 
-                                if ( $is_wpml ) {
3855 
-                                    if ( $column == 'cat_language' ) {
3856 
-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );
3857 
-                                    } else if ( $column == 'cat_id_original' ) {
3858 
-                                        $cat_id_original = (int)$row[$c];
3854 
+                                if ($is_wpml) {
3855 
+                                    if ($column == 'cat_language') {
3856 
+                                        $cat_language = geodir_strtolower(trim($row[$c]));
3857 
+                                    } else if ($column == 'cat_id_original') {
3858 
+                                        $cat_id_original = (int) $row[$c];
3859 3859 
                                     }
3860 3860 
                                 }
3861 3861 
                                 // WPML
3862 3862 
                                 $c++;
3863 3863 
                             }
3864 3864
3865 
-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {
3866 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );
3865 
+                            if ($cat_name == '' || !in_array($cat_posttype, $post_types)) {
3866 
+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));
3867 3867
3868 3868 
                                 $invalid++;
3869 3869 
                                 continue;

@@ -3881,24 +3881,24 @@  discard block
 
 block discarded – undo
3881 3881 
                             $term_data['description'] = $cat_description;
3882 3882 
                             $term_data['cat_schema'] = $cat_schema;
3883 3883 
                             $term_data['top_description'] = $cat_top_description;
3884 
-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';
3885 
-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';
3884 
+                            $term_data['image'] = $cat_image != '' ? basename($cat_image) : '';
3885 
+                            $term_data['icon'] = $cat_icon != '' ? basename($cat_icon) : '';
3886 3886
3887 3887 
                             //$term_data = array_map( 'utf8_encode', $term_data );
3888 3888
3889 
-                            $taxonomy = $cat_posttype . 'category';
3889 
+                            $taxonomy = $cat_posttype.'category';
3890 3890
3891 3891 
                             $term_data['taxonomy'] = $taxonomy;
3892 3892
3893 3893 
                             $term_parent_id = 0;
3894 
-                            if ($cat_parent != "" || (int)$cat_parent > 0) {
3894 
+                            if ($cat_parent != "" || (int) $cat_parent > 0) {
3895 3895 
                                 $term_parent = '';
3896 3896
3897 
-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {
3897 
+                                if ($term_parent = get_term_by('name', $cat_parent, $taxonomy)) {
3898 3898 
                                     //
3899 
-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {
3899 
+                                } else if ($term_parent = get_term_by('slug', $cat_parent, $taxonomy)) {
3900 3900 
                                     //
3901 
-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {
3901 
+                                } else if ($term_parent = get_term_by('id', $cat_parent, $taxonomy)) {
3902 3902 
                                     //
3903 3903 
                                 } else {
3904 3904 
                                     $term_parent_data = array();

@@ -3906,104 +3906,104 @@  discard block
 
 block discarded – undo
3906 3906 
                                     //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );
3907 3907 
                                     $term_parent_data['taxonomy'] = $taxonomy;
3908 3908
3909 
-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );
3909 
+                                    $term_parent_id = (int) geodir_imex_insert_term($taxonomy, $term_parent_data);
3910 3910 
                                 }
3911 3911
3912 
-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {
3913 
-                                    $term_parent_id = (int)$term_parent->term_id;
3912 
+                                if (!empty($term_parent) && !is_wp_error($term_parent)) {
3913 
+                                    $term_parent_id = (int) $term_parent->term_id;
3914 3914 
                                 }
3915 3915 
                             }
3916 
-                            $term_data['parent'] = (int)$term_parent_id;
3916 
+                            $term_data['parent'] = (int) $term_parent_id;
3917 3917
3918 3918 
                             $term_id = NULL;
3919 
-                            if ( $import_choice == 'update' ) {
3920 
-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
3919 
+                            if ($import_choice == 'update') {
3920 
+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {
3921 3921 
                                     $term_data['term_id'] = $term['term_id'];
3922 3922
3923 
-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
3923 
+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {
3924 3924 
                                         $updated++;
3925 3925 
                                     } else {
3926 3926 
                                         $invalid++;
3927 
-                                        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' ) );
3927 
+                                        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'));
3928 3928 
                                     }
3929 
-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
3929 
+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {
3930 3930 
                                     $term_data['term_id'] = $term['term_id'];
3931 3931
3932 
-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {
3932 
+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {
3933 3933 
                                         $updated++;
3934 3934 
                                     } else {
3935 3935 
                                         $invalid++;
3936 
-                                        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' ) );
3936 
+                                        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'));
3937 3937 
                                     }
3938 3938 
                                 } else {
3939 
-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
3939 
+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {
3940 3940 
                                         $created++;
3941 3941 
                                     } else {
3942 3942 
                                         $invalid++;
3943 
-                                        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' ) );
3943 
+                                        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'));
3944 3944 
                                     }
3945 3945 
                                 }
3946 
-                            } else if ( $import_choice == 'skip' ) {
3947 
-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {
3946 
+                            } else if ($import_choice == 'skip') {
3947 
+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {
3948 3948 
                                     $skipped++;
3949 
-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
3949 
+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {
3950 3950 
                                     $skipped++;
3951 3951 
                                 } else {
3952 
-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {
3952 
+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {
3953 3953 
                                         $created++;
3954 3954 
                                     } else {
3955 3955 
                                         $invalid++;
3956 
-                                        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' ) );
3956 
+                                        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'));
3957 3957 
                                     }
3958 3958 
                                 }
3959 3959 
                             } else {
3960 3960 
                                 $invalid++;
3961 
-                                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' ) );
3961 
+                                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'));
3962 3962 
                             }
3963 3963
3964 
-                            if ( $term_id ) {
3964 
+                            if ($term_id) {
3965 3965 
                                 // WPML
3966 3966 
                                 if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {
3967 
-                                    $wpml_element_type = 'tax_' . $taxonomy;
3968 
-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );
3967 
+                                    $wpml_element_type = 'tax_'.$taxonomy;
3968 
+                                    $source_language = geodir_get_language_for_element($cat_id_original, $wpml_element_type);
3969 3969 
                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();
3970 3970
3971 
-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );
3971 
+                                    $trid = $sitepress->get_element_trid($cat_id_original, $wpml_element_type);
3972 3972
3973 
-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );
3973 
+                                    $sitepress->set_element_language_details($term_id, $wpml_element_type, $trid, $cat_language, $source_language);
3974 3974 
                                 }
3975 3975 
                                 // WPML
3976 3976
3977 
-                                if ( isset( $term_data['top_description'] ) ) {
3978 
-                                    update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );
3977 
+                                if (isset($term_data['top_description'])) {
3978 
+                                    update_tax_meta($term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype);
3979 3979 
                                 }
3980 3980
3981 
-                                if ( isset( $term_data['cat_schema'] ) ) {
3982 
-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );
3981 
+                                if (isset($term_data['cat_schema'])) {
3982 
+                                    update_tax_meta($term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype);
3983 3983 
                                 }
3984 3984
3985 3985 
                                 $attachment = false;
3986 
-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {
3987 
-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );
3988 
-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';
3986 
+                                if (isset($term_data['image']) && $term_data['image'] != '') {
3987 
+                                    $cat_image = geodir_get_default_catimage($term_id, $cat_posttype);
3988 
+                                    $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : '';
3989 3989
3990 
-                                    if ( basename($cat_image) != $term_data['image'] ) {
3990 
+                                    if (basename($cat_image) != $term_data['image']) {
3991 3991 
                                         $attachment = true;
3992 
-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );
3992 
+                                        update_tax_meta($term_id, 'ct_cat_default_img', array('id' => 'image', 'src' => $uploads['url'].'/'.$term_data['image']), $cat_posttype);
3993 3993 
                                     }
3994 3994 
                                 }
3995 3995
3996 
-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {
3997 
-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );
3998 
-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';
3996 
+                                if (isset($term_data['icon']) && $term_data['icon'] != '') {
3997 
+                                    $cat_icon = get_tax_meta($term_id, 'ct_cat_icon', false, $cat_posttype);
3998 
+                                    $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';
3999 3999
4000 
-                                    if ( basename($cat_icon) != $term_data['icon'] ) {
4000 
+                                    if (basename($cat_icon) != $term_data['icon']) {
4001 4001 
                                         $attachment = true;
4002 
-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );
4002 
+                                        update_tax_meta($term_id, 'ct_cat_icon', array('id' => 'icon', 'src' => $uploads['url'].'/'.$term_data['icon']), $cat_posttype);
4003 4003 
                                     }
4004 4004 
                                 }
4005 4005
4006 
-                                if ( $attachment ) {
4006 
+                                if ($attachment) {
4007 4007 
                                     $images++;
4008 4008 
                                 }
4009 4009 
                             }

@@ -4025,35 +4025,35 @@  discard block
 
 block discarded – undo
4025 4025 
                 $json['invalid'] = $invalid;
4026 4026 
                 $json['images'] = $images;
4027 4027
4028 
-                wp_send_json( $json );
4028 
+                wp_send_json($json);
4029 4029 
                 exit;
4030 
-            } else if ( $task == 'import_post' ) {
4031 
-                $xtimings['###1'] = microtime(true)-$xstart;
4030 
+            } else if ($task == 'import_post') {
4031 
+                $xtimings['###1'] = microtime(true) - $xstart;
4032 4032 
                 //run some stuff to make the import quicker
4033 
-                wp_defer_term_counting( true );
4034 
-                wp_defer_comment_counting( true );
4035 
-                $wpdb->query( 'SET autocommit = 0;' );
4033 
+                wp_defer_term_counting(true);
4034 
+                wp_defer_comment_counting(true);
4035 
+                $wpdb->query('SET autocommit = 0;');
4036 4036 
 //
4037 4037 
 //                remove_all_actions('publish_post');
4038 4038 
 //                remove_all_actions('transition_post_status');
4039 4039 
 //                remove_all_actions('publish_future_post');
4040 4040
4041 4041 
                 if (!empty($file)) {
4042 
-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
4042 
+                    $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;
4043 4043 
                     $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.
4044 4044 
                     $default_status = 'publish';
4045 
-                    $current_date = date_i18n( 'Y-m-d', time() );
4045 
+                    $current_date = date_i18n('Y-m-d', time());
4046 4046
4047 4047 
                     $columns = isset($file[0]) ? $file[0] : NULL;
4048 4048
4049 4049 
                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
4050 4050 
                         $json['error'] = CSV_INVAILD_FILE;
4051 
-                        wp_send_json( $json );
4051 
+                        wp_send_json($json);
4052 4052 
                         exit;
4053 4053 
                     }
4054 
-                    $xtimings['###2'] = microtime(true)-$xstart;
4054 
+                    $xtimings['###2'] = microtime(true) - $xstart;
4055 4055 
                     $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');
4056 
-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );
4056 
+                    $wp_chars_error = __('(check & remove if any invalid characters used in data)', 'geodirectory');
4057 4057 
                     $processed_actual = 0;
4058 4058 
                     for ($i = 1; $i <= $limit; $i++) {
4059 4059 
                         $index = $processed + $i;

@@ -4062,9 +4062,9 @@  discard block
 
 block discarded – undo
4062 4062 
                         if (isset($file[$index])) {
4063 4063 
                             $processed_actual++;
4064 4064 
                             $row = $file[$index];
4065 
-                            $row = array_map( 'trim', $row );
4065 
+                            $row = array_map('trim', $row);
4066 4066 
                             //$row = array_map( 'utf8_encode', $row );
4067 
-                            $row = array_map( 'addslashes_gpc', $row );
4067 
+                            $row = array_map('addslashes_gpc', $row);
4068 4068
4069 4069 
                             $post_id = '';
4070 4070 
                             $post_title = '';

@@ -4102,80 +4102,80 @@  discard block
 
 block discarded – undo
4102 4102 
                             $original_post_id = '';
4103 4103
4104 4104 
                             $c = 0;
4105 
-                            foreach ($columns as $column ) {
4105 
+                            foreach ($columns as $column) {
4106 4106 
                                 $gd_post[$column] = $row[$c];
4107 4107
4108 
-                                if ( $column == 'post_id' ) {
4108 
+                                if ($column == 'post_id') {
4109 4109 
                                     $post_id = $row[$c];
4110 
-                                } else if ( $column == 'post_title' ) {
4110 
+                                } else if ($column == 'post_title') {
4111 4111 
                                     $post_title = sanitize_text_field($row[$c]);
4112 
-                                } else if ( $column == 'post_author' ) {
4112 
+                                } else if ($column == 'post_author') {
4113 4113 
                                     $post_author = $row[$c];
4114 
-                                } else if ( $column == 'post_date' ) {
4114 
+                                } else if ($column == 'post_date') {
4115 4115 
                                     $post_date = $row[$c];
4116 
-                                } else if ( $column == 'post_content' ) {
4116 
+                                } else if ($column == 'post_content') {
4117 4117 
                                     $post_content = $row[$c];
4118 
-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {
4119 
-                                    $post_category_arr = explode( ',', $row[$c] );
4120 
-                                } else if ( $column == 'default_category' ) {
4118 
+                                } else if ($column == 'post_category' && $row[$c] != '') {
4119 
+                                    $post_category_arr = explode(',', $row[$c]);
4120 
+                                } else if ($column == 'default_category') {
4121 4121 
                                     $default_category = wp_kses_normalize_entities($row[$c]);
4122 
-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {
4123 
-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );
4124 
-                                } else if ( $column == 'post_type' ) {
4122 
+                                } else if ($column == 'post_tags' && $row[$c] != '') {
4123 
+                                    $post_tags = explode(',', sanitize_text_field($row[$c]));
4124 
+                                } else if ($column == 'post_type') {
4125 4125 
                                     $post_type = $row[$c];
4126 
-                                } else if ( $column == 'post_status' ) {
4127 
-                                    $post_status = sanitize_key( $row[$c] );
4128 
-                                } else if ( $column == 'is_featured' ) {
4129 
-                                    $is_featured = (int)$row[$c];
4130 
-                                } else if ( $column == 'geodir_video' ) {
4126 
+                                } else if ($column == 'post_status') {
4127 
+                                    $post_status = sanitize_key($row[$c]);
4128 
+                                } else if ($column == 'is_featured') {
4129 
+                                    $is_featured = (int) $row[$c];
4130 
+                                } else if ($column == 'geodir_video') {
4131 4131 
                                     $geodir_video = $row[$c];
4132 
-                                } else if ( $column == 'post_address' ) {
4132 
+                                } else if ($column == 'post_address') {
4133 4133 
                                     $post_address = sanitize_text_field($row[$c]);
4134 
-                                } else if ( $column == 'post_city' ) {
4134 
+                                } else if ($column == 'post_city') {
4135 4135 
                                     $post_city = sanitize_text_field($row[$c]);
4136 
-                                } else if ( $column == 'post_region' ) {
4136 
+                                } else if ($column == 'post_region') {
4137 4137 
                                     $post_region = sanitize_text_field($row[$c]);
4138 
-                                } else if ( $column == 'post_country' ) {
4138 
+                                } else if ($column == 'post_country') {
4139 4139 
                                     $post_country = sanitize_text_field($row[$c]);
4140 
-                                } else if ( $column == 'post_zip' ) {
4140 
+                                } else if ($column == 'post_zip') {
4141 4141 
                                     $post_zip = sanitize_text_field($row[$c]);
4142 
-                                } else if ( $column == 'post_latitude' ) {
4142 
+                                } else if ($column == 'post_latitude') {
4143 4143 
                                     $post_latitude = sanitize_text_field($row[$c]);
4144 
-                                } else if ( $column == 'post_longitude' ) {
4144 
+                                } else if ($column == 'post_longitude') {
4145 4145 
                                     $post_longitude = sanitize_text_field($row[$c]);
4146 
-                                } else if ( $column == 'post_neighbourhood' ) {
4146 
+                                } else if ($column == 'post_neighbourhood') {
4147 4147 
                                     $post_neighbourhood = sanitize_text_field($row[$c]);
4148 4148 
                                     unset($gd_post[$column]);
4149 
-                                } else if ( $column == 'neighbourhood_latitude' ) {
4149 
+                                } else if ($column == 'neighbourhood_latitude') {
4150 4150 
                                     $neighbourhood_latitude = sanitize_text_field($row[$c]);
4151 
-                                } else if ( $column == 'neighbourhood_longitude' ) {
4151 
+                                } else if ($column == 'neighbourhood_longitude') {
4152 4152 
                                     $neighbourhood_longitude = sanitize_text_field($row[$c]);
4153 
-                                } else if ( $column == 'geodir_timing' ) {
4153 
+                                } else if ($column == 'geodir_timing') {
4154 4154 
                                     $geodir_timing = sanitize_text_field($row[$c]);
4155 
-                                } else if ( $column == 'geodir_contact' ) {
4155 
+                                } else if ($column == 'geodir_contact') {
4156 4156 
                                     $geodir_contact = sanitize_text_field($row[$c]);
4157 
-                                } else if ( $column == 'geodir_email' ) {
4157 
+                                } else if ($column == 'geodir_email') {
4158 4158 
                                     $geodir_email = sanitize_email($row[$c]);
4159 
-                                } else if ( $column == 'geodir_website' ) {
4159 
+                                } else if ($column == 'geodir_website') {
4160 4160 
                                     $geodir_website = sanitize_text_field($row[$c]);
4161 
-                                } else if ( $column == 'geodir_twitter' ) {
4161 
+                                } else if ($column == 'geodir_twitter') {
4162 4162 
                                     $geodir_twitter = sanitize_text_field($row[$c]);
4163 
-                                } else if ( $column == 'geodir_facebook' ) {
4163 
+                                } else if ($column == 'geodir_facebook') {
4164 4164 
                                     $geodir_facebook = sanitize_text_field($row[$c]);
4165 
-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {
4165 
+                                } else if ($column == 'IMAGE' && !empty($row[$c]) && $row[$c] != '') {
4166 4166 
                                     $post_images[] = $row[$c];
4167 
-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {
4168 
-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );
4169 
-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {
4167 
+                                } else if ($column == 'alive_days' && (int) $row[$c] > 0) {
4168 
+                                    $expire_date = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $row[$c].' days'));
4169 
+                                } else if ($column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never') {
4170 4170 
                                     $row[$c] = str_replace('/', '-', $row[$c]);
4171 
-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );
4171 
+                                    $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));
4172 4172 
                                 }
4173 4173 
                                 // WPML
4174 4174 
                                 if ($is_wpml) {
4175 4175 
                                     if ($column == 'language') {
4176 4176 
                                         $language = geodir_strtolower(trim($row[$c]));
4177 4177 
                                     } else if ($column == 'original_post_id') {
4178 
-                                        $original_post_id = (int)$row[$c];
4178 
+                                        $original_post_id = (int) $row[$c];
4179 4179 
                                     }
4180 4180 
                                 }
4181 4181 
                                 // WPML

@@ -4183,7 +4183,7 @@  discard block
 
 block discarded – undo
4183 4183 
                             }
4184 4184 
                             // listing claimed or not
4185 4185 
                             if ($is_claim_active && isset($gd_post['claimed'])) {
4186 
-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;
4186 
+                                $gd_post['claimed'] = (int) $gd_post['claimed'] == 1 ? 1 : 0;
4187 4187 
                             }
4188 4188
4189 4189 
                             // WPML

@@ -4194,43 +4194,43 @@  discard block
 
 block discarded – undo
4194 4194
4195 4195 
                             $gd_post['IMAGE'] = $post_images;
4196 4196
4197 
-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;
4198 
-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;
4197 
+                            $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;
4198 
+                            $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;
4199 4199
4200 4200 
                             $valid = true;
4201 4201
4202 
-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {
4202 
+                            if ($post_title == '' || !in_array($post_type, $post_types)) {
4203 4203 
                                 $invalid++;
4204 4204 
                                 $valid = false;
4205 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );
4205 
+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));
4206 4206 
                             }
4207 
-                            $xtimings['###3'] = microtime(true)-$xstart;
4208 
-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;
4209 
-                            if ( $location_allowed ) {
4207 
+                            $xtimings['###3'] = microtime(true) - $xstart;
4208 
+                            $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
4209 
+                            if ($location_allowed) {
4210 4210 
                                 $location_result = geodir_get_default_location();
4211 
-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {
4211 
+                                if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {
4212 4212 
                                     $invalid_addr++;
4213 4213 
                                     $valid = false;
4214 
-                                    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' ) );
4215 
-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {
4216 
-                                    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 ) ) ) {
4214 
+                                    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'));
4215 
+                                } else if (!empty($location_result) && $location_result->location_id == 0) {
4216 
+                                    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))) {
4217 4217 
                                         $invalid_addr++;
4218 4218 
                                         $valid = false;
4219 
-                                        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' ) );
4219 
+                                        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'));
4220 4220 
                                     } else {
4221 4221 
                                         if (!$location_manager) {
4222 
-                                            $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.
4222 
+                                            $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.
4223 4223 
                                         }
4224 4224 
                                     }
4225 4225 
                                 }
4226 4226 
                             }
4227 
-                            $xtimings['###4']   = microtime(true)-$xstart;
4228 
-                            if ( !$valid ) {
4227 
+                            $xtimings['###4'] = microtime(true) - $xstart;
4228 
+                            if (!$valid) {
4229 4229 
                                 continue;
4230 4230 
                             }
4231 4231
4232 
-                            $cat_taxonomy = $post_type . 'category';
4233 
-                            $tags_taxonomy = $post_type . '_tags';
4232 
+                            $cat_taxonomy = $post_type.'category';
4233 
+                            $tags_taxonomy = $post_type.'_tags';
4234 4234
4235 4235 
                             if ($default_category != '' && !in_array($default_category, $post_category_arr)) {
4236 4236 
                                 $post_category_arr = array_merge(array($default_category), $post_category_arr);

@@ -4238,29 +4238,29 @@  discard block
 
 block discarded – undo
4238 4238
4239 4239 
                             $post_category = array();
4240 4240 
                             $default_category_id = NULL;
4241 
-                            if ( !empty( $post_category_arr ) ) {
4242 
-                                foreach ( $post_category_arr as $value ) {
4243 
-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );
4241 
+                            if (!empty($post_category_arr)) {
4242 
+                                foreach ($post_category_arr as $value) {
4243 
+                                    $category_name = wp_kses_normalize_entities(trim($value));
4244 4244
4245 
-                                    if ( $category_name != '' ) {
4245 
+                                    if ($category_name != '') {
4246 4246 
                                         $term_category = array();
4247 4247
4248 
-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {
4248 
+                                        if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {
4249 4249 
                                             $term_category = $term;
4250 
-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {
4250 
+                                        } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {
4251 4251 
                                             $term_category = $term;
4252 4252 
                                         } else {
4253 4253 
                                             $term_data = array();
4254 4254 
                                             $term_data['name'] = $category_name;
4255 4255 
                                             $term_data['taxonomy'] = $cat_taxonomy;
4256 4256
4257 
-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );
4258 
-                                            if ( $term_id ) {
4259 
-                                                $term_category = get_term( $term_id, $cat_taxonomy );
4257 
+                                            $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data);
4258 
+                                            if ($term_id) {
4259 
+                                                $term_category = get_term($term_id, $cat_taxonomy);
4260 4260 
                                             }
4261 4261 
                                         }
4262 4262
4263 
-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {
4263 
+                                        if (!empty($term_category) && !is_wp_error($term_category)) {
4264 4264 
                                             $post_category[] = intval($term_category->term_id);
4265 4265
4266 4266 
                                             if ($category_name == $default_category) {

@@ -4270,14 +4270,14 @@  discard block
 
 block discarded – undo
4270 4270 
                                     }
4271 4271 
                                 }
4272 4272 
                             }
4273 
-                            $xtimings['###5'] = microtime(true)-$xstart;
4273 
+                            $xtimings['###5'] = microtime(true) - $xstart;
4274 4274 
                             $save_post = array();
4275 4275 
                             $save_post['post_title'] = $post_title;
4276 4276 
                             if (!empty($post_date)) {
4277 
-                                $post_date = geodir_date( $post_date, 'Y-m-d H:i:s' ); // convert to mysql date format.
4277 
+                                $post_date = geodir_date($post_date, 'Y-m-d H:i:s'); // convert to mysql date format.
4278 4278
4279 4279 
                                 $save_post['post_date'] = $post_date;
4280 
-                                $save_post['post_date_gmt'] = get_gmt_from_date( $post_date );
4280 
+                                $save_post['post_date_gmt'] = get_gmt_from_date($post_date);
4281 4281 
                             }
4282 4282 
                             $save_post['post_content'] = $post_content;
4283 4283 
                             $save_post['post_type'] = $post_type;

@@ -4287,15 +4287,15 @@  discard block
 
 block discarded – undo
4287 4287 
                             $save_post['post_tags'] = $post_tags;
4288 4288
4289 4289 
                             $saved_post_id = NULL;
4290 
-                            if ( $import_choice == 'update' ) {
4291 
-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );
4290 
+                            if ($import_choice == 'update') {
4291 
+                                $gd_wp_error = __('Unable to add listing, please check the listing data.', 'geodirectory');
4292 4292
4293 
-                                if ( $post_id > 0 && get_post( $post_id ) ) {
4293 
+                                if ($post_id > 0 && get_post($post_id)) {
4294 4294 
                                     $save_post['ID'] = $post_id;
4295 4295
4296 
-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {
4297 
-                                        if ( is_wp_error( $saved_post_id ) ) {
4298 
-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;
4296 
+                                    if ($saved_post_id = wp_update_post($save_post, true)) {
4297 
+                                        if (is_wp_error($saved_post_id)) {
4298 
+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;
4299 4299 
                                             $saved_post_id = 0;
4300 4300 
                                         } else {
4301 4301 
                                             $saved_post_id = $post_id;

@@ -4303,9 +4303,9 @@  discard block
 
 block discarded – undo
4303 4303 
                                         }
4304 4304 
                                     }
4305 4305 
                                 } else {
4306 
-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
4307 
-                                        if ( is_wp_error( $saved_post_id ) ) {
4308 
-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;
4306 
+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {
4307 
+                                        if (is_wp_error($saved_post_id)) {
4308 
+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;
4309 4309 
                                             $saved_post_id = 0;
4310 4310 
                                         } else {
4311 4311 
                                             $created++;

@@ -4313,19 +4313,19 @@  discard block
 
 block discarded – undo
4313 4313 
                                     }
4314 4314 
                                 }
4315 4315
4316 
-                                if ( !$saved_post_id > 0 ) {
4316 
+                                if (!$saved_post_id > 0) {
4317 4317 
                                     $invalid++;
4318 
-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );
4318 
+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_wp_error);
4319 4319 
                                 }
4320 
-                            } else if ( $import_choice == 'skip' ) {
4321 
-                                if ( $post_id > 0 && get_post( $post_id ) ) {
4320 
+                            } else if ($import_choice == 'skip') {
4321 
+                                if ($post_id > 0 && get_post($post_id)) {
4322 4322 
                                     $skipped++;
4323 4323 
                                 } else {
4324 
-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {
4325 
-                                        if ( is_wp_error( $saved_post_id ) ) {
4324 
+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {
4325 
+                                        if (is_wp_error($saved_post_id)) {
4326 4326 
                                             $invalid++;
4327 4327
4328 
-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );
4328 
+                                            geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$saved_post_id->get_error_message().' '.$wp_chars_error);
4329 4329 
                                             $saved_post_id = 0;
4330 4330 
                                         } else {
4331 4331 
                                             $created++;

@@ -4333,28 +4333,28 @@  discard block
 
 block discarded – undo
4333 4333 
                                     } else {
4334 4334 
                                         $invalid++;
4335 4335
4336 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );
4336 
+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);
4337 4337 
                                     }
4338 4338 
                                 }
4339 4339 
                             } else {
4340 4340 
                                 $invalid++;
4341 4341
4342 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );
4342 
+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);
4343 4343 
                             }
4344 
-                            $xtimings['###6'] = microtime(true)-$xstart;
4345 
-                            if ( (int)$saved_post_id > 0 ) {
4344 
+                            $xtimings['###6'] = microtime(true) - $xstart;
4345 
+                            if ((int) $saved_post_id > 0) {
4346 4346 
                                 // WPML
4347 4347 
                                 if ($is_wpml && $original_post_id > 0 && $language != '') {
4348 
-                                    $wpml_post_type = 'post_' . $post_type;
4349 
-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );
4348 
+                                    $wpml_post_type = 'post_'.$post_type;
4349 
+                                    $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type);
4350 4350 
                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();
4351 4351
4352 
-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );
4352 
+                                    $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type);
4353 4353
4354 
-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );
4354 
+                                    $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language);
4355 4355 
                                 }
4356 4356 
                                 // WPML
4357 
-                                $gd_post_info = geodir_get_post_info( $saved_post_id );
4357 
+                                $gd_post_info = geodir_get_post_info($saved_post_id);
4358 4358
4359 4359 
                                 $gd_post['post_id'] = $saved_post_id;
4360 4360 
                                 $gd_post['ID'] = $saved_post_id;

@@ -4366,7 +4366,7 @@  discard block
 
 block discarded – undo
4366 4366
4367 4367 
                                 // post location
4368 4368 
                                 $post_location_id = 0;
4369 
-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {
4369 
+                                if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {
4370 4370 
                                     $gd_post['post_neighbourhood'] = '';
4371 4371
4372 4372 
                                     $post_location_info = array(

@@ -4376,7 +4376,7 @@  discard block
 
 block discarded – undo
4376 4376 
                                                                 'geo_lat' => $post_latitude,
4377 4377 
                                                                 'geo_lng' => $post_longitude
4378 4378 
                                                             );
4379 
-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {
4379 
+                                    if ($location_id = (int) geodir_add_new_location($post_location_info)) {
4380 4380 
                                         $post_location_id = $location_id;
4381 4381 
                                     }
4382 4382 
                                     

@@ -4414,14 +4414,14 @@  discard block
 
 block discarded – undo
4414 4414 
                                 $gd_post['post_location_id'] = $post_location_id;
4415 4415
4416 4416 
                                 // post package info
4417 
-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;
4417 
+                                $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0;
4418 4418 
                                 if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {
4419 4419 
                                     $package_id = $gd_post_info->package_id;
4420 4420 
                                 }
4421 4421
4422 4422 
                                 $package_info = array();
4423 4423 
                                 if ($package_id && function_exists('geodir_get_package_info_by_id')) {
4424 
-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);
4424 
+                                    $package_info = (array) geodir_get_package_info_by_id($package_id);
4425 4425
4426 4426 
                                     if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {
4427 4427 
                                         $package_info = array();

@@ -4429,18 +4429,18 @@  discard block
 
 block discarded – undo
4429 4429 
                                 }
4430 4430
4431 4431 
                                 if (empty($package_info)) {
4432 
-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );
4432 
+                                    $package_info = (array) geodir_post_package_info(array(), '', $post_type);
4433 4433 
                                 }
4434 4434
4435 
-                                if (!empty($package_info))	 {
4435 
+                                if (!empty($package_info)) {
4436 4436 
                                     $package_id = $package_info['pid'];
4437 4437
4438 4438 
                                     if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {
4439 4439 
                                         $gd_post['expire_date'] = $expire_date;
4440 4440 
                                     } else {
4441 
-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {
4442 
-                                            $gd_post['alive_days'] = (int)$package_info['days'];
4443 
-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );
4441 
+                                        if (isset($package_info['days']) && (int) $package_info['days'] > 0) {
4442 
+                                            $gd_post['alive_days'] = (int) $package_info['days'];
4443 
+                                            $gd_post['expire_date'] = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $package_info['days'].' days'));
4444 4444 
                                         } else {
4445 4445 
                                             $gd_post['expire_date'] = 'Never';
4446 4446 
                                         }

@@ -4449,7 +4449,7 @@  discard block
 
 block discarded – undo
4449 4449 
                                     $gd_post['package_id'] = $package_id;
4450 4450 
                                 }
4451 4451
4452 
-                                $table = $plugin_prefix . $post_type . '_detail';
4452 
+                                $table = $plugin_prefix.$post_type.'_detail';
4453 4453
4454 4454 
                                 if ($post_type == 'gd_event') {
4455 4455 
                                     $gd_post = geodir_imex_process_event_data($gd_post);

@@ -4460,65 +4460,65 @@  discard block
 
 block discarded – undo
4460 4460 
                                 }
4461 4461
4462 4462 
                                 // Export franchise fields
4463 
-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;
4463 
+                                $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;
4464 4464 
                                 if ($is_franchise_active) {
4465 
-                                    if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {
4465 
+                                    if (isset($gd_post['gd_is_franchise']) && (int) $gd_post['gd_is_franchise'] == 1) {
4466 4466 
                                         $gd_franchise_lock = array();
4467 4467
4468 
-                                        if ( isset( $gd_post['gd_franchise_lock'] ) ) {
4469 
-                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );
4470 
-                                            $gd_franchise_lock = trim( $gd_franchise_lock );
4471 
-                                            $gd_franchise_lock = explode( ",", $gd_franchise_lock );
4468 
+                                        if (isset($gd_post['gd_franchise_lock'])) {
4469 
+                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock']);
4470 
+                                            $gd_franchise_lock = trim($gd_franchise_lock);
4471 
+                                            $gd_franchise_lock = explode(",", $gd_franchise_lock);
4472 4472 
                                         }
4473 4473
4474 
-                                        update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );
4475 
-                                        update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );
4474 
+                                        update_post_meta($saved_post_id, 'gd_is_franchise', 1);
4475 
+                                        update_post_meta($saved_post_id, 'gd_franchise_lock', $gd_franchise_lock);
4476 4476 
                                     } else {
4477 
-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {
4478 
-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );
4477 
+                                        if (isset($gd_post['franchise']) && (int) $gd_post['franchise'] > 0 && geodir_franchise_check((int) $gd_post['franchise'])) {
4478 
+                                            geodir_save_post_meta($saved_post_id, 'franchise', (int) $gd_post['franchise']);
4479 4479 
                                         }
4480 4480 
                                     }
4481 4481 
                                 }
4482 4482
4483 4483 
                                 if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {
4484 
-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );
4484 
+                                    $save_post['post_category'] = array_unique(array_map('intval', $save_post['post_category']));
4485 4485 
                                     if ($default_category_id) {
4486 4486 
                                         $save_post['post_default_category'] = $default_category_id;
4487 4487 
                                         $gd_post['default_category'] = $default_category_id;
4488 4488 
                                     }
4489 4489 
                                     $gd_post[$cat_taxonomy] = $save_post['post_category'];
4490 4490 
                                 }
4491 
-                                $xtimings['###7'] = microtime(true)-$xstart;
4491 
+                                $xtimings['###7'] = microtime(true) - $xstart;
4492 4492 
                                 // Save post info
4493 
-                                geodir_save_post_info( $saved_post_id, $gd_post );
4494 
-                                $xtimings['###8'] = microtime(true)-$xstart;
4493 
+                                geodir_save_post_info($saved_post_id, $gd_post);
4494 
+                                $xtimings['###8'] = microtime(true) - $xstart;
4495 4495 
                                 // post taxonomies
4496 
-                                if ( !empty( $save_post['post_category'] ) ) {
4497 
-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );
4496 
+                                if (!empty($save_post['post_category'])) {
4497 
+                                    wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy);
4498 4498
4499 
-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';
4499 
+                                    $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : '';
4500 4500 
                                     if ($default_category_id) {
4501 4501 
                                         $post_default_category = $default_category_id;
4502 4502 
                                     }
4503 4503 
                                     $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);
4504 4504 
                                     $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];
4505 
-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';
4505 
+                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']).',y:' : '';
4506 4506
4507 4507 
                                     if ($post_category_str != '' && $post_default_category) {
4508 
-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);
4508 
+                                        $post_category_str = str_replace($post_default_category.',y:', $post_default_category.',y,d:', $post_category_str);
4509 4509 
                                     }
4510 4510
4511 4511 
                                     $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';
4512 4512
4513 
-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );
4513 
+                                    geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str);
4514 4514 
                                 }
4515 
-                                $xtimings['###8.1'] = microtime(true)-$xstart;
4516 
-                                if ( !empty( $save_post['post_tags'] ) ) {
4517 
-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );
4515 
+                                $xtimings['###8.1'] = microtime(true) - $xstart;
4516 
+                                if (!empty($save_post['post_tags'])) {
4517 
+                                    wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy);
4518 4518 
                                 }
4519 
-                                $xtimings['###9'] = microtime(true)-$xstart;
4519 
+                                $xtimings['###9'] = microtime(true) - $xstart;
4520 4520 
                                 // Post images
4521 
-                                if ( !empty( $post_images ) ) {
4521 
+                                if (!empty($post_images)) {
4522 4522 
                                     $post_images = array_unique($post_images);
4523 4523
4524 4524 
                                     $old_post_images_arr = array();

@@ -4526,65 +4526,65 @@  discard block
 
 block discarded – undo
4526 4526
4527 4527 
                                     $order = 1;
4528 4528
4529 
-                                    $old_post_images = geodir_get_images( $saved_post_id );
4530 
-                                    $xtimings['###9.1'] = microtime(true)-$xstart;
4529 
+                                    $old_post_images = geodir_get_images($saved_post_id);
4530 
+                                    $xtimings['###9.1'] = microtime(true) - $xstart;
4531 4531 
                                     if (!empty($old_post_images)) {
4532 
-                                        foreach( $old_post_images as $old_post_image ) {
4532 
+                                        foreach ($old_post_images as $old_post_image) {
4533 4533 
                                             if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {
4534 4534 
                                                 $old_post_images_arr[] = $old_post_image->file;
4535 4535 
                                             }
4536 4536 
                                         }
4537 4537 
                                     }
4538 4538
4539 
-                                    foreach ( $post_images as $post_image ) {
4540 
-                                        $image_name = basename( $post_image );
4539 
+                                    foreach ($post_images as $post_image) {
4540 
+                                        $image_name = basename($post_image);
4541 4541 
                                         $saved_post_images_arr[] = $image_name;
4542 4542
4543 
-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {
4543 
+                                        if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {
4544 4544 
                                             continue; // Skip if image already exists.
4545 4545 
                                         }
4546 4546
4547 
-                                        $image_name_parts = explode( '.', $image_name );
4548 
-                                        array_pop( $image_name_parts );
4549 
-                                        $proper_image_name = implode( '.', $image_name_parts );
4550 
-                                        $xtimings['###9.2'] = microtime(true)-$xstart;
4551 
-                                        $arr_file_type = wp_check_filetype( $image_name );
4552 
-                                        $xtimings['###9.3'] = microtime(true)-$xstart;
4553 
-                                        if ( !empty( $arr_file_type ) ) {
4547 
+                                        $image_name_parts = explode('.', $image_name);
4548 
+                                        array_pop($image_name_parts);
4549 
+                                        $proper_image_name = implode('.', $image_name_parts);
4550 
+                                        $xtimings['###9.2'] = microtime(true) - $xstart;
4551 
+                                        $arr_file_type = wp_check_filetype($image_name);
4552 
+                                        $xtimings['###9.3'] = microtime(true) - $xstart;
4553 
+                                        if (!empty($arr_file_type)) {
4554 4554 
                                             $uploaded_file_type = $arr_file_type['type'];
4555 4555
4556 4556 
                                             $attachment = array();
4557 4557 
                                             $attachment['post_id'] = $saved_post_id;
4558 4558 
                                             $attachment['title'] = $proper_image_name;
4559 4559 
                                             $attachment['content'] = '';
4560 
-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;
4560 
+                                            $attachment['file'] = $uploads_subdir.'/'.$image_name;
4561 4561 
                                             $attachment['mime_type'] = $uploaded_file_type;
4562 4562 
                                             $attachment['menu_order'] = $order;
4563 4563 
                                             $attachment['is_featured'] = 0;
4564 4564
4565 4565 
                                             $attachment_set = '';
4566 
-                                            foreach ( $attachment as $key => $val ) {
4567 
-                                                if ( $val != '' ) {
4568 
-                                                    $attachment_set .= $key . " = '" . $val . "', ";
4566 
+                                            foreach ($attachment as $key => $val) {
4567 
+                                                if ($val != '') {
4568 
+                                                    $attachment_set .= $key." = '".$val."', ";
4569 4569 
                                                 }
4570 4570 
                                             }
4571 
-                                            $attachment_set = trim( $attachment_set, ", " );
4571 
+                                            $attachment_set = trim($attachment_set, ", ");
4572 4572
4573 4573 
                                             // Add new attachment
4574 
-                                            $xtimings['###9.4'] = microtime(true)-$xstart;
4575 
-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );
4576 
-                                            $xtimings['###9.5'] = microtime(true)-$xstart;
4574 
+                                            $xtimings['###9.4'] = microtime(true) - $xstart;
4575 
+                                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
4576 
+                                            $xtimings['###9.5'] = microtime(true) - $xstart;
4577 4577 
                                             $order++;
4578 4578 
                                         }
4579 4579 
                                     }
4580 4580
4581 
-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';
4581 
+                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/".implode("' AND file NOT LIKE '%/", $saved_post_images_arr)."' )" : '';
4582 4582 
                                     // Remove previous attachment
4583 
-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );
4584 
-                                    $xtimings['###9.6'] = microtime(true)-$xstart;
4585 
-                                    if ( !empty( $saved_post_images_arr ) ) {
4583 
+                                    $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = ".(int) $saved_post_id." ".$saved_post_images_sql);
4584 
+                                    $xtimings['###9.6'] = microtime(true) - $xstart;
4585 
+                                    if (!empty($saved_post_images_arr)) {
4586 4586 
                                         geodir_set_wp_featured_image($saved_post_id);
4587 
-                                        $xtimings['###9.7'] = microtime(true)-$xstart;
4587 
+                                        $xtimings['###9.7'] = microtime(true) - $xstart;
4588 4588 
                                         /*
4589 4589 
                                         $menu_order = 1;
4590 4590 
                                         

@@ -4600,14 +4600,14 @@  discard block
 
 block discarded – undo
4600 4600 
                                         }*/
4601 4601 
                                     }
4602 4602
4603 
-                                    if ( $order > 1 ) {
4603 
+                                    if ($order > 1) {
4604 4604 
                                         $images++;
4605 4605 
                                     }
4606 4606 
                                 }
4607 
-                                $xtimings['###10'] = microtime(true)-$xstart;
4607 
+                                $xtimings['###10'] = microtime(true) - $xstart;
4608 4608 
                                 /** This action is documented in geodirectory-functions/post-functions.php */
4609 
-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );
4610 
-                                $xtimings['###11'] = microtime(true)-$xstart;
4609 
+                                do_action('geodir_after_save_listing', $saved_post_id, $gd_post);
4610 
+                                $xtimings['###11'] = microtime(true) - $xstart;
4611 4611 
                                 if (isset($is_featured)) {
4612 4612 
                                     geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);
4613 4613 
                                 }

@@ -4617,7 +4617,7 @@  discard block
 
 block discarded – undo
4617 4617 
                                 if (isset($gd_post['expire_date'])) {
4618 4618 
                                     geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);
4619 4619 
                                 }
4620 
-                                $xtimings['###12'] = microtime(true)-$xstart;
4620 
+                                $xtimings['###12'] = microtime(true) - $xstart;
4621 4621 
                             }
4622 4622
4623 4623 
                             // WPML

@@ -4630,11 +4630,11 @@  discard block
 
 block discarded – undo
4630 4630 
                 }
4631 4631
4632 4632 
                 //undo some stuff to make the import quicker
4633 
-                wp_defer_term_counting( false );
4634 
-                wp_defer_comment_counting( false );
4635 
-                $wpdb->query( 'COMMIT;' );
4636 
-                $wpdb->query( 'SET autocommit = 1;' );
4637 
-                $xtimings['###13'] = microtime(true)-$xstart;
4633 
+                wp_defer_term_counting(false);
4634 
+                wp_defer_comment_counting(false);
4635 
+                $wpdb->query('COMMIT;');
4636 
+                $wpdb->query('SET autocommit = 1;');
4637 
+                $xtimings['###13'] = microtime(true) - $xstart;
4638 4638 
                 $json = array();
4639 4639 
                 $json['processed'] = $processed_actual;
4640 4640 
                 $json['created'] = $created;

@@ -4643,13 +4643,13 @@  discard block
 
 block discarded – undo
4643 4643 
                 $json['invalid'] = $invalid;
4644 4644 
                 $json['invalid_addr'] = $invalid_addr;
4645 4645 
                 $json['images'] = $images;
4646 
-                $json['timing'] = microtime(true)-$xstart;
4646 
+                $json['timing'] = microtime(true) - $xstart;
4647 4647 
                 $json['timings'] = $xtimings;
4648 4648
4649 4649
4650 
-                wp_send_json( $json );
4650 
+                wp_send_json($json);
4651 4651 
                 exit;
4652 
-            } else if ( $task == 'import_loc' ) {
4652 
+            } else if ($task == 'import_loc') {
4653 4653 
                 global $gd_post_types;
4654 4654 
                 $gd_post_types = $post_types;
4655 4655 
                 

@@ -4658,82 +4658,82 @@  discard block
 
 block discarded – undo
4658 4658
4659 4659 
                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
4660 4660 
                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
4661 
-                        wp_send_json( $json );
4661 
+                        wp_send_json($json);
4662 4662 
                     }
4663 4663
4664 4664 
                     $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');
4665 
-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );
4665 
+                    $gd_error_location = __('Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory');
4666 4666 
                     for ($i = 1; $i <= $limit; $i++) {
4667 4667 
                         $index = $processed + $i;
4668 4668
4669 4669 
                         if (isset($file[$index])) {
4670 4670 
                             $row = $file[$index];
4671 
-                            $row = array_map( 'trim', $row );
4671 
+                            $row = array_map('trim', $row);
4672 4672 
                             $data = array();
4673 4673
4674 
-                            foreach ($columns as $c => $column ) {
4674 
+                            foreach ($columns as $c => $column) {
4675 4675 
                                 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'))) {
4676 4676 
                                     $data[$column] = $row[$c];
4677 4677 
                                 }
4678 4678 
                             }
4679 4679
4680 
-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {
4680 
+                            if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {
4681 4681 
                                 $invalid++;
4682 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4682 
+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);
4683 4683 
                                 continue;
4684 4684 
                             }
4685 4685
4686 4686 
                             $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;
4687 4687
4688 
-                            if ( $import_choice == 'update' ) {
4689 
-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
4690 
-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
4688 
+                            if ($import_choice == 'update') {
4689 
+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {
4690 
+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {
4691 4691 
                                         $updated++;
4692 4692 
                                     } else {
4693 4693 
                                         $invalid++;
4694 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4694 
+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);
4695 4695 
                                     }
4696 
-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
4697 
-                                    $data['location_id'] = (int)$location->location_id;
4696 
+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {
4697 
+                                    $data['location_id'] = (int) $location->location_id;
4698 4698
4699 
-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {
4700 
-                                        $data['location_id'] = (int)$location->location_id;
4701 
-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {
4702 
-                                        $data['location_id'] = (int)$location->location_id;
4703 
-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {
4704 
-                                        $data['location_id'] = (int)$location->location_id;
4699 
+                                    if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {
4700 
+                                        $data['location_id'] = (int) $location->location_id;
4701 
+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {
4702 
+                                        $data['location_id'] = (int) $location->location_id;
4703 
+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {
4704 
+                                        $data['location_id'] = (int) $location->location_id;
4705 4705 
                                     }
4706 4706
4707 
-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {
4707 
+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {
4708 4708 
                                         $updated++;
4709 4709 
                                     } else {
4710 4710 
                                         $invalid++;
4711 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4711 
+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);
4712 4712 
                                     }
4713 4713 
                                 } else {
4714 
-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {
4714 
+                                    if ($location_id = geodir_location_insert_city($data, true)) {
4715 4715 
                                         $created++;
4716 4716 
                                     } else {
4717 4717 
                                         $invalid++;
4718 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4718 
+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);
4719 4719 
                                     }
4720 4720 
                                 }
4721 
-                            } elseif ( $import_choice == 'skip' ) {
4722 
-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {
4721 
+                            } elseif ($import_choice == 'skip') {
4722 
+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {
4723 4723 
                                     $skipped++;
4724 
-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {
4724 
+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {
4725 4725 
                                     $skipped++;
4726 4726 
                                 } else {
4727 
-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {
4727 
+                                    if ($location_id = geodir_location_insert_city($data, true)) {
4728 4728 
                                         $created++;
4729 4729 
                                     } else {
4730 4730 
                                         $invalid++;
4731 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4731 
+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);
4732 4732 
                                     }
4733 4733 
                                 }
4734 4734 
                             } else {
4735 4735 
                                 $invalid++;
4736 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );
4736 
+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);
4737 4737 
                             }
4738 4738 
                         }
4739 4739 
                     }

@@ -4747,24 +4747,24 @@  discard block
 
 block discarded – undo
4747 4747 
                 $json['invalid'] = $invalid;
4748 4748 
                 $json['images'] = $images;
4749 4749
4750 
-                wp_send_json( $json );
4751 
-            } else if ( $task == 'import_hood' ) {
4750 
+                wp_send_json($json);
4751 
+            } else if ($task == 'import_hood') {
4752 4752 
                 if (!empty($file)) {
4753 4753 
                     $columns = isset($file[0]) ? $file[0] : NULL;
4754 4754
4755 4755 
                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
4756 4756 
                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');
4757 
-                        wp_send_json( $json );
4757 
+                        wp_send_json($json);
4758 4758 
                     }
4759 4759
4760 4760 
                     $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');
4761 
-                    $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' );
4761 
+                    $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');
4762 4762 
                     for ($i = 1; $i <= $limit; $i++) {
4763 4763 
                         $index = $processed + $i;
4764 4764
4765 4765 
                         if (isset($file[$index])) {
4766 4766 
                             $row = $file[$index];
4767 
-                            $row = array_map( 'trim', $row );
4767 
+                            $row = array_map('trim', $row);
4768 4768 
                             $data = array();
4769 4769
4770 4770 
                             foreach ($columns as $c => $column) {

@@ -4775,20 +4775,20 @@  discard block
 
 block discarded – undo
4775 4775
4776 4776 
                             if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {
4777 4777 
                                 $invalid++;
4778 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4778 
+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
4779 4779 
                                 continue;
4780 4780 
                             }
4781 4781
4782 4782 
                             $location_info = array();
4783 
-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {
4784 
-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);
4783 
+                            if (!empty($data['location_id']) && (int) $data['location_id'] > 0) {
4784 
+                                $location_info = geodir_get_location_by_id('', (int) $data['location_id']);
4785 4785 
                             } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {
4786 4786 
                                 $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));
4787 4787 
                             }
4788 4788
4789 4789 
                             if (empty($location_info)) {
4790 4790 
                                 $invalid++;
4791 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4791 
+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
4792 4792 
                                 continue;
4793 4793 
                             }
4794 4794 
                             

@@ -4803,35 +4803,35 @@  discard block
 
 block discarded – undo
4803 4803 
                             $hood_data['hood_longitude'] = $data['longitude'];
4804 4804 
                             $hood_data['hood_location_id'] = $location_id;
4805 4805
4806 
-                            if ( $import_choice == 'update' ) {
4807 
-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
4808 
-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];
4806 
+                            if ($import_choice == 'update') {
4807 
+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {
4808 
+                                    $hood_data['hood_id'] = (int) $data['neighbourhood_id'];
4809 4809
4810 4810 
                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
4811 4811 
                                         $updated++;
4812 4812 
                                     } else {
4813 4813 
                                         $invalid++;
4814 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4814 
+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
4815 4815 
                                     }
4816 4816 
                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
4817 
-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;
4817 
+                                    $hood_data['hood_id'] = (int) $neighbourhood->hood_id;
4818 4818
4819 4819 
                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
4820 4820 
                                         $updated++;
4821 4821 
                                     } else {
4822 4822 
                                         $invalid++;
4823 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4823 
+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
4824 4824 
                                     }
4825 4825 
                                 } else {
4826 4826 
                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {
4827 4827 
                                         $created++;
4828 4828 
                                     } else {
4829 4829 
                                         $invalid++;
4830 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4830 
+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
4831 4831 
                                     }
4832 4832 
                                 }
4833 
-                            } elseif ( $import_choice == 'skip' ) {
4834 
-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {
4833 
+                            } elseif ($import_choice == 'skip') {
4834 
+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {
4835 4835 
                                     $skipped++;
4836 4836 
                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {
4837 4837 
                                     $skipped++;

@@ -4841,12 +4841,12 @@  discard block
 
 block discarded – undo
4841 4841 
                                         $created++;
4842 4842 
                                     } else {
4843 4843 
                                         $invalid++;
4844 
-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4844 
+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
4845 4845 
                                     }
4846 4846 
                                 }
4847 4847 
                             } else {
4848 4848 
                                 $invalid++;
4849 
-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );
4849 
+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);
4850 4850 
                             }
4851 4851 
                         }
4852 4852 
                     }

@@ -4860,7 +4860,7 @@  discard block
 
 block discarded – undo
4860 4860 
                 $json['invalid'] = $invalid;
4861 4861 
                 $json['images'] = $images;
4862 4862
4863 
-                wp_send_json( $json );
4863 
+                wp_send_json($json);
4864 4864 
             }
4865 4865 
         }
4866 4866 
         break;

@@ -4904,29 +4904,29 @@  discard block
 
 block discarded – undo
4904 4904 
  * }
4905 4905 
  * @return int|bool Term id when success, false when fail.
4906 4906 
  */
4907 
-function geodir_imex_insert_term( $taxonomy, $term_data ) {
4908 
-	if ( empty( $taxonomy ) || empty( $term_data ) ) {
4907 
+function geodir_imex_insert_term($taxonomy, $term_data) {
4908 
+	if (empty($taxonomy) || empty($term_data)) {
4909 4909 
 		return false;
4910 4910 
 	}
4911 4911
4912 
-	$term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';
4912 
+	$term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : '';
4913 4913 
 	$args = array();
4914 
-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';
4915 
-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';
4916 
-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';
4914 
+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';
4915 
+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';
4916 
+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';
4917 4917
4918 
-	if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {
4919 
-		$term_args = array_merge( $term_data, $args );
4920 
-		$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
4921 
-		$term_args = wp_parse_args( $term_args, $defaults );
4922 
-		$term_args = sanitize_term( $term_args, $taxonomy, 'db' );
4923 
-		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );
4918 
+	if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {
4919 
+		$term_args = array_merge($term_data, $args);
4920 
+		$defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
4921 
+		$term_args = wp_parse_args($term_args, $defaults);
4922 
+		$term_args = sanitize_term($term_args, $taxonomy, 'db');
4923 
+		$args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args);
4924 4924 
 	}
4925 4925
4926 
-    if( !empty( $term ) ) {
4927 
-		$result = wp_insert_term( $term, $taxonomy, $args );
4928 
-        if( !is_wp_error( $result ) ) {
4929 
-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;
4926 
+    if (!empty($term)) {
4927 
+		$result = wp_insert_term($term, $taxonomy, $args);
4928 
+        if (!is_wp_error($result)) {
4929 
+            return isset($result['term_id']) ? $result['term_id'] : 0;
4930 4930 
         }
4931 4931 
     }
4932 4932 
 	

@@ -4956,36 +4956,36 @@  discard block
 
 block discarded – undo
4956 4956 
  * }
4957 4957 
  * @return int|bool Term id when success, false when fail.
4958 4958 
  */
4959 
-function geodir_imex_update_term( $taxonomy, $term_data ) {
4960 
-	if ( empty( $taxonomy ) || empty( $term_data ) ) {
4959 
+function geodir_imex_update_term($taxonomy, $term_data) {
4960 
+	if (empty($taxonomy) || empty($term_data)) {
4961 4961 
 		return false;
4962 4962 
 	}
4963 4963
4964 
-	$term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0;
4964 
+	$term_id = isset($term_data['term_id']) && !empty($term_data['term_id']) ? $term_data['term_id'] : 0;
4965 4965
4966 4966 
 	$args = array();
4967 
-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';
4968 
-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';
4969 
-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';
4967 
+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';
4968 
+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';
4969 
+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';
4970 4970
4971 
-	if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {
4971 
+	if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {
4972 4972 
 		$term_data['term_id'] = $term_info['term_id'];
4973 4973
4974 
-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );
4974 
+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);
4975 4975
4976 
-		if( !is_wp_error( $result ) ) {
4977 
-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;
4976 
+		if (!is_wp_error($result)) {
4977 
+            return isset($result['term_id']) ? $result['term_id'] : 0;
4978 4978 
         }
4979 
-	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {
4979 
+	} else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {
4980 4980 
 		$term_data['term_id'] = $term_info['term_id'];
4981 4981
4982 
-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );
4982 
+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);
4983 4983
4984 
-		if( !is_wp_error( $result ) ) {
4985 
-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;
4984 
+		if (!is_wp_error($result)) {
4985 
+            return isset($result['term_id']) ? $result['term_id'] : 0;
4986 4986 
         }
4987 4987 
 	} else {
4988 
-		return geodir_imex_insert_term( $taxonomy, $term_data );
4988 
+		return geodir_imex_insert_term($taxonomy, $term_data);
4989 4989 
 	}
4990 4990
4991 4991 
 	return false;

@@ -5004,20 +5004,20 @@  discard block
 
 block discarded – undo
5004 5004 
  * @param string $post_type Post type.
5005 5005 
  * @return int Posts count.
5006 5006 
  */
5007 
-function geodir_get_posts_count( $post_type ) {
5007 
+function geodir_get_posts_count($post_type) {
5008 5008 
     global $wpdb, $plugin_prefix;
5009 5009
5010 
-    if ( !post_type_exists( $post_type ) ) {
5010 
+    if (!post_type_exists($post_type)) {
5011 5011 
         return 0;
5012 5012 
     }
5013 5013
5014 
-    $table = $plugin_prefix . $post_type . '_detail';
5014 
+    $table = $plugin_prefix.$post_type.'_detail';
5015 5015
5016 5016 
     // Skip listing with statuses trash, auto-draft etc...
5017 5017 
     $skip_statuses = geodir_imex_export_skip_statuses();
5018 5018 
     $where_statuses = '';
5019 
-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
5020 
-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
5019 
+    if (!empty($skip_statuses) && is_array($skip_statuses)) {
5020 
+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
5021 5021 
     }
5022 5022
5023 5023 
     /**

@@ -5028,11 +5028,11 @@  discard block
 
 block discarded – undo
5028 5028 
      *
5029 5029 
      * @param string $where SQL where clause part.
5030 5030 
      */
5031 
-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );
5031 
+    $where_statuses = apply_filters('geodir_get_posts_count', $where_statuses, $post_type);
5032 5032
5033 
-    $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 );
5033 
+    $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);
5034 5034
5035 
-    $posts_count = (int)$wpdb->get_var( $query );
5035 
+    $posts_count = (int) $wpdb->get_var($query);
5036 5036
5037 5037 
     /**
5038 5038 
      * Modify returned post counts for the current post type.

@@ -5043,7 +5043,7 @@  discard block
 
 block discarded – undo
5043 5043 
      * @param int $posts_count Post counts.
5044 5044 
      * @param string $post_type Post type.
5045 5045 
      */
5046 
-    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );
5046 
+    $posts_count = apply_filters('geodir_imex_count_posts', $posts_count, $post_type);
5047 5047
5048 5048 
     return $posts_count;
5049 5049 
 }

@@ -5065,19 +5065,19 @@  discard block
 
 block discarded – undo
5065 5065 
  * @param int $page_no Page number. Default 0.
5066 5066 
  * @return array Array of posts data.
5067 5067 
  */
5068 
-function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {
5068 
+function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {
5069 5069 
 	global $wp_filesystem;
5070 5070
5071 
-	$posts = geodir_get_export_posts( $post_type, $per_page, $page_no );
5071 
+	$posts = geodir_get_export_posts($post_type, $per_page, $page_no);
5072 5072
5073 5073 
 	$csv_rows = array();
5074 5074
5075 
-	if ( !empty( $posts ) ) {
5076 
-		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );
5075 
+	if (!empty($posts)) {
5076 
+		$is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');
5077 5077 
         $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.
5078 
-        $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;
5078 
+        $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;
5079 5079 
         $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;
5080 
-        $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;
5080 
+        $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;
5081 5081
5082 5082 
 		$csv_row = array();
5083 5083 
 		$csv_row[] = 'post_id';

@@ -5088,7 +5088,7 @@  discard block
 
 block discarded – undo
5088 5088 
 		$csv_row[] = 'default_category';
5089 5089 
 		$csv_row[] = 'post_tags';
5090 5090 
 		$csv_row[] = 'post_type';
5091 
-		if ( $post_type == 'gd_event' ) {
5091 
+		if ($post_type == 'gd_event') {
5092 5092 
 			$csv_row[] = 'event_date';
5093 5093 
 			$csv_row[] = 'event_enddate';
5094 5094 
 			$csv_row[] = 'starttime';

@@ -5147,15 +5147,15 @@  discard block
 
 block discarded – undo
5147 5147 
 		}
5148 5148 
 		// WPML
5149 5149
5150 
-		$custom_fields = geodir_imex_get_custom_fields( $post_type );
5151 
-		if ( !empty( $custom_fields ) ) {
5152 
-			foreach ( $custom_fields as $custom_field ) {
5150 
+		$custom_fields = geodir_imex_get_custom_fields($post_type);
5151 
+		if (!empty($custom_fields)) {
5152 
+			foreach ($custom_fields as $custom_field) {
5153 5153 
 				$csv_row[] = $custom_field->htmlvar_name;
5154 5154 
 			}
5155 5155 
 		}
5156 5156
5157 5157 
 		// Export franchise fields
5158 
-		$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;
5158 
+		$is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;
5159 5159 
 		if ($is_franchise_active) {
5160 5160 
 			$csv_row[] = 'gd_is_franchise';
5161 5161 
 			$csv_row[] = 'gd_franchise_lock';

@@ -5176,28 +5176,28 @@  discard block
 
 block discarded – undo
5176 5176 
 		$csv_rows[] = $csv_row;
5177 5177
5178 5178 
 		$images_count = 5;
5179 
-        $xx=0;
5180 
-		foreach ( $posts as $post ) {$xx++;
5179 
+        $xx = 0;
5180 
+		foreach ($posts as $post) {$xx++;
5181 5181 
 			$post_id = $post['ID'];
5182 5182
5183 
-			$gd_post_info = geodir_get_post_info( $post_id );
5184 
-			$post_info = (array)$gd_post_info;
5183 
+			$gd_post_info = geodir_get_post_info($post_id);
5184 
+			$post_info = (array) $gd_post_info;
5185 5185
5186 
-			$taxonomy_category = $post_type . 'category';
5187 
-			$taxonomy_tags = $post_type . '_tags';
5186 
+			$taxonomy_category = $post_type.'category';
5187 
+			$taxonomy_tags = $post_type.'_tags';
5188 5188
5189 5189 
 			$post_category = '';
5190 5190 
 			$default_category_id = $gd_post_info->default_category;
5191 5191 
 			$default_category = '';
5192 5192 
 			$post_tags = '';
5193 
-			$terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );
5193 
+			$terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags));
5194 5194
5195 
-			if ( !empty( $terms ) && !is_wp_error( $terms ) ) {
5195 
+			if (!empty($terms) && !is_wp_error($terms)) {
5196 5196 
 				$post_category = array();
5197 5197 
 				$post_tags = array();
5198 5198
5199 
-				foreach ( $terms as $term ) {
5200 
-					if ( $term->taxonomy == $taxonomy_category ) {
5199 
+				foreach ($terms as $term) {
5200 
+					if ($term->taxonomy == $taxonomy_category) {
5201 5201 
 						$post_category[] = $term->name;
5202 5202
5203 5203 
 						if ($default_category_id == $term->term_id) {

@@ -5205,7 +5205,7 @@  discard block
 
 block discarded – undo
5205 5205 
 						}
5206 5206 
 					}
5207 5207
5208 
-					if ( $term->taxonomy == $taxonomy_tags ) {
5208 
+					if ($term->taxonomy == $taxonomy_tags) {
5209 5209 
 						$post_tags[] = $term->name;
5210 5210 
 					}
5211 5211 
 				}

@@ -5213,47 +5213,47 @@  discard block
 
 block discarded – undo
5213 5213 
 				if (empty($default_category) && !empty($post_category)) {
5214 5214 
 					$default_category = $post_category[0]; // Set first one as default category.
5215 5215 
 				}
5216 
-				$post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';
5217 
-				$post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : '';
5216 
+				$post_category = !empty($post_category) ? implode(',', $post_category) : '';
5217 
+				$post_tags = !empty($post_tags) ? implode(',', $post_tags) : '';
5218 5218 
 			}
5219 5219
5220 5220 
 			// Franchise data
5221 
-			if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {
5221 
+			if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {
5222 5222 
 				$franchise_id = $post_info['franchise'];
5223 5223 
 				$gd_franchise_info = geodir_get_post_info($franchise_id);
5224 5224
5225 5225 
 				if (geodir_franchise_pkg_is_active($gd_franchise_info)) {
5226 
-					$franchise_info = (array)$gd_franchise_info;
5226 
+					$franchise_info = (array) $gd_franchise_info;
5227 5227 
 					$locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);
5228 5228
5229 5229 
 					if (!empty($locked_fields)) {
5230 
-						foreach( $locked_fields as $locked_field) {
5230 
+						foreach ($locked_fields as $locked_field) {
5231 5231 
 							if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {
5232 5232 
 								$post_info[$locked_field] = $franchise_info[$locked_field];
5233 5233 
 							}
5234 5234
5235 5235 
 							if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {
5236 
-								$franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );
5236 
+								$franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags));
5237 5237
5238 
-								if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {
5238 
+								if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {
5239 5239 
 									$franchise_post_category = array();
5240 5240 
 									$franchise_post_tags = array();
5241 5241
5242 
-									foreach ( $franchise_terms as $franchise_term ) {
5243 
-										if ( $franchise_term->taxonomy == $taxonomy_category ) {
5242 
+									foreach ($franchise_terms as $franchise_term) {
5243 
+										if ($franchise_term->taxonomy == $taxonomy_category) {
5244 5244 
 											$franchise_post_category[] = $franchise_term->name;
5245 5245 
 										}
5246 5246
5247 
-										if ( $franchise_term->taxonomy == $taxonomy_tags ) {
5247 
+										if ($franchise_term->taxonomy == $taxonomy_tags) {
5248 5248 
 											$franchise_post_tags[] = $franchise_term->name;
5249 5249 
 										}
5250 5250 
 									}
5251 5251
5252 5252 
 									if (in_array($taxonomy_category, $locked_fields)) {
5253 
-										$post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';
5253 
+										$post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';
5254 5254 
 									}
5255 5255 
 									if (in_array('post_tags', $locked_fields)) {
5256 
-										$post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : '';
5256 
+										$post_tags = !empty($franchise_post_tags) ? implode(',', $franchise_post_tags) : '';
5257 5257 
 									}
5258 5258 
 								}
5259 5259 
 							}

@@ -5262,18 +5262,18 @@  discard block
 
 block discarded – undo
5262 5262 
 				}
5263 5263 
 			}
5264 5264
5265 
-			$post_images = geodir_get_images( $post_id );
5265 
+			$post_images = geodir_get_images($post_id);
5266 5266 
 			$current_images = array();
5267 
-			if ( !empty( $post_images ) ) {
5268 
-				foreach ( $post_images as $post_image ) {
5269 
-					$post_image = (array)$post_image;
5270 
-					$image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : '';
5271 
-					if ( $image ) {
5267 
+			if (!empty($post_images)) {
5268 
+				foreach ($post_images as $post_image) {
5269 
+					$post_image = (array) $post_image;
5270 
+					$image = !empty($post_image) && isset($post_image['path']) && $wp_filesystem->is_file($post_image['path']) && $wp_filesystem->exists($post_image['path']) ? $post_image['src'] : '';
5271 
+					if ($image) {
5272 5272 
 						$current_images[] = $image;
5273 5273 
 					}
5274 5274 
 				}
5275 5275
5276 
-				$images_count = max( $images_count, count( $current_images ) );
5276 
+				$images_count = max($images_count, count($current_images));
5277 5277 
 			}
5278 5278
5279 5279 
 			$csv_row = array();

@@ -5285,7 +5285,7 @@  discard block
 
 block discarded – undo
5285 5285 
 			$csv_row[] = $default_category; // default_category
5286 5286 
 			$csv_row[] = $post_tags; // post_tags
5287 5287 
 			$csv_row[] = $post_type; // post_type
5288 
-			if ( $post_type == 'gd_event' ) {
5288 
+			if ($post_type == 'gd_event') {
5289 5289 
 				$event_data = geodir_imex_get_event_data($post, $gd_post_info);
5290 5290 
 				$csv_row[] = $event_data['event_date']; // event_date
5291 5291 
 				$csv_row[] = $event_data['event_enddate']; // enddate

@@ -5306,12 +5306,12 @@  discard block
 
 block discarded – undo
5306 5306 
 				$csv_row[] = $event_data['recurring_end_date']; // repeat_end
5307 5307 
 			}
5308 5308 
 			$csv_row[] = $post_info['post_status']; // post_status
5309 
-			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured
5309 
+			$csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured
5310 5310 
             if ($is_claim_active) {
5311 
-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed
5311 
+                $csv_row[] = !empty($post_info['claimed']) && (int) $post_info['claimed'] == 1 ? 1 : ''; // claimed
5312 5312 
             }
5313 5313 
 			if ($is_payment_plugin) {
5314 
-				$csv_row[] = (int)$post_info['package_id']; // package_id
5314 
+				$csv_row[] = (int) $post_info['package_id']; // package_id
5315 5315 
 				$csv_row[] = $post_info['alive_days'] !== '' ? absint($post_info['alive_days']) : ''; // alive_days
5316 5316 
 				$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
5317 5317 
 			}

@@ -5348,14 +5348,14 @@  discard block
 
 block discarded – undo
5348 5348 
 			$csv_row[] = stripslashes($post_info['geodir_special_offers']); // geodir_special_offers
5349 5349 
 			// WPML
5350 5350 
 			if ($is_wpml) {
5351 
-				$csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type );
5352 
-				$csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type );
5351 
+				$csv_row[] = geodir_get_language_for_element($post_id, 'post_'.$post_type);
5352 
+				$csv_row[] = geodir_imex_original_post_id($post_id, 'post_'.$post_type);
5353 5353 
 			}
5354 5354 
 			// WPML
5355 5355
5356 
-			if ( !empty( $custom_fields ) ) {
5357 
-				foreach ( $custom_fields as $custom_field ) {
5358 
-					$csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : '';
5356 
+			if (!empty($custom_fields)) {
5357 
+				foreach ($custom_fields as $custom_field) {
5358 
+					$csv_row[] = isset($post_info[$custom_field->htmlvar_name]) ? $post_info[$custom_field->htmlvar_name] : '';
5359 5359 
 				}
5360 5360 
 			}
5361 5361 
 			

@@ -5366,15 +5366,15 @@  discard block
 
 block discarded – undo
5366 5366 
 				$franchise = '';
5367 5367
5368 5368 
 				if (geodir_franchise_pkg_is_active($gd_post_info)) {
5369 
-					$gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );
5370 
-					$locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';
5369 
+					$gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true);
5370 
+					$locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : '';
5371 5371 
 					$locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');
5372 
-					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id
5372 
+					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id
5373 5373 
 				}
5374 5374
5375 
-				$csv_row[] = (int)$gd_is_franchise; // gd_is_franchise
5375 
+				$csv_row[] = (int) $gd_is_franchise; // gd_is_franchise
5376 5376 
 				$csv_row[] = $locaked_fields; // gd_franchise_lock fields
5377 
-				$csv_row[] = (int)$franchise; // franchise id
5377 
+				$csv_row[] = (int) $franchise; // franchise id
5378 5378 
 			}
5379 5379
5380 5380 
             /**

@@ -5388,15 +5388,15 @@  discard block
 
 block discarded – undo
5388 5388 
              */
5389 5389 
             $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);
5390 5390
5391 
-			for ( $c = 0; $c < $images_count; $c++ ) {
5392 
-				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE
5391 
+			for ($c = 0; $c < $images_count; $c++) {
5392 
+				$csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE
5393 5393 
 			}
5394 5394
5395 5395 
 			$csv_rows[] = $csv_row;
5396 5396
5397 5397 
 		}
5398 5398
5399 
-		for ( $c = 0; $c < $images_count; $c++ ) {
5399 
+		for ($c = 0; $c < $images_count; $c++) {
5400 5400 
 			$csv_rows[0][] = 'IMAGE';
5401 5401 
 		}
5402 5402 
 	}

@@ -5418,30 +5418,30 @@  discard block
 
 block discarded – undo
5418 5418 
  * @param int $page_no Page number. Default 0.
5419 5419 
  * @return array Array of posts data.
5420 5420 
  */
5421 
-function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {
5421 
+function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {
5422 5422 
     global $wpdb, $plugin_prefix;
5423 5423
5424 
-    if ( ! post_type_exists( $post_type ) )
5424 
+    if (!post_type_exists($post_type))
5425 5425 
         return new stdClass;
5426 5426
5427 
-    $table = $plugin_prefix . $post_type . '_detail';
5427 
+    $table = $plugin_prefix.$post_type.'_detail';
5428 5428
5429 5429 
     $limit = '';
5430 
-    if ( $per_page > 0 && $page_no > 0 ) {
5431 
-        $offset = ( $page_no - 1 ) * $per_page;
5430 
+    if ($per_page > 0 && $page_no > 0) {
5431 
+        $offset = ($page_no - 1) * $per_page;
5432 5432
5433 
-        if ( $offset > 0 ) {
5434 
-            $limit = " LIMIT " . $offset . "," . $per_page;
5433 
+        if ($offset > 0) {
5434 
+            $limit = " LIMIT ".$offset.",".$per_page;
5435 5435 
         } else {
5436 
-            $limit = " LIMIT " . $per_page;
5436 
+            $limit = " LIMIT ".$per_page;
5437 5437 
         }
5438 5438 
     }
5439 5439
5440 5440 
     // Skip listing with statuses trash, auto-draft etc...
5441 5441 
     $skip_statuses = geodir_imex_export_skip_statuses();
5442 5442 
     $where_statuses = '';
5443 
-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
5444 
-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
5443 
+    if (!empty($skip_statuses) && is_array($skip_statuses)) {
5444 
+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
5445 5445 
     }
5446 5446
5447 5447 
     /**

@@ -5452,9 +5452,9 @@  discard block
 
 block discarded – undo
5452 5452 
      *
5453 5453 
      * @param string $where SQL where clause part.
5454 5454 
      */
5455 
-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );
5455 
+    $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);
5456 5456
5457 
-    $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 );
5457 
+    $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);
5458 5458 
     /**
5459 5459 
      * Modify returned posts SQL query for the current post type.
5460 5460 
      *

@@ -5464,8 +5464,8 @@  discard block
 
 block discarded – undo
5464 5464 
      * @param int $query The SQL query.
5465 5465 
      * @param string $post_type Post type.
5466 5466 
      */
5467 
-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );
5468 
-    $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );
5467 
+    $query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);
5468 
+    $results = (array) $wpdb->get_results($wpdb->prepare($query, $post_type), ARRAY_A);
5469 5469
5470 5470 
     /**
5471 5471 
      * Modify returned post results for the current post type.

@@ -5476,7 +5476,7 @@  discard block
 
 block discarded – undo
5476 5476 
      * @param object $results An object containing all post ids.
5477 5477 
      * @param string $post_type Post type.
5478 5478 
      */
5479 
-    return apply_filters( 'geodir_export_posts', $results, $post_type );
5479 
+    return apply_filters('geodir_export_posts', $results, $post_type);
5480 5480 
 }
5481 5481
5482 5482 
 /**

@@ -5494,24 +5494,24 @@  discard block
 
 block discarded – undo
5494 5494 
  * @param string $post_type Post type.
5495 5495 
  * @return string The SQL query.
5496 5496 
  */
5497 
-function geodir_imex_get_events_query( $query, $post_type ) {
5498 
-    if ( $post_type == 'gd_event' ) {
5497 
+function geodir_imex_get_events_query($query, $post_type) {
5498 
+    if ($post_type == 'gd_event') {
5499 5499 
         global $wpdb, $plugin_prefix;
5500 5500
5501 
-        $table = $plugin_prefix . $post_type . '_detail';
5501 
+        $table = $plugin_prefix.$post_type.'_detail';
5502 5502 
         $schedule_table = EVENT_SCHEDULE;
5503 5503
5504 5504 
         // Skip listing with statuses trash, auto-draft etc...
5505 5505 
         $skip_statuses = geodir_imex_export_skip_statuses();
5506 5506 
         $where_statuses = '';
5507 
-        if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {
5508 
-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";
5507 
+        if (!empty($skip_statuses) && is_array($skip_statuses)) {
5508 
+            $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";
5509 5509 
         }
5510 5510
5511 5511 
         /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */
5512 
-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );
5512 
+        $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);
5513 5513
5514 
-        $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 );
5514 
+        $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);
5515 5515 
     }
5516 5516
5517 5517 
     return $query;

@@ -5535,35 +5535,35 @@  discard block
 
 block discarded – undo
5535 5535 
  * @param  string $post_type Post type.
5536 5536 
  * @return int Total terms count.
5537 5537 
  */
5538 
-function geodir_get_terms_count( $post_type ) {
5539 
-    $args = array( 'hide_empty' => 0 );
5538 
+function geodir_get_terms_count($post_type) {
5539 
+    $args = array('hide_empty' => 0);
5540 5540
5541 
-    remove_all_filters( 'get_terms' );
5541 
+    remove_all_filters('get_terms');
5542 5542
5543 
-    $taxonomy = $post_type . 'category';
5543 
+    $taxonomy = $post_type.'category';
5544 5544
5545 5545 
     // WPML
5546 5546 
     $is_wpml = geodir_is_wpml();
5547 5547 
     $active_lang = 'all';
5548 
-    if ( $is_wpml ) {
5548 
+    if ($is_wpml) {
5549 5549 
         global $sitepress;
5550 5550 
         $active_lang = $sitepress->get_current_language();
5551 5551
5552 
-        if ( $active_lang != 'all' ) {
5553 
-            $sitepress->switch_lang( 'all', true );
5552 
+        if ($active_lang != 'all') {
5553 
+            $sitepress->switch_lang('all', true);
5554 5554 
         }
5555 5555 
     }
5556 5556 
     // WPML
5557 5557
5558 
-    $count_terms = wp_count_terms( $taxonomy, $args );
5558 
+    $count_terms = wp_count_terms($taxonomy, $args);
5559 5559
5560 5560 
     // WPML
5561 
-    if ( $is_wpml && $active_lang !== 'all' ) {
5561 
+    if ($is_wpml && $active_lang !== 'all') {
5562 5562 
         global $sitepress;
5563 
-        $sitepress->switch_lang( $active_lang, true );
5563 
+        $sitepress->switch_lang($active_lang, true);
5564 5564 
     }
5565 5565 
     // WPML
5566 
-    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;
5566 
+    $count_terms = !is_wp_error($count_terms) ? $count_terms : 0;
5567 5567
5568 5568 
     return $count_terms;
5569 5569 
 }

@@ -5580,23 +5580,23 @@  discard block
 
 block discarded – undo
5580 5580 
  * @param int $page_no Page number. Default 0.
5581 5581 
  * @return array Array of terms data.
5582 5582 
  */
5583 
-function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {
5584 
-	$args = array( 'hide_empty' => 0, 'orderby' => 'id' );
5583 
+function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {
5584 
+	$args = array('hide_empty' => 0, 'orderby' => 'id');
5585 5585
5586 
-	remove_all_filters( 'get_terms' );
5586 
+	remove_all_filters('get_terms');
5587 5587
5588 
-	$taxonomy = $post_type . 'category';
5588 
+	$taxonomy = $post_type.'category';
5589 5589
5590 
-	if ( $per_page > 0 && $page_no > 0 ) {
5591 
-		$args['offset'] = ( $page_no - 1 ) * $per_page;
5590 
+	if ($per_page > 0 && $page_no > 0) {
5591 
+		$args['offset'] = ($page_no - 1) * $per_page;
5592 5592 
 		$args['number'] = $per_page;
5593 5593 
 	}
5594 5594
5595 
-	$terms = get_terms( $taxonomy, $args );
5595 
+	$terms = get_terms($taxonomy, $args);
5596 5596
5597 5597 
 	$csv_rows = array();
5598 5598
5599 
-	if ( !empty( $terms ) ) {
5599 
+	if (!empty($terms)) {
5600 5600 
 		$csv_row = array();
5601 5601 
 		$csv_row[] = 'cat_id';
5602 5602 
 		$csv_row[] = 'cat_name';

@@ -5618,16 +5618,16 @@  discard block
 
 block discarded – undo
5618 5618
5619 5619 
 		$csv_rows[] = $csv_row;
5620 5620
5621 
-		foreach ( $terms as $term ) {
5622 
-			$cat_icon = get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type );
5623 
-			$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';
5621 
+		foreach ($terms as $term) {
5622 
+			$cat_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $post_type);
5623 
+			$cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';
5624 5624
5625 
-			$cat_image = geodir_get_default_catimage( $term->term_id, $post_type );
5626 
-			$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';
5625 
+			$cat_image = geodir_get_default_catimage($term->term_id, $post_type);
5626 
+			$cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : '';
5627 5627
5628 5628 
 			$cat_parent = '';
5629 
-			if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {
5630 
-				$parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy );
5629 
+			if (isset($term->parent) && (int) $term->parent > 0 && term_exists((int) $term->parent, $taxonomy)) {
5630 
+				$parent_term = (array) get_term_by('id', (int) $term->parent, $taxonomy);
5631 5631 
 				$cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';
5632 5632 
 			}
5633 5633 
 			

@@ -5637,15 +5637,15 @@  discard block
 
 block discarded – undo
5637 5637 
 			$csv_row[] = $term->slug;
5638 5638 
 			$csv_row[] = $post_type;
5639 5639 
 			$csv_row[] = $cat_parent;
5640 
-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );
5640 
+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type);
5641 5641 
             // WPML
5642 5642 
 			if ($is_wpml) {
5643 
-				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );
5644 
-                $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );
5643 
+				$csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_'.$taxonomy);
5644 
+                $csv_row[] = geodir_imex_original_post_id($term->term_id, 'tax_'.$taxonomy);
5645 5645 
 			}
5646 5646 
 			// WPML
5647 5647 
 			$csv_row[] = $term->description;
5648 
-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );
5648 
+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type);
5649 5649 
 			$csv_row[] = $cat_image;
5650 5650 
 			$csv_row[] = $cat_icon;
5651 5651 
 			

@@ -5664,10 +5664,10 @@  discard block
 
 block discarded – undo
5664 5664 
  * @param  bool $relative True for relative path & False for absolute path.
5665 5665 
  * @return string Path to the cache directory.
5666 5666 
  */
5667 
-function geodir_path_import_export( $relative = true ) {
5667 
+function geodir_path_import_export($relative = true) {
5668 5668 
 	$upload_dir = wp_upload_dir();
5669 5669
5670 
-	return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';
5670 
+	return $relative ? $upload_dir['baseurl'].'/cache' : $upload_dir['basedir'].'/cache';
5671 5671 
 }
5672 5672
5673 5673 
 /**

@@ -5683,8 +5683,8 @@  discard block
 
 block discarded – undo
5683 5683 
  * @param  bool $clear If true then it overwrite data otherwise add rows at the end of file.
5684 5684 
  * @return bool true if success otherwise false.
5685 5685 
  */
5686 
-function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {
5687 
-	if ( empty( $csv_data ) ) {
5686 
+function geodir_save_csv_data($file_path, $csv_data = array(), $clear = true) {
5687 
+	if (empty($csv_data)) {
5688 5688 
 		return false;
5689 5689 
 	}
5690 5690 
 	

@@ -5692,17 +5692,17 @@  discard block
 
 block discarded – undo
5692 5692
5693 5693 
 	$mode = $clear ? 'w+' : 'a+';
5694 5694
5695 
-	if ( function_exists( 'fputcsv' ) ) {
5696 
-		$file = fopen( $file_path, $mode );
5697 
-		foreach( $csv_data as $csv_row ) {
5695 
+	if (function_exists('fputcsv')) {
5696 
+		$file = fopen($file_path, $mode);
5697 
+		foreach ($csv_data as $csv_row) {
5698 5698 
 			//$csv_row = array_map( 'utf8_decode', $csv_row );
5699 
-			$write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' );
5699 
+			$write_successful = fputcsv($file, $csv_row, ",", $enclosure = '"');
5700 5700 
 		}
5701 
-		fclose( $file );
5701 
+		fclose($file);
5702 5702 
 	} else {
5703 
-		foreach( $csv_data as $csv_row ) {
5703 
+		foreach ($csv_data as $csv_row) {
5704 5704 
 			//$csv_row = array_map( 'utf8_decode', $csv_row );
5705 
-			$wp_filesystem->put_contents( $file_path, $csv_row );
5705 
+			$wp_filesystem->put_contents($file_path, $csv_row);
5706 5706 
 		}
5707 5707 
 	}
5708 5708 
 		

@@ -5720,14 +5720,14 @@  discard block
 
 block discarded – undo
5720 5720 
  * @param  string $file Full path to file.
5721 5721 
  * @return int No of file rows.
5722 5722 
  */
5723 
-function geodir_import_export_line_count( $file ) {
5723 
+function geodir_import_export_line_count($file) {
5724 5724 
 	global $wp_filesystem;
5725 5725
5726 
-	if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {
5727 
-		$contents = $wp_filesystem->get_contents_array( $file );
5726 
+	if ($wp_filesystem->is_file($file) && $wp_filesystem->exists($file)) {
5727 
+		$contents = $wp_filesystem->get_contents_array($file);
5728 5728
5729 
-		if ( !empty( $contents ) && is_array( $contents ) ) {
5730 
-			return count( $contents ) - 1;
5729 
+		if (!empty($contents) && is_array($contents)) {
5730 
+			return count($contents) - 1;
5731 5731 
 		}
5732 5732 
 	}
5733 5733 
 	

@@ -5744,11 +5744,11 @@  discard block
 
 block discarded – undo
5744 5744 
  * @param string $post_type The post type.
5745 5745 
  * @return object Queried object.
5746 5746 
  */
5747 
-function geodir_imex_get_custom_fields( $post_type ) {
5747 
+function geodir_imex_get_custom_fields($post_type) {
5748 5748 
 	global $wpdb;
5749 5749
5750 
-	$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 ) );
5751 
-	$rows = $wpdb->get_results( $sql );
5750 
+	$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));
5751 
+	$rows = $wpdb->get_results($sql);
5752 5752
5753 5753 
 	return $rows;
5754 5754 
 }

@@ -5764,10 +5764,10 @@  discard block
 
 block discarded – undo
5764 5764 
  * @return array Event data array.
5765 5765 
  */
5766 5766 
 function geodir_imex_get_event_data($post, $gd_post_info) {
5767 
-	$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'] ) ) : '';
5767 
+	$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'])) : '';
5768 5768 
 	$event_enddate = $event_date;
5769 
-	$starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : '';
5770 
-	$endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : '';
5769 
+	$starttime = isset($post['starttime']) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['starttime'])) : '';
5770 
+	$endtime = isset($post['endtime']) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['endtime'])) : '';
5771 5771
5772 5772 
 	$is_recurring_event = '';
5773 5773 
 	$event_duration_days = '';

@@ -5784,15 +5784,15 @@  discard block
 
 block discarded – undo
5784 5784
5785 5785 
 	$recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array();
5786 5786 
 	if (!empty($recurring_data)) {
5787 
-		$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;
5788 
-		$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;
5789 
-		$starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime;
5790 
-		$endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime;
5787 
+		$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;
5788 
+		$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;
5789 
+		$starttime = isset($recurring_data['starttime']) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['starttime'])) : $starttime;
5790 
+		$endtime = isset($recurring_data['endtime']) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['endtime'])) : $endtime;
5791 5791 
 		$is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';
5792 5792 
 		$different_times = !empty($recurring_data['different_times']) ? true : false;
5793 5793
5794 
-		$recurring_pkg = geodir_event_recurring_pkg( $gd_post_info );
5795 
-		$is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true;
5794 
+		$recurring_pkg = geodir_event_recurring_pkg($gd_post_info);
5795 
+		$is_recurring = isset($gd_post_info->is_recurring) && (int) $gd_post_info->is_recurring == 0 ? false : true;
5796 5796
5797 5797 
 		if ($recurring_pkg && $is_recurring) {
5798 5798 
 			$recurring_dates = $event_date;

@@ -5802,13 +5802,13 @@  discard block
 
 block discarded – undo
5802 5802 
 			$recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';
5803 5803
5804 5804 
 			if (!empty($recurring_data['event_recurring_dates'])) {
5805 
-				$event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );
5805 
+				$event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);
5806 5806
5807 5807 
 				if (!empty($event_recurring_dates)) {
5808 5808 
 					$recurring_dates = array();
5809 5809
5810 5810 
 					foreach ($event_recurring_dates as $date) {
5811 
-						$recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );
5811 
+						$recurring_dates[] = date_i18n('d/m/Y', strtotime($date));
5812 5812 
 					}
5813 5813
5814 5814 
 					$recurring_dates = implode(",", $recurring_dates);

@@ -5824,7 +5824,7 @@  discard block
 
 block discarded – undo
5824 5824 
 						$times = array();
5825 5825
5826 5826 
 						foreach ($recurring_data['starttimes'] as $time) {
5827 
-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';
5827 
+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';
5828 5828 
 						}
5829 5829
5830 5830 
 						$event_starttimes = implode(",", $times);

@@ -5834,7 +5834,7 @@  discard block
 
 block discarded – undo
5834 5834 
 						$times = array();
5835 5835
5836 5836 
 						foreach ($recurring_data['endtimes'] as $time) {
5837 
-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';
5837 
+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';
5838 5838 
 						}
5839 5839
5840 5840 
 						$event_endtimes = implode(",", $times);

@@ -5846,8 +5846,8 @@  discard block
 
 block discarded – undo
5846 5846 
 					}
5847 5847 
 				}
5848 5848 
 			} else {
5849 
-				$event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1;
5850 
-				$recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;
5849 
+				$event_duration_days = isset($recurring_data['duration_x']) ? (int) $recurring_data['duration_x'] : 1;
5850 
+				$recurring_interval = !empty($recurring_data['repeat_x']) && (int) $recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;
5851 5851
5852 5852 
 				if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {
5853 5853 
 					$week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

@@ -5863,11 +5863,11 @@  discard block
 
 block discarded – undo
5863 5863 
 				}
5864 5864
5865 5865 
 				$recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;
5866 
-				if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {
5867 
-					$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'] ) ) : '';
5866 
+				if (!empty($recurring_data['repeat_end_type']) && (int) $recurring_data['repeat_end_type'] == 1) {
5867 
+					$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'])) : '';
5868 5868 
 					$max_recurring_count = empty($recurring_end_date) ? 1 : '';
5869 5869 
 				} else {
5870 
-					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1);
5870 
+					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int) $recurring_data['max_repeat'] > 0 ? (int) $recurring_data['max_repeat'] : 1);
5871 5871 
 				}
5872 5872 
 			}
5873 5873 
 		}

@@ -5931,9 +5931,9 @@  discard block
 
 block discarded – undo
5931 5931 
  * @return array Event data array.
5932 5932 
  */
5933 5933 
 function geodir_imex_process_event_data($gd_post) {
5934 
-	$recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post );
5934 
+	$recurring_pkg = geodir_event_recurring_pkg((object) $gd_post);
5935 5935
5936 
-	$is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true;
5936 
+	$is_recurring = isset($gd_post['is_recurring_event']) && (int) $gd_post['is_recurring_event'] == 0 ? false : true;
5937 5937 
 	$event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_date($gd_post['event_date'], 'Y-m-d') : '';
5938 5938 
 	$event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_date($gd_post['event_enddate'], 'Y-m-d') : $event_date;
5939 5939 
 	$all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false;

@@ -5980,17 +5980,17 @@  discard block
 
 block discarded – undo
5980 5980 
 				$event_recurring_dates = implode(",", $event_recurring_dates);
5981 5981 
 			}
5982 5982 
 		} else {
5983 
-			$duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1;
5984 
-			$repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1;
5985 
-			$max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1;
5986 
-			$repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_date($gd_post['recurring_end_date'], 'Y-m-d') : '';
5983 
+			$duration_x = !empty($gd_post['event_duration_days']) ? (int) $gd_post['event_duration_days'] : 1;
5984 
+			$repeat_x = !empty($gd_post['recurring_interval']) ? (int) $gd_post['recurring_interval'] : 1;
5985 
+			$max_repeat = !empty($gd_post['max_recurring_count']) ? (int) $gd_post['max_recurring_count'] : 1;
5986 
+			$repeat_end = !empty($gd_post['recurring_end_date']) ? geodir_date($gd_post['recurring_end_date'], 'Y-m-d') : '';
5987 5987
5988 5988 
 			$repeat_end_type = $repeat_end != '' ? 1 : 0;
5989 5989 
 			$max_repeat = $repeat_end != '' ? '' : $max_repeat;
5990 5990
5991 5991 
 			$week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));
5992 5992
5993 
-			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();
5993 
+			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days']) != '' ? explode(',', trim($gd_post['recurring_week_days'])) : array();
5994 5994 
 			$repeat_days = array();
5995 5995 
 			if (!empty($a_repeat_days)) {
5996 5996 
 				foreach ($a_repeat_days as $repeat_day) {

@@ -6008,7 +6008,7 @@  discard block
 
 block discarded – undo
6008 6008 
 			$repeat_weeks = array();
6009 6009 
 			if (!empty($a_repeat_weeks)) {
6010 6010 
 				foreach ($a_repeat_weeks as $repeat_week) {
6011 
-					$repeat_weeks[] = (int)$repeat_week;
6011 
+					$repeat_weeks[] = (int) $repeat_week;
6012 6012 
 				}
6013 6013
6014 6014 
 				$repeat_weeks = array_unique($repeat_weeks);

@@ -6072,7 +6072,7 @@  discard block
 
 block discarded – undo
6072 6072
6073 6073 
     $page_found = $wpdb->get_var(
6074 6074 
         $wpdb->prepare(
6075 
-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",
6075 
+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",
6076 6076 
             array($slug)
6077 6077 
         )
6078 6078 
     );

@@ -6127,7 +6127,7 @@  discard block
 
 block discarded – undo
6127 6127 
  */
6128 6128 
 function geodir_admin_upgrade_notice() {
6129 6129 
     $class = "error";
6130 
-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");
6130 
+    $message = __("Please update core GeoDirectory or some addons may not function correctly.", "geodirectory");
6131 6131 
     echo"<div class=\"$class\"> <p>$message</p></div>";
6132 6132 
 }
6133 6133 
 

@@ -6139,7 +6139,7 @@  discard block
 
 block discarded – undo
6139 6139 
  * @param (object) $r
6140 6140 
  * @return (string) $output
6141 6141 
  */
6142 
-function geodire_admin_upgrade_notice( $plugin_data, $r )
6142 
+function geodire_admin_upgrade_notice($plugin_data, $r)
6143 6143 
 {
6144 6144 
     // readme contents
6145 6145 
     $args = array(

@@ -6147,7 +6147,7 @@  discard block
 
 block discarded – undo
6147 6147 
         'redirection' => 5
6148 6148 
     );
6149 6149 
     $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";
6150 
-    $data       = wp_remote_get( $url, $args );
6150 
+    $data = wp_remote_get($url, $args);
6151 6151
6152 6152 
     if (!is_wp_error($data) && $data['response']['code'] == 200) {
6153 6153 
 

@@ -6162,20 +6162,20 @@  discard block
 
 block discarded – undo
6162 6162 
 function geodir_in_plugin_update_message($content) {
6163 6163 
     // Output Upgrade Notice
6164 6164 
     $matches        = null;
6165 
-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';
6165 
+    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote(GEODIRECTORY_VERSION).'\s*=|$)~Uis';
6166 6166 
     $upgrade_notice = '';
6167 
-    if ( preg_match( $regexp, $content, $matches ) ) {
6168 
-        if(empty($matches)){return;}
6167 
+    if (preg_match($regexp, $content, $matches)) {
6168 
+        if (empty($matches)) {return; }
6169 6169
6170 
-        $version = trim( $matches[1] );
6171 
-        if($version && $version>GEODIRECTORY_VERSION){
6170 
+        $version = trim($matches[1]);
6171 
+        if ($version && $version > GEODIRECTORY_VERSION) {
6172 6172
6173 6173
6174 
-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );
6175 
-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {
6174 
+        $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));
6175 
+        if (version_compare(GEODIRECTORY_VERSION, $version, '<')) {
6176 6176 
             $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';
6177 
-            foreach ( $notices as $index => $line ) {
6178 
-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );
6177 
+            foreach ($notices as $index => $line) {
6178 
+                $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));
6179 6179 
             }
6180 6180 
             $upgrade_notice .= '</div> ';
6181 6181 
         }

@@ -6199,7 +6199,7 @@  discard block
 
 block discarded – undo
6199 6199 
 		$default_language = $sitepress->get_default_language();
6200 6200 
 		if ($current_language != 'all' && $current_language != $default_language) {
6201 6201 
 	?>
6202 
-	<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>
6202 
+	<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>
6203 6203 
 	<?php
6204 6204 
 		}
6205 6205 
 	}

@@ -6214,7 +6214,7 @@  discard block
 
 block discarded – undo
6214 6214 
  * @param array Listing statuses to be skipped.
6215 6215 
  */
6216 6216 
 function geodir_imex_export_skip_statuses() {
6217 
-    $statuses = array( 'trash', 'auto-draft' );
6217 
+    $statuses = array('trash', 'auto-draft');
6218 6218
6219 6219 
     /**
6220 6220 
      * Filter the statuses to skip during GD export listings.

@@ -6224,7 +6224,7 @@  discard block
 
 block discarded – undo
6224 6224 
      *
6225 6225 
      * @param array $statuses Listing statuses to be skipped.
6226 6226 
      */
6227 
-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );
6227 
+    $statuses = apply_filters('geodir_imex_export_skip_statuses', $statuses);
6228 6228
6229 6229 
     return $statuses;
6230 6230 
 }

@@ -6295,16 +6295,16 @@  discard block
 
 block discarded – undo
6295 6295 
 function geodir_imex_get_filter_where($where = '', $post_type = '') {
6296 6296 
     global $wpdb;
6297 6297
6298 
-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;
6298 
+    $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;
6299 6299
6300 
-    if ( !empty( $filters ) ) {
6301 
-        foreach ( $filters as $field => $value ) {
6300 
+    if (!empty($filters)) {
6301 
+        foreach ($filters as $field => $value) {
6302 6302 
             switch ($field) {
6303 6303 
                 case 'start_date':
6304 
-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";
6304 
+                    $where .= " AND `".$wpdb->posts."`.`post_date` >= '".sanitize_text_field($value)." 00:00:00'";
6305 6305 
                 break;
6306 6306 
                 case 'end_date':
6307 
-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";
6307 
+                    $where .= " AND `".$wpdb->posts."`.`post_date` <= '".sanitize_text_field($value)." 23:59:59'";
6308 6308 
                 break;
6309 6309 
             }
6310 6310 
         }

@@ -6316,25 +6316,25 @@  discard block
 
 block discarded – undo
6316 6316 
 add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);
6317 6317
6318 6318
6319 
-function geodir_fix_for_primer_theme(){
6320 
-    if(!defined( 'PRIMER_VERSION' )){return;}
6319 
+function geodir_fix_for_primer_theme() {
6320 
+    if (!defined('PRIMER_VERSION')) {return; }
6321 6321 
     global $pagenow;
6322 6322
6323 
-    if ( ( 'post.php' === $pagenow || 'post-new.php' === $pagenow ) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']) )  ){
6323 
+    if (('post.php' === $pagenow || 'post-new.php' === $pagenow) && (isset($_REQUEST['post_type']) || isset($_REQUEST['post']))) {
6324 6324
6325 
-        $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type( $_GET['post'] );
6325 
+        $post_type = isset($_REQUEST['post_type']) ? esc_attr($_REQUEST['post_type']) : get_post_type($_GET['post']);
6326 6326
6327 6327 
         $post_types = geodir_get_posttypes();
6328 
-        if ($post_type && in_array($post_type, $post_types) ) {
6328 
+        if ($post_type && in_array($post_type, $post_types)) {
6329 6329 
             global $primer_customizer_layouts;
6330 
-            remove_action( 'add_meta_boxes', array( $primer_customizer_layouts, 'add_meta_box' ), 10);
6330 
+            remove_action('add_meta_boxes', array($primer_customizer_layouts, 'add_meta_box'), 10);
6331 6331 
         }
6332 6332 
     }
6333 6333
6334 6334 
 }
6335 6335
6336 
-if(is_admin()){
6337 
-    add_action('add_meta_boxes','geodir_fix_for_primer_theme',0);
6336 
+if (is_admin()) {
6337 
+    add_action('add_meta_boxes', 'geodir_fix_for_primer_theme', 0);
6338 6338 
 }
6339 6339
6340 6340 
 

@@ -6467,32 +6467,32 @@  discard block
 
 block discarded – undo
6467 6467
6468 6468 
 function geodir_ga_activation_url() {
6469 6469
6470 
-    return add_query_arg( array(
6470 
+    return add_query_arg(array(
6471 6471 
         'next'          => admin_url("admin.php?page=geodirectory&active_tab=google_analytic_settings"),
6472 6472 
         'scope'         => GEODIR_GA_SCOPE,
6473 6473 
         'response_type' => 'code',
6474 6474 
         'redirect_uri'  => GEODIR_GA_REDIRECT,
6475 6475 
         'client_id'     => GEODIR_GA_CLIENTID,
6476 
-    ), 'https://accounts.google.com/o/oauth2/auth' );
6476 
+    ), 'https://accounts.google.com/o/oauth2/auth');
6477 6477
6478 6478 
     return $url;
6479 6479 
 }
6480 6480
6481 
-function geodir_gd_accounts(){
6481 
+function geodir_gd_accounts() {
6482 6482 
     $accounts = array();
6483 
-    $useAuth = ( get_option( 'geodir_ga_auth_code' ) == '' ? false : true );
6484 
-    if($useAuth){
6483 
+    $useAuth = (get_option('geodir_ga_auth_code') == '' ? false : true);
6484 
+    if ($useAuth) {
6485 6485 
         try {
6486 6486 
             $accounts = geodir_ga_get_analytics_accounts();
6487 6487 
         } catch (Exception $e) {
6488 
-            geodir_error_log( wp_sprintf( __( 'GD Google Analytics API Error(%s) : %s', 'geodirectory' ), $e->getCode(), $e->getMessage() ) );
6488 
+            geodir_error_log(wp_sprintf(__('GD Google Analytics API Error(%s) : %s', 'geodirectory'), $e->getCode(), $e->getMessage()));
6489 6489 
         }
6490 6490
6491 
-        if(is_array($accounts)){
6492 
-            $accounts = array_merge(array(__('Select Account','geodirectory')),$accounts);
6493 
-        }elseif(get_option('geodir_ga_account_id')){
6491 
+        if (is_array($accounts)) {
6492 
+            $accounts = array_merge(array(__('Select Account', 'geodirectory')), $accounts);
6493 
+        }elseif (get_option('geodir_ga_account_id')) {
6494 6494 
             $accounts = array();
6495 
-            $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required','geodirectory').' ('.get_option('geodir_ga_account_id').')';
6495 
+            $accounts[get_option('geodir_ga_account_id')] = __('Account re-authorization may be required', 'geodirectory').' ('.get_option('geodir_ga_account_id').')';
6496 6496 
         }
6497 6497 
     }
6498 6498 
     return $accounts;

@@ -6503,21 +6503,21 @@  discard block
 
 block discarded – undo
6503 6503 
     global $gd_ga_errors;
6504 6504 
     $accounts = array();
6505 6505
6506 
-    if(get_option('geodir_ga_auth_token')===false){update_option('geodir_ga_auth_token','');}
6506 
+    if (get_option('geodir_ga_auth_token') === false) {update_option('geodir_ga_auth_token', ''); }
6507 6507
6508 6508
6509 
-    if(get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])){
6509 
+    if (get_option('geodir_gd_uids') && !isset($_POST['geodir_ga_auth_code'])) {
6510 6510 
       return get_option('geodir_gd_uids');
6511 6511 
     }
6512 6512
6513 6513 
     # Create a new Gdata call
6514 
-    if ( trim(get_option('geodir_ga_auth_code')) != '' )
6514 
+    if (trim(get_option('geodir_ga_auth_code')) != '')
6515 6515 
         $stats = new GDGoogleAnalyticsStats();
6516 6516 
     else
6517 6517 
         return false;
6518 6518
6519 6519 
     # Check if Google sucessfully logged in
6520 
-    if ( ! $stats->checkLogin() )
6520 
+    if (!$stats->checkLogin())
6521 6521 
         return false;
6522 6522
6523 6523 
     # Get a list of accounts

@@ -6529,28 +6529,28 @@  discard block
 
 block discarded – undo
6529 6529 
     }
6530 6530
6531 6531
6532 
-    natcasesort ($accounts);
6532 
+    natcasesort($accounts);
6533 6533
6534 6534 
     # Return the account array if there are accounts
6535 
-    if ( count($accounts) > 0 ){
6536 
-        update_option('geodir_gd_uids',$accounts);
6535 
+    if (count($accounts) > 0) {
6536 
+        update_option('geodir_gd_uids', $accounts);
6537 6537 
         return $accounts;
6538 6538 
     }
6539 6539 
     else
6540 6540 
         return false;
6541 6541 
 }
6542 6542
6543 
-add_action( 'wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize' );
6544 
-function geodir_ga_deauthorize(){
6543 
+add_action('wp_ajax_geodir_ga_deauthorize', 'geodir_ga_deauthorize');
6544 
+function geodir_ga_deauthorize() {
6545 6545
6546 
-    if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], 'gd_ga_deauthorize' ) ) {
6546 
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'gd_ga_deauthorize')) {
6547 6547
6548 
-        die( 'Security check' );
6548 
+        die('Security check');
6549 6549
6550 6550 
     } else {
6551 
-        update_option('geodir_ga_auth_token','');
6552 
-        update_option('geodir_ga_auth_code','');
6553 
-        update_option('geodir_gd_uids','');
6551 
+        update_option('geodir_ga_auth_token', '');
6552 
+        update_option('geodir_ga_auth_code', '');
6553 
+        update_option('geodir_gd_uids', '');
6554 6554
6555 6555
6556 6556 
         echo admin_url('?page=geodirectory&active_tab=google_analytic_settings');
Please login to merge, or discard this patch.