Test Failed
Push — master ( c9cfa7...621ef4 )
by Stiofan
13:38 queued 49s
created
upgrade.php 3 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -324,7 +324,7 @@
 block discarded – undo
324 324
 
325 325
             if(!empty($show_in_arr )){
326 326
                 $show_in_arr = implode(',',$show_in_arr);
327
-            }else{
327
+            } else{
328 328
                 $show_in_arr = '';
329 329
             }
330 330
 
Please login to merge, or discard this patch.
Indentation   +662 added lines, -662 removed lines patch added patch discarded remove patch
@@ -10,53 +10,53 @@  discard block
 block discarded – undo
10 10
 global $wpdb;
11 11
 
12 12
 if (get_option('geodirectory' . '_db_version') != GEODIRECTORY_VERSION) {
13
-    /**
14
-     * Include custom database table related functions.
15
-     *
16
-     * @since 1.0.0
17
-     * @package GeoDirectory
18
-     */
19
-    include_once('geodirectory-admin/admin_db_install.php');
20
-    add_action('plugins_loaded', 'geodirectory_upgrade_all', 10);
21
-    if (GEODIRECTORY_VERSION <= '1.3.6') {
22
-        add_action('plugins_loaded', 'geodir_upgrade_136', 11);
23
-    }
24
-
25
-    if (GEODIRECTORY_VERSION <= '1.4.6') {
26
-        add_action('init', 'geodir_upgrade_146', 11);
27
-    }
28
-
29
-    if (GEODIRECTORY_VERSION <= '1.4.8') {
30
-        add_action('init', 'geodir_upgrade_148', 11);
31
-    }
32
-
33
-    if (GEODIRECTORY_VERSION <= '1.5.0') {
34
-        add_action('init', 'geodir_upgrade_150', 11);
35
-    }
36
-
37
-    if (GEODIRECTORY_VERSION <= '1.5.2') {
38
-        add_action('init', 'geodir_upgrade_152', 11);
39
-    }
40
-
41
-    if (GEODIRECTORY_VERSION <= '1.5.3') {
42
-        add_action('init', 'geodir_upgrade_153', 11);
43
-    }
44
-
45
-    if (GEODIRECTORY_VERSION <= '1.5.4') {
46
-        add_action('init', 'geodir_upgrade_154', 11);
47
-    }
13
+	/**
14
+	 * Include custom database table related functions.
15
+	 *
16
+	 * @since 1.0.0
17
+	 * @package GeoDirectory
18
+	 */
19
+	include_once('geodirectory-admin/admin_db_install.php');
20
+	add_action('plugins_loaded', 'geodirectory_upgrade_all', 10);
21
+	if (GEODIRECTORY_VERSION <= '1.3.6') {
22
+		add_action('plugins_loaded', 'geodir_upgrade_136', 11);
23
+	}
24
+
25
+	if (GEODIRECTORY_VERSION <= '1.4.6') {
26
+		add_action('init', 'geodir_upgrade_146', 11);
27
+	}
28
+
29
+	if (GEODIRECTORY_VERSION <= '1.4.8') {
30
+		add_action('init', 'geodir_upgrade_148', 11);
31
+	}
32
+
33
+	if (GEODIRECTORY_VERSION <= '1.5.0') {
34
+		add_action('init', 'geodir_upgrade_150', 11);
35
+	}
36
+
37
+	if (GEODIRECTORY_VERSION <= '1.5.2') {
38
+		add_action('init', 'geodir_upgrade_152', 11);
39
+	}
40
+
41
+	if (GEODIRECTORY_VERSION <= '1.5.3') {
42
+		add_action('init', 'geodir_upgrade_153', 11);
43
+	}
44
+
45
+	if (GEODIRECTORY_VERSION <= '1.5.4') {
46
+		add_action('init', 'geodir_upgrade_154', 11);
47
+	}
48 48
     
49
-    if (GEODIRECTORY_VERSION <= '1.6.18') {
50
-        add_action('init', 'geodir_upgrade_1618', 11);
51
-    }
49
+	if (GEODIRECTORY_VERSION <= '1.6.18') {
50
+		add_action('init', 'geodir_upgrade_1618', 11);
51
+	}
52 52
     
53
-    if (GEODIRECTORY_VERSION <= '1.6.22') {
54
-        add_action('init', 'geodir_upgrade_1622', 11);
55
-    }
53
+	if (GEODIRECTORY_VERSION <= '1.6.22') {
54
+		add_action('init', 'geodir_upgrade_1622', 11);
55
+	}
56 56
 
57
-    add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions
57
+	add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions
58 58
 
59
-    update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);
59
+	update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);
60 60
 
61 61
 }
62 62
 
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
  */
70 70
 function geodirectory_upgrade_all()
71 71
 {
72
-    geodir_create_tables();
73
-    geodir_update_review_db();
74
-    gd_install_theme_compat();
72
+	geodir_create_tables();
73
+	geodir_update_review_db();
74
+	gd_install_theme_compat();
75 75
 }
76 76
 
77 77
 /**
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
  */
83 83
 function geodir_upgrade_136()
84 84
 {
85
-    geodir_fix_review_overall_rating();
85
+	geodir_fix_review_overall_rating();
86 86
 }
87 87
 
88 88
 /**
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
  * @package GeoDirectory
93 93
  */
94 94
 function geodir_upgrade_146(){
95
-    gd_convert_virtual_pages();
95
+	gd_convert_virtual_pages();
96 96
 }
97 97
 
98 98
 /**
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
  * @package GeoDirectory
103 103
  */
104 104
 function geodir_upgrade_150(){
105
-    gd_fix_cpt_rewrite_slug();
105
+	gd_fix_cpt_rewrite_slug();
106 106
 }
107 107
 
108 108
 
@@ -114,11 +114,11 @@  discard block
 block discarded – undo
114 114
  * @package GeoDirectory
115 115
  */
116 116
 function geodir_upgrade_148(){
117
-    /*
117
+	/*
118 118
      * Blank the users google password if present as we now use oAuth 2.0
119 119
      */
120
-    update_option('geodir_ga_pass','');
121
-    update_option('geodir_ga_user','');
120
+	update_option('geodir_ga_pass','');
121
+	update_option('geodir_ga_user','');
122 122
 
123 123
 }
124 124
 
@@ -130,8 +130,8 @@  discard block
 block discarded – undo
130 130
  * @package GeoDirectory
131 131
  */
132 132
 function geodir_upgrade_153(){
133
-    geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');
134
-    geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');
133
+	geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');
134
+	geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');
135 135
 }
136 136
 
137 137
 /**
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
  * @package GeoDirectory
142 142
  */
143 143
 function geodir_upgrade_154(){
144
-    geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');
144
+	geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');
145 145
 }
146 146
 
147 147
 /**
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
  * @package GeoDirectory
152 152
  */
153 153
 function geodir_upgrade_152(){
154
-    gd_fix_address_detail_table_limit();
154
+	gd_fix_address_detail_table_limit();
155 155
 }
156 156
 
157 157
 
@@ -167,12 +167,12 @@  discard block
 block discarded – undo
167 167
  */
168 168
 function geodir_update_review_db()
169 169
 {
170
-    global $wpdb, $plugin_prefix;
170
+	global $wpdb, $plugin_prefix;
171 171
 
172
-    geodir_fix_review_date();
173
-    geodir_fix_review_post_status();
174
-    geodir_fix_review_content();
175
-    geodir_fix_review_location();
172
+	geodir_fix_review_date();
173
+	geodir_fix_review_post_status();
174
+	geodir_fix_review_content();
175
+	geodir_fix_review_location();
176 176
 
177 177
 }
178 178
 
@@ -185,8 +185,8 @@  discard block
 block discarded – undo
185 185
  */
186 186
 function geodir_fix_review_date()
187 187
 {
188
-    global $wpdb;
189
-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");
188
+	global $wpdb;
189
+	$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");
190 190
 }
191 191
 
192 192
 /**
@@ -198,8 +198,8 @@  discard block
 block discarded – undo
198 198
  */
199 199
 function geodir_fix_review_post_status()
200 200
 {
201
-    global $wpdb;
202
-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");
201
+	global $wpdb;
202
+	$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");
203 203
 }
204 204
 
205 205
 /**
@@ -212,12 +212,12 @@  discard block
 block discarded – undo
212 212
  */
213 213
 function geodir_fix_review_content()
214 214
 {
215
-    global $wpdb;
216
-    if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {
217
-        return true;
218
-    } else {
219
-        return false;
220
-    }
215
+	global $wpdb;
216
+	if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {
217
+		return true;
218
+	} else {
219
+		return false;
220
+	}
221 221
 }
222 222
 
223 223
 /**
@@ -230,20 +230,20 @@  discard block
 block discarded – undo
230 230
  */
231 231
 function geodir_fix_review_location()
232 232
 {
233
-    global $wpdb;
233
+	global $wpdb;
234 234
 
235
-    $all_postypes = geodir_get_posttypes();
235
+	$all_postypes = geodir_get_posttypes();
236 236
 
237
-    if (!empty($all_postypes)) {
238
-        foreach ($all_postypes as $key) {
239
-            // update each GD CTP
237
+	if (!empty($all_postypes)) {
238
+		foreach ($all_postypes as $key) {
239
+			// update each GD CTP
240 240
 
241
-            $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");
241
+			$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");
242 242
 
243
-        }
244
-        return true;
245
-    }
246
-    return false;
243
+		}
244
+		return true;
245
+	}
246
+	return false;
247 247
 }
248 248
 
249 249
 /**
@@ -255,84 +255,84 @@  discard block
 block discarded – undo
255 255
  */
256 256
 function geodir_fix_review_overall_rating()
257 257
 {
258
-    global $wpdb;
258
+	global $wpdb;
259 259
 
260
-    $all_postypes = geodir_get_posttypes();
260
+	$all_postypes = geodir_get_posttypes();
261 261
 
262
-    if (!empty($all_postypes)) {
263
-        foreach ($all_postypes as $key) {
264
-            // update each GD CTP
265
-            $reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");
262
+	if (!empty($all_postypes)) {
263
+		foreach ($all_postypes as $key) {
264
+			// update each GD CTP
265
+			$reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");
266 266
 
267
-            if (!empty($reviews)) {
268
-                foreach ($reviews as $post_id) {
269
-                    geodir_update_postrating($post_id->post_id, $key);
270
-                }
267
+			if (!empty($reviews)) {
268
+				foreach ($reviews as $post_id) {
269
+					geodir_update_postrating($post_id->post_id, $key);
270
+				}
271 271
 
272
-            }
272
+			}
273 273
 
274
-        }
274
+		}
275 275
 
276
-    }
276
+	}
277 277
 }
278 278
 
279 279
 
280 280
 function gd_convert_custom_field_display(){
281
-    global $wpdb;
281
+	global $wpdb;
282 282
 
283
-    $field_info = $wpdb->get_results("select * from " . GEODIR_CUSTOM_FIELDS_TABLE);
283
+	$field_info = $wpdb->get_results("select * from " . GEODIR_CUSTOM_FIELDS_TABLE);
284 284
 
285
-    $has_run = get_option('gd_convert_custom_field_display');
286
-    if($has_run){return;}
285
+	$has_run = get_option('gd_convert_custom_field_display');
286
+	if($has_run){return;}
287 287
 
288
-    // set the field_type_key for standard fields
289
-    $wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET field_type_key = field_type");
288
+	// set the field_type_key for standard fields
289
+	$wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET field_type_key = field_type");
290 290
 
291 291
 
292
-    if(is_array( $field_info)){
292
+	if(is_array( $field_info)){
293 293
 
294
-        foreach( $field_info as $cf){
294
+		foreach( $field_info as $cf){
295 295
 
296
-            $id = $cf->id;
296
+			$id = $cf->id;
297 297
 
298
-            if(!property_exists($cf,'show_in') || !$id){return;}
298
+			if(!property_exists($cf,'show_in') || !$id){return;}
299 299
 
300
-            $show_in_arr = array();
300
+			$show_in_arr = array();
301 301
 
302
-            if($cf->is_default){
303
-                $show_in_arr[] = "[detail]";
304
-            }
302
+			if($cf->is_default){
303
+				$show_in_arr[] = "[detail]";
304
+			}
305 305
 
306
-            if($cf->show_on_detail){
307
-                $show_in_arr[] = "[moreinfo]";
308
-            }
306
+			if($cf->show_on_detail){
307
+				$show_in_arr[] = "[moreinfo]";
308
+			}
309 309
 
310
-            if($cf->show_on_listing){
311
-                $show_in_arr[] = "[listing]";
312
-            }
310
+			if($cf->show_on_listing){
311
+				$show_in_arr[] = "[listing]";
312
+			}
313 313
 
314
-            if($cf->show_as_tab || $cf->htmlvar_name=='geodir_video' || $cf->htmlvar_name=='geodir_special_offers'){
315
-                $show_in_arr[] = "[owntab]";
316
-            }
314
+			if($cf->show_as_tab || $cf->htmlvar_name=='geodir_video' || $cf->htmlvar_name=='geodir_special_offers'){
315
+				$show_in_arr[] = "[owntab]";
316
+			}
317 317
 
318
-            if($cf->htmlvar_name=='post' || $cf->htmlvar_name=='geodir_contact' || $cf->htmlvar_name=='geodir_timing'){
319
-                $show_in_arr[] = "[mapbubble]";
320
-            }
318
+			if($cf->htmlvar_name=='post' || $cf->htmlvar_name=='geodir_contact' || $cf->htmlvar_name=='geodir_timing'){
319
+				$show_in_arr[] = "[mapbubble]";
320
+			}
321 321
 
322
-            if(!empty($show_in_arr )){
323
-                $show_in_arr = implode(',',$show_in_arr);
324
-            }else{
325
-                $show_in_arr = '';
326
-            }
322
+			if(!empty($show_in_arr )){
323
+				$show_in_arr = implode(',',$show_in_arr);
324
+			}else{
325
+				$show_in_arr = '';
326
+			}
327 327
 
328
-            if($show_in_arr){
329
-                $wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET show_in='$show_in_arr' WHERE id=$id");
330
-            }
328
+			if($show_in_arr){
329
+				$wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET show_in='$show_in_arr' WHERE id=$id");
330
+			}
331 331
 
332
-        }
332
+		}
333 333
 
334
-        update_option('gd_convert_custom_field_display',1);
335
-    }
334
+		update_option('gd_convert_custom_field_display',1);
335
+	}
336 336
 }
337 337
 
338 338
 ############################################
@@ -348,422 +348,422 @@  discard block
 block discarded – undo
348 348
  */
349 349
 function gd_install_theme_compat()
350 350
 {
351
-    global $wpdb;
351
+	global $wpdb;
352 352
 
353
-    $theme_compat = array();
354
-    $theme_compat = get_option('gd_theme_compats');
353
+	$theme_compat = array();
354
+	$theme_compat = get_option('gd_theme_compats');
355 355
 //GDF
356
-    $theme_compat['GeoDirectory_Framework'] = array(
357
-        'geodir_wrapper_open_id' => 'geodir_wrapper',
358
-        'geodir_wrapper_open_class' => '',
359
-        'geodir_wrapper_open_replace' => '',
360
-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',
361
-        'geodir_wrapper_content_open_id' => 'geodir_content',
362
-        'geodir_wrapper_content_open_class' => '',
363
-        'geodir_wrapper_content_open_replace' => '',
364
-        'geodir_wrapper_content_close_replace' => '',
365
-        'geodir_article_open_id' => '',
366
-        'geodir_article_open_class' => '',
367
-        'geodir_article_open_replace' => '',
368
-        'geodir_article_close_replace' => '',
369
-        'geodir_sidebar_right_open_id' => '',
370
-        'geodir_sidebar_right_open_class' => '',
371
-        'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',
372
-        'geodir_sidebar_right_close_replace' => '',
373
-        'geodir_sidebar_left_open_id' => '',
374
-        'geodir_sidebar_left_open_class' => '',
375
-        'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',
376
-        'geodir_sidebar_left_close_replace' => '',
377
-        'geodir_main_content_open_id' => '',
378
-        'geodir_main_content_open_class' => '',
379
-        'geodir_main_content_open_replace' => '<!-- removed -->',
380
-        'geodir_main_content_close_replace' => '<!-- removed -->',
381
-        'geodir_top_content_add' => '',
382
-        'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',
383
-        'geodir_before_widget_filter' => '',
384
-        'geodir_after_widget_filter' => '',
385
-        'geodir_theme_compat_css' => '',
386
-        'geodir_theme_compat_js' => '',
387
-        'geodir_theme_compat_default_options' => '',
388
-        'geodir_theme_compat_code' => ''
389
-    );
356
+	$theme_compat['GeoDirectory_Framework'] = array(
357
+		'geodir_wrapper_open_id' => 'geodir_wrapper',
358
+		'geodir_wrapper_open_class' => '',
359
+		'geodir_wrapper_open_replace' => '',
360
+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',
361
+		'geodir_wrapper_content_open_id' => 'geodir_content',
362
+		'geodir_wrapper_content_open_class' => '',
363
+		'geodir_wrapper_content_open_replace' => '',
364
+		'geodir_wrapper_content_close_replace' => '',
365
+		'geodir_article_open_id' => '',
366
+		'geodir_article_open_class' => '',
367
+		'geodir_article_open_replace' => '',
368
+		'geodir_article_close_replace' => '',
369
+		'geodir_sidebar_right_open_id' => '',
370
+		'geodir_sidebar_right_open_class' => '',
371
+		'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',
372
+		'geodir_sidebar_right_close_replace' => '',
373
+		'geodir_sidebar_left_open_id' => '',
374
+		'geodir_sidebar_left_open_class' => '',
375
+		'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',
376
+		'geodir_sidebar_left_close_replace' => '',
377
+		'geodir_main_content_open_id' => '',
378
+		'geodir_main_content_open_class' => '',
379
+		'geodir_main_content_open_replace' => '<!-- removed -->',
380
+		'geodir_main_content_close_replace' => '<!-- removed -->',
381
+		'geodir_top_content_add' => '',
382
+		'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',
383
+		'geodir_before_widget_filter' => '',
384
+		'geodir_after_widget_filter' => '',
385
+		'geodir_theme_compat_css' => '',
386
+		'geodir_theme_compat_js' => '',
387
+		'geodir_theme_compat_default_options' => '',
388
+		'geodir_theme_compat_code' => ''
389
+	);
390 390
 
391 391
 //Directory Theme
392
-    $theme_compat['Directory_Starter'] = array(
393
-        'geodir_wrapper_open_id' => 'geodir_wrapper',
394
-        'geodir_wrapper_open_class' => '',
395
-        'geodir_wrapper_open_replace' => '',
396
-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',
397
-        'geodir_wrapper_content_open_id' => 'geodir_content',
398
-        'geodir_wrapper_content_open_class' => '',
399
-        'geodir_wrapper_content_open_replace' => '',
400
-        'geodir_wrapper_content_close_replace' => '',
401
-        'geodir_article_open_id' => '',
402
-        'geodir_article_open_class' => '',
403
-        'geodir_article_open_replace' => '',
404
-        'geodir_article_close_replace' => '',
405
-        'geodir_sidebar_right_open_id' => '',
406
-        'geodir_sidebar_right_open_class' => '',
407
-        'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',
408
-        'geodir_sidebar_right_close_replace' => '',
409
-        'geodir_sidebar_left_open_id' => '',
410
-        'geodir_sidebar_left_open_class' => '',
411
-        'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',
412
-        'geodir_sidebar_left_close_replace' => '',
413
-        'geodir_main_content_open_id' => '',
414
-        'geodir_main_content_open_class' => '',
415
-        'geodir_main_content_open_replace' => '<!-- removed -->',
416
-        'geodir_main_content_close_replace' => '<!-- removed -->',
417
-        'geodir_top_content_add' => '',
418
-        'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',
419
-        'geodir_before_widget_filter' => '',
420
-        'geodir_after_widget_filter' => '',
421
-        'geodir_theme_compat_css' => '',
422
-        'geodir_theme_compat_js' => '',
423
-        'geodir_theme_compat_default_options' => '',
424
-        'geodir_theme_compat_code' => ''
425
-    );
392
+	$theme_compat['Directory_Starter'] = array(
393
+		'geodir_wrapper_open_id' => 'geodir_wrapper',
394
+		'geodir_wrapper_open_class' => '',
395
+		'geodir_wrapper_open_replace' => '',
396
+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',
397
+		'geodir_wrapper_content_open_id' => 'geodir_content',
398
+		'geodir_wrapper_content_open_class' => '',
399
+		'geodir_wrapper_content_open_replace' => '',
400
+		'geodir_wrapper_content_close_replace' => '',
401
+		'geodir_article_open_id' => '',
402
+		'geodir_article_open_class' => '',
403
+		'geodir_article_open_replace' => '',
404
+		'geodir_article_close_replace' => '',
405
+		'geodir_sidebar_right_open_id' => '',
406
+		'geodir_sidebar_right_open_class' => '',
407
+		'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',
408
+		'geodir_sidebar_right_close_replace' => '',
409
+		'geodir_sidebar_left_open_id' => '',
410
+		'geodir_sidebar_left_open_class' => '',
411
+		'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',
412
+		'geodir_sidebar_left_close_replace' => '',
413
+		'geodir_main_content_open_id' => '',
414
+		'geodir_main_content_open_class' => '',
415
+		'geodir_main_content_open_replace' => '<!-- removed -->',
416
+		'geodir_main_content_close_replace' => '<!-- removed -->',
417
+		'geodir_top_content_add' => '',
418
+		'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',
419
+		'geodir_before_widget_filter' => '',
420
+		'geodir_after_widget_filter' => '',
421
+		'geodir_theme_compat_css' => '',
422
+		'geodir_theme_compat_js' => '',
423
+		'geodir_theme_compat_default_options' => '',
424
+		'geodir_theme_compat_code' => ''
425
+	);
426 426
 
427 427
 //Jobby
428
-    $theme_compat['Jobby'] = $theme_compat['Directory_Starter'];
428
+	$theme_compat['Jobby'] = $theme_compat['Directory_Starter'];
429 429
 
430 430
 //GeoProperty
431
-    $theme_compat['GeoProperty'] = $theme_compat['Directory_Starter'];
431
+	$theme_compat['GeoProperty'] = $theme_compat['Directory_Starter'];
432 432
 
433 433
 //Avada
434
-    $theme_compat['Avada'] = array(
435
-        'geodir_wrapper_open_id' => '',
436
-        'geodir_wrapper_open_class' => '',
437
-        'geodir_wrapper_open_replace' => '<!-- removed -->',
438
-        'geodir_wrapper_close_replace' => '<!-- removed -->',
439
-        'geodir_wrapper_content_open_id' => 'content',
440
-        'geodir_wrapper_content_open_class' => '',
441
-        'geodir_wrapper_content_open_replace' => '',
442
-        'geodir_wrapper_content_close_replace' => '',
443
-        'geodir_article_open_id' => '',
444
-        'geodir_article_open_class' => '',
445
-        'geodir_article_open_replace' => '',
446
-        'geodir_article_close_replace' => '',
447
-        'geodir_sidebar_right_open_id' => '',
448
-        'geodir_sidebar_right_open_class' => '',
449
-        'geodir_sidebar_right_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',
450
-        'geodir_sidebar_right_close_replace' => '</div><!-- end sidebar -->',
451
-        'geodir_sidebar_left_open_id' => '',
452
-        'geodir_sidebar_left_open_class' => '',
453
-        'geodir_sidebar_left_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',
454
-        'geodir_sidebar_left_close_replace' => '</div><!-- end sidebar -->',
455
-        'geodir_main_content_open_id' => '',
456
-        'geodir_main_content_open_class' => '',
457
-        'geodir_main_content_open_replace' => '<!-- removed -->',
458
-        'geodir_main_content_close_replace' => '<!-- removed -->',
459
-        'geodir_top_content_add' => '',
460
-        'geodir_before_main_content_add' => '',
461
-        'geodir_before_widget_filter' => '',
462
-        'geodir_after_widget_filter' => '',
463
-        'geodir_theme_compat_css' => stripslashes('.geodir-sidebar-left{float:left}select,textarea{border-style:solid;border-width:1px}.top-menu li > div{visibility:visible}.geodir-chosen-container-single .chosen-single{height:auto}ul li#menu-item-gd-location-switcher ul{width:222px}ul li#menu-item-gd-location-switcher ul li{padding-right:0!important}#mobile-nav li#mobile-menu-item-gd-location-switcher li a{padding-left:10px;padding-right:10px}#menu-item-gd-location-switcher dd,#mobile-menu-item-gd-location-switcher{margin-left:0}#menu-item-gd-location-switcher dd a{display:block}.geodir-chosen-container .chosen-results li.highlighted{background-color:#eee;background-image:none;color:#444}#mobile-nav li.mobile-nav-item li a:before{content:\'\';margin:0}#mobile-nav li.mobile-nav-item li a{padding:10px;width:auto}.geodir-listing-search{text-align:center}.geodir-search{float:none;margin:0}.geodir-search select,.geodir-search .search_by_post,.geodir-search input[type="text"],.geodir-search button[type="button"], .geodir-search input[type="button"],.geodir-search input[type="submit"]{display:inline-block;float:none}.geodir-cat-list ul li,.map_category ul li{list-style-type:none}.wpgeo-avada .page-title ul li:after{content:\'\'}.top_banner_section{margin-bottom:0}.geodir-category-list-in{margin:0;padding:15px}.geodir_full_page .geodir-cat-list .widget-title{margin-top:0}.geodir_full_page .geodir-cat-list ul li{padding-left:0}.geodir-loc-bar{border:none;margin:0;padding:0}.geodir-loc-bar-in{padding:15px 0}.geodir_full_page section.widget{margin-bottom:20px}.sidebar .geodir-loginbox-list li{margin-bottom:10px;padding-bottom:10px}.sidebar .geodir-loginbox-list li a{display:block}.sidebar .geodir-chosen-container .chosen-results li{margin:0;padding:5px 6px}.sidebar .geodir-chosen-container .chosen-results li.highlighted{background:#eee;background-image:none;color:#000}.sidebar .geodir_category_list_view li.geodir-gridview{display:inline-block;margin-bottom:15px}.wpgeo-avada.double-sidebars #main #sidebar{margin-left:3%}.wpgeo-avada.double-sidebars #main #sidebar-2{margin-left:-100%}.wpgeo-avada.double-sidebars #content{float:left;margin-left:0}.geodir_full_page section.widget{margin-bottom: 0px;} .sidebar .widget .geodir-hide {display: none;}li.fusion-mobile-nav-item .geodir_location_tab_container a:before{content: "" !important; margin-right: auto !important;}li.fusion-mobile-nav-item .geodir_location_tab_container a{padding-left:5px !important;}'),
464
-        'geodir_theme_compat_js' => '',
465
-        'geodir_theme_compat_default_options' => '',
466
-        'geodir_theme_compat_code' => 'Avada'
467
-    );
434
+	$theme_compat['Avada'] = array(
435
+		'geodir_wrapper_open_id' => '',
436
+		'geodir_wrapper_open_class' => '',
437
+		'geodir_wrapper_open_replace' => '<!-- removed -->',
438
+		'geodir_wrapper_close_replace' => '<!-- removed -->',
439
+		'geodir_wrapper_content_open_id' => 'content',
440
+		'geodir_wrapper_content_open_class' => '',
441
+		'geodir_wrapper_content_open_replace' => '',
442
+		'geodir_wrapper_content_close_replace' => '',
443
+		'geodir_article_open_id' => '',
444
+		'geodir_article_open_class' => '',
445
+		'geodir_article_open_replace' => '',
446
+		'geodir_article_close_replace' => '',
447
+		'geodir_sidebar_right_open_id' => '',
448
+		'geodir_sidebar_right_open_class' => '',
449
+		'geodir_sidebar_right_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',
450
+		'geodir_sidebar_right_close_replace' => '</div><!-- end sidebar -->',
451
+		'geodir_sidebar_left_open_id' => '',
452
+		'geodir_sidebar_left_open_class' => '',
453
+		'geodir_sidebar_left_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',
454
+		'geodir_sidebar_left_close_replace' => '</div><!-- end sidebar -->',
455
+		'geodir_main_content_open_id' => '',
456
+		'geodir_main_content_open_class' => '',
457
+		'geodir_main_content_open_replace' => '<!-- removed -->',
458
+		'geodir_main_content_close_replace' => '<!-- removed -->',
459
+		'geodir_top_content_add' => '',
460
+		'geodir_before_main_content_add' => '',
461
+		'geodir_before_widget_filter' => '',
462
+		'geodir_after_widget_filter' => '',
463
+		'geodir_theme_compat_css' => stripslashes('.geodir-sidebar-left{float:left}select,textarea{border-style:solid;border-width:1px}.top-menu li > div{visibility:visible}.geodir-chosen-container-single .chosen-single{height:auto}ul li#menu-item-gd-location-switcher ul{width:222px}ul li#menu-item-gd-location-switcher ul li{padding-right:0!important}#mobile-nav li#mobile-menu-item-gd-location-switcher li a{padding-left:10px;padding-right:10px}#menu-item-gd-location-switcher dd,#mobile-menu-item-gd-location-switcher{margin-left:0}#menu-item-gd-location-switcher dd a{display:block}.geodir-chosen-container .chosen-results li.highlighted{background-color:#eee;background-image:none;color:#444}#mobile-nav li.mobile-nav-item li a:before{content:\'\';margin:0}#mobile-nav li.mobile-nav-item li a{padding:10px;width:auto}.geodir-listing-search{text-align:center}.geodir-search{float:none;margin:0}.geodir-search select,.geodir-search .search_by_post,.geodir-search input[type="text"],.geodir-search button[type="button"], .geodir-search input[type="button"],.geodir-search input[type="submit"]{display:inline-block;float:none}.geodir-cat-list ul li,.map_category ul li{list-style-type:none}.wpgeo-avada .page-title ul li:after{content:\'\'}.top_banner_section{margin-bottom:0}.geodir-category-list-in{margin:0;padding:15px}.geodir_full_page .geodir-cat-list .widget-title{margin-top:0}.geodir_full_page .geodir-cat-list ul li{padding-left:0}.geodir-loc-bar{border:none;margin:0;padding:0}.geodir-loc-bar-in{padding:15px 0}.geodir_full_page section.widget{margin-bottom:20px}.sidebar .geodir-loginbox-list li{margin-bottom:10px;padding-bottom:10px}.sidebar .geodir-loginbox-list li a{display:block}.sidebar .geodir-chosen-container .chosen-results li{margin:0;padding:5px 6px}.sidebar .geodir-chosen-container .chosen-results li.highlighted{background:#eee;background-image:none;color:#000}.sidebar .geodir_category_list_view li.geodir-gridview{display:inline-block;margin-bottom:15px}.wpgeo-avada.double-sidebars #main #sidebar{margin-left:3%}.wpgeo-avada.double-sidebars #main #sidebar-2{margin-left:-100%}.wpgeo-avada.double-sidebars #content{float:left;margin-left:0}.geodir_full_page section.widget{margin-bottom: 0px;} .sidebar .widget .geodir-hide {display: none;}li.fusion-mobile-nav-item .geodir_location_tab_container a:before{content: "" !important; margin-right: auto !important;}li.fusion-mobile-nav-item .geodir_location_tab_container a{padding-left:5px !important;}'),
464
+		'geodir_theme_compat_js' => '',
465
+		'geodir_theme_compat_default_options' => '',
466
+		'geodir_theme_compat_code' => 'Avada'
467
+	);
468 468
 
469 469
 //Enfold
470
-    $theme_compat['Enfold'] = array(
471
-        'geodir_wrapper_open_id' => '',
472
-        'geodir_wrapper_open_class' => '',
473
-        'geodir_wrapper_open_replace' => '',
474
-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',
475
-        'geodir_wrapper_content_open_id' => '',
476
-        'geodir_wrapper_content_open_class' => '',
477
-        'geodir_wrapper_content_open_replace' => '',
478
-        'geodir_wrapper_content_close_replace' => '</div></main>',
479
-        'geodir_article_open_id' => '',
480
-        'geodir_article_open_class' => '',
481
-        'geodir_article_open_replace' => '',
482
-        'geodir_article_close_replace' => '',
483
-        'geodir_sidebar_right_open_id' => '',
484
-        'geodir_sidebar_right_open_class' => '',
485
-        'geodir_sidebar_right_open_replace' => '',
486
-        'geodir_sidebar_right_close_replace' => '</div></aside><!-- sidebar ends here-->',
487
-        'geodir_sidebar_left_open_id' => '',
488
-        'geodir_sidebar_left_open_class' => '',
489
-        'geodir_sidebar_left_open_replace' => '',
490
-        'geodir_sidebar_left_close_replace' => '</div></aside><!-- sidebar ends here-->',
491
-        'geodir_main_content_open_id' => '',
492
-        'geodir_main_content_open_class' => '',
493
-        'geodir_main_content_open_replace' => '',
494
-        'geodir_main_content_close_replace' => '',
495
-        'geodir_top_content_add' => '',
496
-        'geodir_before_main_content_add' => '',
497
-        'geodir_before_widget_filter' => '',
498
-        'geodir_after_widget_filter' => '',
499
-        'geodir_theme_compat_css' => stripslashes('.geodir_full_page .top_banner_section{margin-bottom:0}.widget .geodir-cat-list ul li{clear:none}.wpgeo-enfold .av-main-nav ul{width:222px}.geodir-listing-search .geodir-loc-bar{border-top:none;padding:0}#main .geodir-listing-search,.geodir-listing-search .geodir-loc-bar{margin-bottom:0}#main .geodir-loc-bar-in,#main .geodir-category-list-in{background-color:#fcfcfc;margin:20px 0;padding:20px}#main .geodir_full_page .geodir-loc-bar-in,#main .geodir_full_page .geodir-loc-bar,#main .geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}#main .geodir-loc-bar-in{padding:20px}#main .geodir-search{margin:0;width:100%}#main .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#main .geodir-search input[type="text"]{margin:0 3% 0 0;padding:10px;width:32.4%}#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"]{font-size:inherit;line-height:2.25;margin:0;padding:7px;width:13%}.enfold-home-top section.widget{margin:0;padding:0}.enfold-home-top .top_banner_section{margin-bottom:0}.enfold-home-top .geodir-loc-bar{background:#fcfcfc;border:none;margin:0;padding:0}#main .enfold-home-top .geodir-loc-bar-in{background:none;border:none;margin:0 auto;padding:20px 0}#main .geodir-breadcrumb{border-bottom-style:solid;border-bottom-width:1px}#gd-tabs dt{clear:none}#geodir_slider ul li{list-style-type:none;margin:0;padding:0}#respond{clear:both}#comments .comments-title span{display:inline;font-size:inherit;font-weight:700}#reviewsTab .comments-area .bypostauthor cite span{display:inline}#top #comments .commentlist .comment,#top #comments .commentlist .comment > div{min-height:0}.commentlist .commenttext{padding-top:15px}#comment_imagesdropbox{margin-bottom:20px}.wpgeo-enfold .geodir_category_list_view li{margin-left:0;padding:0}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_category_list_view li .geodir-post-img{display:block}.wpgeo-enfold .geodir_event_listing_calendar tr.title{background:#ccc}@media only screen and (max-width:480px){.geodir_category_list_view li .geodir-content,.geodir_category_list_view li .geodir-post-img,.geodir_category_list_view li .geodir-addinfo{float:none;width:100%;margin:10px 0}#main .geodir-search input[type="text"],#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"],#main .geodir-search select{margin:10px 0;width:100%}}#main .geodir_full_page section:last-child .geodir-loc-bar{margin-bottom: -1px;border-bottom: none;}'),
500
-        'geodir_theme_compat_js' => '',
501
-        'geodir_theme_compat_default_options' => '',
502
-        'geodir_theme_compat_code' => 'Enfold'
503
-    );
470
+	$theme_compat['Enfold'] = array(
471
+		'geodir_wrapper_open_id' => '',
472
+		'geodir_wrapper_open_class' => '',
473
+		'geodir_wrapper_open_replace' => '',
474
+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',
475
+		'geodir_wrapper_content_open_id' => '',
476
+		'geodir_wrapper_content_open_class' => '',
477
+		'geodir_wrapper_content_open_replace' => '',
478
+		'geodir_wrapper_content_close_replace' => '</div></main>',
479
+		'geodir_article_open_id' => '',
480
+		'geodir_article_open_class' => '',
481
+		'geodir_article_open_replace' => '',
482
+		'geodir_article_close_replace' => '',
483
+		'geodir_sidebar_right_open_id' => '',
484
+		'geodir_sidebar_right_open_class' => '',
485
+		'geodir_sidebar_right_open_replace' => '',
486
+		'geodir_sidebar_right_close_replace' => '</div></aside><!-- sidebar ends here-->',
487
+		'geodir_sidebar_left_open_id' => '',
488
+		'geodir_sidebar_left_open_class' => '',
489
+		'geodir_sidebar_left_open_replace' => '',
490
+		'geodir_sidebar_left_close_replace' => '</div></aside><!-- sidebar ends here-->',
491
+		'geodir_main_content_open_id' => '',
492
+		'geodir_main_content_open_class' => '',
493
+		'geodir_main_content_open_replace' => '',
494
+		'geodir_main_content_close_replace' => '',
495
+		'geodir_top_content_add' => '',
496
+		'geodir_before_main_content_add' => '',
497
+		'geodir_before_widget_filter' => '',
498
+		'geodir_after_widget_filter' => '',
499
+		'geodir_theme_compat_css' => stripslashes('.geodir_full_page .top_banner_section{margin-bottom:0}.widget .geodir-cat-list ul li{clear:none}.wpgeo-enfold .av-main-nav ul{width:222px}.geodir-listing-search .geodir-loc-bar{border-top:none;padding:0}#main .geodir-listing-search,.geodir-listing-search .geodir-loc-bar{margin-bottom:0}#main .geodir-loc-bar-in,#main .geodir-category-list-in{background-color:#fcfcfc;margin:20px 0;padding:20px}#main .geodir_full_page .geodir-loc-bar-in,#main .geodir_full_page .geodir-loc-bar,#main .geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}#main .geodir-loc-bar-in{padding:20px}#main .geodir-search{margin:0;width:100%}#main .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#main .geodir-search input[type="text"]{margin:0 3% 0 0;padding:10px;width:32.4%}#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"]{font-size:inherit;line-height:2.25;margin:0;padding:7px;width:13%}.enfold-home-top section.widget{margin:0;padding:0}.enfold-home-top .top_banner_section{margin-bottom:0}.enfold-home-top .geodir-loc-bar{background:#fcfcfc;border:none;margin:0;padding:0}#main .enfold-home-top .geodir-loc-bar-in{background:none;border:none;margin:0 auto;padding:20px 0}#main .geodir-breadcrumb{border-bottom-style:solid;border-bottom-width:1px}#gd-tabs dt{clear:none}#geodir_slider ul li{list-style-type:none;margin:0;padding:0}#respond{clear:both}#comments .comments-title span{display:inline;font-size:inherit;font-weight:700}#reviewsTab .comments-area .bypostauthor cite span{display:inline}#top #comments .commentlist .comment,#top #comments .commentlist .comment > div{min-height:0}.commentlist .commenttext{padding-top:15px}#comment_imagesdropbox{margin-bottom:20px}.wpgeo-enfold .geodir_category_list_view li{margin-left:0;padding:0}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_category_list_view li .geodir-post-img{display:block}.wpgeo-enfold .geodir_event_listing_calendar tr.title{background:#ccc}@media only screen and (max-width:480px){.geodir_category_list_view li .geodir-content,.geodir_category_list_view li .geodir-post-img,.geodir_category_list_view li .geodir-addinfo{float:none;width:100%;margin:10px 0}#main .geodir-search input[type="text"],#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"],#main .geodir-search select{margin:10px 0;width:100%}}#main .geodir_full_page section:last-child .geodir-loc-bar{margin-bottom: -1px;border-bottom: none;}'),
500
+		'geodir_theme_compat_js' => '',
501
+		'geodir_theme_compat_default_options' => '',
502
+		'geodir_theme_compat_code' => 'Enfold'
503
+	);
504 504
 
505 505
 // X
506
-    $theme_compat['X'] = array(
507
-        'geodir_wrapper_open_id' => '',
508
-        'geodir_wrapper_open_class' => '',
509
-        'geodir_wrapper_open_replace' => '',
510
-        'geodir_wrapper_close_replace' => '',
511
-        'geodir_wrapper_content_open_id' => '',
512
-        'geodir_wrapper_content_open_class' => '',
513
-        'geodir_wrapper_content_open_replace' => '',
514
-        'geodir_wrapper_content_close_replace' => '',
515
-        'geodir_article_open_id' => '',
516
-        'geodir_article_open_class' => '',
517
-        'geodir_article_open_replace' => '',
518
-        'geodir_article_close_replace' => '',
519
-        'geodir_sidebar_right_open_id' => '',
520
-        'geodir_sidebar_right_open_class' => '',
521
-        'geodir_sidebar_right_open_replace' => '',
522
-        'geodir_sidebar_right_close_replace' => '',
523
-        'geodir_sidebar_left_open_id' => '',
524
-        'geodir_sidebar_left_open_class' => '',
525
-        'geodir_sidebar_left_open_replace' => '',
526
-        'geodir_sidebar_left_close_replace' => '',
527
-        'geodir_main_content_open_id' => '',
528
-        'geodir_main_content_open_class' => '',
529
-        'geodir_main_content_open_replace' => '',
530
-        'geodir_main_content_close_replace' => '',
531
-        'geodir_top_content_add' => '',
532
-        'geodir_before_main_content_add' => '',
533
-        'geodir_before_widget_filter' => '',
534
-        'geodir_after_widget_filter' => '',
535
-        'geodir_theme_compat_css' => stripslashes('.x-colophon.bottom{clear:both}#geodir-main-content,.geodir_flex-container{margin-top:16px}.geodir-x ul{list-style:none}.widget ul.geodir_category_list_view{border:none}.geodir_category_list_view li.geodir-gridview:last-child{border-bottom:1px solid #e1e1e1}.home .x-header-landmark{display:none}.geodir-x .x-main .geodir_advance_search_widget{margin:0}.geodir-x .top_banner_section{margin-bottom:0}.geodir-loc-bar{background:rgba(0,0,0,0.05);margin:0;padding:0}.geodir-loc-bar-in{background:none;border:none;padding:10px}.geodir-search{margin:0;width:100%}.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{border:1px solid #ccc;box-shadow:none;height:auto;line-height:21px;margin:0 1% 0 0;padding:5px 10px}.widget .geodir-search select,.geodir-search input[type="text"]{width:28%}.geodir-search input[type="submit"],.geodir-search input[type="button"]{line-height:19px;margin-right:0;width:11%}.geodir-search input:hover[type="submit"],.geodir-search input:hover[type="button"]{background:#333;color:#fff}.geodir-cat-list .widget-title{margin-top:0}.geodir-x .geodir-category-list-in{background:rgba(0,0,0,0.05);border:none}.widget .geodir-cat-list ul.geodir-popular-cat-list{border:none;border-radius:0;box-shadow:none}.geodir_full_page .geodir-cat-list ul li{border:none}.geodir_full_page .geodir-cat-list ul li a{border:none}.post-type-archive .geodir-loc-bar{border:none;margin-top:20px}#menu-item-gd-location-switcher dd{margin-left:0}.geodir-chosen-container-single .chosen-single{height:auto}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_full_page section.widget{clear:both}.x-ethos .entry-title{margin-bottom:20px}.x-ethos .geodir-chosen-container-single .chosen-single{padding:0 0 0 8px}.x-ethos .widget ul li a,.x-ethos .geodir_category_list_view li{color:#333}@media only screen and (max-width:767px){.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{margin:0 0 10px;width:100%}}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-loc-bar,.geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-category-list-in{border-bottom:1px solid rgba(0,0,0,0.1)}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),
536
-        'geodir_theme_compat_js' => '',
537
-        'geodir_theme_compat_default_options' => '',
538
-        'geodir_theme_compat_code' => 'X'
539
-    );
506
+	$theme_compat['X'] = array(
507
+		'geodir_wrapper_open_id' => '',
508
+		'geodir_wrapper_open_class' => '',
509
+		'geodir_wrapper_open_replace' => '',
510
+		'geodir_wrapper_close_replace' => '',
511
+		'geodir_wrapper_content_open_id' => '',
512
+		'geodir_wrapper_content_open_class' => '',
513
+		'geodir_wrapper_content_open_replace' => '',
514
+		'geodir_wrapper_content_close_replace' => '',
515
+		'geodir_article_open_id' => '',
516
+		'geodir_article_open_class' => '',
517
+		'geodir_article_open_replace' => '',
518
+		'geodir_article_close_replace' => '',
519
+		'geodir_sidebar_right_open_id' => '',
520
+		'geodir_sidebar_right_open_class' => '',
521
+		'geodir_sidebar_right_open_replace' => '',
522
+		'geodir_sidebar_right_close_replace' => '',
523
+		'geodir_sidebar_left_open_id' => '',
524
+		'geodir_sidebar_left_open_class' => '',
525
+		'geodir_sidebar_left_open_replace' => '',
526
+		'geodir_sidebar_left_close_replace' => '',
527
+		'geodir_main_content_open_id' => '',
528
+		'geodir_main_content_open_class' => '',
529
+		'geodir_main_content_open_replace' => '',
530
+		'geodir_main_content_close_replace' => '',
531
+		'geodir_top_content_add' => '',
532
+		'geodir_before_main_content_add' => '',
533
+		'geodir_before_widget_filter' => '',
534
+		'geodir_after_widget_filter' => '',
535
+		'geodir_theme_compat_css' => stripslashes('.x-colophon.bottom{clear:both}#geodir-main-content,.geodir_flex-container{margin-top:16px}.geodir-x ul{list-style:none}.widget ul.geodir_category_list_view{border:none}.geodir_category_list_view li.geodir-gridview:last-child{border-bottom:1px solid #e1e1e1}.home .x-header-landmark{display:none}.geodir-x .x-main .geodir_advance_search_widget{margin:0}.geodir-x .top_banner_section{margin-bottom:0}.geodir-loc-bar{background:rgba(0,0,0,0.05);margin:0;padding:0}.geodir-loc-bar-in{background:none;border:none;padding:10px}.geodir-search{margin:0;width:100%}.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{border:1px solid #ccc;box-shadow:none;height:auto;line-height:21px;margin:0 1% 0 0;padding:5px 10px}.widget .geodir-search select,.geodir-search input[type="text"]{width:28%}.geodir-search input[type="submit"],.geodir-search input[type="button"]{line-height:19px;margin-right:0;width:11%}.geodir-search input:hover[type="submit"],.geodir-search input:hover[type="button"]{background:#333;color:#fff}.geodir-cat-list .widget-title{margin-top:0}.geodir-x .geodir-category-list-in{background:rgba(0,0,0,0.05);border:none}.widget .geodir-cat-list ul.geodir-popular-cat-list{border:none;border-radius:0;box-shadow:none}.geodir_full_page .geodir-cat-list ul li{border:none}.geodir_full_page .geodir-cat-list ul li a{border:none}.post-type-archive .geodir-loc-bar{border:none;margin-top:20px}#menu-item-gd-location-switcher dd{margin-left:0}.geodir-chosen-container-single .chosen-single{height:auto}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_full_page section.widget{clear:both}.x-ethos .entry-title{margin-bottom:20px}.x-ethos .geodir-chosen-container-single .chosen-single{padding:0 0 0 8px}.x-ethos .widget ul li a,.x-ethos .geodir_category_list_view li{color:#333}@media only screen and (max-width:767px){.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{margin:0 0 10px;width:100%}}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-loc-bar,.geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-category-list-in{border-bottom:1px solid rgba(0,0,0,0.1)}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),
536
+		'geodir_theme_compat_js' => '',
537
+		'geodir_theme_compat_default_options' => '',
538
+		'geodir_theme_compat_code' => 'X'
539
+	);
540 540
 
541 541
 // Divi
542
-    $theme_compat['Divi'] = array(
543
-        'geodir_wrapper_open_id' => 'main-content',
544
-        'geodir_wrapper_open_class' => '',
545
-        'geodir_wrapper_open_replace' => '',
546
-        'geodir_wrapper_close_replace' => '',
547
-        'geodir_wrapper_content_open_id' => 'left-area',
548
-        'geodir_wrapper_content_open_class' => '',
549
-        'geodir_wrapper_content_open_replace' => '<div class="container"><div id="content-area" class="clearfix"><div id="[id]" class="[class]" role="main" >',
550
-        'geodir_wrapper_content_close_replace' => '',
551
-        'geodir_article_open_id' => '',
552
-        'geodir_article_open_class' => '',
553
-        'geodir_article_open_replace' => '',
554
-        'geodir_article_close_replace' => '',
555
-        'geodir_sidebar_right_open_id' => 'sidebar',
556
-        'geodir_sidebar_right_open_class' => '',
557
-        'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',
558
-        'geodir_sidebar_right_close_replace' => '</aside><!-- sidebar ends here--></div></div>',
559
-        'geodir_sidebar_left_open_id' => 'sidebar',
560
-        'geodir_sidebar_left_open_class' => '',
561
-        'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',
562
-        'geodir_sidebar_left_close_replace' => '</aside><!-- sidebar ends here--></div></div>',
563
-        'geodir_main_content_open_id' => '',
564
-        'geodir_main_content_open_class' => '',
565
-        'geodir_main_content_open_replace' => '',
566
-        'geodir_main_content_close_replace' => '',
567
-        'geodir_top_content_add' => '',
568
-        'geodir_before_main_content_add' => '',
569
-        'geodir_before_widget_filter' => '',
570
-        'geodir_after_widget_filter' => '',
571
-        'geodir_theme_compat_css' => stripslashes('#left-area ul.geodir-direction-nav{list-style-type:none}#sidebar .geodir-company_info{margin-left:30px}#sidebar .geodir-widget{float:none;margin:0 0 30px 30px}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.archive .entry-header,.geodir-breadcrumb{border-bottom:1px solid #e2e2e2}.archive .entry-header h1,ul#breadcrumbs{padding:0 15px;width:100%}#left-area ul.geodir_category_list_view{padding:10px 0}.nav li#menu-item-gd-location-switcher ul{width:222px}#menu-item-gd-location-switcher li.gd-location-switcher-menu-item{padding-right:0}#menu-item-gd-location-switcher dd{margin-left:0}#menu-item-gd-location-switcher .geodir_location_tab_container dd a{padding:5px;width:auto}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type=button],.geodir_full_page .geodir-search input[type=submit],.geodir_full_page .geodir-search input[type=text],.geodir_full_page .geodir-search select{display:inline-block;float:none}'),
572
-        'geodir_theme_compat_js' => '',
573
-        'geodir_theme_compat_default_options' => '',
574
-        'geodir_theme_compat_code' => 'Divi'
575
-    );
542
+	$theme_compat['Divi'] = array(
543
+		'geodir_wrapper_open_id' => 'main-content',
544
+		'geodir_wrapper_open_class' => '',
545
+		'geodir_wrapper_open_replace' => '',
546
+		'geodir_wrapper_close_replace' => '',
547
+		'geodir_wrapper_content_open_id' => 'left-area',
548
+		'geodir_wrapper_content_open_class' => '',
549
+		'geodir_wrapper_content_open_replace' => '<div class="container"><div id="content-area" class="clearfix"><div id="[id]" class="[class]" role="main" >',
550
+		'geodir_wrapper_content_close_replace' => '',
551
+		'geodir_article_open_id' => '',
552
+		'geodir_article_open_class' => '',
553
+		'geodir_article_open_replace' => '',
554
+		'geodir_article_close_replace' => '',
555
+		'geodir_sidebar_right_open_id' => 'sidebar',
556
+		'geodir_sidebar_right_open_class' => '',
557
+		'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',
558
+		'geodir_sidebar_right_close_replace' => '</aside><!-- sidebar ends here--></div></div>',
559
+		'geodir_sidebar_left_open_id' => 'sidebar',
560
+		'geodir_sidebar_left_open_class' => '',
561
+		'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',
562
+		'geodir_sidebar_left_close_replace' => '</aside><!-- sidebar ends here--></div></div>',
563
+		'geodir_main_content_open_id' => '',
564
+		'geodir_main_content_open_class' => '',
565
+		'geodir_main_content_open_replace' => '',
566
+		'geodir_main_content_close_replace' => '',
567
+		'geodir_top_content_add' => '',
568
+		'geodir_before_main_content_add' => '',
569
+		'geodir_before_widget_filter' => '',
570
+		'geodir_after_widget_filter' => '',
571
+		'geodir_theme_compat_css' => stripslashes('#left-area ul.geodir-direction-nav{list-style-type:none}#sidebar .geodir-company_info{margin-left:30px}#sidebar .geodir-widget{float:none;margin:0 0 30px 30px}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.archive .entry-header,.geodir-breadcrumb{border-bottom:1px solid #e2e2e2}.archive .entry-header h1,ul#breadcrumbs{padding:0 15px;width:100%}#left-area ul.geodir_category_list_view{padding:10px 0}.nav li#menu-item-gd-location-switcher ul{width:222px}#menu-item-gd-location-switcher li.gd-location-switcher-menu-item{padding-right:0}#menu-item-gd-location-switcher dd{margin-left:0}#menu-item-gd-location-switcher .geodir_location_tab_container dd a{padding:5px;width:auto}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type=button],.geodir_full_page .geodir-search input[type=submit],.geodir_full_page .geodir-search input[type=text],.geodir_full_page .geodir-search select{display:inline-block;float:none}'),
572
+		'geodir_theme_compat_js' => '',
573
+		'geodir_theme_compat_default_options' => '',
574
+		'geodir_theme_compat_code' => 'Divi'
575
+	);
576 576
 
577 577
 // Genesis
578
-    $theme_compat['Genesis'] = array(
579
-        'geodir_wrapper_open_id' => '',
580
-        'geodir_wrapper_open_class' => 'content-sidebar-wrap',
581
-        'geodir_wrapper_open_replace' => '',
582
-        'geodir_wrapper_close_replace' => '',
583
-        'geodir_wrapper_content_open_id' => '',
584
-        'geodir_wrapper_content_open_class' => 'content',
585
-        'geodir_wrapper_content_open_replace' => '<div class="[class]" role="main" >',
586
-        'geodir_wrapper_content_close_replace' => '',
587
-        'geodir_article_open_id' => '',
588
-        'geodir_article_open_class' => '',
589
-        'geodir_article_open_replace' => '',
590
-        'geodir_article_close_replace' => '',
591
-        'geodir_sidebar_right_open_id' => '',
592
-        'geodir_sidebar_right_open_class' => 'sidebar sidebar-primary widget-area',
593
-        'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',
594
-        'geodir_sidebar_right_close_replace' => '',
595
-        'geodir_sidebar_left_open_id' => '',
596
-        'geodir_sidebar_left_open_class' => 'sidebar sidebar-secondary widget-area',
597
-        'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',
598
-        'geodir_sidebar_left_close_replace' => '',
599
-        'geodir_main_content_open_id' => '',
600
-        'geodir_main_content_open_class' => '',
601
-        'geodir_main_content_open_replace' => '<main  id="[id]" class="entry [class]"  role="main">',
602
-        'geodir_main_content_close_replace' => '',
603
-        'geodir_top_content_add' => '',
604
-        'geodir_before_main_content_add' => '',
605
-        'geodir_before_widget_filter' => '',
606
-        'geodir_after_widget_filter' => '',
607
-        'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-gd-location-switcher menu-item-has-children gd-location-switcher',
608
-        'geodir_theme_compat_css' => stripslashes('.full-width-content #geodir-wrapper-content{width:100%}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}.content{float:left}.sidebar-content .content,.sidebar-content #geodir-wrapper-content{float:right}.sidebar .geodir-company_info{background-color:#fff;border:none}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.geodir-breadcrumb-bar{margin-bottom:-35px} .search-page .entry-title,.listings-page .entry-title{font-size: 20px;}.site-inner .geodir-breadcrumb-bar{margin-bottom:0px}'),
609
-        'geodir_theme_compat_js' => '',
610
-        'geodir_theme_compat_default_options' => '',
611
-        'geodir_theme_compat_code' => 'Genesis'
612
-    );
578
+	$theme_compat['Genesis'] = array(
579
+		'geodir_wrapper_open_id' => '',
580
+		'geodir_wrapper_open_class' => 'content-sidebar-wrap',
581
+		'geodir_wrapper_open_replace' => '',
582
+		'geodir_wrapper_close_replace' => '',
583
+		'geodir_wrapper_content_open_id' => '',
584
+		'geodir_wrapper_content_open_class' => 'content',
585
+		'geodir_wrapper_content_open_replace' => '<div class="[class]" role="main" >',
586
+		'geodir_wrapper_content_close_replace' => '',
587
+		'geodir_article_open_id' => '',
588
+		'geodir_article_open_class' => '',
589
+		'geodir_article_open_replace' => '',
590
+		'geodir_article_close_replace' => '',
591
+		'geodir_sidebar_right_open_id' => '',
592
+		'geodir_sidebar_right_open_class' => 'sidebar sidebar-primary widget-area',
593
+		'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',
594
+		'geodir_sidebar_right_close_replace' => '',
595
+		'geodir_sidebar_left_open_id' => '',
596
+		'geodir_sidebar_left_open_class' => 'sidebar sidebar-secondary widget-area',
597
+		'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',
598
+		'geodir_sidebar_left_close_replace' => '',
599
+		'geodir_main_content_open_id' => '',
600
+		'geodir_main_content_open_class' => '',
601
+		'geodir_main_content_open_replace' => '<main  id="[id]" class="entry [class]"  role="main">',
602
+		'geodir_main_content_close_replace' => '',
603
+		'geodir_top_content_add' => '',
604
+		'geodir_before_main_content_add' => '',
605
+		'geodir_before_widget_filter' => '',
606
+		'geodir_after_widget_filter' => '',
607
+		'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-gd-location-switcher menu-item-has-children gd-location-switcher',
608
+		'geodir_theme_compat_css' => stripslashes('.full-width-content #geodir-wrapper-content{width:100%}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}.content{float:left}.sidebar-content .content,.sidebar-content #geodir-wrapper-content{float:right}.sidebar .geodir-company_info{background-color:#fff;border:none}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.geodir-breadcrumb-bar{margin-bottom:-35px} .search-page .entry-title,.listings-page .entry-title{font-size: 20px;}.site-inner .geodir-breadcrumb-bar{margin-bottom:0px}'),
609
+		'geodir_theme_compat_js' => '',
610
+		'geodir_theme_compat_default_options' => '',
611
+		'geodir_theme_compat_code' => 'Genesis'
612
+	);
613 613
 
614 614
 // Jupiter
615
-    $theme_compat['Jupiter'] = array(
616
-        'geodir_wrapper_open_id' => '',
617
-        'geodir_wrapper_open_class' => '',
618
-        'geodir_wrapper_open_replace' => '<div id="theme-page"><div class="mk-main-wrapper-holder"><div  class="theme-page-wrapper mk-main-wrapper  mk-grid vc_row-fluid">',
619
-        'geodir_wrapper_close_replace' => '</div></div></div>',
620
-        'geodir_wrapper_content_open_id' => '',
621
-        'geodir_wrapper_content_open_class' => '',
622
-        'geodir_wrapper_content_open_replace' => '',
623
-        'geodir_wrapper_content_close_replace' => '',
624
-        'geodir_article_open_id' => '',
625
-        'geodir_article_open_class' => '',
626
-        'geodir_article_open_replace' => '',
627
-        'geodir_article_close_replace' => '',
628
-        'geodir_sidebar_right_open_id' => 'mk-sidebar',
629
-        'geodir_sidebar_right_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',
630
-        'geodir_sidebar_right_open_replace' => '',
631
-        'geodir_sidebar_right_close_replace' => '',
632
-        'geodir_sidebar_left_open_id' => 'mk-sidebar',
633
-        'geodir_sidebar_left_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',
634
-        'geodir_sidebar_left_open_replace' => '',
635
-        'geodir_sidebar_left_close_replace' => '',
636
-        'geodir_main_content_open_id' => '',
637
-        'geodir_main_content_open_class' => '',
638
-        'geodir_main_content_open_replace' => '',
639
-        'geodir_main_content_close_replace' => '',
640
-        'geodir_top_content_add' => '',
641
-        'geodir_before_main_content_add' => '',
642
-        'geodir_before_widget_filter' => '',
643
-        'geodir_after_widget_filter' => '',
644
-        'geodir_before_title_filter' => '<h3 class="widgettitle geodir-widget-title">',
645
-        'geodir_after_title_filter' => '',
646
-        'geodir_menu_li_class_filter' => 'menu-item menu-item-has-children no-mega-menu',
647
-        'geodir_sub_menu_ul_class_filter' => '',
648
-        'geodir_sub_menu_li_class_filter' => '',
649
-        'geodir_menu_a_class_filter' => 'menu-item-link',
650
-        'geodir_sub_menu_a_class_filter' => 'menu-item-link one-page-nav-item',
651
-        'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher menu-item-has-children no-mega-menu',
652
-        'geodir_location_switcher_menu_a_class_filter' => 'menu-item-link',
653
-        'geodir_location_switcher_menu_sub_ul_class_filter' => '',
654
-        'geodir_location_switcher_menu_sub_li_class_filter' => '',
655
-        'geodir_theme_compat_css' => stripslashes('.geodir-widget li,.geodir_category_list_view li{margin:0}#theme-page h3.geodir-entry-title{font-size:14px}#menu-item-gd-location-switcher dd{line-height:44px}#menu-item-gd-location-switcher .geodir_location_sugestion{line-height:20px}.geodir_loginbox{overflow:visible}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),
656
-        'geodir_theme_compat_js' => '',
657
-        'geodir_theme_compat_default_options' => '',
658
-        'geodir_theme_compat_code' => 'Jupiter'
659
-    );
615
+	$theme_compat['Jupiter'] = array(
616
+		'geodir_wrapper_open_id' => '',
617
+		'geodir_wrapper_open_class' => '',
618
+		'geodir_wrapper_open_replace' => '<div id="theme-page"><div class="mk-main-wrapper-holder"><div  class="theme-page-wrapper mk-main-wrapper  mk-grid vc_row-fluid">',
619
+		'geodir_wrapper_close_replace' => '</div></div></div>',
620
+		'geodir_wrapper_content_open_id' => '',
621
+		'geodir_wrapper_content_open_class' => '',
622
+		'geodir_wrapper_content_open_replace' => '',
623
+		'geodir_wrapper_content_close_replace' => '',
624
+		'geodir_article_open_id' => '',
625
+		'geodir_article_open_class' => '',
626
+		'geodir_article_open_replace' => '',
627
+		'geodir_article_close_replace' => '',
628
+		'geodir_sidebar_right_open_id' => 'mk-sidebar',
629
+		'geodir_sidebar_right_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',
630
+		'geodir_sidebar_right_open_replace' => '',
631
+		'geodir_sidebar_right_close_replace' => '',
632
+		'geodir_sidebar_left_open_id' => 'mk-sidebar',
633
+		'geodir_sidebar_left_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',
634
+		'geodir_sidebar_left_open_replace' => '',
635
+		'geodir_sidebar_left_close_replace' => '',
636
+		'geodir_main_content_open_id' => '',
637
+		'geodir_main_content_open_class' => '',
638
+		'geodir_main_content_open_replace' => '',
639
+		'geodir_main_content_close_replace' => '',
640
+		'geodir_top_content_add' => '',
641
+		'geodir_before_main_content_add' => '',
642
+		'geodir_before_widget_filter' => '',
643
+		'geodir_after_widget_filter' => '',
644
+		'geodir_before_title_filter' => '<h3 class="widgettitle geodir-widget-title">',
645
+		'geodir_after_title_filter' => '',
646
+		'geodir_menu_li_class_filter' => 'menu-item menu-item-has-children no-mega-menu',
647
+		'geodir_sub_menu_ul_class_filter' => '',
648
+		'geodir_sub_menu_li_class_filter' => '',
649
+		'geodir_menu_a_class_filter' => 'menu-item-link',
650
+		'geodir_sub_menu_a_class_filter' => 'menu-item-link one-page-nav-item',
651
+		'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher menu-item-has-children no-mega-menu',
652
+		'geodir_location_switcher_menu_a_class_filter' => 'menu-item-link',
653
+		'geodir_location_switcher_menu_sub_ul_class_filter' => '',
654
+		'geodir_location_switcher_menu_sub_li_class_filter' => '',
655
+		'geodir_theme_compat_css' => stripslashes('.geodir-widget li,.geodir_category_list_view li{margin:0}#theme-page h3.geodir-entry-title{font-size:14px}#menu-item-gd-location-switcher dd{line-height:44px}#menu-item-gd-location-switcher .geodir_location_sugestion{line-height:20px}.geodir_loginbox{overflow:visible}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),
656
+		'geodir_theme_compat_js' => '',
657
+		'geodir_theme_compat_default_options' => '',
658
+		'geodir_theme_compat_code' => 'Jupiter'
659
+	);
660 660
 
661 661
 // Multi News
662
-    $theme_compat['Multi_News'] = array(
663
-        'geodir_wrapper_open_id' => '',
664
-        'geodir_wrapper_open_class' => 'main-container clearfix',
665
-        'geodir_wrapper_open_replace' => '',
666
-        'geodir_wrapper_close_replace' => '',
667
-        'geodir_wrapper_content_open_id' => '',
668
-        'geodir_wrapper_content_open_class' => '',
669
-        'geodir_wrapper_content_open_replace' => '<div class="main-left" ><div class="main-content  "><div class="site-content page-wrap">',
670
-        'geodir_wrapper_content_close_replace' => '</div></div></div>',
671
-        'geodir_article_open_id' => '',
672
-        'geodir_article_open_class' => '',
673
-        'geodir_article_open_replace' => '',
674
-        'geodir_article_close_replace' => '',
675
-        'geodir_sidebar_right_open_id' => '',
676
-        'geodir_sidebar_right_open_class' => '',
677
-        'geodir_sidebar_right_open_replace' => '<aside  class="sidebar" role="complementary" itemscope itemtype="[itemtype]" >',
678
-        'geodir_sidebar_right_close_replace' => '',
679
-        'geodir_sidebar_left_open_id' => '',
680
-        'geodir_sidebar_left_open_class' => '',
681
-        'geodir_sidebar_left_open_replace' => '<aside  class="secondary-sidebar" role="complementary" itemscope itemtype="[itemtype]" >',
682
-        'geodir_sidebar_left_close_replace' => '',
683
-        'geodir_main_content_open_id' => '',
684
-        'geodir_main_content_open_class' => '',
685
-        'geodir_main_content_open_replace' => '<div class="site-content page-wrap">',
686
-        'geodir_main_content_close_replace' => '</div>',
687
-        'geodir_top_content_add' => '',
688
-        'geodir_before_main_content_add' => '',
689
-        'geodir_full_page_class_filter' => 'section full-width-section',
690
-        'geodir_before_widget_filter' => '',
691
-        'geodir_after_widget_filter' => '',
692
-        'geodir_before_title_filter' => '<div class="widget-title"><h2>',
693
-        'geodir_after_title_filter' => '</h2></div>',
694
-        'geodir_menu_li_class_filter' => '',
695
-        'geodir_sub_menu_ul_class_filter' => '',
696
-        'geodir_sub_menu_li_class_filter' => '',
697
-        'geodir_menu_a_class_filter' => '',
698
-        'geodir_sub_menu_a_class_filter' => '',
699
-        'geodir_location_switcher_menu_li_class_filter' => '',
700
-        'geodir_location_switcher_menu_a_class_filter' => '',
701
-        'geodir_location_switcher_menu_sub_ul_class_filter' => '',
702
-        'geodir_location_switcher_menu_sub_li_class_filter' => '',
703
-        'geodir_theme_compat_css' => stripslashes('.full-width-section .geodir-search{margin:0;width:100%}.geodir_full_page .geodir-search{margin:0 auto;float:none}.geodir-search input[type=button],.geodir-search input[type=submit]{width:13%}.geodir-search input[type=text]{border:1px solid #ddd;border-radius:0;padding:0 8px}.geodir-category-list-in,.geodir-loc-bar-in{background:#f2f2f2;border-color:#dbdbdb}.geodir-category-list-in{margin-top:0}.geodir-cat-list .widget-title h2{margin:-13px -13px 13px}.widget .geodir-cat-list ul li.geodir-pcat-show a:before{display:none!important}.widget .geodir-cat-list ul li.geodir-pcat-show i{margin-right:5px}.container .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#geodir_carousel,#geodir_slider{border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;margin-bottom:20px!important;border:1px solid #e1e1e1;box-shadow:none}#geodir_carousel{padding:10px}.geodir-tabs-content ol.commentlist{margin:40px 0;padding:0}li#post_mapTab{min-height:400px}#reviewsTab ol.commentlist li{border-bottom:none}#reviewsTab ol.commentlist li article.comment{border-bottom:1px solid #e1e1e1;padding-bottom:10px}.comment-content .rating{display:none}.comment-respond .gd_rating{margin-bottom:20px}div.geodir-rating{width:85px!important}.comment-respond .comment-notes{margin-bottom:10px}.average-review span,.comment-form label,.dtreviewed,.geodir-details-sidebar-user-links a,.geodir-viewall,.geodir_more_info span,.reviewer,dl.geodir-tab-head dd a{font-family:"Archivo Narrow",sans-serif}section.comment-content{margin:0 0 0 12%}#reviewsTab .comments-area .comment-content{width:auto}section.comment-content .description,section.comment-content p{margin:15px 0}dl.geodir-tab-head dd a{background:#f3f3f3;margin-top:-1px;font-size:14px;padding:0 15px}dl.geodir-tab-head dd.geodir-tab-active a{padding-bottom:1px}.geodir-widget .geodir_list_heading,.geodir-widget h3.widget-title{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px;color:#2d2d2d}.geodir-widget .geodir_list_heading h3{background:0 0;border:none}.geodir-widget .geodir_list_heading{margin:-13px -14px 13px}.geodir-map-listing-page{border-width:1px 0 0;border-style:solid;border-color:#dbdbdb}.geodir-sidebar-wrap .geodir-company_info{margin:15px}.geodir-details-sidebar-social-sharing iframe{float:left}.geodir-details-sidebar-rating{overflow:hidden}.geodir-details-sidebar-rating .gd_rating_show,.geodir-details-sidebar-rating .geodir-rating{float:left;margin-right:15px}.geodir-details-sidebar-rating span.item{float:left;margin-top:5px}.geodir-details-sidebar-rating .average-review{top:-4px;position:relative}.geodir-details-sidebar-rating span.item img{margin-top:5px}.geodir_full_page{background:#fff;border:1px solid #e1e1e1;-webkit-box-shadow:0 1px 0 #e5e5e5;box-shadow:0 1px 0 #e5e5e5;padding:15px;margin-bottom:20px;clear:both}.geodir_map_container .main_list img{margin:0 5px}.geodir_category_list_view li.geodir-gridview .geodir-post-img .geodir_thumbnail{margin-bottom:10px}.geodir-addinfo .geodir-pinpoint,.geodir-addinfo a i{margin-right:5px}.geodir_category_list_view li.geodir-gridview h3{font-size:18px;margin-bottom:10px}#related_listingTab ul.geodir_category_list_view{padding:0!important}#reviewsTab #comments .gd_rating{margin-top:5px}.widget .geodir_category_list_view li .geodir-entry-content,.widget .geodir_category_list_view li a:before{display:none!important}.geodir_category_list_view li .geodir-entry-title{margin-bottom:10px}.widget ul.geodir_category_list_view{padding:15px}.sidebar .widget .geodir_category_list_view li{width:calc(100% - 25px)}.widget .geodir-loginbox-list li{overflow:visible!important}.widget ul.chosen-results{margin:0!important}.main_list_selecter{margin-right:5px}.geodir-viewall{float:right;width:auto!important}.widget-title h2{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px}.widget:first-child .geodir_list_heading .widget-title{margin-top:0}.geodir_list_heading .widget-title{float:left;width:80%;margin-top:0}.geodir_list_heading .widget-title h2{padding:0 px;background:0 0;border:none;height:auto;line-height:auto}.chosen-default:before{content:none;display:none;position:absolute;margin-left:-1000000px;float:left}#geodir-wrapper .entry-crumbs{margin-bottom:20px}.geodir-search .mom-select{float:left;width:150px;margin:5px;border:1px solid #ddd;height:40px}.iprelative .gm-style .gm-style-iw{width:100%!important}'),
704
-        'geodir_theme_compat_js' => 'jQuery(document).ready(function(e){e(".geodir_full_page").length&&""===e.trim(e(".geodir_full_page").html())&&e(".geodir_full_page").css({display:"none"})});',
705
-        'geodir_theme_compat_default_options' => '',
706
-        'geodir_theme_compat_code' => 'Multi_News'
707
-    );
708
-
709
-    // Kelo
710
-    $theme_compat['Kleo'] = array(
711
-        'geodir_theme_compat_code' => 'Kleo'
712
-    );
713
-
714
-
715
-    // Twenty Seventeen
716
-    $theme_compat['Twenty_Seventeen'] = array(
717
-        'geodir_wrapper_open_replace' => '<div class="wrap">',
718
-        'geodir_wrapper_content_open_replace' => '<div id="primary" class="content-area" >',
719
-        'geodir_sidebar_right_open_replace' => '<aside id="secondary"  class="widget-area" itemscope itemtype="[itemtype]" >',
720
-        'geodir_sidebar_left_open_replace' => '<aside id="secondary"  class="widget-area" itemscope itemtype="[itemtype]" >',
721
-        'geodir_theme_compat_css' => stripslashes('body.geodir-page #primary header.entry-header {margin-left:0;float:none !important;} .gxeodir_flex-container{float:left;} .geodir-tabs-content.entry-content{width:100% !important;} dl.geodir-tab-head, .geodir_map_container {z-index:2;} .geodir-cat-list ul.geodir-popular-cat-list  li + li {    margin-top: 0;} .geodir-cat-list .geodir-popular-cat-list a img, .entry-content .gm-style a img, .widget .gm-style a img {    box-sizing: none; -webkit-box-shadow: none; -moz-box-shadow: none;}'),
722
-        'geodir_theme_compat_code' => 'Twenty_Seventeen'
723
-    );
724
-
725
-    // buddyBoss
726
-    $theme_compat['Boss.'] = array(
727
-        'geodir_wrapper_open_replace' => '<div class="page-right-sidebar">',
728
-        'geodir_wrapper_content_open_replace' => '<div id="primary" class="site-content">',
729
-        'geodir_article_open_replace' => '<div  id="[id]" class="[class]" itemscope itemtype="[itemtype]">',
730
-        'geodir_article_close_replace' => '</div>',
731
-        'geodir_sidebar_right_open_replace' => '<div id="secondary" class="widget-area" >',
732
-        'geodir_sidebar_right_close_replace' => '</div>',
733
-        'geodir_sidebar_left_open_replace' => '<div id="secondary" class="widget-area" >',
734
-        'geodir_sidebar_left_close_replace' => '</div>',
735
-        'geodir_theme_compat_css' => stripslashes('.geodir-breadcrumb{padding-top:20px;border-bottom:1px solid #ddd;padding-bottom:0} article.geodir-category-listing{padding: 0 !important;}'),
736
-        'geodir_theme_compat_code' => 'BuddyBoss'
737
-
738
-
739
-    );
740
-
741
-    // Flatsome
742
-    $theme_compat['Flatsome'] = array(
743
-        'geodir_wrapper_open_replace' => '<div class="page-wrapper page-right-sidebar"><div class="row">',
744
-        'geodir_wrapper_close_replace' => '</div></div>',
745
-        'geodir_wrapper_content_open_replace' => '<div id="content" class="large-9 left col col-divided" role="main"><div class="page-inner">',
746
-        'geodir_wrapper_content_close_replace' => '</div></div>',
747
-        'geodir_sidebar_right_open_replace' => '<div class="large-3 col"><div id="secondary" class="widget-area " role="complementary">',
748
-        'geodir_sidebar_right_close_replace' => '</div></div>',
749
-        'geodir_sidebar_left_open_replace' => '<div class="large-3 col"><div id="secondary" class="widget-area " role="complementary">',
750
-        'geodir_sidebar_left_close_replace' => '</div></div>',
751
-        'geodir_menu_li_class_filter' => 'menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children  has-dropdown',
752
-        'geodir_sub_menu_ul_class_filter' => 'nav-dropdown nav-dropdown-default gd-nav-dropdown',
753
-        'geodir_sub_menu_li_class_filter' => 'menu-item menu-item-type-custom menu-item-object-custom',
754
-        'geodir_menu_a_class_filter' => 'nav-top-link gd-nav-top-link',
755
-        'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher has-dropdown',
756
-        'geodir_location_switcher_menu_sub_ul_class_filter' => 'nav-dropdown nav-dropdown-default',
757
-        'geodir_theme_compat_css' => stripslashes('dl.geodir_location_tabs_head dt{margin:0;}.header{z-index:90;}'),
758
-        'geodir_theme_compat_js' => stripslashes('jQuery(function(){jQuery("#masthead .gd-nav-top-link").append(\'<i class="icon-angle-down"></i>\'),jQuery("#menu-item-gd-location-switcher >  a").append(\'<i class="icon-angle-down"></i>\'),jQuery(".mobile-sidebar .gd-nav-dropdown").addClass("children"),jQuery(".mobile-sidebar .gd-nav-dropdown").removeClass("nav-dropdown nav-dropdown-default"),jQuery(".mobile-sidebar #menu-item-gd-location-switcher ul").removeClass("nav-dropdown nav-dropdown-default"),setTimeout(function(){},5e3)});'),
759
-
760
-
761
-    );
762
-
763
-
764
-    update_option('gd_theme_compats', $theme_compat);
765
-
766
-    gd_set_theme_compat();// set the compat pack if avail
662
+	$theme_compat['Multi_News'] = array(
663
+		'geodir_wrapper_open_id' => '',
664
+		'geodir_wrapper_open_class' => 'main-container clearfix',
665
+		'geodir_wrapper_open_replace' => '',
666
+		'geodir_wrapper_close_replace' => '',
667
+		'geodir_wrapper_content_open_id' => '',
668
+		'geodir_wrapper_content_open_class' => '',
669
+		'geodir_wrapper_content_open_replace' => '<div class="main-left" ><div class="main-content  "><div class="site-content page-wrap">',
670
+		'geodir_wrapper_content_close_replace' => '</div></div></div>',
671
+		'geodir_article_open_id' => '',
672
+		'geodir_article_open_class' => '',
673
+		'geodir_article_open_replace' => '',
674
+		'geodir_article_close_replace' => '',
675
+		'geodir_sidebar_right_open_id' => '',
676
+		'geodir_sidebar_right_open_class' => '',
677
+		'geodir_sidebar_right_open_replace' => '<aside  class="sidebar" role="complementary" itemscope itemtype="[itemtype]" >',
678
+		'geodir_sidebar_right_close_replace' => '',
679
+		'geodir_sidebar_left_open_id' => '',
680
+		'geodir_sidebar_left_open_class' => '',
681
+		'geodir_sidebar_left_open_replace' => '<aside  class="secondary-sidebar" role="complementary" itemscope itemtype="[itemtype]" >',
682
+		'geodir_sidebar_left_close_replace' => '',
683
+		'geodir_main_content_open_id' => '',
684
+		'geodir_main_content_open_class' => '',
685
+		'geodir_main_content_open_replace' => '<div class="site-content page-wrap">',
686
+		'geodir_main_content_close_replace' => '</div>',
687
+		'geodir_top_content_add' => '',
688
+		'geodir_before_main_content_add' => '',
689
+		'geodir_full_page_class_filter' => 'section full-width-section',
690
+		'geodir_before_widget_filter' => '',
691
+		'geodir_after_widget_filter' => '',
692
+		'geodir_before_title_filter' => '<div class="widget-title"><h2>',
693
+		'geodir_after_title_filter' => '</h2></div>',
694
+		'geodir_menu_li_class_filter' => '',
695
+		'geodir_sub_menu_ul_class_filter' => '',
696
+		'geodir_sub_menu_li_class_filter' => '',
697
+		'geodir_menu_a_class_filter' => '',
698
+		'geodir_sub_menu_a_class_filter' => '',
699
+		'geodir_location_switcher_menu_li_class_filter' => '',
700
+		'geodir_location_switcher_menu_a_class_filter' => '',
701
+		'geodir_location_switcher_menu_sub_ul_class_filter' => '',
702
+		'geodir_location_switcher_menu_sub_li_class_filter' => '',
703
+		'geodir_theme_compat_css' => stripslashes('.full-width-section .geodir-search{margin:0;width:100%}.geodir_full_page .geodir-search{margin:0 auto;float:none}.geodir-search input[type=button],.geodir-search input[type=submit]{width:13%}.geodir-search input[type=text]{border:1px solid #ddd;border-radius:0;padding:0 8px}.geodir-category-list-in,.geodir-loc-bar-in{background:#f2f2f2;border-color:#dbdbdb}.geodir-category-list-in{margin-top:0}.geodir-cat-list .widget-title h2{margin:-13px -13px 13px}.widget .geodir-cat-list ul li.geodir-pcat-show a:before{display:none!important}.widget .geodir-cat-list ul li.geodir-pcat-show i{margin-right:5px}.container .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#geodir_carousel,#geodir_slider{border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;margin-bottom:20px!important;border:1px solid #e1e1e1;box-shadow:none}#geodir_carousel{padding:10px}.geodir-tabs-content ol.commentlist{margin:40px 0;padding:0}li#post_mapTab{min-height:400px}#reviewsTab ol.commentlist li{border-bottom:none}#reviewsTab ol.commentlist li article.comment{border-bottom:1px solid #e1e1e1;padding-bottom:10px}.comment-content .rating{display:none}.comment-respond .gd_rating{margin-bottom:20px}div.geodir-rating{width:85px!important}.comment-respond .comment-notes{margin-bottom:10px}.average-review span,.comment-form label,.dtreviewed,.geodir-details-sidebar-user-links a,.geodir-viewall,.geodir_more_info span,.reviewer,dl.geodir-tab-head dd a{font-family:"Archivo Narrow",sans-serif}section.comment-content{margin:0 0 0 12%}#reviewsTab .comments-area .comment-content{width:auto}section.comment-content .description,section.comment-content p{margin:15px 0}dl.geodir-tab-head dd a{background:#f3f3f3;margin-top:-1px;font-size:14px;padding:0 15px}dl.geodir-tab-head dd.geodir-tab-active a{padding-bottom:1px}.geodir-widget .geodir_list_heading,.geodir-widget h3.widget-title{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px;color:#2d2d2d}.geodir-widget .geodir_list_heading h3{background:0 0;border:none}.geodir-widget .geodir_list_heading{margin:-13px -14px 13px}.geodir-map-listing-page{border-width:1px 0 0;border-style:solid;border-color:#dbdbdb}.geodir-sidebar-wrap .geodir-company_info{margin:15px}.geodir-details-sidebar-social-sharing iframe{float:left}.geodir-details-sidebar-rating{overflow:hidden}.geodir-details-sidebar-rating .gd_rating_show,.geodir-details-sidebar-rating .geodir-rating{float:left;margin-right:15px}.geodir-details-sidebar-rating span.item{float:left;margin-top:5px}.geodir-details-sidebar-rating .average-review{top:-4px;position:relative}.geodir-details-sidebar-rating span.item img{margin-top:5px}.geodir_full_page{background:#fff;border:1px solid #e1e1e1;-webkit-box-shadow:0 1px 0 #e5e5e5;box-shadow:0 1px 0 #e5e5e5;padding:15px;margin-bottom:20px;clear:both}.geodir_map_container .main_list img{margin:0 5px}.geodir_category_list_view li.geodir-gridview .geodir-post-img .geodir_thumbnail{margin-bottom:10px}.geodir-addinfo .geodir-pinpoint,.geodir-addinfo a i{margin-right:5px}.geodir_category_list_view li.geodir-gridview h3{font-size:18px;margin-bottom:10px}#related_listingTab ul.geodir_category_list_view{padding:0!important}#reviewsTab #comments .gd_rating{margin-top:5px}.widget .geodir_category_list_view li .geodir-entry-content,.widget .geodir_category_list_view li a:before{display:none!important}.geodir_category_list_view li .geodir-entry-title{margin-bottom:10px}.widget ul.geodir_category_list_view{padding:15px}.sidebar .widget .geodir_category_list_view li{width:calc(100% - 25px)}.widget .geodir-loginbox-list li{overflow:visible!important}.widget ul.chosen-results{margin:0!important}.main_list_selecter{margin-right:5px}.geodir-viewall{float:right;width:auto!important}.widget-title h2{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px}.widget:first-child .geodir_list_heading .widget-title{margin-top:0}.geodir_list_heading .widget-title{float:left;width:80%;margin-top:0}.geodir_list_heading .widget-title h2{padding:0 px;background:0 0;border:none;height:auto;line-height:auto}.chosen-default:before{content:none;display:none;position:absolute;margin-left:-1000000px;float:left}#geodir-wrapper .entry-crumbs{margin-bottom:20px}.geodir-search .mom-select{float:left;width:150px;margin:5px;border:1px solid #ddd;height:40px}.iprelative .gm-style .gm-style-iw{width:100%!important}'),
704
+		'geodir_theme_compat_js' => 'jQuery(document).ready(function(e){e(".geodir_full_page").length&&""===e.trim(e(".geodir_full_page").html())&&e(".geodir_full_page").css({display:"none"})});',
705
+		'geodir_theme_compat_default_options' => '',
706
+		'geodir_theme_compat_code' => 'Multi_News'
707
+	);
708
+
709
+	// Kelo
710
+	$theme_compat['Kleo'] = array(
711
+		'geodir_theme_compat_code' => 'Kleo'
712
+	);
713
+
714
+
715
+	// Twenty Seventeen
716
+	$theme_compat['Twenty_Seventeen'] = array(
717
+		'geodir_wrapper_open_replace' => '<div class="wrap">',
718
+		'geodir_wrapper_content_open_replace' => '<div id="primary" class="content-area" >',
719
+		'geodir_sidebar_right_open_replace' => '<aside id="secondary"  class="widget-area" itemscope itemtype="[itemtype]" >',
720
+		'geodir_sidebar_left_open_replace' => '<aside id="secondary"  class="widget-area" itemscope itemtype="[itemtype]" >',
721
+		'geodir_theme_compat_css' => stripslashes('body.geodir-page #primary header.entry-header {margin-left:0;float:none !important;} .gxeodir_flex-container{float:left;} .geodir-tabs-content.entry-content{width:100% !important;} dl.geodir-tab-head, .geodir_map_container {z-index:2;} .geodir-cat-list ul.geodir-popular-cat-list  li + li {    margin-top: 0;} .geodir-cat-list .geodir-popular-cat-list a img, .entry-content .gm-style a img, .widget .gm-style a img {    box-sizing: none; -webkit-box-shadow: none; -moz-box-shadow: none;}'),
722
+		'geodir_theme_compat_code' => 'Twenty_Seventeen'
723
+	);
724
+
725
+	// buddyBoss
726
+	$theme_compat['Boss.'] = array(
727
+		'geodir_wrapper_open_replace' => '<div class="page-right-sidebar">',
728
+		'geodir_wrapper_content_open_replace' => '<div id="primary" class="site-content">',
729
+		'geodir_article_open_replace' => '<div  id="[id]" class="[class]" itemscope itemtype="[itemtype]">',
730
+		'geodir_article_close_replace' => '</div>',
731
+		'geodir_sidebar_right_open_replace' => '<div id="secondary" class="widget-area" >',
732
+		'geodir_sidebar_right_close_replace' => '</div>',
733
+		'geodir_sidebar_left_open_replace' => '<div id="secondary" class="widget-area" >',
734
+		'geodir_sidebar_left_close_replace' => '</div>',
735
+		'geodir_theme_compat_css' => stripslashes('.geodir-breadcrumb{padding-top:20px;border-bottom:1px solid #ddd;padding-bottom:0} article.geodir-category-listing{padding: 0 !important;}'),
736
+		'geodir_theme_compat_code' => 'BuddyBoss'
737
+
738
+
739
+	);
740
+
741
+	// Flatsome
742
+	$theme_compat['Flatsome'] = array(
743
+		'geodir_wrapper_open_replace' => '<div class="page-wrapper page-right-sidebar"><div class="row">',
744
+		'geodir_wrapper_close_replace' => '</div></div>',
745
+		'geodir_wrapper_content_open_replace' => '<div id="content" class="large-9 left col col-divided" role="main"><div class="page-inner">',
746
+		'geodir_wrapper_content_close_replace' => '</div></div>',
747
+		'geodir_sidebar_right_open_replace' => '<div class="large-3 col"><div id="secondary" class="widget-area " role="complementary">',
748
+		'geodir_sidebar_right_close_replace' => '</div></div>',
749
+		'geodir_sidebar_left_open_replace' => '<div class="large-3 col"><div id="secondary" class="widget-area " role="complementary">',
750
+		'geodir_sidebar_left_close_replace' => '</div></div>',
751
+		'geodir_menu_li_class_filter' => 'menu-item menu-item-type-post_type menu-item-object-page menu-item-has-children  has-dropdown',
752
+		'geodir_sub_menu_ul_class_filter' => 'nav-dropdown nav-dropdown-default gd-nav-dropdown',
753
+		'geodir_sub_menu_li_class_filter' => 'menu-item menu-item-type-custom menu-item-object-custom',
754
+		'geodir_menu_a_class_filter' => 'nav-top-link gd-nav-top-link',
755
+		'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher has-dropdown',
756
+		'geodir_location_switcher_menu_sub_ul_class_filter' => 'nav-dropdown nav-dropdown-default',
757
+		'geodir_theme_compat_css' => stripslashes('dl.geodir_location_tabs_head dt{margin:0;}.header{z-index:90;}'),
758
+		'geodir_theme_compat_js' => stripslashes('jQuery(function(){jQuery("#masthead .gd-nav-top-link").append(\'<i class="icon-angle-down"></i>\'),jQuery("#menu-item-gd-location-switcher >  a").append(\'<i class="icon-angle-down"></i>\'),jQuery(".mobile-sidebar .gd-nav-dropdown").addClass("children"),jQuery(".mobile-sidebar .gd-nav-dropdown").removeClass("nav-dropdown nav-dropdown-default"),jQuery(".mobile-sidebar #menu-item-gd-location-switcher ul").removeClass("nav-dropdown nav-dropdown-default"),setTimeout(function(){},5e3)});'),
759
+
760
+
761
+	);
762
+
763
+
764
+	update_option('gd_theme_compats', $theme_compat);
765
+
766
+	gd_set_theme_compat();// set the compat pack if avail
767 767
 }
768 768
 
769 769
 
@@ -775,61 +775,61 @@  discard block
 block discarded – undo
775 775
  * @global object $wpdb WordPress Database object.
776 776
  */
777 777
 function gd_convert_virtual_pages(){
778
-    global $wpdb;
779
-
780
-    // Update the add listing page settings
781
-    $add_listing_page = $wpdb->get_var(
782
-        $wpdb->prepare(
783
-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
784
-            array('add-listing')
785
-        )
786
-    );
787
-
788
-    if($add_listing_page){
789
-        wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );
790
-        update_option( 'geodir_add_listing_page', $add_listing_page);
791
-    }
792
-
793
-    // Update the listing preview page settings
794
-    $listing_preview_page = $wpdb->get_var(
795
-        $wpdb->prepare(
796
-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
797
-            array('listing-preview')
798
-        )
799
-    );
800
-
801
-    if($listing_preview_page){
802
-        wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );
803
-        update_option( 'geodir_preview_page', $listing_preview_page);
804
-    }
805
-
806
-    // Update the listing success page settings
807
-    $listing_success_page = $wpdb->get_var(
808
-        $wpdb->prepare(
809
-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
810
-            array('listing-success')
811
-        )
812
-    );
813
-
814
-    if($listing_success_page){
815
-        wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );
816
-        update_option( 'geodir_success_page', $listing_success_page);
817
-    }
818
-
819
-    // Update the listing success page settings
820
-    $location_page = $wpdb->get_var(
821
-        $wpdb->prepare(
822
-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
823
-            array('location')
824
-        )
825
-    );
826
-
827
-    if($location_page){
828
-        $location_slug = get_option('geodir_location_prefix');
829
-        if(!$location_slug ){$location_slug  = 'location';}
830
-        wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );
831
-        update_option( 'geodir_location_page', $location_page);
832
-    }
778
+	global $wpdb;
779
+
780
+	// Update the add listing page settings
781
+	$add_listing_page = $wpdb->get_var(
782
+		$wpdb->prepare(
783
+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
784
+			array('add-listing')
785
+		)
786
+	);
787
+
788
+	if($add_listing_page){
789
+		wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );
790
+		update_option( 'geodir_add_listing_page', $add_listing_page);
791
+	}
792
+
793
+	// Update the listing preview page settings
794
+	$listing_preview_page = $wpdb->get_var(
795
+		$wpdb->prepare(
796
+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
797
+			array('listing-preview')
798
+		)
799
+	);
800
+
801
+	if($listing_preview_page){
802
+		wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );
803
+		update_option( 'geodir_preview_page', $listing_preview_page);
804
+	}
805
+
806
+	// Update the listing success page settings
807
+	$listing_success_page = $wpdb->get_var(
808
+		$wpdb->prepare(
809
+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
810
+			array('listing-success')
811
+		)
812
+	);
813
+
814
+	if($listing_success_page){
815
+		wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );
816
+		update_option( 'geodir_success_page', $listing_success_page);
817
+	}
818
+
819
+	// Update the listing success page settings
820
+	$location_page = $wpdb->get_var(
821
+		$wpdb->prepare(
822
+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
823
+			array('location')
824
+		)
825
+	);
826
+
827
+	if($location_page){
828
+		$location_slug = get_option('geodir_location_prefix');
829
+		if(!$location_slug ){$location_slug  = 'location';}
830
+		wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );
831
+		update_option( 'geodir_location_page', $location_page);
832
+	}
833 833
 
834 834
 }
835 835
 
@@ -843,31 +843,31 @@  discard block
 block discarded – undo
843 843
 function gd_fix_cpt_rewrite_slug()
844 844
 {
845 845
 
846
-    $alt_post_types = array();
847
-    $post_types = get_option('geodir_post_types');
846
+	$alt_post_types = array();
847
+	$post_types = get_option('geodir_post_types');
848 848
 
849 849
 
850
-    if (is_array($post_types)){
850
+	if (is_array($post_types)){
851 851
 
852
-        foreach ($post_types as $post_type => $args) {
852
+		foreach ($post_types as $post_type => $args) {
853 853
 
854 854
 
855
-            if(isset($args['rewrite']['slug'])){
856
-                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);
857
-            }
855
+			if(isset($args['rewrite']['slug'])){
856
+				$args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);
857
+			}
858 858
 
859
-                $alt_post_types[$post_type] = $args;
859
+				$alt_post_types[$post_type] = $args;
860 860
 
861
-        }
862
-    }
861
+		}
862
+	}
863 863
 
864
-    if(!empty($alt_post_types)) {
865
-        update_option('geodir_post_types',$alt_post_types);
866
-        }
864
+	if(!empty($alt_post_types)) {
865
+		update_option('geodir_post_types',$alt_post_types);
866
+		}
867 867
 
868 868
 
869
-    // flush the rewrite rules
870
-    flush_rewrite_rules();
869
+	// flush the rewrite rules
870
+	flush_rewrite_rules();
871 871
 }
872 872
 
873 873
 
@@ -880,20 +880,20 @@  discard block
 block discarded – undo
880 880
  */
881 881
 function gd_fix_address_detail_table_limit()
882 882
 {
883
-    global $wpdb;
884
-
885
-    $all_postypes = geodir_get_posttypes();
886
-
887
-    if (!empty($all_postypes)) {
888
-        foreach ($all_postypes as $key) {
889
-            // update each GD CTP
890
-            try {
891
-                $wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");
892
-            } catch(Exception $e) {
893
-                error_log( 'Error: ' . $e->getMessage() );
894
-            }
895
-        }
896
-    }
883
+	global $wpdb;
884
+
885
+	$all_postypes = geodir_get_posttypes();
886
+
887
+	if (!empty($all_postypes)) {
888
+		foreach ($all_postypes as $key) {
889
+			// update each GD CTP
890
+			try {
891
+				$wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");
892
+			} catch(Exception $e) {
893
+				error_log( 'Error: ' . $e->getMessage() );
894
+			}
895
+		}
896
+	}
897 897
 }
898 898
 
899 899
 /**
@@ -905,63 +905,63 @@  discard block
 block discarded – undo
905 905
  * @return bool
906 906
  */
907 907
 function geodir_upgrade_1618() {
908
-    global $wpdb;
908
+	global $wpdb;
909 909
 
910
-    $gd_posttypes = geodir_get_posttypes();
911
-    $default_location = geodir_get_default_location();
910
+	$gd_posttypes = geodir_get_posttypes();
911
+	$default_location = geodir_get_default_location();
912 912
     
913
-    $old_country = 'Czech Republic';
914
-    $old_slug = 'czech-republic';
915
-    $new_country = 'Czechia';
916
-    $new_slug = 'czechia';
917
-    $flush_rewrite_rules = false;
918
-
919
-    if (!empty($gd_posttypes) && defined('POST_LOCATION_TABLE')) {        
920
-        // Update locations
921
-        if ($wpdb->query($wpdb->prepare("UPDATE `" . POST_LOCATION_TABLE . "` SET `country` = %s, country_slug = %s WHERE `country` LIKE %s OR country_slug LIKE %s", array($new_country, $new_slug, $old_country, $old_slug)))) {
922
-            $flush_rewrite_rules = true;
923
-        }
913
+	$old_country = 'Czech Republic';
914
+	$old_slug = 'czech-republic';
915
+	$new_country = 'Czechia';
916
+	$new_slug = 'czechia';
917
+	$flush_rewrite_rules = false;
918
+
919
+	if (!empty($gd_posttypes) && defined('POST_LOCATION_TABLE')) {        
920
+		// Update locations
921
+		if ($wpdb->query($wpdb->prepare("UPDATE `" . POST_LOCATION_TABLE . "` SET `country` = %s, country_slug = %s WHERE `country` LIKE %s OR country_slug LIKE %s", array($new_country, $new_slug, $old_country, $old_slug)))) {
922
+			$flush_rewrite_rules = true;
923
+		}
924 924
         
925
-        // Update locations seo
926
-        if ($wpdb->query($wpdb->prepare("UPDATE `" . LOCATION_SEO_TABLE . "` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {
927
-            $flush_rewrite_rules = true;
928
-        }
929
-
930
-        // Update term meta
931
-        if ($wpdb->query($wpdb->prepare("UPDATE `" . GEODIR_TERM_META . "` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {
932
-            $flush_rewrite_rules = true;
933
-        }
934
-
935
-        if ($wpdb->query($wpdb->prepare("UPDATE `" . GEODIR_TERM_META . "` SET `location_name` = %s WHERE location_type LIKE 'gd_country' AND location_name LIKE %s", array($new_slug, $old_slug)))) {
936
-            $flush_rewrite_rules = true;
937
-        }
938
-
939
-        // Update detail table
940
-        foreach ($gd_posttypes as $pos_type) {
941
-            try {
942
-                if ($wpdb->query("UPDATE `" . $wpdb->prefix . "geodir_" . $pos_type . "_detail` SET post_country = '" . $new_country . "', post_locations = REPLACE ( post_locations, ',[" . $old_slug . "]', ',[" . $new_slug . "]' ) WHERE post_locations LIKE '%[" . $old_slug . "]' OR post_country LIKE '" . $old_country . "'")) {
943
-                    $flush_rewrite_rules = true;
944
-                }
945
-            } catch(Exception $e) {
946
-                error_log( 'Error: ' . $e->getMessage() );
947
-            }
948
-        }
949
-    }
925
+		// Update locations seo
926
+		if ($wpdb->query($wpdb->prepare("UPDATE `" . LOCATION_SEO_TABLE . "` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {
927
+			$flush_rewrite_rules = true;
928
+		}
929
+
930
+		// Update term meta
931
+		if ($wpdb->query($wpdb->prepare("UPDATE `" . GEODIR_TERM_META . "` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {
932
+			$flush_rewrite_rules = true;
933
+		}
934
+
935
+		if ($wpdb->query($wpdb->prepare("UPDATE `" . GEODIR_TERM_META . "` SET `location_name` = %s WHERE location_type LIKE 'gd_country' AND location_name LIKE %s", array($new_slug, $old_slug)))) {
936
+			$flush_rewrite_rules = true;
937
+		}
938
+
939
+		// Update detail table
940
+		foreach ($gd_posttypes as $pos_type) {
941
+			try {
942
+				if ($wpdb->query("UPDATE `" . $wpdb->prefix . "geodir_" . $pos_type . "_detail` SET post_country = '" . $new_country . "', post_locations = REPLACE ( post_locations, ',[" . $old_slug . "]', ',[" . $new_slug . "]' ) WHERE post_locations LIKE '%[" . $old_slug . "]' OR post_country LIKE '" . $old_country . "'")) {
943
+					$flush_rewrite_rules = true;
944
+				}
945
+			} catch(Exception $e) {
946
+				error_log( 'Error: ' . $e->getMessage() );
947
+			}
948
+		}
949
+	}
950 950
     
951
-    if (!empty($default_location) && ((isset($default_location->country) && $default_location->country == $old_country) || (isset($default_location->country_slug) && $default_location->country_slug == $old_slug))) {
952
-        $default_location->country = $new_country;
953
-        $default_location->country_slug = $new_slug;
951
+	if (!empty($default_location) && ((isset($default_location->country) && $default_location->country == $old_country) || (isset($default_location->country_slug) && $default_location->country_slug == $old_slug))) {
952
+		$default_location->country = $new_country;
953
+		$default_location->country_slug = $new_slug;
954 954
         
955
-        update_option('geodir_default_location', $default_location);
955
+		update_option('geodir_default_location', $default_location);
956 956
         
957
-        $flush_rewrite_rules = true;
958
-    }
957
+		$flush_rewrite_rules = true;
958
+	}
959 959
     
960
-    if ($flush_rewrite_rules) {
961
-        flush_rewrite_rules();
962
-    }
960
+	if ($flush_rewrite_rules) {
961
+		flush_rewrite_rules();
962
+	}
963 963
     
964
-    return true;
964
+	return true;
965 965
 }
966 966
 
967 967
 /**
@@ -972,9 +972,9 @@  discard block
 block discarded – undo
972 972
  * @return bool
973 973
  */
974 974
 function geodir_upgrade_1622() {
975
-    if ( get_option( 'geodir_notify_post_submit', '-1' ) == '-1' ) {
976
-        update_option( 'geodir_notify_post_submit', '1' );
977
-    }
975
+	if ( get_option( 'geodir_notify_post_submit', '-1' ) == '-1' ) {
976
+		update_option( 'geodir_notify_post_submit', '1' );
977
+	}
978 978
     
979
-    return true;
979
+	return true;
980 980
 }
981 981
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 
10 10
 global $wpdb;
11 11
 
12
-if (get_option('geodirectory' . '_db_version') != GEODIRECTORY_VERSION) {
12
+if (get_option('geodirectory'.'_db_version') != GEODIRECTORY_VERSION) {
13 13
     /**
14 14
      * Include custom database table related functions.
15 15
      *
@@ -54,9 +54,9 @@  discard block
 block discarded – undo
54 54
         add_action('init', 'geodir_upgrade_1622', 11);
55 55
     }
56 56
 
57
-    add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions
57
+    add_action('init', 'gd_fix_cpt_rewrite_slug', 11); // this needs to be kept for a few versions
58 58
 
59
-    update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);
59
+    update_option('geodirectory'.'_db_version', GEODIRECTORY_VERSION);
60 60
 
61 61
 }
62 62
 
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
  * @since 1.0.0
92 92
  * @package GeoDirectory
93 93
  */
94
-function geodir_upgrade_146(){
94
+function geodir_upgrade_146() {
95 95
     gd_convert_virtual_pages();
96 96
 }
97 97
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
  * @since 1.5.0
102 102
  * @package GeoDirectory
103 103
  */
104
-function geodir_upgrade_150(){
104
+function geodir_upgrade_150() {
105 105
     gd_fix_cpt_rewrite_slug();
106 106
 }
107 107
 
@@ -113,12 +113,12 @@  discard block
 block discarded – undo
113 113
  * @since 1.4.8
114 114
  * @package GeoDirectory
115 115
  */
116
-function geodir_upgrade_148(){
116
+function geodir_upgrade_148() {
117 117
     /*
118 118
      * Blank the users google password if present as we now use oAuth 2.0
119 119
      */
120
-    update_option('geodir_ga_pass','');
121
-    update_option('geodir_ga_user','');
120
+    update_option('geodir_ga_pass', '');
121
+    update_option('geodir_ga_user', '');
122 122
 
123 123
 }
124 124
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
  * @since 1.5.3
130 130
  * @package GeoDirectory
131 131
  */
132
-function geodir_upgrade_153(){
132
+function geodir_upgrade_153() {
133 133
     geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');
134 134
     geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');
135 135
 }
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
  * @since 1.5.3
141 141
  * @package GeoDirectory
142 142
  */
143
-function geodir_upgrade_154(){
143
+function geodir_upgrade_154() {
144 144
     geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');
145 145
 }
146 146
 
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
  * @since 1.5.2
151 151
  * @package GeoDirectory
152 152
  */
153
-function geodir_upgrade_152(){
153
+function geodir_upgrade_152() {
154 154
     gd_fix_address_detail_table_limit();
155 155
 }
156 156
 
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 function geodir_fix_review_date()
187 187
 {
188 188
     global $wpdb;
189
-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");
189
+    $wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");
190 190
 }
191 191
 
192 192
 /**
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 function geodir_fix_review_post_status()
200 200
 {
201 201
     global $wpdb;
202
-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");
202
+    $wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");
203 203
 }
204 204
 
205 205
 /**
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
 function geodir_fix_review_content()
214 214
 {
215 215
     global $wpdb;
216
-    if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {
216
+    if ($wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {
217 217
         return true;
218 218
     } else {
219 219
         return false;
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
         foreach ($all_postypes as $key) {
239 239
             // update each GD CTP
240 240
 
241
-            $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");
241
+            $wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN ".$wpdb->prefix."geodir_".$key."_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");
242 242
 
243 243
         }
244 244
         return true;
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
     if (!empty($all_postypes)) {
263 263
         foreach ($all_postypes as $key) {
264 264
             // update each GD CTP
265
-            $reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");
265
+            $reviews = $wpdb->get_results("SELECT post_id FROM ".$wpdb->prefix."geodir_".$key."_detail d");
266 266
 
267 267
             if (!empty($reviews)) {
268 268
                 foreach ($reviews as $post_id) {
@@ -277,61 +277,61 @@  discard block
 block discarded – undo
277 277
 }
278 278
 
279 279
 
280
-function gd_convert_custom_field_display(){
280
+function gd_convert_custom_field_display() {
281 281
     global $wpdb;
282 282
 
283
-    $field_info = $wpdb->get_results("select * from " . GEODIR_CUSTOM_FIELDS_TABLE);
283
+    $field_info = $wpdb->get_results("select * from ".GEODIR_CUSTOM_FIELDS_TABLE);
284 284
 
285 285
     $has_run = get_option('gd_convert_custom_field_display');
286
-    if($has_run){return;}
286
+    if ($has_run) {return; }
287 287
 
288 288
     // set the field_type_key for standard fields
289 289
     $wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET field_type_key = field_type");
290 290
 
291 291
 
292
-    if(is_array( $field_info)){
292
+    if (is_array($field_info)) {
293 293
 
294
-        foreach( $field_info as $cf){
294
+        foreach ($field_info as $cf) {
295 295
 
296 296
             $id = $cf->id;
297 297
 
298
-            if(!property_exists($cf,'show_in') || !$id){return;}
298
+            if (!property_exists($cf, 'show_in') || !$id) {return; }
299 299
 
300 300
             $show_in_arr = array();
301 301
 
302
-            if($cf->is_default){
302
+            if ($cf->is_default) {
303 303
                 $show_in_arr[] = "[detail]";
304 304
             }
305 305
 
306
-            if($cf->show_on_detail){
306
+            if ($cf->show_on_detail) {
307 307
                 $show_in_arr[] = "[moreinfo]";
308 308
             }
309 309
 
310
-            if($cf->show_on_listing){
310
+            if ($cf->show_on_listing) {
311 311
                 $show_in_arr[] = "[listing]";
312 312
             }
313 313
 
314
-            if($cf->show_as_tab || $cf->htmlvar_name=='geodir_video' || $cf->htmlvar_name=='geodir_special_offers'){
314
+            if ($cf->show_as_tab || $cf->htmlvar_name == 'geodir_video' || $cf->htmlvar_name == 'geodir_special_offers') {
315 315
                 $show_in_arr[] = "[owntab]";
316 316
             }
317 317
 
318
-            if($cf->htmlvar_name=='post' || $cf->htmlvar_name=='geodir_contact' || $cf->htmlvar_name=='geodir_timing'){
318
+            if ($cf->htmlvar_name == 'post' || $cf->htmlvar_name == 'geodir_contact' || $cf->htmlvar_name == 'geodir_timing') {
319 319
                 $show_in_arr[] = "[mapbubble]";
320 320
             }
321 321
 
322
-            if(!empty($show_in_arr )){
323
-                $show_in_arr = implode(',',$show_in_arr);
324
-            }else{
322
+            if (!empty($show_in_arr)) {
323
+                $show_in_arr = implode(',', $show_in_arr);
324
+            } else {
325 325
                 $show_in_arr = '';
326 326
             }
327 327
 
328
-            if($show_in_arr){
328
+            if ($show_in_arr) {
329 329
                 $wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET show_in='$show_in_arr' WHERE id=$id");
330 330
             }
331 331
 
332 332
         }
333 333
 
334
-        update_option('gd_convert_custom_field_display',1);
334
+        update_option('gd_convert_custom_field_display', 1);
335 335
     }
336 336
 }
337 337
 
@@ -763,7 +763,7 @@  discard block
 block discarded – undo
763 763
 
764 764
     update_option('gd_theme_compats', $theme_compat);
765 765
 
766
-    gd_set_theme_compat();// set the compat pack if avail
766
+    gd_set_theme_compat(); // set the compat pack if avail
767 767
 }
768 768
 
769 769
 
@@ -774,61 +774,61 @@  discard block
 block discarded – undo
774 774
  * @package GeoDirectory
775 775
  * @global object $wpdb WordPress Database object.
776 776
  */
777
-function gd_convert_virtual_pages(){
777
+function gd_convert_virtual_pages() {
778 778
     global $wpdb;
779 779
 
780 780
     // Update the add listing page settings
781 781
     $add_listing_page = $wpdb->get_var(
782 782
         $wpdb->prepare(
783
-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
783
+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
784 784
             array('add-listing')
785 785
         )
786 786
     );
787 787
 
788
-    if($add_listing_page){
789
-        wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );
790
-        update_option( 'geodir_add_listing_page', $add_listing_page);
788
+    if ($add_listing_page) {
789
+        wp_update_post(array('ID' => $add_listing_page, 'post_status' => 'publish'));
790
+        update_option('geodir_add_listing_page', $add_listing_page);
791 791
     }
792 792
 
793 793
     // Update the listing preview page settings
794 794
     $listing_preview_page = $wpdb->get_var(
795 795
         $wpdb->prepare(
796
-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
796
+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
797 797
             array('listing-preview')
798 798
         )
799 799
     );
800 800
 
801
-    if($listing_preview_page){
802
-        wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );
803
-        update_option( 'geodir_preview_page', $listing_preview_page);
801
+    if ($listing_preview_page) {
802
+        wp_update_post(array('ID' => $listing_preview_page, 'post_status' => 'publish'));
803
+        update_option('geodir_preview_page', $listing_preview_page);
804 804
     }
805 805
 
806 806
     // Update the listing success page settings
807 807
     $listing_success_page = $wpdb->get_var(
808 808
         $wpdb->prepare(
809
-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
809
+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
810 810
             array('listing-success')
811 811
         )
812 812
     );
813 813
 
814
-    if($listing_success_page){
815
-        wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );
816
-        update_option( 'geodir_success_page', $listing_success_page);
814
+    if ($listing_success_page) {
815
+        wp_update_post(array('ID' => $listing_success_page, 'post_status' => 'publish'));
816
+        update_option('geodir_success_page', $listing_success_page);
817 817
     }
818 818
 
819 819
     // Update the listing success page settings
820 820
     $location_page = $wpdb->get_var(
821 821
         $wpdb->prepare(
822
-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
822
+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",
823 823
             array('location')
824 824
         )
825 825
     );
826 826
 
827
-    if($location_page){
827
+    if ($location_page) {
828 828
         $location_slug = get_option('geodir_location_prefix');
829
-        if(!$location_slug ){$location_slug  = 'location';}
830
-        wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );
831
-        update_option( 'geodir_location_page', $location_page);
829
+        if (!$location_slug) {$location_slug = 'location'; }
830
+        wp_update_post(array('ID' => $location_page, 'post_status' => 'publish', 'post_name' => $location_slug));
831
+        update_option('geodir_location_page', $location_page);
832 832
     }
833 833
 
834 834
 }
@@ -847,13 +847,13 @@  discard block
 block discarded – undo
847 847
     $post_types = get_option('geodir_post_types');
848 848
 
849 849
 
850
-    if (is_array($post_types)){
850
+    if (is_array($post_types)) {
851 851
 
852 852
         foreach ($post_types as $post_type => $args) {
853 853
 
854 854
 
855
-            if(isset($args['rewrite']['slug'])){
856
-                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);
855
+            if (isset($args['rewrite']['slug'])) {
856
+                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%", "", $args['rewrite']['slug']);
857 857
             }
858 858
 
859 859
                 $alt_post_types[$post_type] = $args;
@@ -861,8 +861,8 @@  discard block
 block discarded – undo
861 861
         }
862 862
     }
863 863
 
864
-    if(!empty($alt_post_types)) {
865
-        update_option('geodir_post_types',$alt_post_types);
864
+    if (!empty($alt_post_types)) {
865
+        update_option('geodir_post_types', $alt_post_types);
866 866
         }
867 867
 
868 868
 
@@ -888,9 +888,9 @@  discard block
 block discarded – undo
888 888
         foreach ($all_postypes as $key) {
889 889
             // update each GD CTP
890 890
             try {
891
-                $wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");
892
-            } catch(Exception $e) {
893
-                error_log( 'Error: ' . $e->getMessage() );
891
+                $wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_".$key."_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");
892
+            } catch (Exception $e) {
893
+                error_log('Error: '.$e->getMessage());
894 894
             }
895 895
         }
896 896
     }
@@ -918,32 +918,32 @@  discard block
 block discarded – undo
918 918
 
919 919
     if (!empty($gd_posttypes) && defined('POST_LOCATION_TABLE')) {        
920 920
         // Update locations
921
-        if ($wpdb->query($wpdb->prepare("UPDATE `" . POST_LOCATION_TABLE . "` SET `country` = %s, country_slug = %s WHERE `country` LIKE %s OR country_slug LIKE %s", array($new_country, $new_slug, $old_country, $old_slug)))) {
921
+        if ($wpdb->query($wpdb->prepare("UPDATE `".POST_LOCATION_TABLE."` SET `country` = %s, country_slug = %s WHERE `country` LIKE %s OR country_slug LIKE %s", array($new_country, $new_slug, $old_country, $old_slug)))) {
922 922
             $flush_rewrite_rules = true;
923 923
         }
924 924
         
925 925
         // Update locations seo
926
-        if ($wpdb->query($wpdb->prepare("UPDATE `" . LOCATION_SEO_TABLE . "` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {
926
+        if ($wpdb->query($wpdb->prepare("UPDATE `".LOCATION_SEO_TABLE."` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {
927 927
             $flush_rewrite_rules = true;
928 928
         }
929 929
 
930 930
         // Update term meta
931
-        if ($wpdb->query($wpdb->prepare("UPDATE `" . GEODIR_TERM_META . "` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {
931
+        if ($wpdb->query($wpdb->prepare("UPDATE `".GEODIR_TERM_META."` SET `country_slug` = %s WHERE country_slug LIKE %s", array($new_slug, $old_slug)))) {
932 932
             $flush_rewrite_rules = true;
933 933
         }
934 934
 
935
-        if ($wpdb->query($wpdb->prepare("UPDATE `" . GEODIR_TERM_META . "` SET `location_name` = %s WHERE location_type LIKE 'gd_country' AND location_name LIKE %s", array($new_slug, $old_slug)))) {
935
+        if ($wpdb->query($wpdb->prepare("UPDATE `".GEODIR_TERM_META."` SET `location_name` = %s WHERE location_type LIKE 'gd_country' AND location_name LIKE %s", array($new_slug, $old_slug)))) {
936 936
             $flush_rewrite_rules = true;
937 937
         }
938 938
 
939 939
         // Update detail table
940 940
         foreach ($gd_posttypes as $pos_type) {
941 941
             try {
942
-                if ($wpdb->query("UPDATE `" . $wpdb->prefix . "geodir_" . $pos_type . "_detail` SET post_country = '" . $new_country . "', post_locations = REPLACE ( post_locations, ',[" . $old_slug . "]', ',[" . $new_slug . "]' ) WHERE post_locations LIKE '%[" . $old_slug . "]' OR post_country LIKE '" . $old_country . "'")) {
942
+                if ($wpdb->query("UPDATE `".$wpdb->prefix."geodir_".$pos_type."_detail` SET post_country = '".$new_country."', post_locations = REPLACE ( post_locations, ',[".$old_slug."]', ',[".$new_slug."]' ) WHERE post_locations LIKE '%[".$old_slug."]' OR post_country LIKE '".$old_country."'")) {
943 943
                     $flush_rewrite_rules = true;
944 944
                 }
945
-            } catch(Exception $e) {
946
-                error_log( 'Error: ' . $e->getMessage() );
945
+            } catch (Exception $e) {
946
+                error_log('Error: '.$e->getMessage());
947 947
             }
948 948
         }
949 949
     }
@@ -972,8 +972,8 @@  discard block
 block discarded – undo
972 972
  * @return bool
973 973
  */
974 974
 function geodir_upgrade_1622() {
975
-    if ( get_option( 'geodir_notify_post_submit', '-1' ) == '-1' ) {
976
-        update_option( 'geodir_notify_post_submit', '1' );
975
+    if (get_option('geodir_notify_post_submit', '-1') == '-1') {
976
+        update_option('geodir_notify_post_submit', '1');
977 977
     }
978 978
     
979 979
     return true;
Please login to merge, or discard this patch.
geodirectory-functions/custom_fields_functions.php 4 patches
Doc Comments   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1345,6 +1345,9 @@  discard block
 block discarded – undo
1345 1345
 }
1346 1346
 
1347 1347
 
1348
+/**
1349
+ * @return string
1350
+ */
1348 1351
 function geodir_field_icon_proccess($cf){
1349 1352
 
1350 1353
 
@@ -1738,7 +1741,7 @@  discard block
 block discarded – undo
1738 1741
  * @global object $wpdb WordPress Database object.
1739 1742
  * @global string $plugin_prefix Geodirectory plugin table prefix.
1740 1743
  * @param int $post_id The post ID.
1741
- * @return mixed Returns video.
1744
+ * @return string Returns video.
1742 1745
  */
1743 1746
 function geodir_get_video($post_id)
1744 1747
 {
@@ -1764,7 +1767,7 @@  discard block
 block discarded – undo
1764 1767
  * @global object $wpdb WordPress Database object.
1765 1768
  * @global string $plugin_prefix Geodirectory plugin table prefix.
1766 1769
  * @param int $post_id The post ID.
1767
- * @return mixed Returns special offers.
1770
+ * @return string Returns special offers.
1768 1771
  */
1769 1772
 function geodir_get_special_offers($post_id)
1770 1773
 {
@@ -1788,7 +1791,7 @@  discard block
 block discarded – undo
1788 1791
      *
1789 1792
      * @since 1.0.0
1790 1793
      * @package GeoDirectory
1791
-     * @return mixed|void Returns max upload file size.
1794
+     * @return string|null Returns max upload file size.
1792 1795
      */
1793 1796
     function geodir_max_upload_size()
1794 1797
     {
@@ -2157,7 +2160,6 @@  discard block
 block discarded – undo
2157 2160
      * @param string $field_type The form field type.
2158 2161
      * @param object|int $result_str The custom field results object or row id.
2159 2162
      * @param string $field_ins_upd When set to "submit" displays form.
2160
-     * @param bool $default when set to true field will be for admin use only.
2161 2163
      */
2162 2164
     function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')
2163 2165
     {
Please login to merge, or discard this patch.
Braces   +133 added lines, -92 removed lines patch added patch discarded remove patch
@@ -51,8 +51,9 @@  discard block
 block discarded – undo
51 51
         global $wpdb;
52 52
         $result = 0;// no rows affected
53 53
         if (!geodir_column_exist($db, $column)) {
54
-            if (!empty($db) && !empty($column))
55
-                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
54
+            if (!empty($db) && !empty($column)) {
55
+                            $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
56
+            }
56 57
         }
57 58
         return $result;
58 59
     }
@@ -82,10 +83,11 @@  discard block
 block discarded – undo
82 83
 
83 84
     $default_query = '';
84 85
 
85
-    if ($default == 'default')
86
-        $default_query .= " and is_admin IN ('1') ";
87
-    elseif ($default == 'custom')
88
-        $default_query .= " and is_admin = '0' ";
86
+    if ($default == 'default') {
87
+            $default_query .= " and is_admin IN ('1') ";
88
+    } elseif ($default == 'custom') {
89
+            $default_query .= " and is_admin = '0' ";
90
+    }
89 91
 
90 92
     if ($fields_location == 'none') {
91 93
     } else{
@@ -239,10 +241,12 @@  discard block
 block discarded – undo
239 241
                 }
240 242
 
241 243
                 return $field_id;
242
-            } else
243
-                return 0;
244
-        } else
245
-            return 0;
244
+            } else {
245
+                            return 0;
246
+            }
247
+        } else {
248
+                    return 0;
249
+        }
246 250
     }
247 251
 }
248 252
 
@@ -350,7 +354,9 @@  discard block
 block discarded – undo
350 354
 
351 355
 
352 356
 
353
-            if ($post_type == '') $post_type = 'gd_place';
357
+            if ($post_type == '') {
358
+            	$post_type = 'gd_place';
359
+            }
354 360
 
355 361
 
356 362
             $detail_table = $plugin_prefix . $post_type . '_detail';
@@ -390,16 +396,17 @@  discard block
 block discarded – undo
390 396
             }
391 397
 
392 398
             $option_values = '';
393
-            if (isset($request_field['option_values']))
394
-                $option_values = $request_field['option_values'];
399
+            if (isset($request_field['option_values'])) {
400
+                            $option_values = $request_field['option_values'];
401
+            }
395 402
 
396 403
             $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0';
397 404
 
398 405
             $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0';
399 406
 
400
-            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))
401
-                $price_pkg = implode(",", $request_field['show_on_pkg']);
402
-            else {
407
+            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) {
408
+                            $price_pkg = implode(",", $request_field['show_on_pkg']);
409
+            } else {
403 410
                 $package_info = array();
404 411
 
405 412
                 $package_info = geodir_post_package_info($package_info, '', $post_type);
@@ -407,22 +414,29 @@  discard block
 block discarded – undo
407 414
             }
408 415
 
409 416
 
410
-            if (isset($request_field['extra']) && !empty($request_field['extra']))
411
-                $extra_fields = $request_field['extra'];
417
+            if (isset($request_field['extra']) && !empty($request_field['extra'])) {
418
+                            $extra_fields = $request_field['extra'];
419
+            }
412 420
 
413
-            if (isset($request_field['is_default']) && $request_field['is_default'] != '')
414
-                $is_default = $request_field['is_default'];
415
-            else
416
-                $is_default = '0';
421
+            if (isset($request_field['is_default']) && $request_field['is_default'] != '') {
422
+                            $is_default = $request_field['is_default'];
423
+            } else {
424
+                            $is_default = '0';
425
+            }
417 426
 
418
-            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')
419
-                $is_admin = $request_field['is_admin'];
420
-            else
421
-                $is_admin = '0';
427
+            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') {
428
+                            $is_admin = $request_field['is_admin'];
429
+            } else {
430
+                            $is_admin = '0';
431
+            }
422 432
 
423 433
 
424
-            if ($is_active == '') $is_active = 1;
425
-            if ($is_required == '') $is_required = 0;
434
+            if ($is_active == '') {
435
+            	$is_active = 1;
436
+            }
437
+            if ($is_required == '') {
438
+            	$is_required = 0;
439
+            }
426 440
 
427 441
 
428 442
             if ($sort_order == '') {
@@ -701,7 +715,7 @@  discard block
 block discarded – undo
701 715
                                 }
702 716
                                 if($op_max){$op_size =$op_max; }
703 717
                             }
704
-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
718
+                        } elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
705 719
                             if(strlen($option_values)){
706 720
                                 $op_size =  strlen($option_values);
707 721
                             }
@@ -718,11 +732,13 @@  discard block
 block discarded – undo
718 732
                             return __('Column change failed, you may have too many columns.','geodirectory');
719 733
                         }
720 734
 
721
-                        if (isset($request_field['cat_display_type']))
722
-                            $extra_fields = $request_field['cat_display_type'];
735
+                        if (isset($request_field['cat_display_type'])) {
736
+                                                    $extra_fields = $request_field['cat_display_type'];
737
+                        }
723 738
 
724
-                        if (isset($request_field['multi_display_type']))
725
-                            $extra_fields = $request_field['multi_display_type'];
739
+                        if (isset($request_field['multi_display_type'])) {
740
+                                                    $extra_fields = $request_field['multi_display_type'];
741
+                        }
726 742
 
727 743
 
728 744
                         break;
@@ -736,8 +752,9 @@  discard block
 block discarded – undo
736 752
                         if($alter_result===false){
737 753
                             return __('Column change failed, you may have too many columns.','geodirectory');
738 754
                         }
739
-                        if (isset($request_field['advanced_editor']))
740
-                            $extra_fields = $request_field['advanced_editor'];
755
+                        if (isset($request_field['advanced_editor'])) {
756
+                                                    $extra_fields = $request_field['advanced_editor'];
757
+                        }
741 758
 
742 759
                         break;
743 760
 
@@ -833,8 +850,9 @@  discard block
 block discarded – undo
833 850
                 );
834 851
 
835 852
 
836
-                if ($cat_sort == '')
837
-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
853
+                if ($cat_sort == '') {
854
+                                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
855
+                }
838 856
 
839 857
 
840 858
                 /**
@@ -1204,8 +1222,10 @@  discard block
 block discarded – undo
1204 1222
         }
1205 1223
 
1206 1224
         return $post_meta_info;
1207
-    else:
1208
-        return false;
1225
+    else {
1226
+    	:
1227
+        return false;
1228
+    }
1209 1229
     endif;
1210 1230
 }
1211 1231
 
@@ -1282,8 +1302,9 @@  discard block
 block discarded – undo
1282 1302
         if (is_admin()) {
1283 1303
             global $post;
1284 1304
 
1285
-            if (isset($_REQUEST['post']))
1286
-                $_REQUEST['pid'] = $_REQUEST['post'];
1305
+            if (isset($_REQUEST['post'])) {
1306
+                            $_REQUEST['pid'] = $_REQUEST['post'];
1307
+            }
1287 1308
         }
1288 1309
 
1289 1310
         
@@ -1375,7 +1396,7 @@  discard block
 block discarded – undo
1375 1396
         $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
1376 1397
     } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
1377 1398
         $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';
1378
-    }else{
1399
+    } else{
1379 1400
         $field_icon = $cf['field_icon'];
1380 1401
     }
1381 1402
 
@@ -1447,8 +1468,9 @@  discard block
 block discarded – undo
1447 1468
                     $variables_array['post_id'] = !empty($post->ID) ? $post->ID : (!empty($post->pid) ? $post->pid : NULL);
1448 1469
                     $variables_array['label'] = __($type['site_title'], 'geodirectory');
1449 1470
                     $variables_array['value'] = '';
1450
-                    if (isset($post->{$type['htmlvar_name']}))
1451
-                        $variables_array['value'] = $post->{$type['htmlvar_name']};
1471
+                    if (isset($post->{$type['htmlvar_name']})) {
1472
+                                            $variables_array['value'] = $post->{$type['htmlvar_name']};
1473
+                    }
1452 1474
                 endif;
1453 1475
 
1454 1476
 
@@ -1470,7 +1492,9 @@  discard block
 block discarded – undo
1470 1492
                      * @param string $html Custom field unfiltered HTML.
1471 1493
                      * @param array $variables_array Custom field variables array.
1472 1494
                      */
1473
-                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
1495
+                    if ($html) {
1496
+                    	echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
1497
+                    }
1474 1498
 
1475 1499
                     /**
1476 1500
                      * Called after a custom fields is output on the frontend.
@@ -1513,10 +1537,11 @@  discard block
 block discarded – undo
1513 1537
      */
1514 1538
     function geodir_default_date_format()
1515 1539
     {
1516
-        if ($format = get_option('date_format'))
1517
-            return $format;
1518
-        else
1519
-            return 'dd-mm-yy';
1540
+        if ($format = get_option('date_format')) {
1541
+                    return $format;
1542
+        } else {
1543
+                    return 'dd-mm-yy';
1544
+        }
1520 1545
     }
1521 1546
 }
1522 1547
 
@@ -1623,11 +1648,13 @@  discard block
 block discarded – undo
1623 1648
                     // Set an array containing a list of acceptable formats
1624 1649
                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
1625 1650
 
1626
-                    if (!function_exists('wp_handle_upload'))
1627
-                        require_once(ABSPATH . 'wp-admin/includes/file.php');
1651
+                    if (!function_exists('wp_handle_upload')) {
1652
+                                            require_once(ABSPATH . 'wp-admin/includes/file.php');
1653
+                    }
1628 1654
 
1629
-                    if (!is_dir($geodir_uploadpath))
1630
-                        mkdir($geodir_uploadpath);
1655
+                    if (!is_dir($geodir_uploadpath)) {
1656
+                                            mkdir($geodir_uploadpath);
1657
+                    }
1631 1658
 
1632 1659
                     $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];
1633 1660
                     $explode_sub_dir = explode("/", $sub_dir);
@@ -1640,16 +1667,19 @@  discard block
 block discarded – undo
1640 1667
                     }
1641 1668
 
1642 1669
                     $uploaded_file = '';
1643
-                    if (file_exists($img_path))
1644
-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1670
+                    if (file_exists($img_path)) {
1671
+                                            $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1672
+                    }
1645 1673
 
1646 1674
                     if ($curr_img_dir != $geodir_uploaddir) {
1647
-                        if (file_exists($img_path))
1648
-                            unlink($img_path);
1675
+                        if (file_exists($img_path)) {
1676
+                                                    unlink($img_path);
1677
+                        }
1649 1678
                     }
1650 1679
 
1651
-                    if (!empty($uploaded_file))
1652
-                        $file_urls = $geodir_uploadurl . '/' . $new_name;
1680
+                    if (!empty($uploaded_file)) {
1681
+                                            $file_urls = $geodir_uploadurl . '/' . $new_name;
1682
+                    }
1653 1683
 
1654 1684
                 } else {
1655 1685
                     $file_urls = $post_image[$m];
@@ -1670,8 +1700,9 @@  discard block
 block discarded – undo
1670 1700
 
1671 1701
         geodir_save_post_meta($post_id, $field_id, $file_urls);
1672 1702
 
1673
-        if (!empty($invalid_files))
1674
-            geodir_remove_attachments($invalid_files);
1703
+        if (!empty($invalid_files)) {
1704
+                    geodir_remove_attachments($invalid_files);
1705
+        }
1675 1706
 
1676 1707
     }
1677 1708
 }
@@ -1897,8 +1928,9 @@  discard block
 block discarded – undo
1897 1928
 
1898 1929
         $all_postypes = geodir_get_posttypes();
1899 1930
 
1900
-        if (!in_array($post_type, $all_postypes))
1901
-            return false;
1931
+        if (!in_array($post_type, $all_postypes)) {
1932
+                    return false;
1933
+        }
1902 1934
 
1903 1935
         $fields = array();
1904 1936
 
@@ -1996,8 +2028,10 @@  discard block
 block discarded – undo
1996 2028
         }
1997 2029
 
1998 2030
         return $field_ids;
1999
-    else:
2000
-        return false;
2031
+    else {
2032
+    	:
2033
+        return false;
2034
+    }
2001 2035
     endif;
2002 2036
 }
2003 2037
 
@@ -2170,8 +2204,9 @@  discard block
 block discarded – undo
2170 2204
 
2171 2205
             return $field_id;
2172 2206
 
2173
-        } else
2174
-            return 0;
2207
+        } else {
2208
+                    return 0;
2209
+        }
2175 2210
 
2176 2211
     }
2177 2212
 }
@@ -2212,8 +2247,9 @@  discard block
 block discarded – undo
2212 2247
         $htmlvar_name = isset($field_type_key) ? $field_type_key : '';
2213 2248
 
2214 2249
         $site_title = '';
2215
-        if ($site_title == '')
2216
-            $site_title = isset($field_info->site_title) ? $field_info->site_title : '';
2250
+        if ($site_title == '') {
2251
+                    $site_title = isset($field_info->site_title) ? $field_info->site_title : '';
2252
+        }
2217 2253
 
2218 2254
         if ($site_title == '') {
2219 2255
             $fields = geodir_get_custom_sort_options($post_type);
@@ -2227,8 +2263,9 @@  discard block
 block discarded – undo
2227 2263
             }
2228 2264
         }
2229 2265
 
2230
-        if ($htmlvar_name == '')
2231
-            $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
2266
+        if ($htmlvar_name == '') {
2267
+                    $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
2268
+        }
2232 2269
 
2233 2270
         $nonce = wp_create_nonce('custom_fields_' . $result_str);
2234 2271
 
@@ -2241,7 +2278,7 @@  discard block
 block discarded – undo
2241 2278
 
2242 2279
                 if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
2243 2280
                     $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';
2244
-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){
2281
+                } elseif(isset($cso['field_icon']) && $cso['field_icon']){
2245 2282
                     $field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cso['field_icon'].'\')"></b>';
2246 2283
                 }
2247 2284
 
@@ -2677,7 +2714,7 @@  discard block
 block discarded – undo
2677 2714
     $dt_value = '';
2678 2715
     if (isset($field_info->data_type)) {
2679 2716
         $dt_value  = esc_attr($field_info->data_type);
2680
-    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
2717
+    } elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
2681 2718
         $dt_value  = $cf['defaults']['data_type'];
2682 2719
     }
2683 2720
     ?>
@@ -2709,7 +2746,7 @@  discard block
 block discarded – undo
2709 2746
     $value = '';
2710 2747
     if (isset($field_info->decimal_point)) {
2711 2748
         $value = esc_attr($field_info->decimal_point);
2712
-    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
2749
+    } elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
2713 2750
         $value = $cf['defaults']['decimal_point'];
2714 2751
     }
2715 2752
     ?>
@@ -2781,11 +2818,13 @@  discard block
 block discarded – undo
2781 2818
 
2782 2819
             <?php
2783 2820
             $selected = '';
2784
-            if (isset($field_info->extra_fields))
2785
-                $advanced_editor = unserialize($field_info->extra_fields);
2821
+            if (isset($field_info->extra_fields)) {
2822
+                            $advanced_editor = unserialize($field_info->extra_fields);
2823
+            }
2786 2824
 
2787
-            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
2788
-                $selected = 'checked="checked"';
2825
+            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor)) {
2826
+                            $selected = 'checked="checked"';
2827
+            }
2789 2828
             ?>
2790 2829
 
2791 2830
             <input type="checkbox" name="advanced_editor[]" id="advanced_editor"
@@ -2807,7 +2846,7 @@  discard block
 block discarded – undo
2807 2846
     $value = '';
2808 2847
     if (isset($field_info->validation_pattern)) {
2809 2848
         $value = esc_attr($field_info->validation_pattern);
2810
-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
2849
+    } elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
2811 2850
         $value = esc_attr($cf['defaults']['validation_pattern']);
2812 2851
     }
2813 2852
     ?>
@@ -2827,7 +2866,7 @@  discard block
 block discarded – undo
2827 2866
     $value = '';
2828 2867
     if (isset($field_info->validation_msg)) {
2829 2868
         $value = esc_attr($field_info->validation_msg);
2830
-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
2869
+    } elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
2831 2870
         $value = esc_attr($cf['defaults']['validation_msg']);
2832 2871
     }
2833 2872
     ?>
@@ -2857,8 +2896,9 @@  discard block
 block discarded – undo
2857 2896
 
2858 2897
     if (!isset($field_info->post_type)) {
2859 2898
         $post_type = sanitize_text_field($_REQUEST['listing_type']);
2860
-    } else
2861
-        $post_type = $field_info->post_type;
2899
+    } else {
2900
+            $post_type = $field_info->post_type;
2901
+    }
2862 2902
     ?>
2863 2903
     <li style="display: none;">
2864 2904
         <label for="htmlvar_name" class="gd-cf-tooltip-wrap">
@@ -3132,7 +3172,7 @@  discard block
 block discarded – undo
3132 3172
     $value = '';
3133 3173
     if (isset($field_info->option_values)) {
3134 3174
         $value = esc_attr($field_info->option_values);
3135
-    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
3175
+    } elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
3136 3176
         $value = esc_attr($cf['defaults']['option_values']);
3137 3177
     }
3138 3178
 
@@ -3275,7 +3315,7 @@  discard block
 block discarded – undo
3275 3315
     $value = '';
3276 3316
     if ($extra_fields && isset($extra_fields['is_price'])) {
3277 3317
     $value = esc_attr($extra_fields['is_price']);
3278
-    }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
3318
+    } elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
3279 3319
     $value = esc_attr($cf['defaults']['extra_fields']['is_price']);
3280 3320
     }
3281 3321
 
@@ -3312,7 +3352,7 @@  discard block
 block discarded – undo
3312 3352
     $value = '';
3313 3353
     if ($extra_fields && isset($extra_fields['thousand_separator'])) {
3314 3354
         $value = esc_attr($extra_fields['thousand_separator']);
3315
-    }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
3355
+    } elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
3316 3356
         $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']);
3317 3357
     }
3318 3358
     ?>
@@ -3339,7 +3379,7 @@  discard block
 block discarded – undo
3339 3379
     $value = '';
3340 3380
     if ($extra_fields && isset($extra_fields['decimal_separator'])) {
3341 3381
         $value = esc_attr($extra_fields['decimal_separator']);
3342
-    }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
3382
+    } elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
3343 3383
         $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']);
3344 3384
     }
3345 3385
     ?>
@@ -3362,7 +3402,7 @@  discard block
 block discarded – undo
3362 3402
     $value = '';
3363 3403
     if ($extra_fields && isset($extra_fields['decimal_display'])) {
3364 3404
         $value = esc_attr($extra_fields['decimal_display']);
3365
-    }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
3405
+    } elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
3366 3406
         $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']);
3367 3407
     }
3368 3408
     ?>
@@ -3385,7 +3425,7 @@  discard block
 block discarded – undo
3385 3425
     $value = '';
3386 3426
     if ($extra_fields && isset($extra_fields['currency_symbol'])) {
3387 3427
         $value = esc_attr($extra_fields['currency_symbol']);
3388
-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
3428
+    } elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
3389 3429
         $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']);
3390 3430
     }
3391 3431
     ?>
@@ -3406,7 +3446,7 @@  discard block
 block discarded – undo
3406 3446
     $value = '';
3407 3447
     if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
3408 3448
         $value = esc_attr($extra_fields['currency_symbol_placement']);
3409
-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
3449
+    } elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
3410 3450
         $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']);
3411 3451
     }
3412 3452
     ?>
@@ -3633,8 +3673,9 @@  discard block
 block discarded – undo
3633 3673
     $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';
3634 3674
 
3635 3675
     if($decimals>0 && $decimal_display=='if'){
3636
-        if(is_int($number) || floor( $number ) == $number)
3637
-            $decimals = 0;
3676
+        if(is_int($number) || floor( $number ) == $number) {
3677
+                    $decimals = 0;
3678
+        }
3638 3679
     }
3639 3680
 
3640 3681
     $number = number_format($number,$decimals,$decimalpoint,$separator);
@@ -3643,7 +3684,7 @@  discard block
 block discarded – undo
3643 3684
 
3644 3685
     if($currency_symbol_placement=='left'){
3645 3686
         $number = $symbol . $number;
3646
-    }else{
3687
+    } else{
3647 3688
         $number = $number . $symbol;
3648 3689
     }
3649 3690
 
Please login to merge, or discard this patch.
Indentation   +2289 added lines, -2289 removed lines patch added patch discarded remove patch
@@ -10,52 +10,52 @@  discard block
 block discarded – undo
10 10
 global $wpdb, $table_prefix;
11 11
 
12 12
 if (!function_exists('geodir_column_exist')) {
13
-    /**
14
-     * Check table column exist or not.
15
-     *
16
-     * @since 1.0.0
17
-     * @package GeoDirectory
18
-     * @global object $wpdb WordPress Database object.
19
-     * @param string $db The table name.
20
-     * @param string $column The column name.
21
-     * @return bool If column exists returns true. Otherwise false.
22
-     */
23
-    function geodir_column_exist($db, $column)
24
-    {
25
-        global $wpdb;
26
-        $exists = false;
27
-        $columns = $wpdb->get_col("show columns from $db");
28
-        foreach ($columns as $c) {
29
-            if ($c == $column) {
30
-                $exists = true;
31
-                break;
32
-            }
33
-        }
34
-        return $exists;
35
-    }
13
+	/**
14
+	 * Check table column exist or not.
15
+	 *
16
+	 * @since 1.0.0
17
+	 * @package GeoDirectory
18
+	 * @global object $wpdb WordPress Database object.
19
+	 * @param string $db The table name.
20
+	 * @param string $column The column name.
21
+	 * @return bool If column exists returns true. Otherwise false.
22
+	 */
23
+	function geodir_column_exist($db, $column)
24
+	{
25
+		global $wpdb;
26
+		$exists = false;
27
+		$columns = $wpdb->get_col("show columns from $db");
28
+		foreach ($columns as $c) {
29
+			if ($c == $column) {
30
+				$exists = true;
31
+				break;
32
+			}
33
+		}
34
+		return $exists;
35
+	}
36 36
 }
37 37
 
38 38
 if (!function_exists('geodir_add_column_if_not_exist')) {
39
-    /**
40
-     * Add column if table column not exist.
41
-     *
42
-     * @since 1.0.0
43
-     * @package GeoDirectory
44
-     * @global object $wpdb WordPress Database object.
45
-     * @param string $db The table name.
46
-     * @param string $column The column name.
47
-     * @param string $column_attr The column attributes.
48
-     */
49
-    function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")
50
-    {
51
-        global $wpdb;
52
-        $result = 0;// no rows affected
53
-        if (!geodir_column_exist($db, $column)) {
54
-            if (!empty($db) && !empty($column))
55
-                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
56
-        }
57
-        return $result;
58
-    }
39
+	/**
40
+	 * Add column if table column not exist.
41
+	 *
42
+	 * @since 1.0.0
43
+	 * @package GeoDirectory
44
+	 * @global object $wpdb WordPress Database object.
45
+	 * @param string $db The table name.
46
+	 * @param string $column The column name.
47
+	 * @param string $column_attr The column attributes.
48
+	 */
49
+	function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")
50
+	{
51
+		global $wpdb;
52
+		$result = 0;// no rows affected
53
+		if (!geodir_column_exist($db, $column)) {
54
+			if (!empty($db) && !empty($column))
55
+				$result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
56
+		}
57
+		return $result;
58
+	}
59 59
 }
60 60
 
61 61
 /**
@@ -72,716 +72,716 @@  discard block
 block discarded – undo
72 72
  */
73 73
 function geodir_post_custom_fields($package_id = '', $default = 'all', $post_type = 'gd_place', $fields_location = 'none')
74 74
 {
75
-    global $wpdb, $geodir_post_custom_fields_cache;
76
-
77
-    $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;
78
-
79
-    if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
80
-        return $geodir_post_custom_fields_cache[$cache_stored];
81
-    }
82
-
83
-    $default_query = '';
84
-
85
-    if ($default == 'default')
86
-        $default_query .= " and is_admin IN ('1') ";
87
-    elseif ($default == 'custom')
88
-        $default_query .= " and is_admin = '0' ";
89
-
90
-    if ($fields_location == 'none') {
91
-    } else{
92
-        $fields_location = esc_sql( $fields_location );
93
-        $default_query .= " and show_in LIKE '%%[$fields_location]%%' ";
94
-    }
95
-
96
-    $post_meta_info = $wpdb->get_results(
97
-        $wpdb->prepare(
98
-            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
99
-            array($post_type)
100
-        )
101
-    );
102
-
103
-
104
-    $return_arr = array();
105
-    if ($post_meta_info) {
106
-
107
-        foreach ($post_meta_info as $post_meta_info_obj) {
108
-
109
-            $custom_fields = array(
110
-                "name" => $post_meta_info_obj->htmlvar_name,
111
-                "label" => $post_meta_info_obj->clabels,
112
-                "default" => $post_meta_info_obj->default_value,
113
-                "type" => $post_meta_info_obj->field_type,
114
-                "desc" => $post_meta_info_obj->admin_desc);
115
-
116
-            if ($post_meta_info_obj->field_type) {
117
-                $options = explode(',', $post_meta_info_obj->option_values);
118
-                $custom_fields["options"] = $options;
119
-            }
120
-
121
-            foreach ($post_meta_info_obj as $key => $val) {
122
-                $custom_fields[$key] = $val;
123
-            }
124
-
125
-            $pricearr = array();
126
-            $pricearr = explode(',', $post_meta_info_obj->packages);
127
-
128
-            if ($package_id != '' && in_array($package_id, $pricearr)) {
129
-                $return_arr[$post_meta_info_obj->sort_order] = $custom_fields;
130
-            } elseif ($package_id == '') {
131
-                $return_arr[$post_meta_info_obj->sort_order] = $custom_fields;
132
-            }
133
-        }
134
-    }
135
-    $geodir_post_custom_fields_cache[$cache_stored] = $return_arr;
136
-
137
-    if (has_filter('geodir_filter_geodir_post_custom_fields')) {
138
-        /**
139
-         * Filter the post custom fields array.
140
-         *
141
-         * @since 1.0.0
142
-         *
143
-         * @param array $return_arr Post custom fields array.
144
-         * @param int|string $package_id The package ID.
145
-         * @param string $post_type Optional. The wordpress post type.
146
-         * @param string $fields_location Optional. Where exactly are you going to place this custom fields?.
147
-         */
148
-        $return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);
149
-    }
150
-
151
-    return $return_arr;
75
+	global $wpdb, $geodir_post_custom_fields_cache;
76
+
77
+	$cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;
78
+
79
+	if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
80
+		return $geodir_post_custom_fields_cache[$cache_stored];
81
+	}
82
+
83
+	$default_query = '';
84
+
85
+	if ($default == 'default')
86
+		$default_query .= " and is_admin IN ('1') ";
87
+	elseif ($default == 'custom')
88
+		$default_query .= " and is_admin = '0' ";
89
+
90
+	if ($fields_location == 'none') {
91
+	} else{
92
+		$fields_location = esc_sql( $fields_location );
93
+		$default_query .= " and show_in LIKE '%%[$fields_location]%%' ";
94
+	}
95
+
96
+	$post_meta_info = $wpdb->get_results(
97
+		$wpdb->prepare(
98
+			"select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
99
+			array($post_type)
100
+		)
101
+	);
102
+
103
+
104
+	$return_arr = array();
105
+	if ($post_meta_info) {
106
+
107
+		foreach ($post_meta_info as $post_meta_info_obj) {
108
+
109
+			$custom_fields = array(
110
+				"name" => $post_meta_info_obj->htmlvar_name,
111
+				"label" => $post_meta_info_obj->clabels,
112
+				"default" => $post_meta_info_obj->default_value,
113
+				"type" => $post_meta_info_obj->field_type,
114
+				"desc" => $post_meta_info_obj->admin_desc);
115
+
116
+			if ($post_meta_info_obj->field_type) {
117
+				$options = explode(',', $post_meta_info_obj->option_values);
118
+				$custom_fields["options"] = $options;
119
+			}
120
+
121
+			foreach ($post_meta_info_obj as $key => $val) {
122
+				$custom_fields[$key] = $val;
123
+			}
124
+
125
+			$pricearr = array();
126
+			$pricearr = explode(',', $post_meta_info_obj->packages);
127
+
128
+			if ($package_id != '' && in_array($package_id, $pricearr)) {
129
+				$return_arr[$post_meta_info_obj->sort_order] = $custom_fields;
130
+			} elseif ($package_id == '') {
131
+				$return_arr[$post_meta_info_obj->sort_order] = $custom_fields;
132
+			}
133
+		}
134
+	}
135
+	$geodir_post_custom_fields_cache[$cache_stored] = $return_arr;
136
+
137
+	if (has_filter('geodir_filter_geodir_post_custom_fields')) {
138
+		/**
139
+		 * Filter the post custom fields array.
140
+		 *
141
+		 * @since 1.0.0
142
+		 *
143
+		 * @param array $return_arr Post custom fields array.
144
+		 * @param int|string $package_id The package ID.
145
+		 * @param string $post_type Optional. The wordpress post type.
146
+		 * @param string $fields_location Optional. Where exactly are you going to place this custom fields?.
147
+		 */
148
+		$return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);
149
+	}
150
+
151
+	return $return_arr;
152 152
 }
153 153
 
154
-    /**
155
-     * Adds admin html for custom fields.
156
-     *
157
-     * @since 1.0.0
158
-     * @package GeoDirectory
159
-     * @global object $wpdb WordPress Database object.
160
-     * @param string $field_type The form field type.
161
-     * @param object|int $result_str The custom field results object or row id.
162
-     * @param string $field_ins_upd When set to "submit" displays form.
163
-     * @param string $field_type_key The key of the custom field.
164
-     */
165
-    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')
166
-    {
167
-        global $wpdb;
168
-        $cf = $result_str;
169
-        if (!is_object($cf)) {
170
-
171
-            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
172
-
173
-        } else {
174
-            $field_info = $cf;
175
-            $result_str = $cf->id;
176
-        }
177
-        /**
178
-         * Contains custom field html.
179
-         *
180
-         * @since 1.0.0
181
-         */
182
-        include('custom_field_html.php');
183
-
184
-    }
154
+	/**
155
+	 * Adds admin html for custom fields.
156
+	 *
157
+	 * @since 1.0.0
158
+	 * @package GeoDirectory
159
+	 * @global object $wpdb WordPress Database object.
160
+	 * @param string $field_type The form field type.
161
+	 * @param object|int $result_str The custom field results object or row id.
162
+	 * @param string $field_ins_upd When set to "submit" displays form.
163
+	 * @param string $field_type_key The key of the custom field.
164
+	 */
165
+	function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')
166
+	{
167
+		global $wpdb;
168
+		$cf = $result_str;
169
+		if (!is_object($cf)) {
170
+
171
+			$field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
172
+
173
+		} else {
174
+			$field_info = $cf;
175
+			$result_str = $cf->id;
176
+		}
177
+		/**
178
+		 * Contains custom field html.
179
+		 *
180
+		 * @since 1.0.0
181
+		 */
182
+		include('custom_field_html.php');
183
+
184
+	}
185 185
 
186 186
 
187 187
 if (!function_exists('geodir_custom_field_delete')) {
188
-    /**
189
-     * Delete custom field using field id.
190
-     *
191
-     * @since 1.0.0
192
-     * @since 1.5.7 Delete field from sorting fields table when custom field deleted.
193
-     * @package GeoDirectory
194
-     * @global object $wpdb WordPress Database object.
195
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
196
-     * @param string $field_id The custom field ID.
197
-     * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.
198
-     */
199
-    function geodir_custom_field_delete($field_id = '') {
200
-        global $wpdb, $plugin_prefix;
201
-
202
-        if ($field_id != '') {
203
-            $cf = trim($field_id, '_');
204
-
205
-            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
206
-                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
207
-
208
-                $post_type = $field->post_type;
209
-                $htmlvar_name = $field->htmlvar_name;
210
-
211
-                if ($post_type != '' && $htmlvar_name != '') {
212
-                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
213
-                }
214
-
215
-                /**
216
-                 * Called after a custom field is deleted.
217
-                 *
218
-                 * @since 1.0.0
219
-                 * @param string $cf The fields ID.
220
-                 * @param string $field->htmlvar_name The html variable name for the field.
221
-                 * @param string $post_type The post type the field belongs to.
222
-                 */
223
-                do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
224
-
225
-                if ($field->field_type == 'address') {
226
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
227
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
228
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
229
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
230
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
231
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
232
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
233
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
234
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
235
-                } else {
236
-                    if ($field->field_type != 'fieldset') {
237
-                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
238
-                    }
239
-                }
240
-
241
-                return $field_id;
242
-            } else
243
-                return 0;
244
-        } else
245
-            return 0;
246
-    }
188
+	/**
189
+	 * Delete custom field using field id.
190
+	 *
191
+	 * @since 1.0.0
192
+	 * @since 1.5.7 Delete field from sorting fields table when custom field deleted.
193
+	 * @package GeoDirectory
194
+	 * @global object $wpdb WordPress Database object.
195
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
196
+	 * @param string $field_id The custom field ID.
197
+	 * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.
198
+	 */
199
+	function geodir_custom_field_delete($field_id = '') {
200
+		global $wpdb, $plugin_prefix;
201
+
202
+		if ($field_id != '') {
203
+			$cf = trim($field_id, '_');
204
+
205
+			if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
206
+				$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
207
+
208
+				$post_type = $field->post_type;
209
+				$htmlvar_name = $field->htmlvar_name;
210
+
211
+				if ($post_type != '' && $htmlvar_name != '') {
212
+					$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
213
+				}
214
+
215
+				/**
216
+				 * Called after a custom field is deleted.
217
+				 *
218
+				 * @since 1.0.0
219
+				 * @param string $cf The fields ID.
220
+				 * @param string $field->htmlvar_name The html variable name for the field.
221
+				 * @param string $post_type The post type the field belongs to.
222
+				 */
223
+				do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
224
+
225
+				if ($field->field_type == 'address') {
226
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
227
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
228
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
229
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
230
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
231
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
232
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
233
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
234
+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
235
+				} else {
236
+					if ($field->field_type != 'fieldset') {
237
+						$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
238
+					}
239
+				}
240
+
241
+				return $field_id;
242
+			} else
243
+				return 0;
244
+		} else
245
+			return 0;
246
+	}
247 247
 }
248 248
 
249 249
 if (!function_exists('geodir_custom_field_save')) {
250
-    /**
251
-     * Save or Update custom fields into the database.
252
-     *
253
-     * @since 1.0.0
254
-     * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.
255
-     * @package GeoDirectory
256
-     * @global object $wpdb WordPress Database object.
257
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
258
-     * @param array $request_field {
259
-     *    Attributes of the request field array.
260
-     *
261
-     *    @type string $action Ajax Action name. Default "geodir_ajax_action".
262
-     *    @type string $manage_field_type Field type Default "custom_fields".
263
-     *    @type string $create_field Create field Default "true".
264
-     *    @type string $field_ins_upd Field ins upd Default "submit".
265
-     *    @type string $_wpnonce WP nonce value.
266
-     *    @type string $listing_type Listing type Example "gd_place".
267
-     *    @type string $field_type Field type Example "radio".
268
-     *    @type string $field_id Field id Example "12".
269
-     *    @type string $data_type Data type Example "VARCHAR".
270
-     *    @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere.
271
-     *    @type array $show_on_pkg Package list to display this field.
272
-     *    @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings.
273
-     *    @type string $site_title Section title which you wish to display in frontend.
274
-     *    @type string $admin_desc Section description which will appear in frontend.
275
-     *    @type string $htmlvar_name Html variable name. This should be a unique name.
276
-     *    @type string $clabels Section Title which will appear in backend.
277
-     *    @type string $default_value The default value (for "link" this will be used as the link text).
278
-     *    @type string $sort_order The display order of this field in backend. e.g. 5.
279
-     *    @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field.
280
-     *    @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field.
281
-     *    @type string $is_required Use "1" to set field as required.
282
-     *    @type string $required_msg Enter text for error message if field required and have not full fill requirement.
283
-     *    @type string $show_on_listing Want to show this on listing page?.
284
-     *    @type string $show_in What locations to show the custom field in.
285
-     *    @type string $show_on_detail Want to show this in More Info tab on detail page?.
286
-     *    @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes.
287
-     *    @type string $option_values Option Values should be separated by comma.
288
-     *    @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class.
289
-     *    @type string $css_class Enter custom css class for field custom style.
290
-     *    @type array $extra_fields An array of extra fields to store.
291
-     *
292
-     * }
293
-     * @param bool $default Not yet implemented.
294
-     * @return int|string If field is unique returns inserted row id. Otherwise returns error string.
295
-     */
296
-    function geodir_custom_field_save($request_field = array(), $default = false)
297
-    {
298
-
299
-        global $wpdb, $plugin_prefix;
300
-
301
-        $old_html_variable = '';
302
-
303
-        $data_type = trim($request_field['data_type']);
304
-
305
-        $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';
306
-
307
-        // some servers fail if a POST value is VARCHAR so we change it.
308
-        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
309
-            $request_field['data_type'] = 'VARCHAR';
310
-        }
311
-
312
-        $cf = trim($result_str, '_');
313
-
314
-
315
-        /*-------- check duplicate validation --------*/
316
-
317
-        $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
318
-        $post_type = $request_field['listing_type'];
319
-
320
-        if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
321
-            $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;
322
-        }
323
-
324
-        $check_html_variable = $wpdb->get_var(
325
-            $wpdb->prepare(
326
-                "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",
327
-                array($cf, $cehhtmlvar_name, $post_type)
328
-            )
329
-        );
330
-
331
-
332
-        if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {
333
-
334
-            if ($cf != '') {
335
-
336
-                $post_meta_info = $wpdb->get_row(
337
-                    $wpdb->prepare(
338
-                        "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",
339
-                        array($cf)
340
-                    )
341
-                );
342
-
343
-            }
344
-
345
-            if (!empty($post_meta_info)) {
346
-                $post_val = $post_meta_info;
347
-                $old_html_variable = $post_val->htmlvar_name;
348
-
349
-            }
350
-
351
-
352
-
353
-            if ($post_type == '') $post_type = 'gd_place';
354
-
355
-
356
-            $detail_table = $plugin_prefix . $post_type . '_detail';
357
-
358
-            $admin_title = $request_field['admin_title'];
359
-            $site_title = $request_field['site_title'];
360
-            $data_type = $request_field['data_type'];
361
-            $field_type = $request_field['field_type'];
362
-            $field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type;
363
-            $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
364
-            $admin_desc = $request_field['admin_desc'];
365
-            $clabels = isset($request_field['clabels']) ? $request_field['clabels'] : '';
366
-            $default_value = isset($request_field['default_value']) ? $request_field['default_value'] : '';
367
-            $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : '';
368
-            $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : '';
369
-            $is_required = isset($request_field['is_required']) ? $request_field['is_required'] : '';
370
-            $required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : '';
371
-            $css_class = isset($request_field['css_class']) ? $request_field['css_class'] : '';
372
-            $field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : '';
373
-            $show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : '';
374
-            $show_in = isset($request_field['show_in']) ? $request_field['show_in'] : '';
375
-            $show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : '';
376
-            $show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : '';
377
-            $decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type
378
-            $decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : '';
379
-            $validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : '';
380
-            $validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : '';
381
-            $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';
250
+	/**
251
+	 * Save or Update custom fields into the database.
252
+	 *
253
+	 * @since 1.0.0
254
+	 * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.
255
+	 * @package GeoDirectory
256
+	 * @global object $wpdb WordPress Database object.
257
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
258
+	 * @param array $request_field {
259
+	 *    Attributes of the request field array.
260
+	 *
261
+	 *    @type string $action Ajax Action name. Default "geodir_ajax_action".
262
+	 *    @type string $manage_field_type Field type Default "custom_fields".
263
+	 *    @type string $create_field Create field Default "true".
264
+	 *    @type string $field_ins_upd Field ins upd Default "submit".
265
+	 *    @type string $_wpnonce WP nonce value.
266
+	 *    @type string $listing_type Listing type Example "gd_place".
267
+	 *    @type string $field_type Field type Example "radio".
268
+	 *    @type string $field_id Field id Example "12".
269
+	 *    @type string $data_type Data type Example "VARCHAR".
270
+	 *    @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere.
271
+	 *    @type array $show_on_pkg Package list to display this field.
272
+	 *    @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings.
273
+	 *    @type string $site_title Section title which you wish to display in frontend.
274
+	 *    @type string $admin_desc Section description which will appear in frontend.
275
+	 *    @type string $htmlvar_name Html variable name. This should be a unique name.
276
+	 *    @type string $clabels Section Title which will appear in backend.
277
+	 *    @type string $default_value The default value (for "link" this will be used as the link text).
278
+	 *    @type string $sort_order The display order of this field in backend. e.g. 5.
279
+	 *    @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field.
280
+	 *    @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field.
281
+	 *    @type string $is_required Use "1" to set field as required.
282
+	 *    @type string $required_msg Enter text for error message if field required and have not full fill requirement.
283
+	 *    @type string $show_on_listing Want to show this on listing page?.
284
+	 *    @type string $show_in What locations to show the custom field in.
285
+	 *    @type string $show_on_detail Want to show this in More Info tab on detail page?.
286
+	 *    @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes.
287
+	 *    @type string $option_values Option Values should be separated by comma.
288
+	 *    @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class.
289
+	 *    @type string $css_class Enter custom css class for field custom style.
290
+	 *    @type array $extra_fields An array of extra fields to store.
291
+	 *
292
+	 * }
293
+	 * @param bool $default Not yet implemented.
294
+	 * @return int|string If field is unique returns inserted row id. Otherwise returns error string.
295
+	 */
296
+	function geodir_custom_field_save($request_field = array(), $default = false)
297
+	{
298
+
299
+		global $wpdb, $plugin_prefix;
300
+
301
+		$old_html_variable = '';
302
+
303
+		$data_type = trim($request_field['data_type']);
304
+
305
+		$result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';
306
+
307
+		// some servers fail if a POST value is VARCHAR so we change it.
308
+		if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
309
+			$request_field['data_type'] = 'VARCHAR';
310
+		}
311
+
312
+		$cf = trim($result_str, '_');
313
+
314
+
315
+		/*-------- check duplicate validation --------*/
316
+
317
+		$cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
318
+		$post_type = $request_field['listing_type'];
319
+
320
+		if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
321
+			$cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;
322
+		}
323
+
324
+		$check_html_variable = $wpdb->get_var(
325
+			$wpdb->prepare(
326
+				"select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",
327
+				array($cf, $cehhtmlvar_name, $post_type)
328
+			)
329
+		);
330
+
331
+
332
+		if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {
333
+
334
+			if ($cf != '') {
335
+
336
+				$post_meta_info = $wpdb->get_row(
337
+					$wpdb->prepare(
338
+						"select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",
339
+						array($cf)
340
+					)
341
+				);
342
+
343
+			}
344
+
345
+			if (!empty($post_meta_info)) {
346
+				$post_val = $post_meta_info;
347
+				$old_html_variable = $post_val->htmlvar_name;
348
+
349
+			}
350
+
351
+
352
+
353
+			if ($post_type == '') $post_type = 'gd_place';
354
+
355
+
356
+			$detail_table = $plugin_prefix . $post_type . '_detail';
357
+
358
+			$admin_title = $request_field['admin_title'];
359
+			$site_title = $request_field['site_title'];
360
+			$data_type = $request_field['data_type'];
361
+			$field_type = $request_field['field_type'];
362
+			$field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type;
363
+			$htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
364
+			$admin_desc = $request_field['admin_desc'];
365
+			$clabels = isset($request_field['clabels']) ? $request_field['clabels'] : '';
366
+			$default_value = isset($request_field['default_value']) ? $request_field['default_value'] : '';
367
+			$sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : '';
368
+			$is_active = isset($request_field['is_active']) ? $request_field['is_active'] : '';
369
+			$is_required = isset($request_field['is_required']) ? $request_field['is_required'] : '';
370
+			$required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : '';
371
+			$css_class = isset($request_field['css_class']) ? $request_field['css_class'] : '';
372
+			$field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : '';
373
+			$show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : '';
374
+			$show_in = isset($request_field['show_in']) ? $request_field['show_in'] : '';
375
+			$show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : '';
376
+			$show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : '';
377
+			$decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type
378
+			$decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : '';
379
+			$validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : '';
380
+			$validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : '';
381
+			$for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';
382 382
 
383 383
             
384
-            if(is_array($show_in)){
385
-                $show_in = implode(",", $request_field['show_in']);
386
-            }
384
+			if(is_array($show_in)){
385
+				$show_in = implode(",", $request_field['show_in']);
386
+			}
387 387
             
388
-            if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
389
-                $htmlvar_name = 'geodir_' . $htmlvar_name;
390
-            }
388
+			if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
389
+				$htmlvar_name = 'geodir_' . $htmlvar_name;
390
+			}
391 391
 
392
-            $option_values = '';
393
-            if (isset($request_field['option_values']))
394
-                $option_values = $request_field['option_values'];
392
+			$option_values = '';
393
+			if (isset($request_field['option_values']))
394
+				$option_values = $request_field['option_values'];
395 395
 
396
-            $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0';
396
+			$cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0';
397 397
 
398
-            $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0';
398
+			$cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0';
399 399
 
400
-            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))
401
-                $price_pkg = implode(",", $request_field['show_on_pkg']);
402
-            else {
403
-                $package_info = array();
400
+			if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))
401
+				$price_pkg = implode(",", $request_field['show_on_pkg']);
402
+			else {
403
+				$package_info = array();
404 404
 
405
-                $package_info = geodir_post_package_info($package_info, '', $post_type);
406
-                $price_pkg = !empty($package_info->pid) ? $package_info->pid : '';
407
-            }
405
+				$package_info = geodir_post_package_info($package_info, '', $post_type);
406
+				$price_pkg = !empty($package_info->pid) ? $package_info->pid : '';
407
+			}
408 408
 
409 409
 
410
-            if (isset($request_field['extra']) && !empty($request_field['extra']))
411
-                $extra_fields = $request_field['extra'];
410
+			if (isset($request_field['extra']) && !empty($request_field['extra']))
411
+				$extra_fields = $request_field['extra'];
412 412
 
413
-            if (isset($request_field['is_default']) && $request_field['is_default'] != '')
414
-                $is_default = $request_field['is_default'];
415
-            else
416
-                $is_default = '0';
413
+			if (isset($request_field['is_default']) && $request_field['is_default'] != '')
414
+				$is_default = $request_field['is_default'];
415
+			else
416
+				$is_default = '0';
417 417
 
418
-            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')
419
-                $is_admin = $request_field['is_admin'];
420
-            else
421
-                $is_admin = '0';
418
+			if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')
419
+				$is_admin = $request_field['is_admin'];
420
+			else
421
+				$is_admin = '0';
422 422
 
423 423
 
424
-            if ($is_active == '') $is_active = 1;
425
-            if ($is_required == '') $is_required = 0;
424
+			if ($is_active == '') $is_active = 1;
425
+			if ($is_required == '') $is_required = 0;
426 426
 
427 427
 
428
-            if ($sort_order == '') {
428
+			if ($sort_order == '') {
429 429
 
430
-                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
430
+				$last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
431 431
 
432
-                $sort_order = (int)$last_order + 1;
433
-            }
432
+				$sort_order = (int)$last_order + 1;
433
+			}
434 434
 
435
-            $default_value_add = '';
435
+			$default_value_add = '';
436 436
 
437 437
 
438
-            if (!empty($post_meta_info)) {
439
-                switch ($field_type):
438
+			if (!empty($post_meta_info)) {
439
+				switch ($field_type):
440 440
 
441
-                    case 'address':
441
+					case 'address':
442 442
 
443
-                        if ($htmlvar_name != '') {
444
-                            $prefix = $htmlvar_name . '_';
445
-                        }
446
-                        $old_prefix = $old_html_variable . '_';
443
+						if ($htmlvar_name != '') {
444
+							$prefix = $htmlvar_name . '_';
445
+						}
446
+						$old_prefix = $old_html_variable . '_';
447 447
 
448 448
 
449
-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";
449
+						$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";
450 450
 
451
-                        if ($default_value != '') {
452
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
453
-                        }
451
+						if ($default_value != '') {
452
+							$meta_field_add .= " DEFAULT '" . $default_value . "'";
453
+						}
454 454
 
455
-                        $wpdb->query($meta_field_add);
455
+						$wpdb->query($meta_field_add);
456 456
 
457
-                        if ($extra_fields != '') {
457
+						if ($extra_fields != '') {
458 458
 
459
-                            if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
459
+							if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
460 460
 
461
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
462
-                                if ($is_column) {
463
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";
461
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
462
+								if ($is_column) {
463
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";
464 464
 
465
-                                    if ($default_value != '') {
466
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
467
-                                    }
465
+									if ($default_value != '') {
466
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
467
+									}
468 468
 
469
-                                    $wpdb->query($meta_field_add);
470
-                                } else {
469
+									$wpdb->query($meta_field_add);
470
+								} else {
471 471
 
472
-                                    $meta_field_add = "VARCHAR( 50 ) NULL";
473
-                                    if ($default_value != '') {
474
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
475
-                                    }
476
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);
472
+									$meta_field_add = "VARCHAR( 50 ) NULL";
473
+									if ($default_value != '') {
474
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
475
+									}
476
+									geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);
477 477
 
478
-                                }
478
+								}
479 479
 
480 480
 
481
-                            }
481
+							}
482 482
 
483 483
 
484
-                            if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
484
+							if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
485 485
 
486
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
486
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
487 487
 
488
-                                if ($is_column) {
489
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";
488
+								if ($is_column) {
489
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";
490 490
 
491
-                                    if ($default_value != '') {
492
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
493
-                                    }
491
+									if ($default_value != '') {
492
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
493
+									}
494 494
 
495
-                                    $wpdb->query($meta_field_add);
496
-                                } else {
497
-                                    $meta_field_add = "VARCHAR( 50 ) NULL";
498
-                                    if ($default_value != '') {
499
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
500
-                                    }
495
+									$wpdb->query($meta_field_add);
496
+								} else {
497
+									$meta_field_add = "VARCHAR( 50 ) NULL";
498
+									if ($default_value != '') {
499
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
500
+									}
501 501
 
502
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);
503
-                                }
502
+									geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);
503
+								}
504 504
 
505
-                            }
506
-                            if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
505
+							}
506
+							if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
507 507
 
508
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
508
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
509 509
 
510
-                                if ($is_column) {
510
+								if ($is_column) {
511 511
 
512
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";
512
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";
513 513
 
514
-                                    if ($default_value != '') {
515
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
516
-                                    }
514
+									if ($default_value != '') {
515
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
516
+									}
517 517
 
518
-                                    $wpdb->query($meta_field_add);
519
-                                } else {
518
+									$wpdb->query($meta_field_add);
519
+								} else {
520 520
 
521
-                                    $meta_field_add = "VARCHAR( 50 ) NULL";
522
-                                    if ($default_value != '') {
523
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
524
-                                    }
521
+									$meta_field_add = "VARCHAR( 50 ) NULL";
522
+									if ($default_value != '') {
523
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
524
+									}
525 525
 
526
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);
526
+									geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);
527 527
 
528
-                                }
528
+								}
529 529
 
530
-                            }
531
-                            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
530
+							}
531
+							if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
532 532
 
533
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
533
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
534 534
 
535
-                                if ($is_column) {
535
+								if ($is_column) {
536 536
 
537
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";
537
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";
538 538
 
539
-                                    if ($default_value != '') {
540
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
541
-                                    }
539
+									if ($default_value != '') {
540
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
541
+									}
542 542
 
543
-                                    $wpdb->query($meta_field_add);
544
-                                } else {
543
+									$wpdb->query($meta_field_add);
544
+								} else {
545 545
 
546
-                                    $meta_field_add = "VARCHAR( 50 ) NULL";
547
-                                    if ($default_value != '') {
548
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
549
-                                    }
546
+									$meta_field_add = "VARCHAR( 50 ) NULL";
547
+									if ($default_value != '') {
548
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
549
+									}
550 550
 
551
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);
551
+									geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);
552 552
 
553
-                                }
553
+								}
554 554
 
555
-                            }
556
-                            if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
555
+							}
556
+							if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
557 557
 
558
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
559
-                                if ($is_column) {
558
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
559
+								if ($is_column) {
560 560
 
561
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
561
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
562 562
 
563
-                                    if ($default_value != '') {
564
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
565
-                                    }
563
+									if ($default_value != '') {
564
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
565
+									}
566 566
 
567
-                                    $wpdb->query($meta_field_add);
568
-                                } else {
567
+									$wpdb->query($meta_field_add);
568
+								} else {
569 569
 
570
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
571
-                                    $meta_field_add = "VARCHAR( 20 ) NULL";
572
-                                    if ($default_value != '') {
573
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
574
-                                    }
570
+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
571
+									$meta_field_add = "VARCHAR( 20 ) NULL";
572
+									if ($default_value != '') {
573
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
574
+									}
575 575
 
576
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);
576
+									geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);
577 577
 
578
-                                }
578
+								}
579 579
 
580 580
 
581
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
581
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
582 582
 
583
-                                if ($is_column) {
584
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
583
+								if ($is_column) {
584
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
585 585
 
586
-                                    if ($default_value != '') {
587
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
588
-                                    }
586
+									if ($default_value != '') {
587
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
588
+									}
589 589
 
590
-                                    $wpdb->query($meta_field_add);
591
-                                } else {
590
+									$wpdb->query($meta_field_add);
591
+								} else {
592 592
 
593
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
594
-                                    $meta_field_add = "VARCHAR( 20 ) NULL";
595
-                                    if ($default_value != '') {
596
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
597
-                                    }
593
+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
594
+									$meta_field_add = "VARCHAR( 20 ) NULL";
595
+									if ($default_value != '') {
596
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
597
+									}
598 598
 
599
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);
600
-                                }
599
+									geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);
600
+								}
601 601
 
602
-                            }
603
-                            if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
602
+							}
603
+							if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
604 604
 
605
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
605
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
606 606
 
607
-                                if ($is_column) {
608
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
607
+								if ($is_column) {
608
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
609 609
 
610
-                                    if ($default_value != '') {
611
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
612
-                                    }
610
+									if ($default_value != '') {
611
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
612
+									}
613 613
 
614
-                                    $wpdb->query($meta_field_add);
615
-                                } else {
614
+									$wpdb->query($meta_field_add);
615
+								} else {
616 616
 
617
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
617
+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
618 618
 
619
-                                    $meta_field_add = "VARCHAR( 15 ) NULL";
620
-                                    if ($default_value != '') {
621
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
622
-                                    }
619
+									$meta_field_add = "VARCHAR( 15 ) NULL";
620
+									if ($default_value != '') {
621
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
622
+									}
623 623
 
624
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);
625
-                                }
624
+									geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);
625
+								}
626 626
 
627 627
 
628
-                            }
629
-                            if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
628
+							}
629
+							if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
630 630
 
631
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
632
-                                if ($is_column) {
633
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
631
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
632
+								if ($is_column) {
633
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
634 634
 
635
-                                    if ($default_value != '') {
636
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
637
-                                    }
635
+									if ($default_value != '') {
636
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
637
+									}
638 638
 
639
-                                    $wpdb->query($meta_field_add);
639
+									$wpdb->query($meta_field_add);
640 640
 
641
-                                } else {
641
+								} else {
642 642
 
643
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
643
+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
644 644
 
645
-                                    $meta_field_add = "VARCHAR( 3 ) NULL";
646
-                                    if ($default_value != '') {
647
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
648
-                                    }
645
+									$meta_field_add = "VARCHAR( 3 ) NULL";
646
+									if ($default_value != '') {
647
+										$meta_field_add .= " DEFAULT '" . $default_value . "'";
648
+									}
649 649
 
650
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);
651
-                                }
650
+									geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);
651
+								}
652 652
 
653
-                            }
654
-                            // show lat lng
655
-                            if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
656
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
653
+							}
654
+							// show lat lng
655
+							if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
656
+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
657 657
 
658
-                                if ($is_column) {
659
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
660
-                                    $meta_field_add .= " DEFAULT '1'";
658
+								if ($is_column) {
659
+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
660
+									$meta_field_add .= " DEFAULT '1'";
661 661
 
662
-                                    $wpdb->query($meta_field_add);
663
-                                } else {
664
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
662
+									$wpdb->query($meta_field_add);
663
+								} else {
664
+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
665 665
 
666
-                                    $meta_field_add = "VARCHAR( 3 ) NULL";
667
-                                    $meta_field_add .= " DEFAULT '1'";
666
+									$meta_field_add = "VARCHAR( 3 ) NULL";
667
+									$meta_field_add .= " DEFAULT '1'";
668 668
 
669
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);
670
-                                }
669
+									geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);
670
+								}
671 671
 
672
-                            }
673
-                        }// end extra
672
+							}
673
+						}// end extra
674 674
 
675
-                        break;
675
+						break;
676 676
 
677
-                    case 'checkbox':
678
-                        $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TINYINT(1) NOT NULL";
677
+					case 'checkbox':
678
+						$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TINYINT(1) NOT NULL";
679 679
 						if ($default_value != '') {
680 680
 							$default_value_add .= " DEFAULT '" . $default_value . "'";
681 681
 						}
682 682
 
683
-                        $alter_result = $wpdb->query($default_value_add);
684
-                        if ( $alter_result === false) {
685
-                            return __('Column change failed, you may have too many columns.', 'geodirectory');
686
-                        }
687
-                        break;
688
-                    case 'multiselect':
689
-                    case 'select':
690
-                    case 'taxonomy':
691
-
692
-                        $op_size = '500';
693
-
694
-                        // only make the field as big as it needs to be.
695
-                        if(isset($option_values) && $option_values && $field_type=='select'){
696
-                            $option_values_arr = explode(',',$option_values);
697
-                            if(is_array($option_values_arr)){
698
-                                $op_max = 0;
699
-                                foreach($option_values_arr as $op_val){
700
-                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
701
-                                }
702
-                                if($op_max){$op_size =$op_max; }
703
-                            }
704
-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
705
-                            if(strlen($option_values)){
706
-                                $op_size =  strlen($option_values);
707
-                            }
708
-                        }
709
-
710
-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";
711
-
712
-                        if ($default_value != '') {
713
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
714
-                        }
715
-
716
-                        $alter_result = $wpdb->query($meta_field_add);
717
-                        if($alter_result===false){
718
-                            return __('Column change failed, you may have too many columns.','geodirectory');
719
-                        }
720
-
721
-                        if (isset($request_field['cat_display_type']))
722
-                            $extra_fields = $request_field['cat_display_type'];
723
-
724
-                        if (isset($request_field['multi_display_type']))
725
-                            $extra_fields = $request_field['multi_display_type'];
726
-
727
-
728
-                        break;
729
-
730
-                    case 'textarea':
731
-                    case 'html':
732
-                    case 'url':
733
-                    case 'file':
734
-
735
-                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
736
-                        if($alter_result===false){
737
-                            return __('Column change failed, you may have too many columns.','geodirectory');
738
-                        }
739
-                        if (isset($request_field['advanced_editor']))
740
-                            $extra_fields = $request_field['advanced_editor'];
741
-
742
-                        break;
743
-
744
-                    case 'fieldset':
745
-                        // Nothing happened for fieldset
746
-                        break;
747
-
748
-                    default:
749
-                        if ($data_type != 'VARCHAR' && $data_type != '') {
750
-                            if ($data_type == 'FLOAT' && $decimal_point > 0) {
751
-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";
752
-                            } else {
753
-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";
754
-                            }
755
-
756
-                            if (is_numeric($default_value) && $default_value != '') {
757
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
758
-                            }
759
-                        } else {
760
-                            $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";
761
-                            if ($default_value != '') {
762
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
763
-                            }
764
-                        }
765
-
766
-                        $alter_result = $wpdb->query($default_value_add);
767
-                        if($alter_result===false){
768
-                            return __('Column change failed, you may have too many columns.','geodirectory');
769
-                        }
770
-                        break;
771
-                endswitch;
772
-
773
-                $extra_field_query = '';
774
-                if (!empty($extra_fields)) {
775
-                    $extra_field_query = serialize($extra_fields);
776
-                }
777
-
778
-                $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';
779
-
780
-                $wpdb->query(
781
-
782
-                    $wpdb->prepare(
783
-
784
-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
683
+						$alter_result = $wpdb->query($default_value_add);
684
+						if ( $alter_result === false) {
685
+							return __('Column change failed, you may have too many columns.', 'geodirectory');
686
+						}
687
+						break;
688
+					case 'multiselect':
689
+					case 'select':
690
+					case 'taxonomy':
691
+
692
+						$op_size = '500';
693
+
694
+						// only make the field as big as it needs to be.
695
+						if(isset($option_values) && $option_values && $field_type=='select'){
696
+							$option_values_arr = explode(',',$option_values);
697
+							if(is_array($option_values_arr)){
698
+								$op_max = 0;
699
+								foreach($option_values_arr as $op_val){
700
+									if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
701
+								}
702
+								if($op_max){$op_size =$op_max; }
703
+							}
704
+						}elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
705
+							if(strlen($option_values)){
706
+								$op_size =  strlen($option_values);
707
+							}
708
+						}
709
+
710
+						$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";
711
+
712
+						if ($default_value != '') {
713
+							$meta_field_add .= " DEFAULT '" . $default_value . "'";
714
+						}
715
+
716
+						$alter_result = $wpdb->query($meta_field_add);
717
+						if($alter_result===false){
718
+							return __('Column change failed, you may have too many columns.','geodirectory');
719
+						}
720
+
721
+						if (isset($request_field['cat_display_type']))
722
+							$extra_fields = $request_field['cat_display_type'];
723
+
724
+						if (isset($request_field['multi_display_type']))
725
+							$extra_fields = $request_field['multi_display_type'];
726
+
727
+
728
+						break;
729
+
730
+					case 'textarea':
731
+					case 'html':
732
+					case 'url':
733
+					case 'file':
734
+
735
+						$alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
736
+						if($alter_result===false){
737
+							return __('Column change failed, you may have too many columns.','geodirectory');
738
+						}
739
+						if (isset($request_field['advanced_editor']))
740
+							$extra_fields = $request_field['advanced_editor'];
741
+
742
+						break;
743
+
744
+					case 'fieldset':
745
+						// Nothing happened for fieldset
746
+						break;
747
+
748
+					default:
749
+						if ($data_type != 'VARCHAR' && $data_type != '') {
750
+							if ($data_type == 'FLOAT' && $decimal_point > 0) {
751
+								$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";
752
+							} else {
753
+								$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";
754
+							}
755
+
756
+							if (is_numeric($default_value) && $default_value != '') {
757
+								$default_value_add .= " DEFAULT '" . $default_value . "'";
758
+							}
759
+						} else {
760
+							$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";
761
+							if ($default_value != '') {
762
+								$default_value_add .= " DEFAULT '" . $default_value . "'";
763
+							}
764
+						}
765
+
766
+						$alter_result = $wpdb->query($default_value_add);
767
+						if($alter_result===false){
768
+							return __('Column change failed, you may have too many columns.','geodirectory');
769
+						}
770
+						break;
771
+				endswitch;
772
+
773
+				$extra_field_query = '';
774
+				if (!empty($extra_fields)) {
775
+					$extra_field_query = serialize($extra_fields);
776
+				}
777
+
778
+				$decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';
779
+
780
+				$wpdb->query(
781
+
782
+					$wpdb->prepare(
783
+
784
+						"update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
785 785
 					post_type = %s,
786 786
 					admin_title = %s,
787 787
 					site_title = %s,
@@ -815,308 +815,308 @@  discard block
 block discarded – undo
815 815
 					for_admin_use = %s
816 816
 					where id = %d",
817 817
 
818
-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)
819
-                    )
818
+						array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)
819
+					)
820 820
 
821
-                );
821
+				);
822 822
 
823
-                $lastid = trim($cf);
823
+				$lastid = trim($cf);
824 824
 
825 825
 
826
-                $wpdb->query(
827
-                    $wpdb->prepare(
828
-                        "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
826
+				$wpdb->query(
827
+					$wpdb->prepare(
828
+						"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
829 829
 					 	site_title=%s
830 830
 					where post_type = %s and htmlvar_name = %s",
831
-                        array($site_title, $post_type, $htmlvar_name)
832
-                    )
833
-                );
834
-
835
-
836
-                if ($cat_sort == '')
837
-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
838
-
839
-
840
-                /**
841
-                 * Called after all custom fields are saved for a post.
842
-                 *
843
-                 * @since 1.0.0
844
-                 * @param int $lastid The post ID.
845
-                 */
846
-                do_action('geodir_after_custom_fields_updated', $lastid);
847
-
848
-            } else {
849
-
850
-                switch ($field_type):
851
-
852
-                    case 'address':
853
-
854
-                        $data_type = '';
855
-
856
-                        if ($htmlvar_name != '') {
857
-                            $prefix = $htmlvar_name . '_';
858
-                        }
859
-                        $old_prefix = $old_html_variable;
860
-
861
-                        //$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL";
862
-
863
-                        $meta_field_add = "VARCHAR( 254 ) NULL";
864
-                        if ($default_value != '') {
865
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
866
-                        }
867
-
868
-                        geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);
869
-                        //$wpdb->query($meta_field_add);
870
-
871
-
872
-                        if (!empty($extra_fields)) {
831
+						array($site_title, $post_type, $htmlvar_name)
832
+					)
833
+				);
834
+
835
+
836
+				if ($cat_sort == '')
837
+					$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
838
+
839
+
840
+				/**
841
+				 * Called after all custom fields are saved for a post.
842
+				 *
843
+				 * @since 1.0.0
844
+				 * @param int $lastid The post ID.
845
+				 */
846
+				do_action('geodir_after_custom_fields_updated', $lastid);
847
+
848
+			} else {
873 849
 
874
-                            if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
875
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";
876
-                                $meta_field_add = "VARCHAR( 50 ) NULL";
877
-                                if ($default_value != '') {
878
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
879
-                                }
880
-
881
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);
882
-                                //$wpdb->query($meta_field_add);
883
-                            }
884
-                            if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
885
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";
886
-                                $meta_field_add = "VARCHAR( 50 ) NULL";
887
-                                if ($default_value != '') {
888
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
889
-                                }
890
-
891
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);
892
-                                //$wpdb->query($meta_field_add);
893
-                            }
894
-                            if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
895
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";
896
-
897
-                                $meta_field_add = "VARCHAR( 30 ) NULL";
898
-                                if ($default_value != '') {
899
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
900
-                                }
901
-
902
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);
903
-                                //$wpdb->query($meta_field_add);
904
-                            }
905
-                            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
906
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";
907
-                                $meta_field_add = "VARCHAR( 15 ) NULL";
908
-                                if ($default_value != '') {
909
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
910
-                                }
911
-
912
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);
913
-                                //$wpdb->query($meta_field_add);
914
-                            }
915
-                            if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
916
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
917
-                                $meta_field_add = "VARCHAR( 20 ) NULL";
918
-                                if ($default_value != '') {
919
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
920
-                                }
921
-
922
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);
923
-                                //$wpdb->query($meta_field_add);
924
-
925
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
926
-
927
-                                $meta_field_add = "VARCHAR( 20 ) NULL";
928
-                                if ($default_value != '') {
929
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
930
-                                }
931
-
932
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);
933
-
934
-                                //$wpdb->query($meta_field_add);
935
-                            }
936
-                            if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
937
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
938
-
939
-                                $meta_field_add = "VARCHAR( 15 ) NULL";
940
-                                if ($default_value != '') {
941
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
942
-                                }
943
-
944
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);
945
-
946
-                                //$wpdb->query($meta_field_add);
947
-                            }
948
-                            if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
949
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
950
-
951
-                                $meta_field_add = "VARCHAR( 3 ) NULL";
952
-                                if ($default_value != '') {
953
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
954
-                                }
955
-
956
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);
957
-
958
-                                //$wpdb->query($meta_field_add);
959
-                            }
960
-                            // show lat lng
961
-                            if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
962
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
963
-
964
-                                $meta_field_add = "VARCHAR( 3 ) NULL";
965
-                                $meta_field_add .= " DEFAULT '1'";
966
-
967
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);
968
-                                //$wpdb->query($meta_field_add);
969
-                            }
970
-                        }
971
-
972
-                        break;
973
-
974
-                    case 'checkbox':
975
-                        $data_type = 'TINYINT';
976
-
977
-                        $meta_field_add = $data_type . "( 1 ) NOT NULL ";
978
-                        if ((int)$default_value === 1) {
979
-                            $meta_field_add .= " DEFAULT '1'";
980
-                        }
981
-
982
-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
983
-                        if ($add_result === false) {
984
-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
985
-                        }
986
-                        break;
987
-                    case 'multiselect':
988
-                    case 'select':
989
-                        $data_type = 'VARCHAR';
990
-                        $op_size = '500';
991
-
992
-                        // only make the field as big as it needs to be.
993
-                        if (isset($option_values) && $option_values && $field_type == 'select') {
994
-                            $option_values_arr = explode(',', $option_values);
995
-
996
-                            if (is_array($option_values_arr)) {
997
-                                $op_max = 0;
998
-
999
-                                foreach ($option_values_arr as $op_val) {
1000
-                                    if (strlen($op_val) && strlen($op_val) > $op_max) {
1001
-                                        $op_max = strlen($op_val);
1002
-                                    }
1003
-                                }
1004
-
1005
-                                if ($op_max) {
1006
-                                    $op_size = $op_max;
1007
-                                }
1008
-                            }
1009
-                        } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
1010
-                            if (strlen($option_values)) {
1011
-                                $op_size =  strlen($option_values);
1012
-                            }
1013
-
1014
-                            if (isset($request_field['multi_display_type'])) {
1015
-                                $extra_fields = $request_field['multi_display_type'];
1016
-                            }
1017
-                        }
1018
-
1019
-                        $meta_field_add = $data_type . "( $op_size ) NULL ";
1020
-                        if ($default_value != '') {
1021
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
1022
-                        }
1023
-
1024
-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1025
-                        if ($add_result === false) {
1026
-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
1027
-                        }
1028
-                        break;
1029
-                    case 'textarea':
1030
-                    case 'html':
1031
-                    case 'url':
1032
-                    case 'file':
1033
-
1034
-                        $data_type = 'TEXT';
1035
-
1036
-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1037
-
1038
-                        $meta_field_add = $data_type . " NULL ";
1039
-                        /*if($default_value != '')
850
+				switch ($field_type):
851
+
852
+					case 'address':
853
+
854
+						$data_type = '';
855
+
856
+						if ($htmlvar_name != '') {
857
+							$prefix = $htmlvar_name . '_';
858
+						}
859
+						$old_prefix = $old_html_variable;
860
+
861
+						//$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL";
862
+
863
+						$meta_field_add = "VARCHAR( 254 ) NULL";
864
+						if ($default_value != '') {
865
+							$meta_field_add .= " DEFAULT '" . $default_value . "'";
866
+						}
867
+
868
+						geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);
869
+						//$wpdb->query($meta_field_add);
870
+
871
+
872
+						if (!empty($extra_fields)) {
873
+
874
+							if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
875
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";
876
+								$meta_field_add = "VARCHAR( 50 ) NULL";
877
+								if ($default_value != '') {
878
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
879
+								}
880
+
881
+								geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);
882
+								//$wpdb->query($meta_field_add);
883
+							}
884
+							if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
885
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";
886
+								$meta_field_add = "VARCHAR( 50 ) NULL";
887
+								if ($default_value != '') {
888
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
889
+								}
890
+
891
+								geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);
892
+								//$wpdb->query($meta_field_add);
893
+							}
894
+							if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
895
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";
896
+
897
+								$meta_field_add = "VARCHAR( 30 ) NULL";
898
+								if ($default_value != '') {
899
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
900
+								}
901
+
902
+								geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);
903
+								//$wpdb->query($meta_field_add);
904
+							}
905
+							if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
906
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";
907
+								$meta_field_add = "VARCHAR( 15 ) NULL";
908
+								if ($default_value != '') {
909
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
910
+								}
911
+
912
+								geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);
913
+								//$wpdb->query($meta_field_add);
914
+							}
915
+							if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
916
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
917
+								$meta_field_add = "VARCHAR( 20 ) NULL";
918
+								if ($default_value != '') {
919
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
920
+								}
921
+
922
+								geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);
923
+								//$wpdb->query($meta_field_add);
924
+
925
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
926
+
927
+								$meta_field_add = "VARCHAR( 20 ) NULL";
928
+								if ($default_value != '') {
929
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
930
+								}
931
+
932
+								geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);
933
+
934
+								//$wpdb->query($meta_field_add);
935
+							}
936
+							if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
937
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
938
+
939
+								$meta_field_add = "VARCHAR( 15 ) NULL";
940
+								if ($default_value != '') {
941
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
942
+								}
943
+
944
+								geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);
945
+
946
+								//$wpdb->query($meta_field_add);
947
+							}
948
+							if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
949
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
950
+
951
+								$meta_field_add = "VARCHAR( 3 ) NULL";
952
+								if ($default_value != '') {
953
+									$meta_field_add .= " DEFAULT '" . $default_value . "'";
954
+								}
955
+
956
+								geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);
957
+
958
+								//$wpdb->query($meta_field_add);
959
+							}
960
+							// show lat lng
961
+							if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
962
+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
963
+
964
+								$meta_field_add = "VARCHAR( 3 ) NULL";
965
+								$meta_field_add .= " DEFAULT '1'";
966
+
967
+								geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);
968
+								//$wpdb->query($meta_field_add);
969
+							}
970
+						}
971
+
972
+						break;
973
+
974
+					case 'checkbox':
975
+						$data_type = 'TINYINT';
976
+
977
+						$meta_field_add = $data_type . "( 1 ) NOT NULL ";
978
+						if ((int)$default_value === 1) {
979
+							$meta_field_add .= " DEFAULT '1'";
980
+						}
981
+
982
+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
983
+						if ($add_result === false) {
984
+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
985
+						}
986
+						break;
987
+					case 'multiselect':
988
+					case 'select':
989
+						$data_type = 'VARCHAR';
990
+						$op_size = '500';
991
+
992
+						// only make the field as big as it needs to be.
993
+						if (isset($option_values) && $option_values && $field_type == 'select') {
994
+							$option_values_arr = explode(',', $option_values);
995
+
996
+							if (is_array($option_values_arr)) {
997
+								$op_max = 0;
998
+
999
+								foreach ($option_values_arr as $op_val) {
1000
+									if (strlen($op_val) && strlen($op_val) > $op_max) {
1001
+										$op_max = strlen($op_val);
1002
+									}
1003
+								}
1004
+
1005
+								if ($op_max) {
1006
+									$op_size = $op_max;
1007
+								}
1008
+							}
1009
+						} elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
1010
+							if (strlen($option_values)) {
1011
+								$op_size =  strlen($option_values);
1012
+							}
1013
+
1014
+							if (isset($request_field['multi_display_type'])) {
1015
+								$extra_fields = $request_field['multi_display_type'];
1016
+							}
1017
+						}
1018
+
1019
+						$meta_field_add = $data_type . "( $op_size ) NULL ";
1020
+						if ($default_value != '') {
1021
+							$meta_field_add .= " DEFAULT '" . $default_value . "'";
1022
+						}
1023
+
1024
+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1025
+						if ($add_result === false) {
1026
+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
1027
+						}
1028
+						break;
1029
+					case 'textarea':
1030
+					case 'html':
1031
+					case 'url':
1032
+					case 'file':
1033
+
1034
+						$data_type = 'TEXT';
1035
+
1036
+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1037
+
1038
+						$meta_field_add = $data_type . " NULL ";
1039
+						/*if($default_value != '')
1040 1040
 					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/
1041 1041
 
1042
-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1043
-                        if ($add_result === false) {
1044
-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
1045
-                        }
1042
+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1043
+						if ($add_result === false) {
1044
+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
1045
+						}
1046 1046
 
1047
-                        break;
1047
+						break;
1048 1048
 
1049
-                    case 'datepicker':
1049
+					case 'datepicker':
1050 1050
 
1051
-                        $data_type = 'DATE';
1051
+						$data_type = 'DATE';
1052 1052
 
1053
-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1053
+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1054 1054
 
1055
-                        $meta_field_add = $data_type . " NULL ";
1055
+						$meta_field_add = $data_type . " NULL ";
1056 1056
 
1057
-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1058
-                        if ($add_result === false) {
1059
-                            return __('Column creation failed, you may have too many columns or the default value might have a invalid date format.', 'geodirectory');
1060
-                        }
1057
+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1058
+						if ($add_result === false) {
1059
+							return __('Column creation failed, you may have too many columns or the default value might have a invalid date format.', 'geodirectory');
1060
+						}
1061 1061
 
1062
-                        break;
1062
+						break;
1063 1063
 
1064
-                    case 'time':
1064
+					case 'time':
1065 1065
 
1066
-                        $data_type = 'TIME';
1066
+						$data_type = 'TIME';
1067 1067
 
1068
-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1068
+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1069 1069
 
1070
-                        $meta_field_add = $data_type . " NULL ";
1070
+						$meta_field_add = $data_type . " NULL ";
1071 1071
 
1072
-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1073
-                        if ($add_result === false) {
1074
-                            return __('Column creation failed, you may have too many columns or the default value might have a invalid time format.', 'geodirectory');
1075
-                        }
1072
+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1073
+						if ($add_result === false) {
1074
+							return __('Column creation failed, you may have too many columns or the default value might have a invalid time format.', 'geodirectory');
1075
+						}
1076 1076
 
1077
-                        break;
1077
+						break;
1078 1078
 
1079
-                    default:
1079
+					default:
1080 1080
 
1081
-                        if ($data_type != 'VARCHAR' && $data_type != '') {
1082
-                            $meta_field_add = $data_type . " NULL ";
1081
+						if ($data_type != 'VARCHAR' && $data_type != '') {
1082
+							$meta_field_add = $data_type . " NULL ";
1083 1083
 
1084
-                            if ($data_type == 'FLOAT' && $decimal_point > 0) {
1085
-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";
1086
-                            }
1084
+							if ($data_type == 'FLOAT' && $decimal_point > 0) {
1085
+								$meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";
1086
+							}
1087 1087
 
1088
-                            if (is_numeric($default_value) && $default_value != '') {
1089
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
1090
-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";
1091
-                            }
1092
-                        } else {
1093
-                            $meta_field_add = " VARCHAR( 254 ) NULL ";
1088
+							if (is_numeric($default_value) && $default_value != '') {
1089
+								$default_value_add .= " DEFAULT '" . $default_value . "'";
1090
+								$meta_field_add .= " DEFAULT '" . $default_value . "'";
1091
+							}
1092
+						} else {
1093
+							$meta_field_add = " VARCHAR( 254 ) NULL ";
1094 1094
 
1095
-                            if ($default_value != '') {
1096
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
1097
-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";
1098
-                            }
1099
-                        }
1095
+							if ($default_value != '') {
1096
+								$default_value_add .= " DEFAULT '" . $default_value . "'";
1097
+								$meta_field_add .= " DEFAULT '" . $default_value . "'";
1098
+							}
1099
+						}
1100 1100
 
1101
-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1102
-                        if ($add_result === false) {
1103
-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
1104
-                        }
1105
-                        break;
1106
-                endswitch;
1101
+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1102
+						if ($add_result === false) {
1103
+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');
1104
+						}
1105
+						break;
1106
+				endswitch;
1107 1107
 
1108
-                $extra_field_query = '';
1109
-                if (!empty($extra_fields)) {
1110
-                    $extra_field_query = serialize($extra_fields);
1111
-                }
1108
+				$extra_field_query = '';
1109
+				if (!empty($extra_fields)) {
1110
+					$extra_field_query = serialize($extra_fields);
1111
+				}
1112 1112
 
1113
-                $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';
1113
+				$decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';
1114 1114
 
1115
-                $wpdb->query(
1115
+				$wpdb->query(
1116 1116
 
1117
-                    $wpdb->prepare(
1117
+					$wpdb->prepare(
1118 1118
 
1119
-                        "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
1119
+						"insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
1120 1120
 					post_type = %s,
1121 1121
 					admin_title = %s,
1122 1122
 					site_title = %s,
@@ -1149,26 +1149,26 @@  discard block
 block discarded – undo
1149 1149
 					validation_msg = %s,
1150 1150
 					for_admin_use = %s ",
1151 1151
 
1152
-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)
1152
+						array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)
1153 1153
 
1154
-                    )
1154
+					)
1155 1155
 
1156
-                );
1156
+				);
1157 1157
 
1158
-                $lastid = $wpdb->insert_id;
1158
+				$lastid = $wpdb->insert_id;
1159 1159
 
1160
-                $lastid = trim($lastid);
1160
+				$lastid = trim($lastid);
1161 1161
 
1162
-            }
1162
+			}
1163 1163
 
1164
-            return (int)$lastid;
1164
+			return (int)$lastid;
1165 1165
 
1166 1166
 
1167
-        } else {
1168
-            return 'HTML Variable Name should be a unique name';
1169
-        }
1167
+		} else {
1168
+			return 'HTML Variable Name should be a unique name';
1169
+		}
1170 1170
 
1171
-    }
1171
+	}
1172 1172
 }
1173 1173
 
1174 1174
 /**
@@ -1183,63 +1183,63 @@  discard block
 block discarded – undo
1183 1183
 function godir_set_field_order($field_ids = array())
1184 1184
 {
1185 1185
 
1186
-    global $wpdb;
1186
+	global $wpdb;
1187 1187
 
1188
-    $count = 0;
1189
-    if (!empty($field_ids)):
1190
-        $post_meta_info = false;
1191
-        foreach ($field_ids as $id) {
1188
+	$count = 0;
1189
+	if (!empty($field_ids)):
1190
+		$post_meta_info = false;
1191
+		foreach ($field_ids as $id) {
1192 1192
 
1193
-            $cf = trim($id, '_');
1193
+			$cf = trim($id, '_');
1194 1194
 
1195
-            $post_meta_info = $wpdb->query(
1196
-                $wpdb->prepare(
1197
-                    "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
1195
+			$post_meta_info = $wpdb->query(
1196
+				$wpdb->prepare(
1197
+					"update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
1198 1198
 															sort_order=%d 
1199 1199
 															where id= %d",
1200
-                    array($count, $cf)
1201
-                )
1202
-            );
1203
-            $count++;
1204
-        }
1205
-
1206
-        return $post_meta_info;
1207
-    else:
1208
-        return false;
1209
-    endif;
1200
+					array($count, $cf)
1201
+				)
1202
+			);
1203
+			$count++;
1204
+		}
1205
+
1206
+		return $post_meta_info;
1207
+	else:
1208
+		return false;
1209
+	endif;
1210 1210
 }
1211 1211
 
1212 1212
 function geodir_get_cf_value($cf) {
1213
-    global $gd_session;
1214
-    $value = '';
1215
-    if (is_admin()) {
1216
-        global $post;
1217
-
1218
-        if (isset($_REQUEST['post'])) {
1219
-            $_REQUEST['pid'] = (int)$_REQUEST['post'];
1220
-        }
1221
-    }
1222
-
1223
-    if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
1224
-        $post = $gd_ses_listing;
1225
-        $value = isset($post[$cf['name']]) ? $post[$cf['name']] : '';
1226
-    } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
1227
-        $value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true);
1228
-    } else {
1229
-        if ($value == '') {
1230
-            $value = $cf['default'];
1231
-        }
1232
-    }
1213
+	global $gd_session;
1214
+	$value = '';
1215
+	if (is_admin()) {
1216
+		global $post;
1217
+
1218
+		if (isset($_REQUEST['post'])) {
1219
+			$_REQUEST['pid'] = (int)$_REQUEST['post'];
1220
+		}
1221
+	}
1222
+
1223
+	if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
1224
+		$post = $gd_ses_listing;
1225
+		$value = isset($post[$cf['name']]) ? $post[$cf['name']] : '';
1226
+	} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
1227
+		$value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true);
1228
+	} else {
1229
+		if ($value == '') {
1230
+			$value = $cf['default'];
1231
+		}
1232
+	}
1233 1233
     
1234
-    /**
1235
-     * Filter the custom field value.
1236
-     *
1237
-     * @since 1.6.20
1238
-     * 
1239
-     * @param mixed $value Custom field value.
1240
-     * @param array $cf Custom field info.
1241
-     */
1242
-    return apply_filters( 'geodir_get_cf_value', $value, $cf );
1234
+	/**
1235
+	 * Filter the custom field value.
1236
+	 *
1237
+	 * @since 1.6.20
1238
+	 * 
1239
+	 * @param mixed $value Custom field value.
1240
+	 * @param array $cf Custom field info.
1241
+	 */
1242
+	return apply_filters( 'geodir_get_cf_value', $value, $cf );
1243 1243
 }
1244 1244
 
1245 1245
 /**
@@ -1258,424 +1258,424 @@  discard block
 block discarded – undo
1258 1258
  * @param string $post_type Optional. The wordpress post type.
1259 1259
  */
1260 1260
 function geodir_get_custom_fields_html($package_id = '', $default = 'custom', $post_type = 'gd_place') {
1261
-    global $is_default, $mapzoom, $gd_session;
1261
+	global $is_default, $mapzoom, $gd_session;
1262 1262
 
1263
-    $listing_type = $post_type;
1263
+	$listing_type = $post_type;
1264 1264
 
1265
-    $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);
1265
+	$custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);
1266 1266
 
1267
-    foreach ($custom_fields as $key => $val) {
1268
-        if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}
1269
-        $val = stripslashes_deep($val); // strip slashes from labels
1270
-        if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}
1267
+	foreach ($custom_fields as $key => $val) {
1268
+		if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}
1269
+		$val = stripslashes_deep($val); // strip slashes from labels
1270
+		if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}
1271 1271
 
1272
-        $name = $val['name'];
1273
-        $type = $val['type'];
1274
-        $is_default = $val['is_default'];
1272
+		$name = $val['name'];
1273
+		$type = $val['type'];
1274
+		$is_default = $val['is_default'];
1275 1275
 
1276
-        /* field available to site admin only for edit */
1277
-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;
1278
-        if ($for_admin_use && !is_super_admin()) {
1279
-            continue;
1280
-        }
1276
+		/* field available to site admin only for edit */
1277
+		$for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;
1278
+		if ($for_admin_use && !is_super_admin()) {
1279
+			continue;
1280
+		}
1281 1281
 
1282
-        if (is_admin()) {
1283
-            global $post;
1282
+		if (is_admin()) {
1283
+			global $post;
1284 1284
 
1285
-            if (isset($_REQUEST['post']))
1286
-                $_REQUEST['pid'] = $_REQUEST['post'];
1287
-        }
1285
+			if (isset($_REQUEST['post']))
1286
+				$_REQUEST['pid'] = $_REQUEST['post'];
1287
+		}
1288 1288
 
1289 1289
         
1290 1290
 
1291
-        /**
1292
-         * Called before the custom fields info is output for submitting a post.
1293
-         *
1294
-         * Used dynamic hook type geodir_before_custom_form_field_$name.
1295
-         *
1296
-         * @since 1.0.0
1297
-         * @param string $listing_type The post post type.
1298
-         * @param int $package_id The price package ID for the post.
1299
-         * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
1300
-         * @see 'geodir_after_custom_form_field_$name'
1301
-         */
1302
-        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
1303
-
1304
-
1305
-        $custom_field = $val;
1306
-        $html ='';
1307
-        /**
1308
-         * Filter the output for custom fields.
1309
-         *
1310
-         * Here we can remove or add new functions depending on the field type.
1311
-         *
1312
-         * @param string $html The html to be filtered (blank).
1313
-         * @param array $custom_field The custom field array values.
1314
-         */
1315
-        echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
1316
-
1317
-
1318
-
1319
-        /**
1320
-         * Called after the custom fields info is output for submitting a post.
1321
-         *
1322
-         * Used dynamic hook type geodir_after_custom_form_field_$name.
1323
-         *
1324
-         * @since 1.0.0
1325
-         * @param string $listing_type The post post type.
1326
-         * @param int $package_id The price package ID for the post.
1327
-         * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
1328
-         * @see 'geodir_before_custom_form_field_$name'
1329
-         */
1330
-        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
1331
-
1332
-    }
1291
+		/**
1292
+		 * Called before the custom fields info is output for submitting a post.
1293
+		 *
1294
+		 * Used dynamic hook type geodir_before_custom_form_field_$name.
1295
+		 *
1296
+		 * @since 1.0.0
1297
+		 * @param string $listing_type The post post type.
1298
+		 * @param int $package_id The price package ID for the post.
1299
+		 * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
1300
+		 * @see 'geodir_after_custom_form_field_$name'
1301
+		 */
1302
+		do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
1303
+
1304
+
1305
+		$custom_field = $val;
1306
+		$html ='';
1307
+		/**
1308
+		 * Filter the output for custom fields.
1309
+		 *
1310
+		 * Here we can remove or add new functions depending on the field type.
1311
+		 *
1312
+		 * @param string $html The html to be filtered (blank).
1313
+		 * @param array $custom_field The custom field array values.
1314
+		 */
1315
+		echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
1316
+
1317
+
1318
+
1319
+		/**
1320
+		 * Called after the custom fields info is output for submitting a post.
1321
+		 *
1322
+		 * Used dynamic hook type geodir_after_custom_form_field_$name.
1323
+		 *
1324
+		 * @since 1.0.0
1325
+		 * @param string $listing_type The post post type.
1326
+		 * @param int $package_id The price package ID for the post.
1327
+		 * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
1328
+		 * @see 'geodir_before_custom_form_field_$name'
1329
+		 */
1330
+		do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
1331
+
1332
+	}
1333 1333
 
1334 1334
 }
1335 1335
 
1336 1336
 
1337 1337
 if (!function_exists('geodir_get_field_infoby')) {
1338
-    /**
1339
-     * Get custom field using key and value.
1340
-     *
1341
-     * @since 1.0.0
1342
-     * @package GeoDirectory
1343
-     * @global object $wpdb WordPress Database object.
1344
-     * @param string $key The key you want to look for.
1345
-     * @param string $value The value of the key you want to look for.
1346
-     * @param string $geodir_post_type The post type.
1347
-     * @return bool|mixed Returns field info when available. otherwise returns false.
1348
-     */
1349
-    function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')
1350
-    {
1351
-
1352
-        global $wpdb;
1353
-
1354
-        $filter = $wpdb->get_row(
1355
-            $wpdb->prepare(
1356
-                "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",
1357
-                array($geodir_post_type)
1358
-            ),ARRAY_A
1359
-        );
1360
-
1361
-        if ($filter) {
1362
-            return $filter;
1363
-        } else {
1364
-            return false;
1365
-        }
1366
-
1367
-    }
1338
+	/**
1339
+	 * Get custom field using key and value.
1340
+	 *
1341
+	 * @since 1.0.0
1342
+	 * @package GeoDirectory
1343
+	 * @global object $wpdb WordPress Database object.
1344
+	 * @param string $key The key you want to look for.
1345
+	 * @param string $value The value of the key you want to look for.
1346
+	 * @param string $geodir_post_type The post type.
1347
+	 * @return bool|mixed Returns field info when available. otherwise returns false.
1348
+	 */
1349
+	function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')
1350
+	{
1351
+
1352
+		global $wpdb;
1353
+
1354
+		$filter = $wpdb->get_row(
1355
+			$wpdb->prepare(
1356
+				"SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",
1357
+				array($geodir_post_type)
1358
+			),ARRAY_A
1359
+		);
1360
+
1361
+		if ($filter) {
1362
+			return $filter;
1363
+		} else {
1364
+			return false;
1365
+		}
1366
+
1367
+	}
1368 1368
 }
1369 1369
 
1370 1370
 
1371 1371
 function geodir_field_icon_proccess($cf){
1372 1372
 
1373 1373
 
1374
-    if (strpos($cf['field_icon'], 'http') !== false) {
1375
-        $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
1376
-    } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
1377
-        $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';
1378
-    }else{
1379
-        $field_icon = $cf['field_icon'];
1380
-    }
1374
+	if (strpos($cf['field_icon'], 'http') !== false) {
1375
+		$field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
1376
+	} elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
1377
+		$field_icon = '<i class="' . $cf['field_icon'] . '"></i>';
1378
+	}else{
1379
+		$field_icon = $cf['field_icon'];
1380
+	}
1381 1381
 
1382
-    return $field_icon;
1382
+	return $field_icon;
1383 1383
 }
1384 1384
 
1385 1385
 if (!function_exists('geodir_show_listing_info')) {
1386
-    /**
1387
-     * Show listing info depending on field location.
1388
-     *
1389
-     * @since 1.0.0
1390
-     * @since 1.5.7 Custom fields option values added to db translation.
1391
-     *              Changes to display url fields title.
1392
-     * @package GeoDirectory
1393
-     * @global object $wpdb WordPress Database object.
1394
-     * @global object $post The current post object.
1395
-     *
1396
-     * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.
1397
-     * @return string Returns listing info html.
1398
-     */
1399
-    function geodir_show_listing_info($fields_location = '') {
1400
-        global $post, $preview, $wpdb;
1401
-
1402
-        $package_info = array();
1403
-
1404
-        if(!$preview && !isset($post->post_id)){
1405
-            $post = geodir_get_post_info($post->ID);
1406
-        }
1407
-
1408
-        $package_info = geodir_post_package_info($package_info, $post);
1409
-        $post_package_id = !empty($package_info->pid) ? $package_info->pid : '';
1410
-        $p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype();
1411
-
1412
-        ob_start();
1413
-        $fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location);
1414
-
1415
-        if (!empty($fields_info)) {
1416
-            $post = stripslashes_deep($post); // strip slashes
1386
+	/**
1387
+	 * Show listing info depending on field location.
1388
+	 *
1389
+	 * @since 1.0.0
1390
+	 * @since 1.5.7 Custom fields option values added to db translation.
1391
+	 *              Changes to display url fields title.
1392
+	 * @package GeoDirectory
1393
+	 * @global object $wpdb WordPress Database object.
1394
+	 * @global object $post The current post object.
1395
+	 *
1396
+	 * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.
1397
+	 * @return string Returns listing info html.
1398
+	 */
1399
+	function geodir_show_listing_info($fields_location = '') {
1400
+		global $post, $preview, $wpdb;
1401
+
1402
+		$package_info = array();
1403
+
1404
+		if(!$preview && !isset($post->post_id)){
1405
+			$post = geodir_get_post_info($post->ID);
1406
+		}
1407
+
1408
+		$package_info = geodir_post_package_info($package_info, $post);
1409
+		$post_package_id = !empty($package_info->pid) ? $package_info->pid : '';
1410
+		$p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype();
1411
+
1412
+		ob_start();
1413
+		$fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location);
1414
+
1415
+		if (!empty($fields_info)) {
1416
+			$post = stripslashes_deep($post); // strip slashes
1417 1417
             
1418
-            //echo '<div class="geodir-company_info field-group">';
1419
-            global $field_set_start;
1420
-            $field_set_start = 0;
1421
-
1422
-
1423
-
1424
-            foreach ($fields_info as $type) {
1425
-                if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
1426
-                $type = stripslashes_deep($type); // strip slashes
1427
-                if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
1428
-                $html = '';
1429
-                $field_icon = geodir_field_icon_proccess($type);
1430
-                $filed_type = $type['type'];
1431
-                $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';
1432
-                if($html_var=='post'){$html_var='post_address';}
1433
-
1434
-                /**
1435
-                 * Filter the output for custom fields.
1436
-                 *
1437
-                 * Here we can remove or add new functions depending on the field type.
1438
-                 *
1439
-                 * @param string $html The html to be filtered (blank).
1440
-                 * @param string $fields_location The location the field is to be show.
1441
-                 * @param array $type The array of field values.
1442
-                 */
1443
-                $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
1444
-
1445
-                $variables_array = array();
1446
-
1447
-
1448
-                if ($type['type'] != 'fieldset'):
1449
-                    $variables_array['post_id'] = !empty($post->ID) ? $post->ID : (!empty($post->pid) ? $post->pid : NULL);
1450
-                    $variables_array['label'] = __($type['site_title'], 'geodirectory');
1451
-                    $variables_array['value'] = '';
1452
-                    if (isset($post->{$type['htmlvar_name']}))
1453
-                        $variables_array['value'] = $post->{$type['htmlvar_name']};
1454
-                endif;
1455
-
1456
-
1457
-                if ($html):
1458
-
1459
-                    /**
1460
-                     * Called before a custom fields is output on the frontend.
1461
-                     *
1462
-                     * @since 1.0.0
1463
-                     * @param string $html_var The HTML variable name for the field.
1464
-                     */
1465
-                    do_action("geodir_before_show_{$html_var}");
1466
-                    /**
1467
-                     * Filter custom field output.
1468
-                     *
1469
-                     * @since 1.0.0
1470
-                     *
1471
-                     * @param string $html_var The HTML variable name for the field.
1472
-                     * @param string $html Custom field unfiltered HTML.
1473
-                     * @param array $variables_array Custom field variables array.
1474
-                     */
1475
-                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
1476
-
1477
-                    /**
1478
-                     * Called after a custom fields is output on the frontend.
1479
-                     *
1480
-                     * @since 1.0.0
1481
-                     * @param string $html_var The HTML variable name for the field.
1482
-                     */
1483
-                    do_action("geodir_after_show_{$html_var}");
1484
-
1485
-                endif;
1486
-
1487
-            }
1488
-
1489
-            //echo '</div>';
1490
-
1491
-        }
1492
-
1493
-
1494
-        $html = ob_get_clean();
1495
-
1496
-        /**
1497
-         * Filter the custom fields over all output.
1498
-         *
1499
-         * @param string $html The html of the custom fields.
1500
-         * @param string $fields_location The location the fields are being output.
1501
-         * @since 1.6.9
1502
-         */
1503
-        return apply_filters('geodir_show_listing_info',$html,$fields_location);
1504
-
1505
-    }
1418
+			//echo '<div class="geodir-company_info field-group">';
1419
+			global $field_set_start;
1420
+			$field_set_start = 0;
1421
+
1422
+
1423
+
1424
+			foreach ($fields_info as $type) {
1425
+				if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
1426
+				$type = stripslashes_deep($type); // strip slashes
1427
+				if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
1428
+				$html = '';
1429
+				$field_icon = geodir_field_icon_proccess($type);
1430
+				$filed_type = $type['type'];
1431
+				$html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';
1432
+				if($html_var=='post'){$html_var='post_address';}
1433
+
1434
+				/**
1435
+				 * Filter the output for custom fields.
1436
+				 *
1437
+				 * Here we can remove or add new functions depending on the field type.
1438
+				 *
1439
+				 * @param string $html The html to be filtered (blank).
1440
+				 * @param string $fields_location The location the field is to be show.
1441
+				 * @param array $type The array of field values.
1442
+				 */
1443
+				$html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
1444
+
1445
+				$variables_array = array();
1446
+
1447
+
1448
+				if ($type['type'] != 'fieldset'):
1449
+					$variables_array['post_id'] = !empty($post->ID) ? $post->ID : (!empty($post->pid) ? $post->pid : NULL);
1450
+					$variables_array['label'] = __($type['site_title'], 'geodirectory');
1451
+					$variables_array['value'] = '';
1452
+					if (isset($post->{$type['htmlvar_name']}))
1453
+						$variables_array['value'] = $post->{$type['htmlvar_name']};
1454
+				endif;
1455
+
1456
+
1457
+				if ($html):
1458
+
1459
+					/**
1460
+					 * Called before a custom fields is output on the frontend.
1461
+					 *
1462
+					 * @since 1.0.0
1463
+					 * @param string $html_var The HTML variable name for the field.
1464
+					 */
1465
+					do_action("geodir_before_show_{$html_var}");
1466
+					/**
1467
+					 * Filter custom field output.
1468
+					 *
1469
+					 * @since 1.0.0
1470
+					 *
1471
+					 * @param string $html_var The HTML variable name for the field.
1472
+					 * @param string $html Custom field unfiltered HTML.
1473
+					 * @param array $variables_array Custom field variables array.
1474
+					 */
1475
+					if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
1476
+
1477
+					/**
1478
+					 * Called after a custom fields is output on the frontend.
1479
+					 *
1480
+					 * @since 1.0.0
1481
+					 * @param string $html_var The HTML variable name for the field.
1482
+					 */
1483
+					do_action("geodir_after_show_{$html_var}");
1484
+
1485
+				endif;
1486
+
1487
+			}
1488
+
1489
+			//echo '</div>';
1490
+
1491
+		}
1492
+
1493
+
1494
+		$html = ob_get_clean();
1495
+
1496
+		/**
1497
+		 * Filter the custom fields over all output.
1498
+		 *
1499
+		 * @param string $html The html of the custom fields.
1500
+		 * @param string $fields_location The location the fields are being output.
1501
+		 * @since 1.6.9
1502
+		 */
1503
+		return apply_filters('geodir_show_listing_info',$html,$fields_location);
1504
+
1505
+	}
1506 1506
 }
1507 1507
 
1508 1508
 if (!function_exists('geodir_default_date_format')) {
1509
-    /**
1510
-     * Returns default date format.
1511
-     *
1512
-     * @since 1.0.0
1513
-     * @package GeoDirectory
1514
-     * @return mixed|string|void Returns default date format.
1515
-     */
1516
-    function geodir_default_date_format()
1517
-    {
1518
-        if ($format = get_option('date_format'))
1519
-            return $format;
1520
-        else
1521
-            return 'dd-mm-yy';
1522
-    }
1509
+	/**
1510
+	 * Returns default date format.
1511
+	 *
1512
+	 * @since 1.0.0
1513
+	 * @package GeoDirectory
1514
+	 * @return mixed|string|void Returns default date format.
1515
+	 */
1516
+	function geodir_default_date_format()
1517
+	{
1518
+		if ($format = get_option('date_format'))
1519
+			return $format;
1520
+		else
1521
+			return 'dd-mm-yy';
1522
+	}
1523 1523
 }
1524 1524
 
1525 1525
 if (!function_exists('geodir_get_formated_date')) {
1526
-    /**
1527
-     * Returns formatted date.
1528
-     *
1529
-     * @since 1.0.0
1530
-     * @package GeoDirectory
1531
-     * @param string $date Date string to convert.
1532
-     * @return bool|int|string Returns formatted date.
1533
-     */
1534
-    function geodir_get_formated_date($date)
1535
-    {
1536
-        return mysql2date(get_option('date_format'), $date);
1537
-    }
1526
+	/**
1527
+	 * Returns formatted date.
1528
+	 *
1529
+	 * @since 1.0.0
1530
+	 * @package GeoDirectory
1531
+	 * @param string $date Date string to convert.
1532
+	 * @return bool|int|string Returns formatted date.
1533
+	 */
1534
+	function geodir_get_formated_date($date)
1535
+	{
1536
+		return mysql2date(get_option('date_format'), $date);
1537
+	}
1538 1538
 }
1539 1539
 
1540 1540
 if (!function_exists('geodir_get_formated_time')) {
1541
-    /**
1542
-     * Returns formatted time.
1543
-     *
1544
-     * @since 1.0.0
1545
-     * @package GeoDirectory
1546
-     * @param string $time Time string to convert.
1547
-     * @return bool|int|string Returns formatted time.
1548
-     */
1549
-    function geodir_get_formated_time($time)
1550
-    {
1551
-        return mysql2date(get_option('time_format'), $time, $translate = true);
1552
-    }
1541
+	/**
1542
+	 * Returns formatted time.
1543
+	 *
1544
+	 * @since 1.0.0
1545
+	 * @package GeoDirectory
1546
+	 * @param string $time Time string to convert.
1547
+	 * @return bool|int|string Returns formatted time.
1548
+	 */
1549
+	function geodir_get_formated_time($time)
1550
+	{
1551
+		return mysql2date(get_option('time_format'), $time, $translate = true);
1552
+	}
1553 1553
 }
1554 1554
 
1555 1555
 
1556 1556
 if (!function_exists('geodir_save_post_file_fields')) {
1557
-    /**
1558
-     * Save post file fields
1559
-     *
1560
-     * @since 1.0.0
1561
-     * @since 1.4.7 Added `$extra_fields` parameter.
1562
-     * @package GeoDirectory
1563
-     * @global object $wpdb WordPress Database object.
1564
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
1565
-     * @global object $current_user Current user object.
1566
-     * @param int $post_id
1567
-     * @param string $field_id
1568
-     * @param array $post_image
1569
-     * @param array $extra_fields Array of extra fields.
1570
-     */
1571
-    function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())
1572
-    {
1557
+	/**
1558
+	 * Save post file fields
1559
+	 *
1560
+	 * @since 1.0.0
1561
+	 * @since 1.4.7 Added `$extra_fields` parameter.
1562
+	 * @package GeoDirectory
1563
+	 * @global object $wpdb WordPress Database object.
1564
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
1565
+	 * @global object $current_user Current user object.
1566
+	 * @param int $post_id
1567
+	 * @param string $field_id
1568
+	 * @param array $post_image
1569
+	 * @param array $extra_fields Array of extra fields.
1570
+	 */
1571
+	function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())
1572
+	{
1573 1573
 
1574
-        global $wpdb, $plugin_prefix, $current_user;
1574
+		global $wpdb, $plugin_prefix, $current_user;
1575 1575
 
1576
-        $post_type = get_post_type($post_id);
1577
-        //echo $field_id; exit;
1578
-        $table = $plugin_prefix . $post_type . '_detail';
1576
+		$post_type = get_post_type($post_id);
1577
+		//echo $field_id; exit;
1578
+		$table = $plugin_prefix . $post_type . '_detail';
1579 1579
 
1580
-        $postcurr_images = array();
1581
-        $postcurr_images = geodir_get_post_meta($post_id, $field_id, true);
1582
-        $file_urls = '';
1580
+		$postcurr_images = array();
1581
+		$postcurr_images = geodir_get_post_meta($post_id, $field_id, true);
1582
+		$file_urls = '';
1583 1583
 
1584
-        if (!empty($post_image)) {
1584
+		if (!empty($post_image)) {
1585 1585
 
1586
-            $invalid_files = array();
1586
+			$invalid_files = array();
1587 1587
 
1588
-            //Get and remove all old images of post from database to set by new order
1589
-            $geodir_uploaddir = '';
1590
-            $uploads = wp_upload_dir();
1591
-            $uploads_dir = $uploads['path'];
1588
+			//Get and remove all old images of post from database to set by new order
1589
+			$geodir_uploaddir = '';
1590
+			$uploads = wp_upload_dir();
1591
+			$uploads_dir = $uploads['path'];
1592 1592
 
1593
-            $geodir_uploadpath = $uploads['path'];
1594
-            $geodir_uploadurl = $uploads['url'];
1595
-            $sub_dir = $uploads['subdir'];
1593
+			$geodir_uploadpath = $uploads['path'];
1594
+			$geodir_uploadurl = $uploads['url'];
1595
+			$sub_dir = $uploads['subdir'];
1596 1596
 
1597
-            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
1597
+			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
1598 1598
 
1599
-            for ($m = 0; $m < count($post_image); $m++) {
1599
+			for ($m = 0; $m < count($post_image); $m++) {
1600 1600
 
1601
-                /* --------- start ------- */
1601
+				/* --------- start ------- */
1602 1602
 
1603
-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
1603
+				if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
1604 1604
 
1605 1605
 
1606
-                    $curr_img_url = $post_image[$m];
1607
-                    $image_name_arr = explode('/', $curr_img_url);
1608
-                    $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
1609
-                    $filename = end($image_name_arr);
1610
-                    $img_name_arr = explode('.', $filename);
1606
+					$curr_img_url = $post_image[$m];
1607
+					$image_name_arr = explode('/', $curr_img_url);
1608
+					$curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
1609
+					$filename = end($image_name_arr);
1610
+					$img_name_arr = explode('.', $filename);
1611 1611
 
1612
-                    $arr_file_type = wp_check_filetype($filename);
1612
+					$arr_file_type = wp_check_filetype($filename);
1613 1613
 
1614
-                    if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
1615
-                        continue;
1616
-                    }
1614
+					if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
1615
+						continue;
1616
+					}
1617 1617
 
1618
-                    $uploaded_file_type = $arr_file_type['type'];
1619
-                    $uploaded_file_ext = $arr_file_type['ext'];
1618
+					$uploaded_file_type = $arr_file_type['type'];
1619
+					$uploaded_file_ext = $arr_file_type['ext'];
1620 1620
 
1621
-                    if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
1622
-                        continue; // Invalid file type.
1623
-                    }
1621
+					if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
1622
+						continue; // Invalid file type.
1623
+					}
1624 1624
 
1625
-                    // Set an array containing a list of acceptable formats
1626
-                    //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
1625
+					// Set an array containing a list of acceptable formats
1626
+					//$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
1627 1627
 
1628
-                    if (!function_exists('wp_handle_upload'))
1629
-                        require_once(ABSPATH . 'wp-admin/includes/file.php');
1628
+					if (!function_exists('wp_handle_upload'))
1629
+						require_once(ABSPATH . 'wp-admin/includes/file.php');
1630 1630
 
1631
-                    if (!is_dir($geodir_uploadpath))
1632
-                        mkdir($geodir_uploadpath);
1631
+					if (!is_dir($geodir_uploadpath))
1632
+						mkdir($geodir_uploadpath);
1633 1633
 
1634
-                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];
1635
-                    $explode_sub_dir = explode("/", $sub_dir);
1636
-                    if ($curr_img_dir == end($explode_sub_dir)) {
1637
-                        $img_path = $geodir_uploadpath . '/' . $filename;
1638
-                        $img_url = $geodir_uploadurl . '/' . $filename;
1639
-                    } else {
1640
-                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1641
-                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;
1642
-                    }
1634
+					$new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];
1635
+					$explode_sub_dir = explode("/", $sub_dir);
1636
+					if ($curr_img_dir == end($explode_sub_dir)) {
1637
+						$img_path = $geodir_uploadpath . '/' . $filename;
1638
+						$img_url = $geodir_uploadurl . '/' . $filename;
1639
+					} else {
1640
+						$img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1641
+						$img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;
1642
+					}
1643 1643
 
1644
-                    $uploaded_file = '';
1645
-                    if (file_exists($img_path))
1646
-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1644
+					$uploaded_file = '';
1645
+					if (file_exists($img_path))
1646
+						$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1647 1647
 
1648
-                    if ($curr_img_dir != $geodir_uploaddir) {
1649
-                        if (file_exists($img_path))
1650
-                            unlink($img_path);
1651
-                    }
1648
+					if ($curr_img_dir != $geodir_uploaddir) {
1649
+						if (file_exists($img_path))
1650
+							unlink($img_path);
1651
+					}
1652 1652
 
1653
-                    if (!empty($uploaded_file))
1654
-                        $file_urls = $geodir_uploadurl . '/' . $new_name;
1653
+					if (!empty($uploaded_file))
1654
+						$file_urls = $geodir_uploadurl . '/' . $new_name;
1655 1655
 
1656
-                } else {
1657
-                    $file_urls = $post_image[$m];
1658
-                }
1659
-            }
1656
+				} else {
1657
+					$file_urls = $post_image[$m];
1658
+				}
1659
+			}
1660 1660
 
1661 1661
 
1662
-        }
1662
+		}
1663 1663
 
1664
-        //Remove all old attachments and temp images
1665
-        if (!empty($postcurr_images)) {
1664
+		//Remove all old attachments and temp images
1665
+		if (!empty($postcurr_images)) {
1666 1666
 
1667
-            if ($file_urls != $postcurr_images) {
1668
-                $invalid_files[] = (object)array('src' => $postcurr_images);
1669
-                $invalid_files = (object)$invalid_files;
1670
-            }
1671
-        }
1667
+			if ($file_urls != $postcurr_images) {
1668
+				$invalid_files[] = (object)array('src' => $postcurr_images);
1669
+				$invalid_files = (object)$invalid_files;
1670
+			}
1671
+		}
1672 1672
 
1673
-        geodir_save_post_meta($post_id, $field_id, $file_urls);
1673
+		geodir_save_post_meta($post_id, $field_id, $file_urls);
1674 1674
 
1675
-        if (!empty($invalid_files))
1676
-            geodir_remove_attachments($invalid_files);
1675
+		if (!empty($invalid_files))
1676
+			geodir_remove_attachments($invalid_files);
1677 1677
 
1678
-    }
1678
+	}
1679 1679
 }
1680 1680
 
1681 1681
 
@@ -1690,76 +1690,76 @@  discard block
 block discarded – undo
1690 1690
  */
1691 1691
 function geodir_custom_upload_mimes($existing_mimes = array())
1692 1692
 {
1693
-    $existing_mimes['wif'] = 'text/plain';
1694
-    $existing_mimes['jpg|jpeg'] = 'image/jpeg';
1695
-    $existing_mimes['gif'] = 'image/gif';
1696
-    $existing_mimes['png'] = 'image/png';
1697
-    $existing_mimes['pdf'] = 'application/pdf';
1698
-    $existing_mimes['txt'] = 'text/text';
1699
-    $existing_mimes['csv'] = 'application/octet-stream';
1700
-    $existing_mimes['doc'] = 'application/msword';
1701
-    $existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel';
1702
-    $existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
1703
-    $existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
1704
-    return $existing_mimes;
1693
+	$existing_mimes['wif'] = 'text/plain';
1694
+	$existing_mimes['jpg|jpeg'] = 'image/jpeg';
1695
+	$existing_mimes['gif'] = 'image/gif';
1696
+	$existing_mimes['png'] = 'image/png';
1697
+	$existing_mimes['pdf'] = 'application/pdf';
1698
+	$existing_mimes['txt'] = 'text/text';
1699
+	$existing_mimes['csv'] = 'application/octet-stream';
1700
+	$existing_mimes['doc'] = 'application/msword';
1701
+	$existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel';
1702
+	$existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
1703
+	$existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
1704
+	return $existing_mimes;
1705 1705
 }
1706 1706
 
1707 1707
 if (!function_exists('geodir_plupload_action')) {
1708 1708
 
1709
-    /**
1710
-     * Get upload directory path details
1711
-     *
1712
-     * @since 1.0.0
1713
-     * @package GeoDirectory
1714
-     * @global object $current_user Current user object.
1715
-     * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.
1716
-     * @return mixed Returns upload directory details as an array.
1717
-     */
1718
-    function geodir_upload_dir($upload)
1719
-    {
1720
-        global $current_user;
1721
-        $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;
1722
-        $upload['path'] = $upload['basedir'] . $upload['subdir'];
1723
-        $upload['url'] = $upload['baseurl'] . $upload['subdir'];
1724
-        return $upload;
1725
-    }
1726
-
1727
-    /**
1728
-     * Handles place file and image upload.
1729
-     *
1730
-     * @since 1.0.0
1731
-     * @package GeoDirectory
1732
-     */
1733
-    function geodir_plupload_action()
1734
-    {
1735
-        // check ajax nonce
1736
-        $imgid = $_POST["imgid"];
1737
-
1738
-        check_ajax_referer($imgid . 'pluploadan');
1739
-
1740
-        // handle custom file uploaddir
1741
-        add_filter('upload_dir', 'geodir_upload_dir');
1742
-
1743
-        // change file orientation if needed
1744
-        $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);
1745
-
1746
-        // handle file upload
1747
-        $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
1748
-        // remove handle custom file uploaddir
1749
-        remove_filter('upload_dir', 'geodir_upload_dir');
1750
-
1751
-        if(!isset($status['url']) && isset($status['error'])){
1752
-            print_r($status);
1753
-        }
1754
-
1755
-        // send the uploaded file url in response
1756
-        if (isset($status['url'])) {
1757
-            echo $status['url'];
1758
-        } else {
1759
-            echo 'x';
1760
-        }
1761
-        exit;
1762
-    }
1709
+	/**
1710
+	 * Get upload directory path details
1711
+	 *
1712
+	 * @since 1.0.0
1713
+	 * @package GeoDirectory
1714
+	 * @global object $current_user Current user object.
1715
+	 * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.
1716
+	 * @return mixed Returns upload directory details as an array.
1717
+	 */
1718
+	function geodir_upload_dir($upload)
1719
+	{
1720
+		global $current_user;
1721
+		$upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;
1722
+		$upload['path'] = $upload['basedir'] . $upload['subdir'];
1723
+		$upload['url'] = $upload['baseurl'] . $upload['subdir'];
1724
+		return $upload;
1725
+	}
1726
+
1727
+	/**
1728
+	 * Handles place file and image upload.
1729
+	 *
1730
+	 * @since 1.0.0
1731
+	 * @package GeoDirectory
1732
+	 */
1733
+	function geodir_plupload_action()
1734
+	{
1735
+		// check ajax nonce
1736
+		$imgid = $_POST["imgid"];
1737
+
1738
+		check_ajax_referer($imgid . 'pluploadan');
1739
+
1740
+		// handle custom file uploaddir
1741
+		add_filter('upload_dir', 'geodir_upload_dir');
1742
+
1743
+		// change file orientation if needed
1744
+		$fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);
1745
+
1746
+		// handle file upload
1747
+		$status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
1748
+		// remove handle custom file uploaddir
1749
+		remove_filter('upload_dir', 'geodir_upload_dir');
1750
+
1751
+		if(!isset($status['url']) && isset($status['error'])){
1752
+			print_r($status);
1753
+		}
1754
+
1755
+		// send the uploaded file url in response
1756
+		if (isset($status['url'])) {
1757
+			echo $status['url'];
1758
+		} else {
1759
+			echo 'x';
1760
+		}
1761
+		exit;
1762
+	}
1763 1763
 }
1764 1764
 
1765 1765
 /**
@@ -1774,17 +1774,17 @@  discard block
 block discarded – undo
1774 1774
  */
1775 1775
 function geodir_get_video($post_id)
1776 1776
 {
1777
-    global $wpdb, $plugin_prefix;
1777
+	global $wpdb, $plugin_prefix;
1778 1778
 
1779
-    $post_type = get_post_type($post_id);
1779
+	$post_type = get_post_type($post_id);
1780 1780
 
1781
-    $table = $plugin_prefix . $post_type . '_detail';
1781
+	$table = $plugin_prefix . $post_type . '_detail';
1782 1782
 
1783
-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
1783
+	$results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
1784 1784
 
1785
-    if ($results) {
1786
-        return $results[0]->geodir_video;
1787
-    }
1785
+	if ($results) {
1786
+		return $results[0]->geodir_video;
1787
+	}
1788 1788
 
1789 1789
 }
1790 1790
 
@@ -1800,40 +1800,40 @@  discard block
 block discarded – undo
1800 1800
  */
1801 1801
 function geodir_get_special_offers($post_id)
1802 1802
 {
1803
-    global $wpdb, $plugin_prefix;
1803
+	global $wpdb, $plugin_prefix;
1804 1804
 
1805
-    $post_type = get_post_type($post_id);
1805
+	$post_type = get_post_type($post_id);
1806 1806
 
1807
-    $table = $plugin_prefix . $post_type . '_detail';
1807
+	$table = $plugin_prefix . $post_type . '_detail';
1808 1808
 
1809
-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
1809
+	$results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
1810 1810
 
1811
-    if ($results) {
1812
-        return $results[0]->geodir_special_offers;
1813
-    }
1811
+	if ($results) {
1812
+		return $results[0]->geodir_special_offers;
1813
+	}
1814 1814
 
1815 1815
 }
1816 1816
 
1817 1817
 if (!function_exists('geodir_max_upload_size')) {
1818
-    /**
1819
-     * Get max upload file size
1820
-     *
1821
-     * @since 1.0.0
1822
-     * @package GeoDirectory
1823
-     * @return mixed|void Returns max upload file size.
1824
-     */
1825
-    function geodir_max_upload_size()
1826
-    {
1827
-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
1828
-
1829
-        if ($max_filesize > 0 && $max_filesize < 1) {
1830
-            $max_filesize = (int)($max_filesize * 1024) . 'kb';
1831
-        } else {
1832
-            $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';
1833
-        }
1834
-        /** Filter documented in geodirectory-functions/general_functions.php **/
1835
-        return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
1836
-    }
1818
+	/**
1819
+	 * Get max upload file size
1820
+	 *
1821
+	 * @since 1.0.0
1822
+	 * @package GeoDirectory
1823
+	 * @return mixed|void Returns max upload file size.
1824
+	 */
1825
+	function geodir_max_upload_size()
1826
+	{
1827
+		$max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
1828
+
1829
+		if ($max_filesize > 0 && $max_filesize < 1) {
1830
+			$max_filesize = (int)($max_filesize * 1024) . 'kb';
1831
+		} else {
1832
+			$max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';
1833
+		}
1834
+		/** Filter documented in geodirectory-functions/general_functions.php **/
1835
+		return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
1836
+	}
1837 1837
 }
1838 1838
 
1839 1839
 
@@ -1851,33 +1851,33 @@  discard block
 block discarded – undo
1851 1851
  */
1852 1852
 function geodir_add_custom_sort_options($fields, $post_type)
1853 1853
 {
1854
-    global $wpdb;
1854
+	global $wpdb;
1855 1855
 
1856
-    if ($post_type != '') {
1856
+	if ($post_type != '') {
1857 1857
 
1858
-        $all_postypes = geodir_get_posttypes();
1858
+		$all_postypes = geodir_get_posttypes();
1859 1859
 
1860
-        if (in_array($post_type, $all_postypes)) {
1860
+		if (in_array($post_type, $all_postypes)) {
1861 1861
 
1862
-            $custom_fields = $wpdb->get_results(
1863
-                $wpdb->prepare(
1864
-                    "select post_type,data_type,field_type,site_title,admin_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",
1865
-                    array($post_type)
1866
-                ), 'ARRAY_A'
1867
-            );
1862
+			$custom_fields = $wpdb->get_results(
1863
+				$wpdb->prepare(
1864
+					"select post_type,data_type,field_type,site_title,admin_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",
1865
+					array($post_type)
1866
+				), 'ARRAY_A'
1867
+			);
1868 1868
 
1869
-            if (!empty($custom_fields)) {
1869
+			if (!empty($custom_fields)) {
1870 1870
 
1871
-                foreach ($custom_fields as $val) {
1872
-                    $fields[] = $val;
1873
-                }
1874
-            }
1871
+				foreach ($custom_fields as $val) {
1872
+					$fields[] = $val;
1873
+				}
1874
+			}
1875 1875
 
1876
-        }
1876
+		}
1877 1877
 
1878
-    }
1878
+	}
1879 1879
 
1880
-    return $fields;
1880
+	return $fields;
1881 1881
 }
1882 1882
 
1883 1883
 
@@ -1893,76 +1893,76 @@  discard block
 block discarded – undo
1893 1893
 function geodir_get_custom_sort_options($post_type = '')
1894 1894
 {
1895 1895
 
1896
-    global $wpdb;
1897
-
1898
-    if ($post_type != '') {
1899
-
1900
-        $all_postypes = geodir_get_posttypes();
1901
-
1902
-        if (!in_array($post_type, $all_postypes))
1903
-            return false;
1904
-
1905
-        $fields = array();
1906
-
1907
-        $fields[] = array(
1908
-            'post_type' => $post_type,
1909
-            'data_type' => '',
1910
-            'field_type' => 'random',
1911
-            'site_title' => 'Random',
1912
-            'htmlvar_name' => 'post_title',
1913
-            'field_icon' =>  'fa fa-random',
1914
-            'description' =>  __('Random sort (not recommended for large sites)', 'geodirectory')
1915
-        );
1916
-
1917
-        $fields[] = array(
1918
-            'post_type' => $post_type,
1919
-            'data_type' => '',
1920
-            'field_type' => 'datetime',
1921
-            'site_title' => __('Add date', 'geodirectory'),
1922
-            'htmlvar_name' => 'post_date',
1923
-            'field_icon' =>  'fa fa-calendar',
1924
-            'description' =>  __('Sort by date added', 'geodirectory')
1925
-        );
1926
-        $fields[] = array(
1927
-            'post_type' => $post_type,
1928
-            'data_type' => '',
1929
-            'field_type' => 'bigint',
1930
-            'site_title' => __('Review', 'geodirectory'),
1931
-            'htmlvar_name' => 'comment_count',
1932
-            'field_icon' =>  'fa fa-commenting-o',
1933
-            'description' =>  __('Sort by the number of reviews', 'geodirectory')
1934
-        );
1935
-        $fields[] = array(
1936
-            'post_type' => $post_type,
1937
-            'data_type' => '',
1938
-            'field_type' => 'float',
1939
-            'site_title' => __('Rating', 'geodirectory'),
1940
-            'htmlvar_name' => 'overall_rating',
1941
-            'field_icon' =>  'fa fa-star-o',
1942
-            'description' =>  __('Sort by the overall rating value', 'geodirectory')
1943
-        );
1944
-        $fields[] = array(
1945
-            'post_type' => $post_type,
1946
-            'data_type' => '',
1947
-            'field_type' => 'text',
1948
-            'site_title' => __('Title', 'geodirectory'),
1949
-            'htmlvar_name' => 'post_title',
1950
-            'field_icon' =>  'fa fa-sort-alpha-desc',
1951
-            'description' =>  __('Sort alphabetically by title', 'geodirectory')
1952
-        );
1953
-
1954
-        /**
1955
-         * Hook to add custom sort options.
1956
-         *
1957
-         * @since 1.0.0
1958
-         * @param array $fields Unmodified sort options array.
1959
-         * @param string $post_type Post type.
1960
-         */
1961
-        return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);
1962
-
1963
-    }
1964
-
1965
-    return false;
1896
+	global $wpdb;
1897
+
1898
+	if ($post_type != '') {
1899
+
1900
+		$all_postypes = geodir_get_posttypes();
1901
+
1902
+		if (!in_array($post_type, $all_postypes))
1903
+			return false;
1904
+
1905
+		$fields = array();
1906
+
1907
+		$fields[] = array(
1908
+			'post_type' => $post_type,
1909
+			'data_type' => '',
1910
+			'field_type' => 'random',
1911
+			'site_title' => 'Random',
1912
+			'htmlvar_name' => 'post_title',
1913
+			'field_icon' =>  'fa fa-random',
1914
+			'description' =>  __('Random sort (not recommended for large sites)', 'geodirectory')
1915
+		);
1916
+
1917
+		$fields[] = array(
1918
+			'post_type' => $post_type,
1919
+			'data_type' => '',
1920
+			'field_type' => 'datetime',
1921
+			'site_title' => __('Add date', 'geodirectory'),
1922
+			'htmlvar_name' => 'post_date',
1923
+			'field_icon' =>  'fa fa-calendar',
1924
+			'description' =>  __('Sort by date added', 'geodirectory')
1925
+		);
1926
+		$fields[] = array(
1927
+			'post_type' => $post_type,
1928
+			'data_type' => '',
1929
+			'field_type' => 'bigint',
1930
+			'site_title' => __('Review', 'geodirectory'),
1931
+			'htmlvar_name' => 'comment_count',
1932
+			'field_icon' =>  'fa fa-commenting-o',
1933
+			'description' =>  __('Sort by the number of reviews', 'geodirectory')
1934
+		);
1935
+		$fields[] = array(
1936
+			'post_type' => $post_type,
1937
+			'data_type' => '',
1938
+			'field_type' => 'float',
1939
+			'site_title' => __('Rating', 'geodirectory'),
1940
+			'htmlvar_name' => 'overall_rating',
1941
+			'field_icon' =>  'fa fa-star-o',
1942
+			'description' =>  __('Sort by the overall rating value', 'geodirectory')
1943
+		);
1944
+		$fields[] = array(
1945
+			'post_type' => $post_type,
1946
+			'data_type' => '',
1947
+			'field_type' => 'text',
1948
+			'site_title' => __('Title', 'geodirectory'),
1949
+			'htmlvar_name' => 'post_title',
1950
+			'field_icon' =>  'fa fa-sort-alpha-desc',
1951
+			'description' =>  __('Sort alphabetically by title', 'geodirectory')
1952
+		);
1953
+
1954
+		/**
1955
+		 * Hook to add custom sort options.
1956
+		 *
1957
+		 * @since 1.0.0
1958
+		 * @param array $fields Unmodified sort options array.
1959
+		 * @param string $post_type Post type.
1960
+		 */
1961
+		return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);
1962
+
1963
+	}
1964
+
1965
+	return false;
1966 1966
 }
1967 1967
 
1968 1968
 
@@ -1978,117 +1978,117 @@  discard block
 block discarded – undo
1978 1978
 function godir_set_sort_field_order($field_ids = array())
1979 1979
 {
1980 1980
 
1981
-    global $wpdb;
1981
+	global $wpdb;
1982 1982
 
1983
-    $count = 0;
1984
-    if (!empty($field_ids)):
1985
-        foreach ($field_ids as $id) {
1983
+	$count = 0;
1984
+	if (!empty($field_ids)):
1985
+		foreach ($field_ids as $id) {
1986 1986
 
1987
-            $cf = trim($id, '_');
1987
+			$cf = trim($id, '_');
1988 1988
 
1989
-            $post_meta_info = $wpdb->query(
1990
-                $wpdb->prepare(
1991
-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
1989
+			$post_meta_info = $wpdb->query(
1990
+				$wpdb->prepare(
1991
+					"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
1992 1992
 															sort_order=%d 
1993 1993
 															where id= %d",
1994
-                    array($count, $cf)
1995
-                )
1996
-            );
1997
-            $count++;
1998
-        }
1999
-
2000
-        return $field_ids;
2001
-    else:
2002
-        return false;
2003
-    endif;
1994
+					array($count, $cf)
1995
+				)
1996
+			);
1997
+			$count++;
1998
+		}
1999
+
2000
+		return $field_ids;
2001
+	else:
2002
+		return false;
2003
+	endif;
2004 2004
 }
2005 2005
 
2006 2006
 
2007 2007
 if (!function_exists('geodir_custom_sort_field_save')) {
2008
-    /**
2009
-     * Save or Update custom sort fields into the database.
2010
-     *
2011
-     * @since 1.0.0
2012
-     * @package GeoDirectory
2013
-     * @global object $wpdb WordPress Database object.
2014
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
2015
-     * @param array $request_field {
2016
-     *    Attributes of the Request field.
2017
-     *
2018
-     *    @type string $action Ajax action name.
2019
-     *    @type string $manage_field_type Manage field type Default "sorting_options".
2020
-     *    @type string $create_field Do you want to create this field?.
2021
-     *    @type string $field_ins_upd Field created or updated?.
2022
-     *    @type string $_wpnonce Nonce value.
2023
-     *    @type string $listing_type The Post type.
2024
-     *    @type string $field_type Field Type.
2025
-     *    @type string $field_id Field ID.
2026
-     *    @type string $data_type Data Type.
2027
-     *    @type string $htmlvar_name HTML variable name.
2028
-     *    @type string $site_title Section title which you wish to display in frontend.
2029
-     *    @type string $is_default Is this default sorting?.
2030
-     *    @type string $is_active If not active then the field will not be displayed anywhere.
2031
-     *    @type string $sort_order Sort Order.
2032
-     *
2033
-     * }
2034
-     * @param bool $default Not yet implemented.
2035
-     * @return int Returns the last affected db table row id.
2036
-     */
2037
-    function geodir_custom_sort_field_save($request_field = array(), $default = false)
2038
-    {
2039
-
2040
-        global $wpdb, $plugin_prefix;
2041
-
2042
-        $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';
2043
-
2044
-        $cf = trim($result_str, '_');
2045
-
2046
-        /*-------- check duplicate validation --------*/
2047
-
2048
-        $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';
2049
-        $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
2050
-
2051
-        $post_type = $request_field['listing_type'];
2052
-        $data_type = isset($request_field['data_type']) ? $request_field['data_type'] : '';
2053
-        $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';
2054
-        $site_title = isset($request_field['site_title']) ? $request_field['site_title'] : '';
2055
-        $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
2056
-        $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0;
2057
-        $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0;
2058
-        $is_default = isset($request_field['is_default']) ? $request_field['is_default'] : '';
2059
-        $asc = isset($request_field['asc']) ? $request_field['asc'] : 0;
2060
-        $desc = isset($request_field['desc']) ? $request_field['desc'] : 0;
2061
-        $asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : '';
2062
-        $desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : '';
2063
-
2064
-        $default_order = '';
2065
-        if ($is_default != '') {
2066
-            $default_order = $is_default;
2067
-            $is_default = '1';
2068
-        }
2069
-
2070
-
2071
-        $check_html_variable = $wpdb->get_var(
2072
-            $wpdb->prepare(
2073
-                "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",
2074
-                array($cehhtmlvar_name, $post_type, $field_type)
2075
-            )
2076
-        );
2077
-
2078
-        if ($is_default == 1) {
2079
-
2080
-            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
2081
-
2082
-        }
2083
-
2084
-
2085
-        if (!$check_html_variable) {
2086
-
2087
-            $wpdb->query(
2088
-
2089
-                $wpdb->prepare(
2090
-
2091
-                    "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
2008
+	/**
2009
+	 * Save or Update custom sort fields into the database.
2010
+	 *
2011
+	 * @since 1.0.0
2012
+	 * @package GeoDirectory
2013
+	 * @global object $wpdb WordPress Database object.
2014
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
2015
+	 * @param array $request_field {
2016
+	 *    Attributes of the Request field.
2017
+	 *
2018
+	 *    @type string $action Ajax action name.
2019
+	 *    @type string $manage_field_type Manage field type Default "sorting_options".
2020
+	 *    @type string $create_field Do you want to create this field?.
2021
+	 *    @type string $field_ins_upd Field created or updated?.
2022
+	 *    @type string $_wpnonce Nonce value.
2023
+	 *    @type string $listing_type The Post type.
2024
+	 *    @type string $field_type Field Type.
2025
+	 *    @type string $field_id Field ID.
2026
+	 *    @type string $data_type Data Type.
2027
+	 *    @type string $htmlvar_name HTML variable name.
2028
+	 *    @type string $site_title Section title which you wish to display in frontend.
2029
+	 *    @type string $is_default Is this default sorting?.
2030
+	 *    @type string $is_active If not active then the field will not be displayed anywhere.
2031
+	 *    @type string $sort_order Sort Order.
2032
+	 *
2033
+	 * }
2034
+	 * @param bool $default Not yet implemented.
2035
+	 * @return int Returns the last affected db table row id.
2036
+	 */
2037
+	function geodir_custom_sort_field_save($request_field = array(), $default = false)
2038
+	{
2039
+
2040
+		global $wpdb, $plugin_prefix;
2041
+
2042
+		$result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';
2043
+
2044
+		$cf = trim($result_str, '_');
2045
+
2046
+		/*-------- check duplicate validation --------*/
2047
+
2048
+		$field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';
2049
+		$cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
2050
+
2051
+		$post_type = $request_field['listing_type'];
2052
+		$data_type = isset($request_field['data_type']) ? $request_field['data_type'] : '';
2053
+		$field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';
2054
+		$site_title = isset($request_field['site_title']) ? $request_field['site_title'] : '';
2055
+		$htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';
2056
+		$sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0;
2057
+		$is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0;
2058
+		$is_default = isset($request_field['is_default']) ? $request_field['is_default'] : '';
2059
+		$asc = isset($request_field['asc']) ? $request_field['asc'] : 0;
2060
+		$desc = isset($request_field['desc']) ? $request_field['desc'] : 0;
2061
+		$asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : '';
2062
+		$desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : '';
2063
+
2064
+		$default_order = '';
2065
+		if ($is_default != '') {
2066
+			$default_order = $is_default;
2067
+			$is_default = '1';
2068
+		}
2069
+
2070
+
2071
+		$check_html_variable = $wpdb->get_var(
2072
+			$wpdb->prepare(
2073
+				"select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",
2074
+				array($cehhtmlvar_name, $post_type, $field_type)
2075
+			)
2076
+		);
2077
+
2078
+		if ($is_default == 1) {
2079
+
2080
+			$wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
2081
+
2082
+		}
2083
+
2084
+
2085
+		if (!$check_html_variable) {
2086
+
2087
+			$wpdb->query(
2088
+
2089
+				$wpdb->prepare(
2090
+
2091
+					"insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
2092 2092
 				post_type = %s,
2093 2093
 				data_type = %s,
2094 2094
 				field_type = %s,
@@ -2103,23 +2103,23 @@  discard block
 block discarded – undo
2103 2103
 				asc_title = %s,
2104 2104
 				desc_title = %s",
2105 2105
 
2106
-                    array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title)
2107
-                )
2106
+					array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title)
2107
+				)
2108 2108
 
2109
-            );
2109
+			);
2110 2110
 
2111 2111
 
2112
-            $lastid = $wpdb->insert_id;
2112
+			$lastid = $wpdb->insert_id;
2113 2113
 
2114
-            $lastid = trim($lastid);
2114
+			$lastid = trim($lastid);
2115 2115
 
2116
-        } else {
2116
+		} else {
2117 2117
 
2118
-            $wpdb->query(
2118
+			$wpdb->query(
2119 2119
 
2120
-                $wpdb->prepare(
2120
+				$wpdb->prepare(
2121 2121
 
2122
-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
2122
+					"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
2123 2123
 				post_type = %s,
2124 2124
 				data_type = %s,
2125 2125
 				field_type = %s,
@@ -2135,123 +2135,123 @@  discard block
 block discarded – undo
2135 2135
 				desc_title = %s
2136 2136
 				where id = %d",
2137 2137
 
2138
-                    array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf)
2139
-                )
2138
+					array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf)
2139
+				)
2140 2140
 
2141
-            );
2141
+			);
2142 2142
 
2143
-            $lastid = trim($cf);
2143
+			$lastid = trim($cf);
2144 2144
 
2145
-        }
2145
+		}
2146 2146
 
2147 2147
 
2148
-        return (int)$lastid;
2148
+		return (int)$lastid;
2149 2149
 
2150
-    }
2150
+	}
2151 2151
 }
2152 2152
 
2153 2153
 
2154 2154
 if (!function_exists('geodir_custom_sort_field_delete')) {
2155
-    /**
2156
-     * Delete a custom sort field using field id.
2157
-     * @since 1.0.0
2158
-     * @package GeoDirectory
2159
-     * @global object $wpdb WordPress Database object.
2160
-     * @global string $plugin_prefix Geodirectory plugin table prefix.
2161
-     * @param string $field_id The field ID.
2162
-     * @return int|string Returns field id when successful deletion, else returns 0.
2163
-     */
2164
-    function geodir_custom_sort_field_delete($field_id = '')
2165
-    {
2166
-
2167
-        global $wpdb, $plugin_prefix;
2168
-        if ($field_id != '') {
2169
-            $cf = trim($field_id, '_');
2170
-
2171
-            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
2172
-
2173
-            return $field_id;
2174
-
2175
-        } else
2176
-            return 0;
2177
-
2178
-    }
2155
+	/**
2156
+	 * Delete a custom sort field using field id.
2157
+	 * @since 1.0.0
2158
+	 * @package GeoDirectory
2159
+	 * @global object $wpdb WordPress Database object.
2160
+	 * @global string $plugin_prefix Geodirectory plugin table prefix.
2161
+	 * @param string $field_id The field ID.
2162
+	 * @return int|string Returns field id when successful deletion, else returns 0.
2163
+	 */
2164
+	function geodir_custom_sort_field_delete($field_id = '')
2165
+	{
2166
+
2167
+		global $wpdb, $plugin_prefix;
2168
+		if ($field_id != '') {
2169
+			$cf = trim($field_id, '_');
2170
+
2171
+			$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
2172
+
2173
+			return $field_id;
2174
+
2175
+		} else
2176
+			return 0;
2177
+
2178
+	}
2179 2179
 }
2180 2180
 
2181 2181
 
2182 2182
 if (!function_exists('geodir_custom_sort_field_adminhtml')) {
2183
-    /**
2184
-     * Custom sort field admin html.
2185
-     *
2186
-     * @since 1.0.0
2187
-     * @package GeoDirectory
2188
-     * @global object $wpdb WordPress Database object.
2189
-     * @param string $field_type The form field type.
2190
-     * @param object|int $result_str The custom field results object or row id.
2191
-     * @param string $field_ins_upd When set to "submit" displays form.
2192
-     * @param bool $default when set to true field will be for admin use only.
2193
-     */
2194
-    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')
2195
-    {
2196
-        global $wpdb;
2197
-        $cf = $result_str;
2198
-        if (!is_object($cf)) {
2199
-            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
2200
-        } else {
2201
-            $field_info = $cf;
2202
-            $result_str = $cf->id;
2203
-        }
2204
-
2205
-        $field_info = stripslashes_deep($field_info); // strip slashes
2206
-
2207
-        if (!isset($field_info->post_type)) {
2208
-            $post_type = sanitize_text_field($_REQUEST['listing_type']);
2209
-        } else {
2210
-            $post_type = $field_info->post_type;
2211
-        }
2212
-
2213
-
2214
-        $htmlvar_name = isset($field_type_key) ? $field_type_key : '';
2215
-
2216
-        $site_title = '';
2217
-        if ($site_title == '')
2218
-            $site_title = isset($field_info->site_title) ? $field_info->site_title : '';
2219
-
2220
-        if ($site_title == '') {
2221
-            $fields = geodir_get_custom_sort_options($post_type);
2222
-
2223
-            foreach ($fields as $val) {
2224
-                $val = stripslashes_deep($val); // strip slashes
2225
-
2226
-                if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {
2227
-                    $site_title = isset($val['site_title']) ? $val['site_title'] : '';
2228
-                }
2229
-            }
2230
-        }
2231
-
2232
-        if ($htmlvar_name == '')
2233
-            $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
2234
-
2235
-        $nonce = wp_create_nonce('custom_fields_' . $result_str);
2236
-
2237
-        $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';
2238
-        $cso_arr = geodir_get_custom_sort_options($post_type);
2239
-
2240
-        $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);
2241
-        foreach($cso_arr as $cso){
2242
-            if($cur_field_type==$cso['field_type']){
2243
-
2244
-                if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
2245
-                    $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';
2246
-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){
2247
-                    $field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cso['field_icon'].'\')"></b>';
2248
-                }
2249
-
2250
-            }
2251
-        }
2252
-
2253
-        $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);
2254
-        ?>
2183
+	/**
2184
+	 * Custom sort field admin html.
2185
+	 *
2186
+	 * @since 1.0.0
2187
+	 * @package GeoDirectory
2188
+	 * @global object $wpdb WordPress Database object.
2189
+	 * @param string $field_type The form field type.
2190
+	 * @param object|int $result_str The custom field results object or row id.
2191
+	 * @param string $field_ins_upd When set to "submit" displays form.
2192
+	 * @param bool $default when set to true field will be for admin use only.
2193
+	 */
2194
+	function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')
2195
+	{
2196
+		global $wpdb;
2197
+		$cf = $result_str;
2198
+		if (!is_object($cf)) {
2199
+			$field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
2200
+		} else {
2201
+			$field_info = $cf;
2202
+			$result_str = $cf->id;
2203
+		}
2204
+
2205
+		$field_info = stripslashes_deep($field_info); // strip slashes
2206
+
2207
+		if (!isset($field_info->post_type)) {
2208
+			$post_type = sanitize_text_field($_REQUEST['listing_type']);
2209
+		} else {
2210
+			$post_type = $field_info->post_type;
2211
+		}
2212
+
2213
+
2214
+		$htmlvar_name = isset($field_type_key) ? $field_type_key : '';
2215
+
2216
+		$site_title = '';
2217
+		if ($site_title == '')
2218
+			$site_title = isset($field_info->site_title) ? $field_info->site_title : '';
2219
+
2220
+		if ($site_title == '') {
2221
+			$fields = geodir_get_custom_sort_options($post_type);
2222
+
2223
+			foreach ($fields as $val) {
2224
+				$val = stripslashes_deep($val); // strip slashes
2225
+
2226
+				if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {
2227
+					$site_title = isset($val['site_title']) ? $val['site_title'] : '';
2228
+				}
2229
+			}
2230
+		}
2231
+
2232
+		if ($htmlvar_name == '')
2233
+			$htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
2234
+
2235
+		$nonce = wp_create_nonce('custom_fields_' . $result_str);
2236
+
2237
+		$field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';
2238
+		$cso_arr = geodir_get_custom_sort_options($post_type);
2239
+
2240
+		$cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);
2241
+		foreach($cso_arr as $cso){
2242
+			if($cur_field_type==$cso['field_type']){
2243
+
2244
+				if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
2245
+					$field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';
2246
+				}elseif(isset($cso['field_icon']) && $cso['field_icon']){
2247
+					$field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cso['field_icon'].'\')"></b>';
2248
+				}
2249
+
2250
+			}
2251
+		}
2252
+
2253
+		$radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);
2254
+		?>
2255 2255
 
2256 2256
         <li class="text" id="licontainer_<?php echo $result_str;?>">
2257 2257
             <form><!-- we need to wrap in a form so we can use radio buttons with same name -->
@@ -2260,7 +2260,7 @@  discard block
 block discarded – undo
2260 2260
                  ondblclick="show_hide('field_frm<?php echo $result_str;?>')">
2261 2261
                 <?php
2262 2262
 
2263
-                ?>
2263
+				?>
2264 2264
 
2265 2265
                 <div title="<?php _e('Click to remove field', 'geodirectory');?>"
2266 2266
                      onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
@@ -2275,17 +2275,17 @@  discard block
 block discarded – undo
2275 2275
 
2276 2276
             <div id="field_frm<?php echo $result_str;?>" class="field_frm"
2277 2277
                  style="display:<?php if ($field_ins_upd == 'submit') {
2278
-                     echo 'block;';
2279
-                 } else {
2280
-                     echo 'none;';
2281
-                 } ?>">
2278
+					 echo 'block;';
2279
+				 } else {
2280
+					 echo 'none;';
2281
+				 } ?>">
2282 2282
                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>
2283 2283
                 <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>
2284 2284
                 <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>
2285 2285
                 <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/>
2286 2286
                 <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {
2287
-                    echo $field_info->data_type;
2288
-                }?>"/>
2287
+					echo $field_info->data_type;
2288
+				}?>"/>
2289 2289
                 <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/>
2290 2290
 
2291 2291
 
@@ -2308,14 +2308,14 @@  discard block
 block discarded – undo
2308 2308
 
2309 2309
                                 <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled"  value="1"
2310 2310
                                     <?php if ($value == '1') {
2311
-                                        echo 'checked';
2312
-                                    } ?>/>
2311
+										echo 'checked';
2312
+									} ?>/>
2313 2313
                                 <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2314 2314
 
2315 2315
                                 <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0"
2316 2316
                                     <?php if ($value == '0' || !$value) {
2317
-                                        echo 'checked';
2318
-                                    } ?>/>
2317
+										echo 'checked';
2318
+									} ?>/>
2319 2319
                                 <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2320 2320
 
2321 2321
                             </div>
@@ -2352,8 +2352,8 @@  discard block
 block discarded – undo
2352 2352
 
2353 2353
                                 <input type="radio" name="is_default"
2354 2354
                                        value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {
2355
-                                    echo 'checked="checked"';
2356
-                                } ?>/>
2355
+									echo 'checked="checked"';
2356
+								} ?>/>
2357 2357
                             </div>
2358 2358
 
2359 2359
                         </li>
@@ -2373,14 +2373,14 @@  discard block
 block discarded – undo
2373 2373
 
2374 2374
                                 <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled"  value="1"
2375 2375
                                     <?php if ($value == '1') {
2376
-                                        echo 'checked';
2377
-                                    } ?>/>
2376
+										echo 'checked';
2377
+									} ?>/>
2378 2378
                                 <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2379 2379
 
2380 2380
                                 <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0"
2381 2381
                                     <?php if ($value == '0' || !$value) {
2382
-                                        echo 'checked';
2383
-                                    } ?>/>
2382
+										echo 'checked';
2383
+									} ?>/>
2384 2384
                                 <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2385 2385
 
2386 2386
                             </div>
@@ -2416,8 +2416,8 @@  discard block
 block discarded – undo
2416 2416
 
2417 2417
                                 <input type="radio" name="is_default"
2418 2418
                                        value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {
2419
-                                    echo 'checked="checked"';
2420
-                                } ?>/>
2419
+									echo 'checked="checked"';
2420
+								} ?>/>
2421 2421
                             </div>
2422 2422
 
2423 2423
                         </li>
@@ -2459,8 +2459,8 @@  discard block
 block discarded – undo
2459 2459
 
2460 2460
                                 <input type="checkbox" name="is_default"
2461 2461
                                        value="<?php echo $field_type; ?>"  <?php if (isset($value) && $value == '1') {
2462
-                                    echo 'checked="checked"';
2463
-                                } ?>/>
2462
+									echo 'checked="checked"';
2463
+								} ?>/>
2464 2464
                             </div>
2465 2465
 
2466 2466
 
@@ -2483,14 +2483,14 @@  discard block
 block discarded – undo
2483 2483
 
2484 2484
                             <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"
2485 2485
                                 <?php if ($value == '1') {
2486
-                                    echo 'checked';
2487
-                                } ?>/>
2486
+									echo 'checked';
2487
+								} ?>/>
2488 2488
                             <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2489 2489
 
2490 2490
                             <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"
2491 2491
                                 <?php if ($value == '0' || !$value) {
2492
-                                    echo 'checked';
2493
-                                } ?>/>
2492
+									echo 'checked';
2493
+								} ?>/>
2494 2494
                             <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2495 2495
 
2496 2496
                         </div>
@@ -2500,8 +2500,8 @@  discard block
 block discarded – undo
2500 2500
 
2501 2501
                     <input type="hidden" readonly="readonly" name="sort_order" id="sort_order"
2502 2502
                                                 value="<?php if (isset($field_info->sort_order)) {
2503
-                                                    echo esc_attr($field_info->sort_order);
2504
-                                                }?>" size="50"/>
2503
+													echo esc_attr($field_info->sort_order);
2504
+												}?>" size="50"/>
2505 2505
 
2506 2506
 
2507 2507
 
@@ -2525,38 +2525,38 @@  discard block
 block discarded – undo
2525 2525
             </form>
2526 2526
         </li> <?php
2527 2527
 
2528
-    }
2528
+	}
2529 2529
 }
2530 2530
 
2531 2531
 if (!function_exists('check_field_visibility')) {
2532
-    /**
2533
-     * Check field visibility as per price package.
2534
-     *
2535
-     * @since 1.0.0
2536
-     * @package GeoDirectory
2537
-     * @global object $wpdb WordPress Database object.
2538
-     * @global array $geodir_addon_list List of active GeoDirectory extensions.
2539
-     * @param int|string $package_id The package ID.
2540
-     * @param string $field_name The field name.
2541
-     * @param string $post_type Optional. The wordpress post type.
2542
-     * @return bool Returns true when field visible, otherwise false.
2543
-     */
2544
-    function check_field_visibility($package_id, $field_name, $post_type)
2545
-    {
2546
-        global $wpdb, $geodir_addon_list;
2547
-        if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {
2548
-            return true;
2549
-        }
2550
-        if (!$package_id || !$field_name || !$post_type) {
2551
-            return true;
2552
-        }
2553
-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
2554
-
2555
-        if ($wpdb->get_var($sql)) {
2556
-            return true;
2557
-        }
2558
-        return false;
2559
-    }
2532
+	/**
2533
+	 * Check field visibility as per price package.
2534
+	 *
2535
+	 * @since 1.0.0
2536
+	 * @package GeoDirectory
2537
+	 * @global object $wpdb WordPress Database object.
2538
+	 * @global array $geodir_addon_list List of active GeoDirectory extensions.
2539
+	 * @param int|string $package_id The package ID.
2540
+	 * @param string $field_name The field name.
2541
+	 * @param string $post_type Optional. The wordpress post type.
2542
+	 * @return bool Returns true when field visible, otherwise false.
2543
+	 */
2544
+	function check_field_visibility($package_id, $field_name, $post_type)
2545
+	{
2546
+		global $wpdb, $geodir_addon_list;
2547
+		if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {
2548
+			return true;
2549
+		}
2550
+		if (!$package_id || !$field_name || !$post_type) {
2551
+			return true;
2552
+		}
2553
+		$sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
2554
+
2555
+		if ($wpdb->get_var($sql)) {
2556
+			return true;
2557
+		}
2558
+		return false;
2559
+	}
2560 2560
 }
2561 2561
 
2562 2562
 /**
@@ -2572,43 +2572,43 @@  discard block
 block discarded – undo
2572 2572
  */
2573 2573
 function geodir_string_to_options($input = '', $translated = false)
2574 2574
 {
2575
-    $return = array();
2576
-    if ($input != '') {
2577
-        $input = trim($input);
2578
-        $input = rtrim($input, ",");
2579
-        $input = ltrim($input, ",");
2580
-        $input = trim($input);
2581
-    }
2582
-
2583
-    $input_arr = explode(',', $input);
2584
-
2585
-    if (!empty($input_arr)) {
2586
-        foreach ($input_arr as $input_str) {
2587
-            $input_str = trim($input_str);
2588
-
2589
-            if (strpos($input_str, "/") !== false) {
2590
-                $input_str = explode("/", $input_str, 2);
2591
-                $label = trim($input_str[0]);
2592
-                if ($translated && $label != '') {
2593
-                    $label = __($label, 'geodirectory');
2594
-                }
2595
-                $label = geodir_utf8_ucfirst($label);
2596
-                $value = trim($input_str[1]);
2597
-            } else {
2598
-                $value = $input_str;
2599
-                if ($translated && $input_str != '') {
2600
-                    $input_str = __($input_str, 'geodirectory');
2601
-                }
2602
-                $label = geodir_utf8_ucfirst($input_str);
2603
-            }
2604
-
2605
-            if ($label != '') {
2606
-                $return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);
2607
-            }
2608
-        }
2609
-    }
2610
-
2611
-    return $return;
2575
+	$return = array();
2576
+	if ($input != '') {
2577
+		$input = trim($input);
2578
+		$input = rtrim($input, ",");
2579
+		$input = ltrim($input, ",");
2580
+		$input = trim($input);
2581
+	}
2582
+
2583
+	$input_arr = explode(',', $input);
2584
+
2585
+	if (!empty($input_arr)) {
2586
+		foreach ($input_arr as $input_str) {
2587
+			$input_str = trim($input_str);
2588
+
2589
+			if (strpos($input_str, "/") !== false) {
2590
+				$input_str = explode("/", $input_str, 2);
2591
+				$label = trim($input_str[0]);
2592
+				if ($translated && $label != '') {
2593
+					$label = __($label, 'geodirectory');
2594
+				}
2595
+				$label = geodir_utf8_ucfirst($label);
2596
+				$value = trim($input_str[1]);
2597
+			} else {
2598
+				$value = $input_str;
2599
+				if ($translated && $input_str != '') {
2600
+					$input_str = __($input_str, 'geodirectory');
2601
+				}
2602
+				$label = geodir_utf8_ucfirst($input_str);
2603
+			}
2604
+
2605
+			if ($label != '') {
2606
+				$return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);
2607
+			}
2608
+		}
2609
+	}
2610
+
2611
+	return $return;
2612 2612
 }
2613 2613
 
2614 2614
 /**
@@ -2623,66 +2623,66 @@  discard block
 block discarded – undo
2623 2623
  */
2624 2624
 function geodir_string_values_to_options($option_values = '', $translated = false)
2625 2625
 {
2626
-    $options = array();
2627
-    if ($option_values == '') {
2628
-        return NULL;
2629
-    }
2630
-
2631
-    if (strpos($option_values, "{/optgroup}") !== false) {
2632
-        $option_values_arr = explode("{/optgroup}", $option_values);
2633
-
2634
-        foreach ($option_values_arr as $optgroup) {
2635
-            if (strpos($optgroup, "{optgroup}") !== false) {
2636
-                $optgroup_arr = explode("{optgroup}", $optgroup);
2637
-
2638
-                $count = 0;
2639
-                foreach ($optgroup_arr as $optgroup_str) {
2640
-                    $count++;
2641
-                    $optgroup_str = trim($optgroup_str);
2642
-
2643
-                    $optgroup_label = '';
2644
-                    if (strpos($optgroup_str, "|") !== false) {
2645
-                        $optgroup_str_arr = explode("|", $optgroup_str, 2);
2646
-                        $optgroup_label = trim($optgroup_str_arr[0]);
2647
-                        if ($translated && $optgroup_label != '') {
2648
-                            $optgroup_label = __($optgroup_label, 'geodirectory');
2649
-                        }
2650
-                        $optgroup_label = geodir_utf8_ucfirst($optgroup_label);
2651
-                        $optgroup_str = $optgroup_str_arr[1];
2652
-                    }
2653
-
2654
-                    $optgroup3 = geodir_string_to_options($optgroup_str, $translated);
2655
-
2656
-                    if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {
2657
-                        $optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));
2658
-                        $optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));
2659
-                        $optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end);
2660
-                    }
2661
-                    $options = array_merge($options, $optgroup3);
2662
-                }
2663
-            } else {
2664
-                $optgroup1 = geodir_string_to_options($optgroup, $translated);
2665
-                $options = array_merge($options, $optgroup1);
2666
-            }
2667
-        }
2668
-    } else {
2669
-        $options = geodir_string_to_options($option_values, $translated);
2670
-    }
2671
-
2672
-    return $options;
2626
+	$options = array();
2627
+	if ($option_values == '') {
2628
+		return NULL;
2629
+	}
2630
+
2631
+	if (strpos($option_values, "{/optgroup}") !== false) {
2632
+		$option_values_arr = explode("{/optgroup}", $option_values);
2633
+
2634
+		foreach ($option_values_arr as $optgroup) {
2635
+			if (strpos($optgroup, "{optgroup}") !== false) {
2636
+				$optgroup_arr = explode("{optgroup}", $optgroup);
2637
+
2638
+				$count = 0;
2639
+				foreach ($optgroup_arr as $optgroup_str) {
2640
+					$count++;
2641
+					$optgroup_str = trim($optgroup_str);
2642
+
2643
+					$optgroup_label = '';
2644
+					if (strpos($optgroup_str, "|") !== false) {
2645
+						$optgroup_str_arr = explode("|", $optgroup_str, 2);
2646
+						$optgroup_label = trim($optgroup_str_arr[0]);
2647
+						if ($translated && $optgroup_label != '') {
2648
+							$optgroup_label = __($optgroup_label, 'geodirectory');
2649
+						}
2650
+						$optgroup_label = geodir_utf8_ucfirst($optgroup_label);
2651
+						$optgroup_str = $optgroup_str_arr[1];
2652
+					}
2653
+
2654
+					$optgroup3 = geodir_string_to_options($optgroup_str, $translated);
2655
+
2656
+					if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {
2657
+						$optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));
2658
+						$optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));
2659
+						$optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end);
2660
+					}
2661
+					$options = array_merge($options, $optgroup3);
2662
+				}
2663
+			} else {
2664
+				$optgroup1 = geodir_string_to_options($optgroup, $translated);
2665
+				$options = array_merge($options, $optgroup1);
2666
+			}
2667
+		}
2668
+	} else {
2669
+		$options = geodir_string_to_options($option_values, $translated);
2670
+	}
2671
+
2672
+	return $options;
2673 2673
 }
2674 2674
 
2675 2675
 
2676 2676
 function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){
2677
-    ob_start();
2678
-
2679
-    $dt_value = '';
2680
-    if (isset($field_info->data_type)) {
2681
-        $dt_value  = esc_attr($field_info->data_type);
2682
-    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
2683
-        $dt_value  = $cf['defaults']['data_type'];
2684
-    }
2685
-    ?>
2677
+	ob_start();
2678
+
2679
+	$dt_value = '';
2680
+	if (isset($field_info->data_type)) {
2681
+		$dt_value  = esc_attr($field_info->data_type);
2682
+	}elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
2683
+		$dt_value  = $cf['defaults']['data_type'];
2684
+	}
2685
+	?>
2686 2686
     <li>
2687 2687
         <label for="data_type"><?php _e('Field Data Type ? :', 'geodirectory'); ?></label>
2688 2688
         <div class="gd-cf-input-wrap">
@@ -2691,16 +2691,16 @@  discard block
 block discarded – undo
2691 2691
                     onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');">
2692 2692
                 <option
2693 2693
                     value="XVARCHAR" <?php if ($dt_value  == 'VARCHAR') {
2694
-                    echo 'selected="selected"';
2695
-                } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
2694
+					echo 'selected="selected"';
2695
+				} ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
2696 2696
                 <option
2697 2697
                     value="INT" <?php if ($dt_value   == 'INT') {
2698
-                    echo 'selected="selected"';
2699
-                } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
2698
+					echo 'selected="selected"';
2699
+				} ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
2700 2700
                 <option
2701 2701
                     value="FLOAT" <?php if ($dt_value   == 'FLOAT') {
2702
-                    echo 'selected="selected"';
2703
-                } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
2702
+					echo 'selected="selected"';
2703
+				} ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
2704 2704
             </select>
2705 2705
             <br/> <span><?php _e('Select Custom Field type', 'geodirectory'); ?></span>
2706 2706
 
@@ -2708,13 +2708,13 @@  discard block
 block discarded – undo
2708 2708
     </li>
2709 2709
 
2710 2710
     <?php
2711
-    $value = '';
2712
-    if (isset($field_info->decimal_point)) {
2713
-        $value = esc_attr($field_info->decimal_point);
2714
-    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
2715
-        $value = $cf['defaults']['decimal_point'];
2716
-    }
2717
-    ?>
2711
+	$value = '';
2712
+	if (isset($field_info->decimal_point)) {
2713
+		$value = esc_attr($field_info->decimal_point);
2714
+	}elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
2715
+		$value = $cf['defaults']['decimal_point'];
2716
+	}
2717
+	?>
2718 2718
 
2719 2719
     <li class="decimal-point-wrapper"
2720 2720
         style="<?php echo ($dt_value  == 'FLOAT') ? '' : 'display:none' ?>">
@@ -2723,7 +2723,7 @@  discard block
 block discarded – undo
2723 2723
             <select name="decimal_point" id="decimal_point">
2724 2724
                 <option value=""><?php echo _e('Select', 'geodirectory'); ?></option>
2725 2725
                 <?php for ($i = 1; $i <= 10; $i++) {
2726
-                    $selected = $i == $value ? 'selected="selected"' : ''; ?>
2726
+					$selected = $i == $value ? 'selected="selected"' : ''; ?>
2727 2727
                     <option value="<?php echo $i; ?>" <?php echo $selected; ?>><?php echo $i; ?></option>
2728 2728
                 <?php } ?>
2729 2729
             </select>
@@ -2732,8 +2732,8 @@  discard block
 block discarded – undo
2732 2732
     </li>
2733 2733
 <?php
2734 2734
 
2735
-    $output = ob_get_clean();
2736
-    return $output;
2735
+	$output = ob_get_clean();
2736
+	return $output;
2737 2737
 }
2738 2738
 add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);
2739 2739
 
@@ -2769,9 +2769,9 @@  discard block
 block discarded – undo
2769 2769
 
2770 2770
 
2771 2771
 function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){
2772
-    if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
2773
-    ob_start();
2774
-    ?>
2772
+	if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
2773
+	ob_start();
2774
+	?>
2775 2775
     <li>
2776 2776
         <label for="advanced_editor" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show advanced editor :', 'geodirectory'); ?>
2777 2777
             <div class="gdcf-tooltip">
@@ -2782,13 +2782,13 @@  discard block
 block discarded – undo
2782 2782
         <div class="gd-cf-input-wrap">
2783 2783
 
2784 2784
             <?php
2785
-            $selected = '';
2786
-            if (isset($field_info->extra_fields))
2787
-                $advanced_editor = unserialize($field_info->extra_fields);
2785
+			$selected = '';
2786
+			if (isset($field_info->extra_fields))
2787
+				$advanced_editor = unserialize($field_info->extra_fields);
2788 2788
 
2789
-            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
2790
-                $selected = 'checked="checked"';
2791
-            ?>
2789
+			if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))
2790
+				$selected = 'checked="checked"';
2791
+			?>
2792 2792
 
2793 2793
             <input type="checkbox" name="advanced_editor[]" id="advanced_editor"
2794 2794
                    value="1" <?php echo $selected; ?>/>
@@ -2797,22 +2797,22 @@  discard block
 block discarded – undo
2797 2797
     </li>
2798 2798
     <?php
2799 2799
 
2800
-    $output = ob_get_clean();
2801
-    return $output;
2800
+	$output = ob_get_clean();
2801
+	return $output;
2802 2802
 }
2803 2803
 add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);
2804 2804
 
2805 2805
 
2806 2806
 function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){
2807
-    ob_start();
2808
-
2809
-    $value = '';
2810
-    if (isset($field_info->validation_pattern)) {
2811
-        $value = esc_attr($field_info->validation_pattern);
2812
-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
2813
-        $value = esc_attr($cf['defaults']['validation_pattern']);
2814
-    }
2815
-    ?>
2807
+	ob_start();
2808
+
2809
+	$value = '';
2810
+	if (isset($field_info->validation_pattern)) {
2811
+		$value = esc_attr($field_info->validation_pattern);
2812
+	}elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
2813
+		$value = esc_attr($cf['defaults']['validation_pattern']);
2814
+	}
2815
+	?>
2816 2816
     <li>
2817 2817
         <label for="validation_pattern" class="gd-cf-tooltip-wrap">
2818 2818
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Pattern:', 'geodirectory'); ?>
@@ -2826,13 +2826,13 @@  discard block
 block discarded – undo
2826 2826
         </div>
2827 2827
     </li>
2828 2828
     <?php
2829
-    $value = '';
2830
-    if (isset($field_info->validation_msg)) {
2831
-        $value = esc_attr($field_info->validation_msg);
2832
-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
2833
-        $value = esc_attr($cf['defaults']['validation_msg']);
2834
-    }
2835
-    ?>
2829
+	$value = '';
2830
+	if (isset($field_info->validation_msg)) {
2831
+		$value = esc_attr($field_info->validation_msg);
2832
+	}elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
2833
+		$value = esc_attr($cf['defaults']['validation_msg']);
2834
+	}
2835
+	?>
2836 2836
     <li>
2837 2837
         <label for="validation_msg" class="gd-cf-tooltip-wrap">
2838 2838
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Message:', 'geodirectory'); ?>
@@ -2847,21 +2847,21 @@  discard block
 block discarded – undo
2847 2847
     </li>
2848 2848
     <?php
2849 2849
 
2850
-    $output = ob_get_clean();
2851
-    return $output;
2850
+	$output = ob_get_clean();
2851
+	return $output;
2852 2852
 }
2853 2853
 add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);
2854 2854
 
2855 2855
 
2856 2856
 function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){
2857
-    ob_start();
2858
-    global $post_type;
2859
-
2860
-    if (!isset($field_info->post_type)) {
2861
-        $post_type = sanitize_text_field($_REQUEST['listing_type']);
2862
-    } else
2863
-        $post_type = $field_info->post_type;
2864
-    ?>
2857
+	ob_start();
2858
+	global $post_type;
2859
+
2860
+	if (!isset($field_info->post_type)) {
2861
+		$post_type = sanitize_text_field($_REQUEST['listing_type']);
2862
+	} else
2863
+		$post_type = $field_info->post_type;
2864
+	?>
2865 2865
     <li style="display: none;">
2866 2866
         <label for="htmlvar_name" class="gd-cf-tooltip-wrap">
2867 2867
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Select taxonomy:', 'geodirectory'); ?>
@@ -2872,15 +2872,15 @@  discard block
 block discarded – undo
2872 2872
         <div class="gd-cf-input-wrap">
2873 2873
             <select name="htmlvar_name" id="htmlvar_name">
2874 2874
                 <?php
2875
-                $gd_taxonomy = geodir_get_taxonomies($post_type);
2875
+				$gd_taxonomy = geodir_get_taxonomies($post_type);
2876 2876
 
2877
-                foreach ($gd_taxonomy as $gd_tax) {
2878
-                    ?>
2877
+				foreach ($gd_taxonomy as $gd_tax) {
2878
+					?>
2879 2879
                     <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {
2880
-                        echo 'selected="selected"';
2881
-                    }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php
2882
-                }
2883
-                ?>
2880
+						echo 'selected="selected"';
2881
+					}?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php
2882
+				}
2883
+				?>
2884 2884
             </select>
2885 2885
         </div>
2886 2886
     </li>
@@ -2896,49 +2896,49 @@  discard block
 block discarded – undo
2896 2896
 
2897 2897
             <select name="cat_display_type" id="cat_display_type">
2898 2898
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {
2899
-                    echo 'selected="selected"';
2900
-                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
2899
+					echo 'selected="selected"';
2900
+				}?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
2901 2901
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
2902
-                    echo 'selected="selected"';
2903
-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
2902
+					echo 'selected="selected"';
2903
+				}?> value="select"><?php _e('Select', 'geodirectory');?></option>
2904 2904
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {
2905
-                    echo 'selected="selected"';
2906
-                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
2905
+					echo 'selected="selected"';
2906
+				}?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
2907 2907
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
2908
-                    echo 'selected="selected"';
2909
-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
2908
+					echo 'selected="selected"';
2909
+				}?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
2910 2910
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
2911
-                    echo 'selected="selected"';
2912
-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
2911
+					echo 'selected="selected"';
2912
+				}?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
2913 2913
             </select>
2914 2914
         </div>
2915 2915
     </li>
2916 2916
     <?php
2917 2917
 
2918
-    $output = ob_get_clean();
2919
-    return $output;
2918
+	$output = ob_get_clean();
2919
+	return $output;
2920 2920
 }
2921 2921
 add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);
2922 2922
 
2923 2923
 
2924 2924
 function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){
2925 2925
 
2926
-    ob_start();
2927
-    if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
2928
-        $address = stripslashes_deep(unserialize($field_info->extra_fields));
2929
-    }
2926
+	ob_start();
2927
+	if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
2928
+		$address = stripslashes_deep(unserialize($field_info->extra_fields));
2929
+	}
2930 2930
 
2931
-    $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);
2932
-    ?>
2931
+	$radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);
2932
+	?>
2933 2933
     <?php
2934
-    /**
2935
-     * Called on the add custom fields settings page before the address field is output.
2936
-     *
2937
-     * @since 1.0.0
2938
-     * @param array $address The address settings array.
2939
-     * @param object $field_info Extra fields info.
2940
-     */
2941
-    do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>
2934
+	/**
2935
+	 * Called on the add custom fields settings page before the address field is output.
2936
+	 *
2937
+	 * @since 1.0.0
2938
+	 * @param array $address The address settings array.
2939
+	 * @param object $field_info Extra fields info.
2940
+	 */
2941
+	do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>
2942 2942
 
2943 2943
     <li>
2944 2944
         <label for="show_zip" class="gd-cf-tooltip-wrap">
@@ -2951,14 +2951,14 @@  discard block
 block discarded – undo
2951 2951
 
2952 2952
             <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled"  value="1"
2953 2953
                 <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {
2954
-                    echo 'checked';
2955
-                } ?>/>
2954
+					echo 'checked';
2955
+				} ?>/>
2956 2956
             <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2957 2957
 
2958 2958
             <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0"
2959 2959
                 <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {
2960
-                    echo 'checked';
2961
-                } ?>/>
2960
+					echo 'checked';
2961
+				} ?>/>
2962 2962
             <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2963 2963
 
2964 2964
 
@@ -2975,8 +2975,8 @@  discard block
 block discarded – undo
2975 2975
         <div class="gd-cf-input-wrap">
2976 2976
             <input type="text" name="extra[zip_lable]" id="zip_lable"
2977 2977
                    value="<?php if (isset($address['zip_lable'])) {
2978
-                       echo esc_attr($address['zip_lable']);
2979
-                   }?>"/>
2978
+					   echo esc_attr($address['zip_lable']);
2979
+				   }?>"/>
2980 2980
         </div>
2981 2981
     </li>
2982 2982
 
@@ -2993,8 +2993,8 @@  discard block
 block discarded – undo
2993 2993
         <div class="gd-cf-input-wrap">
2994 2994
             <input type="text" name="extra[map_lable]" id="map_lable"
2995 2995
                    value="<?php if (isset($address['map_lable'])) {
2996
-                       echo esc_attr($address['map_lable']);
2997
-                   }?>"/>
2996
+					   echo esc_attr($address['map_lable']);
2997
+				   }?>"/>
2998 2998
         </div>
2999 2999
     </li>
3000 3000
 
@@ -3009,14 +3009,14 @@  discard block
 block discarded – undo
3009 3009
 
3010 3010
             <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"
3011 3011
                 <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {
3012
-                    echo 'checked';
3013
-                } ?>/>
3012
+					echo 'checked';
3013
+				} ?>/>
3014 3014
             <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3015 3015
 
3016 3016
             <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"
3017 3017
                 <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {
3018
-                    echo 'checked';
3019
-                } ?>/>
3018
+					echo 'checked';
3019
+				} ?>/>
3020 3020
             <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3021 3021
 
3022 3022
         </div>
@@ -3033,14 +3033,14 @@  discard block
 block discarded – undo
3033 3033
 
3034 3034
             <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"
3035 3035
                 <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {
3036
-                    echo 'checked';
3037
-                } ?>/>
3036
+					echo 'checked';
3037
+				} ?>/>
3038 3038
             <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3039 3039
 
3040 3040
             <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0"
3041 3041
                 <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {
3042
-                    echo 'checked';
3043
-                } ?>/>
3042
+					echo 'checked';
3043
+				} ?>/>
3044 3044
             <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3045 3045
 
3046 3046
         </div>
@@ -3057,8 +3057,8 @@  discard block
 block discarded – undo
3057 3057
         <div class="gd-cf-input-wrap">
3058 3058
             <input type="text" name="extra[mapview_lable]" id="mapview_lable"
3059 3059
                    value="<?php if (isset($address['mapview_lable'])) {
3060
-                       echo esc_attr($address['mapview_lable']);
3061
-                   }?>"/>
3060
+					   echo esc_attr($address['mapview_lable']);
3061
+				   }?>"/>
3062 3062
         </div>
3063 3063
     </li>
3064 3064
     <li>
@@ -3072,29 +3072,29 @@  discard block
 block discarded – undo
3072 3072
 
3073 3073
             <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"
3074 3074
                 <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {
3075
-                    echo 'checked';
3076
-                } ?>/>
3075
+					echo 'checked';
3076
+				} ?>/>
3077 3077
             <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3078 3078
 
3079 3079
             <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0"
3080 3080
                 <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {
3081
-                    echo 'checked';
3082
-                } ?>/>
3081
+					echo 'checked';
3082
+				} ?>/>
3083 3083
             <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3084 3084
 
3085 3085
         </div>
3086 3086
     </li>
3087 3087
     <?php
3088 3088
 
3089
-    $html = ob_get_clean();
3090
-    return $output.$html;
3089
+	$html = ob_get_clean();
3090
+	return $output.$html;
3091 3091
 }
3092 3092
 add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);
3093 3093
 
3094 3094
 
3095 3095
 function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){
3096
-    ob_start();
3097
-    ?>
3096
+	ob_start();
3097
+	?>
3098 3098
     <li>
3099 3099
         <label for="multi_display_type" class="gd-cf-tooltip-wrap">
3100 3100
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>
@@ -3106,14 +3106,14 @@  discard block
 block discarded – undo
3106 3106
 
3107 3107
             <select name="multi_display_type" id="multi_display_type">
3108 3108
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
3109
-                    echo 'selected="selected"';
3110
-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
3109
+					echo 'selected="selected"';
3110
+				}?> value="select"><?php _e('Select', 'geodirectory');?></option>
3111 3111
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
3112
-                    echo 'selected="selected"';
3113
-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
3112
+					echo 'selected="selected"';
3113
+				}?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
3114 3114
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
3115
-                    echo 'selected="selected"';
3116
-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
3115
+					echo 'selected="selected"';
3116
+				}?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
3117 3117
             </select>
3118 3118
 
3119 3119
             <br/>
@@ -3121,25 +3121,25 @@  discard block
 block discarded – undo
3121 3121
     </li>
3122 3122
     <?php
3123 3123
 
3124
-    $html = ob_get_clean();
3125
-    return $output.$html;
3124
+	$html = ob_get_clean();
3125
+	return $output.$html;
3126 3126
 }
3127 3127
 add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);
3128 3128
 
3129 3129
 
3130 3130
 function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){
3131 3131
 
3132
-    ob_start();
3132
+	ob_start();
3133 3133
 
3134
-    $value = '';
3135
-    if (isset($field_info->option_values)) {
3136
-        $value = esc_attr($field_info->option_values);
3137
-    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
3138
-        $value = esc_attr($cf['defaults']['option_values']);
3139
-    }
3134
+	$value = '';
3135
+	if (isset($field_info->option_values)) {
3136
+		$value = esc_attr($field_info->option_values);
3137
+	}elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
3138
+		$value = esc_attr($cf['defaults']['option_values']);
3139
+	}
3140 3140
 
3141
-    $field_type = isset($field_info->field_type) ? $field_info->field_type : '';
3142
-    ?>
3141
+	$field_type = isset($field_info->field_type) ? $field_info->field_type : '';
3142
+	?>
3143 3143
     <li>
3144 3144
         <label for="option_values" class="gd-cf-tooltip-wrap">
3145 3145
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>
@@ -3166,8 +3166,8 @@  discard block
 block discarded – undo
3166 3166
     </li>
3167 3167
     <?php
3168 3168
 
3169
-    $html = ob_get_clean();
3170
-    return $output.$html;
3169
+	$html = ob_get_clean();
3170
+	return $output.$html;
3171 3171
 }
3172 3172
 add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);
3173 3173
 add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);
@@ -3175,12 +3175,12 @@  discard block
 block discarded – undo
3175 3175
 
3176 3176
 
3177 3177
 function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){
3178
-    ob_start();
3179
-    $extra = array();
3180
-    if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
3181
-        $extra = unserialize($field_info->extra_fields);
3182
-    }
3183
-    ?>
3178
+	ob_start();
3179
+	$extra = array();
3180
+	if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
3181
+		$extra = unserialize($field_info->extra_fields);
3182
+	}
3183
+	?>
3184 3184
     <li>
3185 3185
         <label for="date_format" class="gd-cf-tooltip-wrap">
3186 3186
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>
@@ -3190,52 +3190,52 @@  discard block
 block discarded – undo
3190 3190
         </label>
3191 3191
         <div class="gd-cf-input-wrap" style="overflow:inherit;">
3192 3192
             <?php
3193
-            $date_formats = array(
3194
-                'm/d/Y',
3195
-                'd/m/Y',
3196
-                'Y/m/d',
3197
-                'm-d-Y',
3198
-                'd-m-Y',
3199
-                'Y-m-d',
3200
-                'F j, Y',
3201
-            );
3202
-            /**
3203
-             * Filter the custom field date format options.
3204
-             *
3205
-             * @since 1.6.5
3206
-             * @param array $date_formats The PHP date format array.
3207
-             */
3208
-            $date_formats = apply_filters('geodir_date_formats',$date_formats);
3209
-            ?>
3193
+			$date_formats = array(
3194
+				'm/d/Y',
3195
+				'd/m/Y',
3196
+				'Y/m/d',
3197
+				'm-d-Y',
3198
+				'd-m-Y',
3199
+				'Y-m-d',
3200
+				'F j, Y',
3201
+			);
3202
+			/**
3203
+			 * Filter the custom field date format options.
3204
+			 *
3205
+			 * @since 1.6.5
3206
+			 * @param array $date_formats The PHP date format array.
3207
+			 */
3208
+			$date_formats = apply_filters('geodir_date_formats',$date_formats);
3209
+			?>
3210 3210
             <select name="extra[date_format]" id="date_format">
3211 3211
                 <?php
3212
-                foreach($date_formats as $format){
3213
-                    $selected = '';
3214
-                    if(!empty($extra) && esc_attr($extra['date_format'])==$format){
3215
-                        $selected = "selected='selected'";
3216
-                    }
3217
-                    echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";
3218
-                }
3219
-                ?>
3212
+				foreach($date_formats as $format){
3213
+					$selected = '';
3214
+					if(!empty($extra) && esc_attr($extra['date_format'])==$format){
3215
+						$selected = "selected='selected'";
3216
+					}
3217
+					echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";
3218
+				}
3219
+				?>
3220 3220
             </select>
3221 3221
 
3222 3222
         </div>
3223 3223
     </li>
3224 3224
     <?php
3225 3225
 
3226
-    $html = ob_get_clean();
3227
-    return $output.$html;
3226
+	$html = ob_get_clean();
3227
+	return $output.$html;
3228 3228
 }
3229 3229
 add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);
3230 3230
 
3231 3231
 
3232 3232
 function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){
3233
-    ob_start();
3234
-    $allowed_file_types = geodir_allowed_mime_types();
3233
+	ob_start();
3234
+	$allowed_file_types = geodir_allowed_mime_types();
3235 3235
 
3236
-    $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';
3237
-    $gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');
3238
-    ?>
3236
+	$extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';
3237
+	$gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');
3238
+	?>
3239 3239
     <li>
3240 3240
         <label for="gd_file_types" class="gd-cf-tooltip-wrap">
3241 3241
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>
@@ -3258,33 +3258,33 @@  discard block
 block discarded – undo
3258 3258
     </li>
3259 3259
     <?php
3260 3260
 
3261
-    $html = ob_get_clean();
3262
-    return $output.$html;
3261
+	$html = ob_get_clean();
3262
+	return $output.$html;
3263 3263
 }
3264 3264
 add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);
3265 3265
 
3266 3266
 function geodir_cfa_extra_fields_text($output,$result_str,$cf,$field_info){
3267
-    ob_start();
3267
+	ob_start();
3268 3268
 
3269
-    $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';
3269
+	$extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';
3270 3270
    // print_r($cf);echo '###';
3271 3271
 
3272 3272
 
3273 3273
 
3274
-    $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);
3274
+	$radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);
3275 3275
 
3276 3276
 
3277
-    $value = '';
3278
-    if ($extra_fields && isset($extra_fields['is_price'])) {
3279
-    $value = esc_attr($extra_fields['is_price']);
3280
-    }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
3281
-    $value = esc_attr($cf['defaults']['extra_fields']['is_price']);
3282
-    }
3277
+	$value = '';
3278
+	if ($extra_fields && isset($extra_fields['is_price'])) {
3279
+	$value = esc_attr($extra_fields['is_price']);
3280
+	}elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
3281
+	$value = esc_attr($cf['defaults']['extra_fields']['is_price']);
3282
+	}
3283 3283
 
3284
-    $show_price_extra = ($value==1) ? 1 : 0;
3284
+	$show_price_extra = ($value==1) ? 1 : 0;
3285 3285
 
3286
-    $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0;
3287
-    ?>
3286
+	$show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0;
3287
+	?>
3288 3288
     <li class="gdcf-price-extra-set" <?php if(!$show_price){ echo "style='display:none;'";}?>>
3289 3289
         <label for="is_price" class="gd-cf-tooltip-wrap">
3290 3290
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display as price? :', 'geodirectory'); ?>
@@ -3296,14 +3296,14 @@  discard block
 block discarded – undo
3296 3296
 
3297 3297
             <input type="radio" id="is_price_yes<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-enabled"  value="1"
3298 3298
                 <?php if ($value == '1') {
3299
-                    echo 'checked';
3300
-                } ?>/>
3299
+					echo 'checked';
3300
+				} ?>/>
3301 3301
             <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3302 3302
 
3303 3303
             <input type="radio" id="is_price_no<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-disabled" value="0"
3304 3304
                 <?php if ($value == '0' || !$value) {
3305
-                    echo 'checked';
3306
-                } ?>/>
3305
+					echo 'checked';
3306
+				} ?>/>
3307 3307
             <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3308 3308
 
3309 3309
         </div>
@@ -3311,13 +3311,13 @@  discard block
 block discarded – undo
3311 3311
 
3312 3312
     <?php
3313 3313
 
3314
-    $value = '';
3315
-    if ($extra_fields && isset($extra_fields['thousand_separator'])) {
3316
-        $value = esc_attr($extra_fields['thousand_separator']);
3317
-    }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
3318
-        $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']);
3319
-    }
3320
-    ?>
3314
+	$value = '';
3315
+	if ($extra_fields && isset($extra_fields['thousand_separator'])) {
3316
+		$value = esc_attr($extra_fields['thousand_separator']);
3317
+	}elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
3318
+		$value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']);
3319
+	}
3320
+	?>
3321 3321
     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
3322 3322
         <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory');?>
3323 3323
             <div class="gdcf-tooltip">
@@ -3339,13 +3339,13 @@  discard block
 block discarded – undo
3339 3339
 
3340 3340
     <?php
3341 3341
 
3342
-    $value = '';
3343
-    if ($extra_fields && isset($extra_fields['decimal_separator'])) {
3344
-        $value = esc_attr($extra_fields['decimal_separator']);
3345
-    }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
3346
-        $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']);
3347
-    }
3348
-    ?>
3342
+	$value = '';
3343
+	if ($extra_fields && isset($extra_fields['decimal_separator'])) {
3344
+		$value = esc_attr($extra_fields['decimal_separator']);
3345
+	}elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
3346
+		$value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']);
3347
+	}
3348
+	?>
3349 3349
     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
3350 3350
         <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory');?>
3351 3351
             <div class="gdcf-tooltip">
@@ -3362,13 +3362,13 @@  discard block
 block discarded – undo
3362 3362
 
3363 3363
     <?php
3364 3364
 
3365
-    $value = '';
3366
-    if ($extra_fields && isset($extra_fields['decimal_display'])) {
3367
-        $value = esc_attr($extra_fields['decimal_display']);
3368
-    }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
3369
-        $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']);
3370
-    }
3371
-    ?>
3365
+	$value = '';
3366
+	if ($extra_fields && isset($extra_fields['decimal_display'])) {
3367
+		$value = esc_attr($extra_fields['decimal_display']);
3368
+	}elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
3369
+		$value = esc_attr($cf['defaults']['extra_fields']['decimal_display']);
3370
+	}
3371
+	?>
3372 3372
     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
3373 3373
         <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory');?>
3374 3374
             <div class="gdcf-tooltip">
@@ -3385,13 +3385,13 @@  discard block
 block discarded – undo
3385 3385
 
3386 3386
     <?php
3387 3387
 
3388
-    $value = '';
3389
-    if ($extra_fields && isset($extra_fields['currency_symbol'])) {
3390
-        $value = esc_attr($extra_fields['currency_symbol']);
3391
-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
3392
-        $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']);
3393
-    }
3394
-    ?>
3388
+	$value = '';
3389
+	if ($extra_fields && isset($extra_fields['currency_symbol'])) {
3390
+		$value = esc_attr($extra_fields['currency_symbol']);
3391
+	}elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
3392
+		$value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']);
3393
+	}
3394
+	?>
3395 3395
     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
3396 3396
         <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory');?>
3397 3397
             <div class="gdcf-tooltip">
@@ -3406,13 +3406,13 @@  discard block
 block discarded – undo
3406 3406
 
3407 3407
     <?php
3408 3408
 
3409
-    $value = '';
3410
-    if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
3411
-        $value = esc_attr($extra_fields['currency_symbol_placement']);
3412
-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
3413
-        $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']);
3414
-    }
3415
-    ?>
3409
+	$value = '';
3410
+	if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
3411
+		$value = esc_attr($extra_fields['currency_symbol_placement']);
3412
+	}elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
3413
+		$value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']);
3414
+	}
3415
+	?>
3416 3416
     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
3417 3417
         <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory');?>
3418 3418
             <div class="gdcf-tooltip">
@@ -3430,226 +3430,226 @@  discard block
 block discarded – undo
3430 3430
 
3431 3431
     <?php
3432 3432
 
3433
-    $html = ob_get_clean();
3434
-    return $output.$html;
3433
+	$html = ob_get_clean();
3434
+	return $output.$html;
3435 3435
 }
3436 3436
 add_filter('geodir_cfa_extra_fields_text','geodir_cfa_extra_fields_text',10,4);
3437 3437
 
3438 3438
 function geodir_default_custom_fields($post_type='gd_place',$package_id=''){
3439
-    $fields = array();
3440
-    $package = ($package_id=='') ? '' : array($package_id);
3441
-
3442
-    $fields[] = array('listing_type' => $post_type,
3443
-                      'data_type' => 'VARCHAR',
3444
-                      'field_type' => 'taxonomy',
3445
-                      'admin_title' => __('Category', 'geodirectory'),
3446
-                      'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),
3447
-                      'site_title' => __('Category', 'geodirectory'),
3448
-                      'htmlvar_name' => $post_type.'category',
3449
-                      'default_value' => '',
3450
-                      'is_default' => '1',
3451
-                      'is_admin' => '1',
3452
-                      'is_required' => '1',
3453
-                      'show_in'   =>  '[detail]',
3454
-                      'show_on_pkg' => $package,
3455
-                      'clabels' => __('Category', 'geodirectory'));
3456
-
3457
-    $fields[] = array('listing_type' => $post_type,
3458
-                      'data_type' => 'VARCHAR',
3459
-                      'field_type' => 'address',
3460
-                      'admin_title' => __('Address', 'geodirectory'),
3461
-                      'admin_desc' => ADDRESS_MSG,
3462
-                      'site_title' => __('Address', 'geodirectory'),
3463
-                      'htmlvar_name' => 'post',
3464
-                      'default_value' => '',
3465
-                      'option_values' => '',
3466
-                      'is_default' => '1',
3467
-                      'is_admin' => '1',
3468
-                      'is_required' => '1',
3469
-                      'show_in'   =>  '[detail],[mapbubble]',
3470
-                      'show_on_pkg' => $package,
3471
-                      'required_msg' => __('Address fields are required', 'geodirectory'),
3472
-                      'clabels' => __('Address', 'geodirectory'),
3473
-                      'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),
3474
-                                       'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),
3475
-                                       'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),
3476
-                                       'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),
3477
-                                       'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),
3478
-                                       'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),
3479
-                                       'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden',
3480
-                                       'show_latlng' => 1));
3481
-
3482
-    $fields[] = array('listing_type' => $post_type,
3483
-                      'data_type' => 'VARCHAR',
3484
-                      'field_type' => 'text',
3485
-                      'admin_title' => __('Time', 'geodirectory'),
3486
-                      'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),
3487
-                      'site_title' => __('Time', 'geodirectory'),
3488
-                      'htmlvar_name' => 'timing',
3489
-                      'default_value' => '',
3490
-                      'option_values' => '',
3491
-                      'is_default' => '1',
3492
-                      'is_admin' => '1',
3493
-                      'show_in' =>  '[detail],[mapbubble]',
3494
-                      'show_on_pkg' => $package,
3495
-                      'clabels' => __('Time', 'geodirectory'));
3496
-
3497
-    $fields[] = array('listing_type' => $post_type,
3498
-                      'data_type' => 'VARCHAR',
3499
-                      'field_type' => 'phone',
3500
-                      'admin_title' => __('Phone', 'geodirectory'),
3501
-                      'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),
3502
-                      'site_title' => __('Phone', 'geodirectory'),
3503
-                      'htmlvar_name' => 'contact',
3504
-                      'default_value' => '',
3505
-                      'option_values' => '',
3506
-                      'is_default' => '1',
3507
-                      'is_admin' => '1',
3508
-                      'show_in' =>  '[detail],[mapbubble]',
3509
-                      'show_on_pkg' => $package,
3510
-                      'clabels' => __('Phone', 'geodirectory'));
3511
-
3512
-    $fields[] = array('listing_type' => $post_type,
3513
-                      'data_type' => 'VARCHAR',
3514
-                      'field_type' => 'email',
3515
-                      'admin_title' => __('Email', 'geodirectory'),
3516
-                      'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),
3517
-                      'site_title' => __('Email', 'geodirectory'),
3518
-                      'htmlvar_name' => 'email',
3519
-                      'default_value' => '',
3520
-                      'option_values' => '',
3521
-                      'is_default' => '1',
3522
-                      'is_admin' => '1',
3523
-                      'show_in' => '[detail]',
3524
-                      'show_on_pkg' => $package,
3525
-                      'clabels' => __('Email', 'geodirectory'));
3526
-
3527
-    $fields[] = array('listing_type' => $post_type,
3528
-                      'data_type' => 'VARCHAR',
3529
-                      'field_type' => 'url',
3530
-                      'admin_title' => __('Website', 'geodirectory'),
3531
-                      'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),
3532
-                      'site_title' => __('Website', 'geodirectory'),
3533
-                      'htmlvar_name' => 'website',
3534
-                      'default_value' => '',
3535
-                      'option_values' => '',
3536
-                      'is_default' => '1',
3537
-                      'is_admin' => '1',
3538
-                      'show_in' => '[detail]',
3539
-                      'show_on_pkg' => $package,
3540
-                      'clabels' => __('Website', 'geodirectory'));
3541
-
3542
-    $fields[] = array('listing_type' => $post_type,
3543
-                      'data_type' => 'VARCHAR',
3544
-                      'field_type' => 'url',
3545
-                      'admin_title' => __('Twitter', 'geodirectory'),
3546
-                      'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),
3547
-                      'site_title' => __('Twitter', 'geodirectory'),
3548
-                      'htmlvar_name' => 'twitter',
3549
-                      'default_value' => '',
3550
-                      'option_values' => '',
3551
-                      'is_default' => '1',
3552
-                      'is_admin' => '1',
3553
-                      'show_in' => '[detail]',
3554
-                      'show_on_pkg' => $package,
3555
-                      'clabels' => __('Twitter', 'geodirectory'));
3556
-
3557
-    $fields[] = array('listing_type' => $post_type,
3558
-                      'data_type' => 'VARCHAR',
3559
-                      'field_type' => 'url',
3560
-                      'admin_title' => __('Facebook', 'geodirectory'),
3561
-                      'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),
3562
-                      'site_title' => __('Facebook', 'geodirectory'),
3563
-                      'htmlvar_name' => 'facebook',
3564
-                      'default_value' => '',
3565
-                      'option_values' => '',
3566
-                      'is_default' => '1',
3567
-                      'is_admin' => '1',
3568
-                      'show_in' => '[detail]',
3569
-                      'show_on_pkg' => $package,
3570
-                      'clabels' => __('Facebook', 'geodirectory'));
3571
-
3572
-    $fields[] = array('listing_type' => $post_type,
3573
-                      'data_type' => 'TEXT',
3574
-                      'field_type' => 'textarea',
3575
-                      'admin_title' => __('Video', 'geodirectory'),
3576
-                      'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),
3577
-                      'site_title' => __('Video', 'geodirectory'),
3578
-                      'htmlvar_name' => 'video',
3579
-                      'default_value' => '',
3580
-                      'option_values' => '',
3581
-                      'is_default' => '0',
3582
-                      'is_admin' => '1',
3583
-                      'show_in' => '[owntab]',
3584
-                      'show_on_pkg' => $package,
3585
-                      'clabels' => __('Video', 'geodirectory'));
3586
-
3587
-    $fields[] = array('listing_type' => $post_type,
3588
-                      'data_type' => 'TEXT',
3589
-                      'field_type' => 'textarea',
3590
-                      'admin_title' => __('Special Offers', 'geodirectory'),
3591
-                      'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),
3592
-                      'site_title' => __('Special Offers', 'geodirectory'),
3593
-                      'htmlvar_name' => 'special_offers',
3594
-                      'default_value' => '',
3595
-                      'option_values' => '',
3596
-                      'is_default' => '0',
3597
-                      'is_admin' => '1',
3598
-                      'show_in' => '[owntab]',
3599
-                      'show_on_pkg' => $package,
3600
-                      'clabels' => __('Special Offers', 'geodirectory'));
3601
-
3602
-    /**
3603
-     * Filter the array of default custom fields DB table data.
3604
-     *
3605
-     * @since 1.6.6
3606
-     * @param string $fields The default custom fields as an array.
3607
-     */
3608
-    $fields = apply_filters('geodir_default_custom_fields', $fields);
3609
-
3610
-    return  $fields;
3439
+	$fields = array();
3440
+	$package = ($package_id=='') ? '' : array($package_id);
3441
+
3442
+	$fields[] = array('listing_type' => $post_type,
3443
+					  'data_type' => 'VARCHAR',
3444
+					  'field_type' => 'taxonomy',
3445
+					  'admin_title' => __('Category', 'geodirectory'),
3446
+					  'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),
3447
+					  'site_title' => __('Category', 'geodirectory'),
3448
+					  'htmlvar_name' => $post_type.'category',
3449
+					  'default_value' => '',
3450
+					  'is_default' => '1',
3451
+					  'is_admin' => '1',
3452
+					  'is_required' => '1',
3453
+					  'show_in'   =>  '[detail]',
3454
+					  'show_on_pkg' => $package,
3455
+					  'clabels' => __('Category', 'geodirectory'));
3456
+
3457
+	$fields[] = array('listing_type' => $post_type,
3458
+					  'data_type' => 'VARCHAR',
3459
+					  'field_type' => 'address',
3460
+					  'admin_title' => __('Address', 'geodirectory'),
3461
+					  'admin_desc' => ADDRESS_MSG,
3462
+					  'site_title' => __('Address', 'geodirectory'),
3463
+					  'htmlvar_name' => 'post',
3464
+					  'default_value' => '',
3465
+					  'option_values' => '',
3466
+					  'is_default' => '1',
3467
+					  'is_admin' => '1',
3468
+					  'is_required' => '1',
3469
+					  'show_in'   =>  '[detail],[mapbubble]',
3470
+					  'show_on_pkg' => $package,
3471
+					  'required_msg' => __('Address fields are required', 'geodirectory'),
3472
+					  'clabels' => __('Address', 'geodirectory'),
3473
+					  'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),
3474
+									   'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),
3475
+									   'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),
3476
+									   'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),
3477
+									   'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),
3478
+									   'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),
3479
+									   'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden',
3480
+									   'show_latlng' => 1));
3481
+
3482
+	$fields[] = array('listing_type' => $post_type,
3483
+					  'data_type' => 'VARCHAR',
3484
+					  'field_type' => 'text',
3485
+					  'admin_title' => __('Time', 'geodirectory'),
3486
+					  'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),
3487
+					  'site_title' => __('Time', 'geodirectory'),
3488
+					  'htmlvar_name' => 'timing',
3489
+					  'default_value' => '',
3490
+					  'option_values' => '',
3491
+					  'is_default' => '1',
3492
+					  'is_admin' => '1',
3493
+					  'show_in' =>  '[detail],[mapbubble]',
3494
+					  'show_on_pkg' => $package,
3495
+					  'clabels' => __('Time', 'geodirectory'));
3496
+
3497
+	$fields[] = array('listing_type' => $post_type,
3498
+					  'data_type' => 'VARCHAR',
3499
+					  'field_type' => 'phone',
3500
+					  'admin_title' => __('Phone', 'geodirectory'),
3501
+					  'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),
3502
+					  'site_title' => __('Phone', 'geodirectory'),
3503
+					  'htmlvar_name' => 'contact',
3504
+					  'default_value' => '',
3505
+					  'option_values' => '',
3506
+					  'is_default' => '1',
3507
+					  'is_admin' => '1',
3508
+					  'show_in' =>  '[detail],[mapbubble]',
3509
+					  'show_on_pkg' => $package,
3510
+					  'clabels' => __('Phone', 'geodirectory'));
3511
+
3512
+	$fields[] = array('listing_type' => $post_type,
3513
+					  'data_type' => 'VARCHAR',
3514
+					  'field_type' => 'email',
3515
+					  'admin_title' => __('Email', 'geodirectory'),
3516
+					  'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),
3517
+					  'site_title' => __('Email', 'geodirectory'),
3518
+					  'htmlvar_name' => 'email',
3519
+					  'default_value' => '',
3520
+					  'option_values' => '',
3521
+					  'is_default' => '1',
3522
+					  'is_admin' => '1',
3523
+					  'show_in' => '[detail]',
3524
+					  'show_on_pkg' => $package,
3525
+					  'clabels' => __('Email', 'geodirectory'));
3526
+
3527
+	$fields[] = array('listing_type' => $post_type,
3528
+					  'data_type' => 'VARCHAR',
3529
+					  'field_type' => 'url',
3530
+					  'admin_title' => __('Website', 'geodirectory'),
3531
+					  'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),
3532
+					  'site_title' => __('Website', 'geodirectory'),
3533
+					  'htmlvar_name' => 'website',
3534
+					  'default_value' => '',
3535
+					  'option_values' => '',
3536
+					  'is_default' => '1',
3537
+					  'is_admin' => '1',
3538
+					  'show_in' => '[detail]',
3539
+					  'show_on_pkg' => $package,
3540
+					  'clabels' => __('Website', 'geodirectory'));
3541
+
3542
+	$fields[] = array('listing_type' => $post_type,
3543
+					  'data_type' => 'VARCHAR',
3544
+					  'field_type' => 'url',
3545
+					  'admin_title' => __('Twitter', 'geodirectory'),
3546
+					  'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),
3547
+					  'site_title' => __('Twitter', 'geodirectory'),
3548
+					  'htmlvar_name' => 'twitter',
3549
+					  'default_value' => '',
3550
+					  'option_values' => '',
3551
+					  'is_default' => '1',
3552
+					  'is_admin' => '1',
3553
+					  'show_in' => '[detail]',
3554
+					  'show_on_pkg' => $package,
3555
+					  'clabels' => __('Twitter', 'geodirectory'));
3556
+
3557
+	$fields[] = array('listing_type' => $post_type,
3558
+					  'data_type' => 'VARCHAR',
3559
+					  'field_type' => 'url',
3560
+					  'admin_title' => __('Facebook', 'geodirectory'),
3561
+					  'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),
3562
+					  'site_title' => __('Facebook', 'geodirectory'),
3563
+					  'htmlvar_name' => 'facebook',
3564
+					  'default_value' => '',
3565
+					  'option_values' => '',
3566
+					  'is_default' => '1',
3567
+					  'is_admin' => '1',
3568
+					  'show_in' => '[detail]',
3569
+					  'show_on_pkg' => $package,
3570
+					  'clabels' => __('Facebook', 'geodirectory'));
3571
+
3572
+	$fields[] = array('listing_type' => $post_type,
3573
+					  'data_type' => 'TEXT',
3574
+					  'field_type' => 'textarea',
3575
+					  'admin_title' => __('Video', 'geodirectory'),
3576
+					  'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),
3577
+					  'site_title' => __('Video', 'geodirectory'),
3578
+					  'htmlvar_name' => 'video',
3579
+					  'default_value' => '',
3580
+					  'option_values' => '',
3581
+					  'is_default' => '0',
3582
+					  'is_admin' => '1',
3583
+					  'show_in' => '[owntab]',
3584
+					  'show_on_pkg' => $package,
3585
+					  'clabels' => __('Video', 'geodirectory'));
3586
+
3587
+	$fields[] = array('listing_type' => $post_type,
3588
+					  'data_type' => 'TEXT',
3589
+					  'field_type' => 'textarea',
3590
+					  'admin_title' => __('Special Offers', 'geodirectory'),
3591
+					  'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),
3592
+					  'site_title' => __('Special Offers', 'geodirectory'),
3593
+					  'htmlvar_name' => 'special_offers',
3594
+					  'default_value' => '',
3595
+					  'option_values' => '',
3596
+					  'is_default' => '0',
3597
+					  'is_admin' => '1',
3598
+					  'show_in' => '[owntab]',
3599
+					  'show_on_pkg' => $package,
3600
+					  'clabels' => __('Special Offers', 'geodirectory'));
3601
+
3602
+	/**
3603
+	 * Filter the array of default custom fields DB table data.
3604
+	 *
3605
+	 * @since 1.6.6
3606
+	 * @param string $fields The default custom fields as an array.
3607
+	 */
3608
+	$fields = apply_filters('geodir_default_custom_fields', $fields);
3609
+
3610
+	return  $fields;
3611 3611
 }
3612 3612
 
3613 3613
 function geodir_currency_format_number($number='',$cf=''){
3614 3614
 
3615
-    $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : '';
3615
+	$cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : '';
3616 3616
 
3617
-    $symbol = isset($cs['currency_symbol']) ? $cs['currency_symbol'] : '$';
3618
-    $decimals = isset($cf['decimal_point']) && $cf['decimal_point'] ? $cf['decimal_point'] : 2;
3619
-    $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if');
3620
-    $decimalpoint = '.';
3617
+	$symbol = isset($cs['currency_symbol']) ? $cs['currency_symbol'] : '$';
3618
+	$decimals = isset($cf['decimal_point']) && $cf['decimal_point'] ? $cf['decimal_point'] : 2;
3619
+	$decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if');
3620
+	$decimalpoint = '.';
3621 3621
 
3622
-    if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){
3623
-        $decimalpoint = ',';
3624
-    }
3622
+	if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){
3623
+		$decimalpoint = ',';
3624
+	}
3625 3625
 
3626
-    $separator = ',';
3626
+	$separator = ',';
3627 3627
 
3628
-    if(isset($cs['thousand_separator'])){
3629
-        if($cs['thousand_separator']=='comma'){$separator = ',';}
3630
-        if($cs['thousand_separator']=='slash'){$separator = '\\';}
3631
-        if($cs['thousand_separator']=='period'){$separator = '.';}
3632
-        if($cs['thousand_separator']=='space'){$separator = ' ';}
3633
-        if($cs['thousand_separator']=='apostrophe'){$separator = "'";}
3634
-        if($cs['thousand_separator']=='none'){$separator = '';}
3635
-    }
3628
+	if(isset($cs['thousand_separator'])){
3629
+		if($cs['thousand_separator']=='comma'){$separator = ',';}
3630
+		if($cs['thousand_separator']=='slash'){$separator = '\\';}
3631
+		if($cs['thousand_separator']=='period'){$separator = '.';}
3632
+		if($cs['thousand_separator']=='space'){$separator = ' ';}
3633
+		if($cs['thousand_separator']=='apostrophe'){$separator = "'";}
3634
+		if($cs['thousand_separator']=='none'){$separator = '';}
3635
+	}
3636 3636
 
3637
-    $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';
3637
+	$currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';
3638 3638
 
3639
-    if($decimals>0 && $decimal_display=='if'){
3640
-        if(is_int($number) || floor( $number ) == $number)
3641
-            $decimals = 0;
3642
-    }
3639
+	if($decimals>0 && $decimal_display=='if'){
3640
+		if(is_int($number) || floor( $number ) == $number)
3641
+			$decimals = 0;
3642
+	}
3643 3643
 
3644
-    $number = number_format($number,$decimals,$decimalpoint,$separator);
3644
+	$number = number_format($number,$decimals,$decimalpoint,$separator);
3645 3645
 
3646 3646
 
3647 3647
 
3648
-    if($currency_symbol_placement=='left'){
3649
-        $number = $symbol . $number;
3650
-    }else{
3651
-        $number = $number . $symbol;
3652
-    }
3648
+	if($currency_symbol_placement=='left'){
3649
+		$number = $symbol . $number;
3650
+	}else{
3651
+		$number = $number . $symbol;
3652
+	}
3653 3653
 
3654 3654
 
3655 3655
    return $number;
Please login to merge, or discard this patch.
Spacing   +419 added lines, -419 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
     function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")
50 50
     {
51 51
         global $wpdb;
52
-        $result = 0;// no rows affected
52
+        $result = 0; // no rows affected
53 53
         if (!geodir_column_exist($db, $column)) {
54 54
             if (!empty($db) && !empty($column))
55 55
                 $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 {
75 75
     global $wpdb, $geodir_post_custom_fields_cache;
76 76
 
77
-    $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;
77
+    $cache_stored = $post_type.'_'.$package_id.'_'.$default.'_'.$fields_location;
78 78
 
79 79
     if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {
80 80
         return $geodir_post_custom_fields_cache[$cache_stored];
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
         $default_query .= " and is_admin = '0' ";
89 89
 
90 90
     if ($fields_location == 'none') {
91
-    } else{
92
-        $fields_location = esc_sql( $fields_location );
91
+    } else {
92
+        $fields_location = esc_sql($fields_location);
93 93
         $default_query .= " and show_in LIKE '%%[$fields_location]%%' ";
94 94
     }
95 95
 
96 96
     $post_meta_info = $wpdb->get_results(
97 97
         $wpdb->prepare(
98
-            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
98
+            "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",
99 99
             array($post_type)
100 100
         )
101 101
     );
@@ -162,13 +162,13 @@  discard block
 block discarded – undo
162 162
      * @param string $field_ins_upd When set to "submit" displays form.
163 163
      * @param string $field_type_key The key of the custom field.
164 164
      */
165
-    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')
165
+    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '')
166 166
     {
167 167
         global $wpdb;
168 168
         $cf = $result_str;
169 169
         if (!is_object($cf)) {
170 170
 
171
-            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));
171
+            $field_info = $wpdb->get_row($wpdb->prepare("select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)));
172 172
 
173 173
         } else {
174 174
             $field_info = $cf;
@@ -202,14 +202,14 @@  discard block
 block discarded – undo
202 202
         if ($field_id != '') {
203 203
             $cf = trim($field_id, '_');
204 204
 
205
-            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {
206
-                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));
205
+            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)))) {
206
+                $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d ", array($cf)));
207 207
 
208 208
                 $post_type = $field->post_type;
209 209
                 $htmlvar_name = $field->htmlvar_name;
210 210
 
211 211
                 if ($post_type != '' && $htmlvar_name != '') {
212
-                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
212
+                    $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));
213 213
                 }
214 214
 
215 215
                 /**
@@ -223,18 +223,18 @@  discard block
 block discarded – undo
223 223
                 do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);
224 224
 
225 225
                 if ($field->field_type == 'address') {
226
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");
227
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");
228
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");
229
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");
230
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");
231
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");
232
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");
233
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");
234
-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");
226
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_address`");
227
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_city`");
228
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_region`");
229
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_country`");
230
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_zip`");
231
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_latitude`");
232
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_longitude`");
233
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapview`");
234
+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapzoom`");
235 235
                 } else {
236 236
                     if ($field->field_type != 'fieldset') {
237
-                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");
237
+                        $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."`");
238 238
                     }
239 239
                 }
240 240
 
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
         $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';
306 306
 
307 307
         // some servers fail if a POST value is VARCHAR so we change it.
308
-        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){
308
+        if (isset($request_field['data_type']) && $request_field['data_type'] == 'XVARCHAR') {
309 309
             $request_field['data_type'] = 'VARCHAR';
310 310
         }
311 311
 
@@ -318,12 +318,12 @@  discard block
 block discarded – undo
318 318
         $post_type = $request_field['listing_type'];
319 319
 
320 320
         if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {
321
-            $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;
321
+            $cehhtmlvar_name = 'geodir_'.$cehhtmlvar_name;
322 322
         }
323 323
 
324 324
         $check_html_variable = $wpdb->get_var(
325 325
             $wpdb->prepare(
326
-                "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",
326
+                "select htmlvar_name from ".GEODIR_CUSTOM_FIELDS_TABLE." where id <> %d and htmlvar_name = %s and post_type = %s ",
327 327
                 array($cf, $cehhtmlvar_name, $post_type)
328 328
             )
329 329
         );
@@ -335,7 +335,7 @@  discard block
 block discarded – undo
335 335
 
336 336
                 $post_meta_info = $wpdb->get_row(
337 337
                     $wpdb->prepare(
338
-                        "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",
338
+                        "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id = %d",
339 339
                         array($cf)
340 340
                     )
341 341
                 );
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
             if ($post_type == '') $post_type = 'gd_place';
354 354
 
355 355
 
356
-            $detail_table = $plugin_prefix . $post_type . '_detail';
356
+            $detail_table = $plugin_prefix.$post_type.'_detail';
357 357
 
358 358
             $admin_title = $request_field['admin_title'];
359 359
             $site_title = $request_field['site_title'];
@@ -381,12 +381,12 @@  discard block
 block discarded – undo
381 381
             $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';
382 382
 
383 383
             
384
-            if(is_array($show_in)){
384
+            if (is_array($show_in)) {
385 385
                 $show_in = implode(",", $request_field['show_in']);
386 386
             }
387 387
             
388 388
             if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {
389
-                $htmlvar_name = 'geodir_' . $htmlvar_name;
389
+                $htmlvar_name = 'geodir_'.$htmlvar_name;
390 390
             }
391 391
 
392 392
             $option_values = '';
@@ -427,9 +427,9 @@  discard block
 block discarded – undo
427 427
 
428 428
             if ($sort_order == '') {
429 429
 
430
-                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);
430
+                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM ".GEODIR_CUSTOM_FIELDS_TABLE);
431 431
 
432
-                $sort_order = (int)$last_order + 1;
432
+                $sort_order = (int) $last_order + 1;
433 433
             }
434 434
 
435 435
             $default_value_add = '';
@@ -441,15 +441,15 @@  discard block
 block discarded – undo
441 441
                     case 'address':
442 442
 
443 443
                         if ($htmlvar_name != '') {
444
-                            $prefix = $htmlvar_name . '_';
444
+                            $prefix = $htmlvar_name.'_';
445 445
                         }
446
-                        $old_prefix = $old_html_variable . '_';
446
+                        $old_prefix = $old_html_variable.'_';
447 447
 
448 448
 
449
-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";
449
+                        $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."address` `".$prefix."address` VARCHAR( 254 ) NULL";
450 450
 
451 451
                         if ($default_value != '') {
452
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
452
+                            $meta_field_add .= " DEFAULT '".$default_value."'";
453 453
                         }
454 454
 
455 455
                         $wpdb->query($meta_field_add);
@@ -458,12 +458,12 @@  discard block
 block discarded – undo
458 458
 
459 459
                             if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
460 460
 
461
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");
461
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."city'");
462 462
                                 if ($is_column) {
463
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";
463
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."city` `".$prefix."city` VARCHAR( 50 ) NULL";
464 464
 
465 465
                                     if ($default_value != '') {
466
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
466
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
467 467
                                     }
468 468
 
469 469
                                     $wpdb->query($meta_field_add);
@@ -471,9 +471,9 @@  discard block
 block discarded – undo
471 471
 
472 472
                                     $meta_field_add = "VARCHAR( 50 ) NULL";
473 473
                                     if ($default_value != '') {
474
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
474
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
475 475
                                     }
476
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);
476
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add);
477 477
 
478 478
                                 }
479 479
 
@@ -483,36 +483,36 @@  discard block
 block discarded – undo
483 483
 
484 484
                             if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
485 485
 
486
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");
486
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."region'");
487 487
 
488 488
                                 if ($is_column) {
489
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";
489
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."region` `".$prefix."region` VARCHAR( 50 ) NULL";
490 490
 
491 491
                                     if ($default_value != '') {
492
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
492
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
493 493
                                     }
494 494
 
495 495
                                     $wpdb->query($meta_field_add);
496 496
                                 } else {
497 497
                                     $meta_field_add = "VARCHAR( 50 ) NULL";
498 498
                                     if ($default_value != '') {
499
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
499
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
500 500
                                     }
501 501
 
502
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);
502
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add);
503 503
                                 }
504 504
 
505 505
                             }
506 506
                             if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
507 507
 
508
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");
508
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."country'");
509 509
 
510 510
                                 if ($is_column) {
511 511
 
512
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";
512
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."country` `".$prefix."country` VARCHAR( 50 ) NULL";
513 513
 
514 514
                                     if ($default_value != '') {
515
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
515
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
516 516
                                     }
517 517
 
518 518
                                     $wpdb->query($meta_field_add);
@@ -520,24 +520,24 @@  discard block
 block discarded – undo
520 520
 
521 521
                                     $meta_field_add = "VARCHAR( 50 ) NULL";
522 522
                                     if ($default_value != '') {
523
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
523
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
524 524
                                     }
525 525
 
526
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);
526
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add);
527 527
 
528 528
                                 }
529 529
 
530 530
                             }
531 531
                             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
532 532
 
533
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");
533
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."zip'");
534 534
 
535 535
                                 if ($is_column) {
536 536
 
537
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";
537
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."zip` `".$prefix."zip` VARCHAR( 50 ) NULL";
538 538
 
539 539
                                     if ($default_value != '') {
540
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
540
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
541 541
                                     }
542 542
 
543 543
                                     $wpdb->query($meta_field_add);
@@ -545,128 +545,128 @@  discard block
 block discarded – undo
545 545
 
546 546
                                     $meta_field_add = "VARCHAR( 50 ) NULL";
547 547
                                     if ($default_value != '') {
548
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
548
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
549 549
                                     }
550 550
 
551
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);
551
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add);
552 552
 
553 553
                                 }
554 554
 
555 555
                             }
556 556
                             if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
557 557
 
558
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");
558
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latitude'");
559 559
                                 if ($is_column) {
560 560
 
561
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
561
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latitude` `".$prefix."latitude` VARCHAR( 20 ) NULL";
562 562
 
563 563
                                     if ($default_value != '') {
564
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
564
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
565 565
                                     }
566 566
 
567 567
                                     $wpdb->query($meta_field_add);
568 568
                                 } else {
569 569
 
570
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
570
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL";
571 571
                                     $meta_field_add = "VARCHAR( 20 ) NULL";
572 572
                                     if ($default_value != '') {
573
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
573
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
574 574
                                     }
575 575
 
576
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);
576
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add);
577 577
 
578 578
                                 }
579 579
 
580 580
 
581
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");
581
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."longitude'");
582 582
 
583 583
                                 if ($is_column) {
584
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
584
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."longitude` `".$prefix."longitude` VARCHAR( 20 ) NULL";
585 585
 
586 586
                                     if ($default_value != '') {
587
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
587
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
588 588
                                     }
589 589
 
590 590
                                     $wpdb->query($meta_field_add);
591 591
                                 } else {
592 592
 
593
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
593
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL";
594 594
                                     $meta_field_add = "VARCHAR( 20 ) NULL";
595 595
                                     if ($default_value != '') {
596
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
596
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
597 597
                                     }
598 598
 
599
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);
599
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add);
600 600
                                 }
601 601
 
602 602
                             }
603 603
                             if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
604 604
 
605
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");
605
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapview'");
606 606
 
607 607
                                 if ($is_column) {
608
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
608
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapview` `".$prefix."mapview` VARCHAR( 15 ) NULL";
609 609
 
610 610
                                     if ($default_value != '') {
611
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
611
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
612 612
                                     }
613 613
 
614 614
                                     $wpdb->query($meta_field_add);
615 615
                                 } else {
616 616
 
617
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
617
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL";
618 618
 
619 619
                                     $meta_field_add = "VARCHAR( 15 ) NULL";
620 620
                                     if ($default_value != '') {
621
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
621
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
622 622
                                     }
623 623
 
624
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);
624
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add);
625 625
                                 }
626 626
 
627 627
 
628 628
                             }
629 629
                             if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
630 630
 
631
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");
631
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapzoom'");
632 632
                                 if ($is_column) {
633
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
633
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapzoom` `".$prefix."mapzoom` VARCHAR( 3 ) NULL";
634 634
 
635 635
                                     if ($default_value != '') {
636
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
636
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
637 637
                                     }
638 638
 
639 639
                                     $wpdb->query($meta_field_add);
640 640
 
641 641
                                 } else {
642 642
 
643
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
643
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL";
644 644
 
645 645
                                     $meta_field_add = "VARCHAR( 3 ) NULL";
646 646
                                     if ($default_value != '') {
647
-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";
647
+                                        $meta_field_add .= " DEFAULT '".$default_value."'";
648 648
                                     }
649 649
 
650
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);
650
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add);
651 651
                                 }
652 652
 
653 653
                             }
654 654
                             // show lat lng
655 655
                             if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
656
-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");
656
+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latlng'");
657 657
 
658 658
                                 if ($is_column) {
659
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
659
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latlng` `".$prefix."latlng` VARCHAR( 3 ) NULL";
660 660
                                     $meta_field_add .= " DEFAULT '1'";
661 661
 
662 662
                                     $wpdb->query($meta_field_add);
663 663
                                 } else {
664
-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
664
+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL";
665 665
 
666 666
                                     $meta_field_add = "VARCHAR( 3 ) NULL";
667 667
                                     $meta_field_add .= " DEFAULT '1'";
668 668
 
669
-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);
669
+                                    geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add);
670 670
                                 }
671 671
 
672 672
                             }
@@ -675,13 +675,13 @@  discard block
 block discarded – undo
675 675
                         break;
676 676
 
677 677
                     case 'checkbox':
678
-                        $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TINYINT(1) NOT NULL";
678
+                        $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` TINYINT(1) NOT NULL";
679 679
 						if ($default_value != '') {
680
-							$default_value_add .= " DEFAULT '" . $default_value . "'";
680
+							$default_value_add .= " DEFAULT '".$default_value."'";
681 681
 						}
682 682
 
683 683
                         $alter_result = $wpdb->query($default_value_add);
684
-                        if ( $alter_result === false) {
684
+                        if ($alter_result === false) {
685 685
                             return __('Column change failed, you may have too many columns.', 'geodirectory');
686 686
                         }
687 687
                         break;
@@ -692,30 +692,30 @@  discard block
 block discarded – undo
692 692
                         $op_size = '500';
693 693
 
694 694
                         // only make the field as big as it needs to be.
695
-                        if(isset($option_values) && $option_values && $field_type=='select'){
696
-                            $option_values_arr = explode(',',$option_values);
697
-                            if(is_array($option_values_arr)){
695
+                        if (isset($option_values) && $option_values && $field_type == 'select') {
696
+                            $option_values_arr = explode(',', $option_values);
697
+                            if (is_array($option_values_arr)) {
698 698
                                 $op_max = 0;
699
-                                foreach($option_values_arr as $op_val){
700
-                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}
699
+                                foreach ($option_values_arr as $op_val) {
700
+                                    if (strlen($op_val) && strlen($op_val) > $op_max) {$op_max = strlen($op_val); }
701 701
                                 }
702
-                                if($op_max){$op_size =$op_max; }
702
+                                if ($op_max) {$op_size = $op_max; }
703 703
                             }
704
-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){
705
-                            if(strlen($option_values)){
706
-                                $op_size =  strlen($option_values);
704
+                        }elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
705
+                            if (strlen($option_values)) {
706
+                                $op_size = strlen($option_values);
707 707
                             }
708 708
                         }
709 709
 
710
-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";
710
+                        $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."`VARCHAR( $op_size ) NULL";
711 711
 
712 712
                         if ($default_value != '') {
713
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
713
+                            $meta_field_add .= " DEFAULT '".$default_value."'";
714 714
                         }
715 715
 
716 716
                         $alter_result = $wpdb->query($meta_field_add);
717
-                        if($alter_result===false){
718
-                            return __('Column change failed, you may have too many columns.','geodirectory');
717
+                        if ($alter_result === false) {
718
+                            return __('Column change failed, you may have too many columns.', 'geodirectory');
719 719
                         }
720 720
 
721 721
                         if (isset($request_field['cat_display_type']))
@@ -732,9 +732,9 @@  discard block
 block discarded – undo
732 732
                     case 'url':
733 733
                     case 'file':
734 734
 
735
-                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");
736
-                        if($alter_result===false){
737
-                            return __('Column change failed, you may have too many columns.','geodirectory');
735
+                        $alter_result = $wpdb->query("ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` TEXT NULL");
736
+                        if ($alter_result === false) {
737
+                            return __('Column change failed, you may have too many columns.', 'geodirectory');
738 738
                         }
739 739
                         if (isset($request_field['advanced_editor']))
740 740
                             $extra_fields = $request_field['advanced_editor'];
@@ -748,24 +748,24 @@  discard block
 block discarded – undo
748 748
                     default:
749 749
                         if ($data_type != 'VARCHAR' && $data_type != '') {
750 750
                             if ($data_type == 'FLOAT' && $decimal_point > 0) {
751
-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";
751
+                                $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` DECIMAL(11, ".(int) $decimal_point.") NULL";
752 752
                             } else {
753
-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";
753
+                                $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` ".$data_type." NULL";
754 754
                             }
755 755
 
756 756
                             if (is_numeric($default_value) && $default_value != '') {
757
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
757
+                                $default_value_add .= " DEFAULT '".$default_value."'";
758 758
                             }
759 759
                         } else {
760
-                            $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";
760
+                            $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` VARCHAR( 254 ) NULL";
761 761
                             if ($default_value != '') {
762
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
762
+                                $default_value_add .= " DEFAULT '".$default_value."'";
763 763
                             }
764 764
                         }
765 765
 
766 766
                         $alter_result = $wpdb->query($default_value_add);
767
-                        if($alter_result===false){
768
-                            return __('Column change failed, you may have too many columns.','geodirectory');
767
+                        if ($alter_result === false) {
768
+                            return __('Column change failed, you may have too many columns.', 'geodirectory');
769 769
                         }
770 770
                         break;
771 771
                 endswitch;
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
781 781
 
782 782
                     $wpdb->prepare(
783 783
 
784
-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
784
+                        "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 
785 785
 					post_type = %s,
786 786
 					admin_title = %s,
787 787
 					site_title = %s,
@@ -815,7 +815,7 @@  discard block
 block discarded – undo
815 815
 					for_admin_use = %s
816 816
 					where id = %d",
817 817
 
818
-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)
818
+                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use, $cf)
819 819
                     )
820 820
 
821 821
                 );
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
 
826 826
                 $wpdb->query(
827 827
                     $wpdb->prepare(
828
-                        "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
828
+                        "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 
829 829
 					 	site_title=%s
830 830
 					where post_type = %s and htmlvar_name = %s",
831 831
                         array($site_title, $post_type, $htmlvar_name)
@@ -834,7 +834,7 @@  discard block
 block discarded – undo
834 834
 
835 835
 
836 836
                 if ($cat_sort == '')
837
-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
837
+                    $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
838 838
 
839 839
 
840 840
                 /**
@@ -854,7 +854,7 @@  discard block
 block discarded – undo
854 854
                         $data_type = '';
855 855
 
856 856
                         if ($htmlvar_name != '') {
857
-                            $prefix = $htmlvar_name . '_';
857
+                            $prefix = $htmlvar_name.'_';
858 858
                         }
859 859
                         $old_prefix = $old_html_variable;
860 860
 
@@ -862,109 +862,109 @@  discard block
 block discarded – undo
862 862
 
863 863
                         $meta_field_add = "VARCHAR( 254 ) NULL";
864 864
                         if ($default_value != '') {
865
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
865
+                            $meta_field_add .= " DEFAULT '".$default_value."'";
866 866
                         }
867 867
 
868
-                        geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);
868
+                        geodir_add_column_if_not_exist($detail_table, $prefix."address", $meta_field_add);
869 869
                         //$wpdb->query($meta_field_add);
870 870
 
871 871
 
872 872
                         if (!empty($extra_fields)) {
873 873
 
874 874
                             if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
875
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";
875
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."city` VARCHAR( 30 ) NULL";
876 876
                                 $meta_field_add = "VARCHAR( 50 ) NULL";
877 877
                                 if ($default_value != '') {
878
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
878
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
879 879
                                 }
880 880
 
881
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);
881
+                                geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add);
882 882
                                 //$wpdb->query($meta_field_add);
883 883
                             }
884 884
                             if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
885
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";
885
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."region` VARCHAR( 30 ) NULL";
886 886
                                 $meta_field_add = "VARCHAR( 50 ) NULL";
887 887
                                 if ($default_value != '') {
888
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
888
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
889 889
                                 }
890 890
 
891
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);
891
+                                geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add);
892 892
                                 //$wpdb->query($meta_field_add);
893 893
                             }
894 894
                             if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
895
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";
895
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."country` VARCHAR( 30 ) NULL";
896 896
 
897 897
                                 $meta_field_add = "VARCHAR( 30 ) NULL";
898 898
                                 if ($default_value != '') {
899
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
899
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
900 900
                                 }
901 901
 
902
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);
902
+                                geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add);
903 903
                                 //$wpdb->query($meta_field_add);
904 904
                             }
905 905
                             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
906
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";
906
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."zip` VARCHAR( 15 ) NULL";
907 907
                                 $meta_field_add = "VARCHAR( 15 ) NULL";
908 908
                                 if ($default_value != '') {
909
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
909
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
910 910
                                 }
911 911
 
912
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);
912
+                                geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add);
913 913
                                 //$wpdb->query($meta_field_add);
914 914
                             }
915 915
                             if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {
916
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";
916
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL";
917 917
                                 $meta_field_add = "VARCHAR( 20 ) NULL";
918 918
                                 if ($default_value != '') {
919
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
919
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
920 920
                                 }
921 921
 
922
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);
922
+                                geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add);
923 923
                                 //$wpdb->query($meta_field_add);
924 924
 
925
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";
925
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL";
926 926
 
927 927
                                 $meta_field_add = "VARCHAR( 20 ) NULL";
928 928
                                 if ($default_value != '') {
929
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
929
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
930 930
                                 }
931 931
 
932
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);
932
+                                geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add);
933 933
 
934 934
                                 //$wpdb->query($meta_field_add);
935 935
                             }
936 936
                             if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {
937
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";
937
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL";
938 938
 
939 939
                                 $meta_field_add = "VARCHAR( 15 ) NULL";
940 940
                                 if ($default_value != '') {
941
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
941
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
942 942
                                 }
943 943
 
944
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);
944
+                                geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add);
945 945
 
946 946
                                 //$wpdb->query($meta_field_add);
947 947
                             }
948 948
                             if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {
949
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";
949
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL";
950 950
 
951 951
                                 $meta_field_add = "VARCHAR( 3 ) NULL";
952 952
                                 if ($default_value != '') {
953
-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";
953
+                                    $meta_field_add .= " DEFAULT '".$default_value."'";
954 954
                                 }
955 955
 
956
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);
956
+                                geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add);
957 957
 
958 958
                                 //$wpdb->query($meta_field_add);
959 959
                             }
960 960
                             // show lat lng
961 961
                             if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {
962
-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";
962
+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL";
963 963
 
964 964
                                 $meta_field_add = "VARCHAR( 3 ) NULL";
965 965
                                 $meta_field_add .= " DEFAULT '1'";
966 966
 
967
-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);
967
+                                geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add);
968 968
                                 //$wpdb->query($meta_field_add);
969 969
                             }
970 970
                         }
@@ -974,8 +974,8 @@  discard block
 block discarded – undo
974 974
                     case 'checkbox':
975 975
                         $data_type = 'TINYINT';
976 976
 
977
-                        $meta_field_add = $data_type . "( 1 ) NOT NULL ";
978
-                        if ((int)$default_value === 1) {
977
+                        $meta_field_add = $data_type."( 1 ) NOT NULL ";
978
+                        if ((int) $default_value === 1) {
979 979
                             $meta_field_add .= " DEFAULT '1'";
980 980
                         }
981 981
 
@@ -1008,7 +1008,7 @@  discard block
 block discarded – undo
1008 1008
                             }
1009 1009
                         } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {
1010 1010
                             if (strlen($option_values)) {
1011
-                                $op_size =  strlen($option_values);
1011
+                                $op_size = strlen($option_values);
1012 1012
                             }
1013 1013
 
1014 1014
                             if (isset($request_field['multi_display_type'])) {
@@ -1016,9 +1016,9 @@  discard block
 block discarded – undo
1016 1016
                             }
1017 1017
                         }
1018 1018
 
1019
-                        $meta_field_add = $data_type . "( $op_size ) NULL ";
1019
+                        $meta_field_add = $data_type."( $op_size ) NULL ";
1020 1020
                         if ($default_value != '') {
1021
-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";
1021
+                            $meta_field_add .= " DEFAULT '".$default_value."'";
1022 1022
                         }
1023 1023
 
1024 1024
                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
@@ -1033,9 +1033,9 @@  discard block
 block discarded – undo
1033 1033
 
1034 1034
                         $data_type = 'TEXT';
1035 1035
 
1036
-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1036
+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";
1037 1037
 
1038
-                        $meta_field_add = $data_type . " NULL ";
1038
+                        $meta_field_add = $data_type." NULL ";
1039 1039
                         /*if($default_value != '')
1040 1040
 					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/
1041 1041
 
@@ -1050,9 +1050,9 @@  discard block
 block discarded – undo
1050 1050
 
1051 1051
                         $data_type = 'DATE';
1052 1052
 
1053
-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1053
+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";
1054 1054
 
1055
-                        $meta_field_add = $data_type . " NULL ";
1055
+                        $meta_field_add = $data_type." NULL ";
1056 1056
 
1057 1057
                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1058 1058
                         if ($add_result === false) {
@@ -1065,9 +1065,9 @@  discard block
 block discarded – undo
1065 1065
 
1066 1066
                         $data_type = 'TIME';
1067 1067
 
1068
-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";
1068
+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";
1069 1069
 
1070
-                        $meta_field_add = $data_type . " NULL ";
1070
+                        $meta_field_add = $data_type." NULL ";
1071 1071
 
1072 1072
                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);
1073 1073
                         if ($add_result === false) {
@@ -1079,22 +1079,22 @@  discard block
 block discarded – undo
1079 1079
                     default:
1080 1080
 
1081 1081
                         if ($data_type != 'VARCHAR' && $data_type != '') {
1082
-                            $meta_field_add = $data_type . " NULL ";
1082
+                            $meta_field_add = $data_type." NULL ";
1083 1083
 
1084 1084
                             if ($data_type == 'FLOAT' && $decimal_point > 0) {
1085
-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";
1085
+                                $meta_field_add = "DECIMAL(11, ".(int) $decimal_point.") NULL ";
1086 1086
                             }
1087 1087
 
1088 1088
                             if (is_numeric($default_value) && $default_value != '') {
1089
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
1090
-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";
1089
+                                $default_value_add .= " DEFAULT '".$default_value."'";
1090
+                                $meta_field_add .= " DEFAULT '".$default_value."'";
1091 1091
                             }
1092 1092
                         } else {
1093 1093
                             $meta_field_add = " VARCHAR( 254 ) NULL ";
1094 1094
 
1095 1095
                             if ($default_value != '') {
1096
-                                $default_value_add .= " DEFAULT '" . $default_value . "'";
1097
-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";
1096
+                                $default_value_add .= " DEFAULT '".$default_value."'";
1097
+                                $meta_field_add .= " DEFAULT '".$default_value."'";
1098 1098
                             }
1099 1099
                         }
1100 1100
 
@@ -1116,7 +1116,7 @@  discard block
 block discarded – undo
1116 1116
 
1117 1117
                     $wpdb->prepare(
1118 1118
 
1119
-                        "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
1119
+                        "insert into ".GEODIR_CUSTOM_FIELDS_TABLE." set 
1120 1120
 					post_type = %s,
1121 1121
 					admin_title = %s,
1122 1122
 					site_title = %s,
@@ -1149,7 +1149,7 @@  discard block
 block discarded – undo
1149 1149
 					validation_msg = %s,
1150 1150
 					for_admin_use = %s ",
1151 1151
 
1152
-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)
1152
+                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use)
1153 1153
 
1154 1154
                     )
1155 1155
 
@@ -1161,7 +1161,7 @@  discard block
 block discarded – undo
1161 1161
 
1162 1162
             }
1163 1163
 
1164
-            return (int)$lastid;
1164
+            return (int) $lastid;
1165 1165
 
1166 1166
 
1167 1167
         } else {
@@ -1194,7 +1194,7 @@  discard block
 block discarded – undo
1194 1194
 
1195 1195
             $post_meta_info = $wpdb->query(
1196 1196
                 $wpdb->prepare(
1197
-                    "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 
1197
+                    "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 
1198 1198
 															sort_order=%d 
1199 1199
 															where id= %d",
1200 1200
                     array($count, $cf)
@@ -1216,7 +1216,7 @@  discard block
 block discarded – undo
1216 1216
         global $post;
1217 1217
 
1218 1218
         if (isset($_REQUEST['post'])) {
1219
-            $_REQUEST['pid'] = (int)$_REQUEST['post'];
1219
+            $_REQUEST['pid'] = (int) $_REQUEST['post'];
1220 1220
         }
1221 1221
     }
1222 1222
 
@@ -1239,7 +1239,7 @@  discard block
 block discarded – undo
1239 1239
      * @param mixed $value Custom field value.
1240 1240
      * @param array $cf Custom field info.
1241 1241
      */
1242
-    return apply_filters( 'geodir_get_cf_value', $value, $cf );
1242
+    return apply_filters('geodir_get_cf_value', $value, $cf);
1243 1243
 }
1244 1244
 
1245 1245
 /**
@@ -1265,16 +1265,16 @@  discard block
 block discarded – undo
1265 1265
     $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);
1266 1266
 
1267 1267
     foreach ($custom_fields as $key => $val) {
1268
-        if(isset($val['extra_fields'])){$extra_fields = $val['extra_fields'];}
1268
+        if (isset($val['extra_fields'])) {$extra_fields = $val['extra_fields']; }
1269 1269
         $val = stripslashes_deep($val); // strip slashes from labels
1270
-        if(isset($val['extra_fields'])){$val['extra_fields'] = $extra_fields;}
1270
+        if (isset($val['extra_fields'])) {$val['extra_fields'] = $extra_fields; }
1271 1271
 
1272 1272
         $name = $val['name'];
1273 1273
         $type = $val['type'];
1274 1274
         $is_default = $val['is_default'];
1275 1275
 
1276 1276
         /* field available to site admin only for edit */
1277
-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;
1277
+        $for_admin_use = isset($val['for_admin_use']) && (int) $val['for_admin_use'] == 1 ? true : false;
1278 1278
         if ($for_admin_use && !is_super_admin()) {
1279 1279
             continue;
1280 1280
         }
@@ -1299,11 +1299,11 @@  discard block
 block discarded – undo
1299 1299
          * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
1300 1300
          * @see 'geodir_after_custom_form_field_$name'
1301 1301
          */
1302
-        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);
1302
+        do_action('geodir_before_custom_form_field_'.$name, $listing_type, $package_id, $val);
1303 1303
 
1304 1304
 
1305 1305
         $custom_field = $val;
1306
-        $html ='';
1306
+        $html = '';
1307 1307
         /**
1308 1308
          * Filter the output for custom fields.
1309 1309
          *
@@ -1312,7 +1312,7 @@  discard block
 block discarded – undo
1312 1312
          * @param string $html The html to be filtered (blank).
1313 1313
          * @param array $custom_field The custom field array values.
1314 1314
          */
1315
-        echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);
1315
+        echo apply_filters("geodir_custom_field_input_{$type}", $html, $custom_field);
1316 1316
 
1317 1317
 
1318 1318
 
@@ -1327,7 +1327,7 @@  discard block
 block discarded – undo
1327 1327
          * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.
1328 1328
          * @see 'geodir_before_custom_form_field_$name'
1329 1329
          */
1330
-        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);
1330
+        do_action('geodir_after_custom_form_field_'.$name, $listing_type, $package_id, $val);
1331 1331
 
1332 1332
     }
1333 1333
 
@@ -1353,9 +1353,9 @@  discard block
 block discarded – undo
1353 1353
 
1354 1354
         $filter = $wpdb->get_row(
1355 1355
             $wpdb->prepare(
1356
-                "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",
1356
+                "SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND ".$key."='".$value."'",
1357 1357
                 array($geodir_post_type)
1358
-            ),ARRAY_A
1358
+            ), ARRAY_A
1359 1359
         );
1360 1360
 
1361 1361
         if ($filter) {
@@ -1368,14 +1368,14 @@  discard block
 block discarded – undo
1368 1368
 }
1369 1369
 
1370 1370
 
1371
-function geodir_field_icon_proccess($cf){
1371
+function geodir_field_icon_proccess($cf) {
1372 1372
 
1373 1373
 
1374 1374
     if (strpos($cf['field_icon'], 'http') !== false) {
1375
-        $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
1375
+        $field_icon = ' background: url('.$cf['field_icon'].') no-repeat left center;background-size:18px 18px;padding-left: 21px;';
1376 1376
     } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {
1377
-        $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';
1378
-    }else{
1377
+        $field_icon = '<i class="'.$cf['field_icon'].'"></i>';
1378
+    } else {
1379 1379
         $field_icon = $cf['field_icon'];
1380 1380
     }
1381 1381
 
@@ -1401,7 +1401,7 @@  discard block
 block discarded – undo
1401 1401
 
1402 1402
         $package_info = array();
1403 1403
 
1404
-        if(!$preview && !isset($post->post_id)){
1404
+        if (!$preview && !isset($post->post_id)) {
1405 1405
             $post = geodir_get_post_info($post->ID);
1406 1406
         }
1407 1407
 
@@ -1422,14 +1422,14 @@  discard block
 block discarded – undo
1422 1422
 
1423 1423
 
1424 1424
             foreach ($fields_info as $type) {
1425
-                if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}
1425
+                if (isset($type['extra_fields'])) {$extra_fields = $type['extra_fields']; }
1426 1426
                 $type = stripslashes_deep($type); // strip slashes
1427
-                if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}
1427
+                if (isset($type['extra_fields'])) {$type['extra_fields'] = $extra_fields; }
1428 1428
                 $html = '';
1429 1429
                 $field_icon = geodir_field_icon_proccess($type);
1430 1430
                 $filed_type = $type['type'];
1431 1431
                 $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';
1432
-                if($html_var=='post'){$html_var='post_address';}
1432
+                if ($html_var == 'post') {$html_var = 'post_address'; }
1433 1433
 
1434 1434
                 /**
1435 1435
                  * Filter the output for custom fields.
@@ -1440,7 +1440,7 @@  discard block
 block discarded – undo
1440 1440
                  * @param string $fields_location The location the field is to be show.
1441 1441
                  * @param array $type The array of field values.
1442 1442
                  */
1443
-                $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);
1443
+                $html = apply_filters("geodir_custom_field_output_{$filed_type}", $html, $fields_location, $type);
1444 1444
 
1445 1445
                 $variables_array = array();
1446 1446
 
@@ -1500,7 +1500,7 @@  discard block
 block discarded – undo
1500 1500
          * @param string $fields_location The location the fields are being output.
1501 1501
          * @since 1.6.9
1502 1502
          */
1503
-        return apply_filters('geodir_show_listing_info',$html,$fields_location);
1503
+        return apply_filters('geodir_show_listing_info', $html, $fields_location);
1504 1504
 
1505 1505
     }
1506 1506
 }
@@ -1575,7 +1575,7 @@  discard block
 block discarded – undo
1575 1575
 
1576 1576
         $post_type = get_post_type($post_id);
1577 1577
         //echo $field_id; exit;
1578
-        $table = $plugin_prefix . $post_type . '_detail';
1578
+        $table = $plugin_prefix.$post_type.'_detail';
1579 1579
 
1580 1580
         $postcurr_images = array();
1581 1581
         $postcurr_images = geodir_get_post_meta($post_id, $field_id, true);
@@ -1594,13 +1594,13 @@  discard block
 block discarded – undo
1594 1594
             $geodir_uploadurl = $uploads['url'];
1595 1595
             $sub_dir = $uploads['subdir'];
1596 1596
 
1597
-            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
1597
+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';
1598 1598
 
1599 1599
             for ($m = 0; $m < count($post_image); $m++) {
1600 1600
 
1601 1601
                 /* --------- start ------- */
1602 1602
 
1603
-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
1603
+                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM ".$table." WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {
1604 1604
 
1605 1605
 
1606 1606
                     $curr_img_url = $post_image[$m];
@@ -1626,24 +1626,24 @@  discard block
 block discarded – undo
1626 1626
                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
1627 1627
 
1628 1628
                     if (!function_exists('wp_handle_upload'))
1629
-                        require_once(ABSPATH . 'wp-admin/includes/file.php');
1629
+                        require_once(ABSPATH.'wp-admin/includes/file.php');
1630 1630
 
1631 1631
                     if (!is_dir($geodir_uploadpath))
1632 1632
                         mkdir($geodir_uploadpath);
1633 1633
 
1634
-                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];
1634
+                    $new_name = $post_id.'_'.$field_id.'_'.$img_name_arr[0].'.'.$img_name_arr[1];
1635 1635
                     $explode_sub_dir = explode("/", $sub_dir);
1636 1636
                     if ($curr_img_dir == end($explode_sub_dir)) {
1637
-                        $img_path = $geodir_uploadpath . '/' . $filename;
1638
-                        $img_url = $geodir_uploadurl . '/' . $filename;
1637
+                        $img_path = $geodir_uploadpath.'/'.$filename;
1638
+                        $img_url = $geodir_uploadurl.'/'.$filename;
1639 1639
                     } else {
1640
-                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1641
-                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;
1640
+                        $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;
1641
+                        $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename;
1642 1642
                     }
1643 1643
 
1644 1644
                     $uploaded_file = '';
1645 1645
                     if (file_exists($img_path))
1646
-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
1646
+                        $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name);
1647 1647
 
1648 1648
                     if ($curr_img_dir != $geodir_uploaddir) {
1649 1649
                         if (file_exists($img_path))
@@ -1651,7 +1651,7 @@  discard block
 block discarded – undo
1651 1651
                     }
1652 1652
 
1653 1653
                     if (!empty($uploaded_file))
1654
-                        $file_urls = $geodir_uploadurl . '/' . $new_name;
1654
+                        $file_urls = $geodir_uploadurl.'/'.$new_name;
1655 1655
 
1656 1656
                 } else {
1657 1657
                     $file_urls = $post_image[$m];
@@ -1665,8 +1665,8 @@  discard block
 block discarded – undo
1665 1665
         if (!empty($postcurr_images)) {
1666 1666
 
1667 1667
             if ($file_urls != $postcurr_images) {
1668
-                $invalid_files[] = (object)array('src' => $postcurr_images);
1669
-                $invalid_files = (object)$invalid_files;
1668
+                $invalid_files[] = (object) array('src' => $postcurr_images);
1669
+                $invalid_files = (object) $invalid_files;
1670 1670
             }
1671 1671
         }
1672 1672
 
@@ -1718,9 +1718,9 @@  discard block
 block discarded – undo
1718 1718
     function geodir_upload_dir($upload)
1719 1719
     {
1720 1720
         global $current_user;
1721
-        $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;
1722
-        $upload['path'] = $upload['basedir'] . $upload['subdir'];
1723
-        $upload['url'] = $upload['baseurl'] . $upload['subdir'];
1721
+        $upload['subdir'] = $upload['subdir'].'/temp_'.$current_user->data->ID;
1722
+        $upload['path'] = $upload['basedir'].$upload['subdir'];
1723
+        $upload['url'] = $upload['baseurl'].$upload['subdir'];
1724 1724
         return $upload;
1725 1725
     }
1726 1726
 
@@ -1735,20 +1735,20 @@  discard block
 block discarded – undo
1735 1735
         // check ajax nonce
1736 1736
         $imgid = $_POST["imgid"];
1737 1737
 
1738
-        check_ajax_referer($imgid . 'pluploadan');
1738
+        check_ajax_referer($imgid.'pluploadan');
1739 1739
 
1740 1740
         // handle custom file uploaddir
1741 1741
         add_filter('upload_dir', 'geodir_upload_dir');
1742 1742
 
1743 1743
         // change file orientation if needed
1744
-        $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);
1744
+        $fixed_file = geodir_exif($_FILES[$imgid.'async-upload']);
1745 1745
 
1746 1746
         // handle file upload
1747 1747
         $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));
1748 1748
         // remove handle custom file uploaddir
1749 1749
         remove_filter('upload_dir', 'geodir_upload_dir');
1750 1750
 
1751
-        if(!isset($status['url']) && isset($status['error'])){
1751
+        if (!isset($status['url']) && isset($status['error'])) {
1752 1752
             print_r($status);
1753 1753
         }
1754 1754
 
@@ -1778,9 +1778,9 @@  discard block
 block discarded – undo
1778 1778
 
1779 1779
     $post_type = get_post_type($post_id);
1780 1780
 
1781
-    $table = $plugin_prefix . $post_type . '_detail';
1781
+    $table = $plugin_prefix.$post_type.'_detail';
1782 1782
 
1783
-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));
1783
+    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM ".$table." WHERE post_id=%d", array($post_id)));
1784 1784
 
1785 1785
     if ($results) {
1786 1786
         return $results[0]->geodir_video;
@@ -1804,9 +1804,9 @@  discard block
 block discarded – undo
1804 1804
 
1805 1805
     $post_type = get_post_type($post_id);
1806 1806
 
1807
-    $table = $plugin_prefix . $post_type . '_detail';
1807
+    $table = $plugin_prefix.$post_type.'_detail';
1808 1808
 
1809
-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));
1809
+    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM ".$table." WHERE post_id=%d", array($post_id)));
1810 1810
 
1811 1811
     if ($results) {
1812 1812
         return $results[0]->geodir_special_offers;
@@ -1824,12 +1824,12 @@  discard block
 block discarded – undo
1824 1824
      */
1825 1825
     function geodir_max_upload_size()
1826 1826
     {
1827
-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);
1827
+        $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);
1828 1828
 
1829 1829
         if ($max_filesize > 0 && $max_filesize < 1) {
1830
-            $max_filesize = (int)($max_filesize * 1024) . 'kb';
1830
+            $max_filesize = (int) ($max_filesize * 1024).'kb';
1831 1831
         } else {
1832
-            $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';
1832
+            $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb';
1833 1833
         }
1834 1834
         /** Filter documented in geodirectory-functions/general_functions.php **/
1835 1835
         return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);
@@ -1861,7 +1861,7 @@  discard block
 block discarded – undo
1861 1861
 
1862 1862
             $custom_fields = $wpdb->get_results(
1863 1863
                 $wpdb->prepare(
1864
-                    "select post_type,data_type,field_type,site_title,admin_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",
1864
+                    "select post_type,data_type,field_type,site_title,admin_title,htmlvar_name,field_icon from ".GEODIR_CUSTOM_FIELDS_TABLE." where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",
1865 1865
                     array($post_type)
1866 1866
                 ), 'ARRAY_A'
1867 1867
             );
@@ -1988,7 +1988,7 @@  discard block
 block discarded – undo
1988 1988
 
1989 1989
             $post_meta_info = $wpdb->query(
1990 1990
                 $wpdb->prepare(
1991
-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
1991
+                    "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 
1992 1992
 															sort_order=%d 
1993 1993
 															where id= %d",
1994 1994
                     array($count, $cf)
@@ -2070,14 +2070,14 @@  discard block
 block discarded – undo
2070 2070
 
2071 2071
         $check_html_variable = $wpdb->get_var(
2072 2072
             $wpdb->prepare(
2073
-                "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",
2073
+                "select htmlvar_name from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s and field_type=%s ",
2074 2074
                 array($cehhtmlvar_name, $post_type, $field_type)
2075 2075
             )
2076 2076
         );
2077 2077
 
2078 2078
         if ($is_default == 1) {
2079 2079
 
2080
-            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));
2080
+            $wpdb->query($wpdb->prepare("update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set is_default='0', default_order='' where post_type = %s", array($post_type)));
2081 2081
 
2082 2082
         }
2083 2083
 
@@ -2088,7 +2088,7 @@  discard block
 block discarded – undo
2088 2088
 
2089 2089
                 $wpdb->prepare(
2090 2090
 
2091
-                    "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
2091
+                    "insert into ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 
2092 2092
 				post_type = %s,
2093 2093
 				data_type = %s,
2094 2094
 				field_type = %s,
@@ -2119,7 +2119,7 @@  discard block
 block discarded – undo
2119 2119
 
2120 2120
                 $wpdb->prepare(
2121 2121
 
2122
-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 
2122
+                    "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 
2123 2123
 				post_type = %s,
2124 2124
 				data_type = %s,
2125 2125
 				field_type = %s,
@@ -2145,7 +2145,7 @@  discard block
 block discarded – undo
2145 2145
         }
2146 2146
 
2147 2147
 
2148
-        return (int)$lastid;
2148
+        return (int) $lastid;
2149 2149
 
2150 2150
     }
2151 2151
 }
@@ -2168,7 +2168,7 @@  discard block
 block discarded – undo
2168 2168
         if ($field_id != '') {
2169 2169
             $cf = trim($field_id, '_');
2170 2170
 
2171
-            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));
2171
+            $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where id= %d ", array($cf)));
2172 2172
 
2173 2173
             return $field_id;
2174 2174
 
@@ -2191,12 +2191,12 @@  discard block
 block discarded – undo
2191 2191
      * @param string $field_ins_upd When set to "submit" displays form.
2192 2192
      * @param bool $default when set to true field will be for admin use only.
2193 2193
      */
2194
-    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')
2194
+    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '')
2195 2195
     {
2196 2196
         global $wpdb;
2197 2197
         $cf = $result_str;
2198 2198
         if (!is_object($cf)) {
2199
-            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));
2199
+            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE id = %d", array($cf)));
2200 2200
         } else {
2201 2201
             $field_info = $cf;
2202 2202
             $result_str = $cf->id;
@@ -2232,18 +2232,18 @@  discard block
 block discarded – undo
2232 2232
         if ($htmlvar_name == '')
2233 2233
             $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
2234 2234
 
2235
-        $nonce = wp_create_nonce('custom_fields_' . $result_str);
2235
+        $nonce = wp_create_nonce('custom_fields_'.$result_str);
2236 2236
 
2237 2237
         $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';
2238 2238
         $cso_arr = geodir_get_custom_sort_options($post_type);
2239 2239
 
2240 2240
         $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);
2241
-        foreach($cso_arr as $cso){
2242
-            if($cur_field_type==$cso['field_type']){
2241
+        foreach ($cso_arr as $cso) {
2242
+            if ($cur_field_type == $cso['field_type']) {
2243 2243
 
2244 2244
                 if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {
2245 2245
                     $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';
2246
-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){
2246
+                }elseif (isset($cso['field_icon']) && $cso['field_icon']) {
2247 2247
                     $field_icon = '<b class="gd-cf-icon" style="background-image: url(\''.$cso['field_icon'].'\')"></b>';
2248 2248
                 }
2249 2249
 
@@ -2253,40 +2253,40 @@  discard block
 block discarded – undo
2253 2253
         $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);
2254 2254
         ?>
2255 2255
 
2256
-        <li class="text" id="licontainer_<?php echo $result_str;?>">
2256
+        <li class="text" id="licontainer_<?php echo $result_str; ?>">
2257 2257
             <form><!-- we need to wrap in a form so we can use radio buttons with same name -->
2258
-            <div class="title title<?php echo $result_str;?> gt-fieldset"
2259
-                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory');?>"
2260
-                 ondblclick="show_hide('field_frm<?php echo $result_str;?>')">
2258
+            <div class="title title<?php echo $result_str; ?> gt-fieldset"
2259
+                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory'); ?>"
2260
+                 ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">
2261 2261
                 <?php
2262 2262
 
2263 2263
                 ?>
2264 2264
 
2265
-                <div title="<?php _e('Click to remove field', 'geodirectory');?>"
2266
-                     onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
2265
+                <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"
2266
+                     onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"
2267 2267
                      class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div>
2268 2268
 
2269 2269
 
2270
-                <?php echo $field_icon;?>
2270
+                <?php echo $field_icon; ?>
2271 2271
                 <b style="cursor:pointer;"
2272
-                   onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' (' . $site_title . ')');?></b>
2272
+                   onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory').' ('.$site_title.')'); ?></b>
2273 2273
 
2274 2274
             </div>
2275 2275
 
2276
-            <div id="field_frm<?php echo $result_str;?>" class="field_frm"
2276
+            <div id="field_frm<?php echo $result_str; ?>" class="field_frm"
2277 2277
                  style="display:<?php if ($field_ins_upd == 'submit') {
2278 2278
                      echo 'block;';
2279 2279
                  } else {
2280 2280
                      echo 'none;';
2281 2281
                  } ?>">
2282 2282
                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>
2283
-                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>
2284
-                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>
2285
-                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/>
2283
+                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/>
2284
+                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/>
2285
+                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str; ?>"/>
2286 2286
                 <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {
2287 2287
                     echo $field_info->data_type;
2288 2288
                 }?>"/>
2289
-                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/>
2289
+                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name; ?>"/>
2290 2290
 
2291 2291
 
2292 2292
                 <ul class="widefat post fixed" border="0" style="width:100%;">
@@ -2296,7 +2296,7 @@  discard block
 block discarded – undo
2296 2296
                         <input type="hidden" name="site_title" id="site_title" value="<?php echo esc_attr($site_title); ?>"/>
2297 2297
 
2298 2298
                         <li>
2299
-                            <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0;?>
2299
+                            <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0; ?>
2300 2300
 
2301 2301
                             <label for="asc" class="gd-cf-tooltip-wrap">
2302 2302
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Ascending Sort (low to high)', 'geodirectory'); ?>
@@ -2306,24 +2306,24 @@  discard block
 block discarded – undo
2306 2306
                             </label>
2307 2307
                             <div class="gd-cf-input-wrap gd-switch">
2308 2308
 
2309
-                                <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled"  value="1"
2309
+                                <input type="radio" id="asc_yes<?php echo $radio_id; ?>" name="asc" class="gdri-enabled"  value="1"
2310 2310
                                     <?php if ($value == '1') {
2311 2311
                                         echo 'checked';
2312 2312
                                     } ?>/>
2313
-                                <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2313
+                                <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2314 2314
 
2315
-                                <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0"
2315
+                                <input type="radio" id="asc_no<?php echo $radio_id; ?>" name="asc" class="gdri-disabled" value="0"
2316 2316
                                     <?php if ($value == '0' || !$value) {
2317 2317
                                         echo 'checked';
2318 2318
                                     } ?>/>
2319
-                                <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2319
+                                <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2320 2320
 
2321 2321
                             </div>
2322 2322
 
2323 2323
                         </li>
2324 2324
 
2325
-                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>
2326
-                            <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : '';?>
2325
+                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>
2326
+                            <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : ''; ?>
2327 2327
 
2328 2328
                             <label for="asc_title" class="gd-cf-tooltip-wrap">
2329 2329
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Ascending title', 'geodirectory'); ?>
@@ -2333,14 +2333,14 @@  discard block
 block discarded – undo
2333 2333
                             </label>
2334 2334
                             <div class="gd-cf-input-wrap">
2335 2335
 
2336
-                                <input type="text" name="asc_title" id="asc_title" value="<?php echo $value;?>" />
2336
+                                <input type="text" name="asc_title" id="asc_title" value="<?php echo $value; ?>" />
2337 2337
                             </div>
2338 2338
 
2339 2339
 
2340 2340
                         </li>
2341 2341
 
2342 2342
 
2343
-                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>
2343
+                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>
2344 2344
 
2345 2345
                             <label for="is_default" class="gd-cf-tooltip-wrap">
2346 2346
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>
@@ -2351,7 +2351,7 @@  discard block
 block discarded – undo
2351 2351
                             <div class="gd-cf-input-wrap">
2352 2352
 
2353 2353
                                 <input type="radio" name="is_default"
2354
-                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {
2354
+                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_asc') {
2355 2355
                                     echo 'checked="checked"';
2356 2356
                                 } ?>/>
2357 2357
                             </div>
@@ -2361,7 +2361,7 @@  discard block
 block discarded – undo
2361 2361
 
2362 2362
 
2363 2363
                         <li>
2364
-                            <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0;?>
2364
+                            <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0; ?>
2365 2365
 
2366 2366
                             <label for="desc" class="gd-cf-tooltip-wrap">
2367 2367
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Descending Sort (high to low)', 'geodirectory'); ?>
@@ -2371,24 +2371,24 @@  discard block
 block discarded – undo
2371 2371
                             </label>
2372 2372
                             <div class="gd-cf-input-wrap gd-switch">
2373 2373
 
2374
-                                <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled"  value="1"
2374
+                                <input type="radio" id="desc_yes<?php echo $radio_id; ?>" name="desc" class="gdri-enabled"  value="1"
2375 2375
                                     <?php if ($value == '1') {
2376 2376
                                         echo 'checked';
2377 2377
                                     } ?>/>
2378
-                                <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2378
+                                <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2379 2379
 
2380
-                                <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0"
2380
+                                <input type="radio" id="desc_no<?php echo $radio_id; ?>" name="desc" class="gdri-disabled" value="0"
2381 2381
                                     <?php if ($value == '0' || !$value) {
2382 2382
                                         echo 'checked';
2383 2383
                                     } ?>/>
2384
-                                <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2384
+                                <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2385 2385
 
2386 2386
                             </div>
2387 2387
 
2388 2388
                         </li>
2389 2389
 
2390
-                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>
2391
-                            <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : '';?>
2390
+                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>
2391
+                            <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : ''; ?>
2392 2392
 
2393 2393
                             <label for="desc_title" class="gd-cf-tooltip-wrap">
2394 2394
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Descending title', 'geodirectory'); ?>
@@ -2398,13 +2398,13 @@  discard block
 block discarded – undo
2398 2398
                             </label>
2399 2399
                             <div class="gd-cf-input-wrap">
2400 2400
 
2401
-                                <input type="text" name="desc_title" id="desc_title" value="<?php echo $value;?>" />
2401
+                                <input type="text" name="desc_title" id="desc_title" value="<?php echo $value; ?>" />
2402 2402
                             </div>
2403 2403
 
2404 2404
 
2405 2405
                         </li>
2406 2406
 
2407
-                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>
2407
+                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>
2408 2408
 
2409 2409
                             <label for="is_default" class="gd-cf-tooltip-wrap">
2410 2410
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>
@@ -2415,7 +2415,7 @@  discard block
 block discarded – undo
2415 2415
                             <div class="gd-cf-input-wrap">
2416 2416
 
2417 2417
                                 <input type="radio" name="is_default"
2418
-                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {
2418
+                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_desc') {
2419 2419
                                     echo 'checked="checked"';
2420 2420
                                 } ?>/>
2421 2421
                             </div>
@@ -2440,14 +2440,14 @@  discard block
 block discarded – undo
2440 2440
                             </label>
2441 2441
                             <div class="gd-cf-input-wrap">
2442 2442
 
2443
-                                <input type="text" name="site_title" id="site_title" value="<?php echo $value;?>" />
2443
+                                <input type="text" name="site_title" id="site_title" value="<?php echo $value; ?>" />
2444 2444
                             </div>
2445 2445
 
2446 2446
 
2447 2447
                         </li>
2448 2448
 
2449 2449
                         <li>
2450
-                            <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : '';?>
2450
+                            <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : ''; ?>
2451 2451
 
2452 2452
                             <label for="is_default" class="gd-cf-tooltip-wrap">
2453 2453
                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>
@@ -2471,7 +2471,7 @@  discard block
 block discarded – undo
2471 2471
 
2472 2472
 
2473 2473
                     <li>
2474
-                        <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active: 0;?>
2474
+                        <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active : 0; ?>
2475 2475
 
2476 2476
                         <label for="is_active" class="gd-cf-tooltip-wrap">
2477 2477
                             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is active', 'geodirectory'); ?>
@@ -2481,17 +2481,17 @@  discard block
 block discarded – undo
2481 2481
                         </label>
2482 2482
                         <div class="gd-cf-input-wrap gd-switch">
2483 2483
 
2484
-                            <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"
2484
+                            <input type="radio" id="is_active_yes<?php echo $radio_id; ?>" name="is_active" class="gdri-enabled"  value="1"
2485 2485
                                 <?php if ($value == '1') {
2486 2486
                                     echo 'checked';
2487 2487
                                 } ?>/>
2488
-                            <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2488
+                            <label for="is_active_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2489 2489
 
2490
-                            <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"
2490
+                            <input type="radio" id="is_active_no<?php echo $radio_id; ?>" name="is_active" class="gdri-disabled" value="0"
2491 2491
                                 <?php if ($value == '0' || !$value) {
2492 2492
                                     echo 'checked';
2493 2493
                                 } ?>/>
2494
-                            <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2494
+                            <label for="is_active_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2495 2495
 
2496 2496
                         </div>
2497 2497
 
@@ -2512,10 +2512,10 @@  discard block
 block discarded – undo
2512 2512
                             <h3></h3>
2513 2513
                         </label>
2514 2514
                         <div class="gd-cf-input-wrap">
2515
-                            <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"
2515
+                            <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"
2516 2516
                                    onclick="save_sort_field('<?php echo esc_attr($result_str); ?>')"/>
2517
-                                <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"
2518
-                                                                    onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"
2517
+                                <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"
2518
+                                                                    onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"
2519 2519
                                                                     class="button"/></a>
2520 2520
                         </div>
2521 2521
                     </li>
@@ -2550,7 +2550,7 @@  discard block
 block discarded – undo
2550 2550
         if (!$package_id || !$field_name || !$post_type) {
2551 2551
             return true;
2552 2552
         }
2553
-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));
2553
+        $sql = $wpdb->prepare("SELECT id FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int) $package_id));
2554 2554
 
2555 2555
         if ($wpdb->get_var($sql)) {
2556 2556
             return true;
@@ -2673,13 +2673,13 @@  discard block
 block discarded – undo
2673 2673
 }
2674 2674
 
2675 2675
 
2676
-function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){
2676
+function geodir_cfa_data_type_text($output, $result_str, $cf, $field_info) {
2677 2677
     ob_start();
2678 2678
 
2679 2679
     $dt_value = '';
2680 2680
     if (isset($field_info->data_type)) {
2681 2681
         $dt_value  = esc_attr($field_info->data_type);
2682
-    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){
2682
+    }elseif (isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']) {
2683 2683
         $dt_value  = $cf['defaults']['data_type'];
2684 2684
     }
2685 2685
     ?>
@@ -2690,15 +2690,15 @@  discard block
 block discarded – undo
2690 2690
             <select name="data_type" id="data_type"
2691 2691
                     onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');">
2692 2692
                 <option
2693
-                    value="XVARCHAR" <?php if ($dt_value  == 'VARCHAR') {
2693
+                    value="XVARCHAR" <?php if ($dt_value == 'VARCHAR') {
2694 2694
                     echo 'selected="selected"';
2695 2695
                 } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>
2696 2696
                 <option
2697
-                    value="INT" <?php if ($dt_value   == 'INT') {
2697
+                    value="INT" <?php if ($dt_value == 'INT') {
2698 2698
                     echo 'selected="selected"';
2699 2699
                 } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>
2700 2700
                 <option
2701
-                    value="FLOAT" <?php if ($dt_value   == 'FLOAT') {
2701
+                    value="FLOAT" <?php if ($dt_value == 'FLOAT') {
2702 2702
                     echo 'selected="selected"';
2703 2703
                 } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>
2704 2704
             </select>
@@ -2711,13 +2711,13 @@  discard block
 block discarded – undo
2711 2711
     $value = '';
2712 2712
     if (isset($field_info->decimal_point)) {
2713 2713
         $value = esc_attr($field_info->decimal_point);
2714
-    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){
2714
+    }elseif (isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']) {
2715 2715
         $value = $cf['defaults']['decimal_point'];
2716 2716
     }
2717 2717
     ?>
2718 2718
 
2719 2719
     <li class="decimal-point-wrapper"
2720
-        style="<?php echo ($dt_value  == 'FLOAT') ? '' : 'display:none' ?>">
2720
+        style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>">
2721 2721
         <label for="decimal_point"><?php _e('Select decimal point :', 'geodirectory'); ?></label>
2722 2722
         <div class="gd-cf-input-wrap">
2723 2723
             <select name="decimal_point" id="decimal_point">
@@ -2735,41 +2735,41 @@  discard block
 block discarded – undo
2735 2735
     $output = ob_get_clean();
2736 2736
     return $output;
2737 2737
 }
2738
-add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);
2738
+add_filter('geodir_cfa_data_type_text', 'geodir_cfa_data_type_text', 10, 4);
2739 2739
 
2740 2740
 // htmlvar not needed for fieldset and taxonomy
2741
-add_filter('geodir_cfa_htmlvar_name_fieldset','__return_empty_string',10,4);
2742
-add_filter('geodir_cfa_htmlvar_name_taxonomy','__return_empty_string',10,4);
2741
+add_filter('geodir_cfa_htmlvar_name_fieldset', '__return_empty_string', 10, 4);
2742
+add_filter('geodir_cfa_htmlvar_name_taxonomy', '__return_empty_string', 10, 4);
2743 2743
 
2744 2744
 
2745 2745
 // default_value not needed for textarea, html, file, fieldset, taxonomy, address
2746
-add_filter('geodir_cfa_default_value_file','__return_empty_string',10,4);
2747
-add_filter('geodir_cfa_default_value_taxonomy','__return_empty_string',10,4);
2748
-add_filter('geodir_cfa_default_value_address','__return_empty_string',10,4);
2749
-add_filter('geodir_cfa_default_value_fieldset','__return_empty_string',10,4);
2746
+add_filter('geodir_cfa_default_value_file', '__return_empty_string', 10, 4);
2747
+add_filter('geodir_cfa_default_value_taxonomy', '__return_empty_string', 10, 4);
2748
+add_filter('geodir_cfa_default_value_address', '__return_empty_string', 10, 4);
2749
+add_filter('geodir_cfa_default_value_fieldset', '__return_empty_string', 10, 4);
2750 2750
 
2751 2751
 // is_required not needed for fieldset
2752
-add_filter('geodir_cfa_is_required_fieldset','__return_empty_string',10,4);
2753
-add_filter('geodir_cfa_required_msg_fieldset','__return_empty_string',10,4);
2752
+add_filter('geodir_cfa_is_required_fieldset', '__return_empty_string', 10, 4);
2753
+add_filter('geodir_cfa_required_msg_fieldset', '__return_empty_string', 10, 4);
2754 2754
 
2755 2755
 // field_icon not needed for fieldset
2756
-add_filter('geodir_cfa_field_icon_fieldset','__return_empty_string',10,4);
2757
-add_filter('geodir_cfa_css_class_fieldset','__return_empty_string',10,4);
2756
+add_filter('geodir_cfa_field_icon_fieldset', '__return_empty_string', 10, 4);
2757
+add_filter('geodir_cfa_css_class_fieldset', '__return_empty_string', 10, 4);
2758 2758
 
2759 2759
 // cat_sort not needed for some fields
2760
-add_filter('geodir_cfa_cat_sort_html','__return_empty_string',10,4);
2761
-add_filter('geodir_cfa_cat_sort_file','__return_empty_string',10,4);
2762
-add_filter('geodir_cfa_cat_sort_url','__return_empty_string',10,4);
2763
-add_filter('geodir_cfa_cat_sort_fieldset','__return_empty_string',10,4);
2764
-add_filter('geodir_cfa_cat_sort_multiselect','__return_empty_string',10,4);
2765
-add_filter('geodir_cfa_cat_sort_textarea','__return_empty_string',10,4);
2766
-add_filter('geodir_cfa_cat_sort_taxonomy','__return_empty_string',10,4);
2767
-add_filter('geodir_cfa_cat_sort_address','__return_empty_string',10,4);
2760
+add_filter('geodir_cfa_cat_sort_html', '__return_empty_string', 10, 4);
2761
+add_filter('geodir_cfa_cat_sort_file', '__return_empty_string', 10, 4);
2762
+add_filter('geodir_cfa_cat_sort_url', '__return_empty_string', 10, 4);
2763
+add_filter('geodir_cfa_cat_sort_fieldset', '__return_empty_string', 10, 4);
2764
+add_filter('geodir_cfa_cat_sort_multiselect', '__return_empty_string', 10, 4);
2765
+add_filter('geodir_cfa_cat_sort_textarea', '__return_empty_string', 10, 4);
2766
+add_filter('geodir_cfa_cat_sort_taxonomy', '__return_empty_string', 10, 4);
2767
+add_filter('geodir_cfa_cat_sort_address', '__return_empty_string', 10, 4);
2768 2768
 
2769 2769
 
2770 2770
 
2771
-function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){
2772
-    if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}
2771
+function geodir_cfa_advanced_editor_geodir_special_offers($output, $result_str, $cf, $field_info) {
2772
+    if ($field_info->htmlvar_name != 'geodir_special_offers') {return ''; }
2773 2773
     ob_start();
2774 2774
     ?>
2775 2775
     <li>
@@ -2800,16 +2800,16 @@  discard block
 block discarded – undo
2800 2800
     $output = ob_get_clean();
2801 2801
     return $output;
2802 2802
 }
2803
-add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);
2803
+add_filter('geodir_cfa_advanced_editor_textarea', 'geodir_cfa_advanced_editor_geodir_special_offers', 10, 4);
2804 2804
 
2805 2805
 
2806
-function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){
2806
+function geodir_cfa_validation_pattern_text($output, $result_str, $cf, $field_info) {
2807 2807
     ob_start();
2808 2808
 
2809 2809
     $value = '';
2810 2810
     if (isset($field_info->validation_pattern)) {
2811 2811
         $value = esc_attr($field_info->validation_pattern);
2812
-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){
2812
+    }elseif (isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']) {
2813 2813
         $value = esc_attr($cf['defaults']['validation_pattern']);
2814 2814
     }
2815 2815
     ?>
@@ -2829,7 +2829,7 @@  discard block
 block discarded – undo
2829 2829
     $value = '';
2830 2830
     if (isset($field_info->validation_msg)) {
2831 2831
         $value = esc_attr($field_info->validation_msg);
2832
-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){
2832
+    }elseif (isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']) {
2833 2833
         $value = esc_attr($cf['defaults']['validation_msg']);
2834 2834
     }
2835 2835
     ?>
@@ -2850,10 +2850,10 @@  discard block
 block discarded – undo
2850 2850
     $output = ob_get_clean();
2851 2851
     return $output;
2852 2852
 }
2853
-add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);
2853
+add_filter('geodir_cfa_validation_pattern_text', 'geodir_cfa_validation_pattern_text', 10, 4);
2854 2854
 
2855 2855
 
2856
-function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){
2856
+function geodir_cfa_htmlvar_name_taxonomy($output, $result_str, $cf, $field_info) {
2857 2857
     ob_start();
2858 2858
     global $post_type;
2859 2859
 
@@ -2878,7 +2878,7 @@  discard block
 block discarded – undo
2878 2878
                     ?>
2879 2879
                     <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {
2880 2880
                         echo 'selected="selected"';
2881
-                    }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php
2881
+                    }?> id="<?php echo $gd_tax; ?>"><?php echo $gd_tax; ?></option><?php
2882 2882
                 }
2883 2883
                 ?>
2884 2884
             </select>
@@ -2889,7 +2889,7 @@  discard block
 block discarded – undo
2889 2889
         <label for="cat_display_type" class="gd-cf-tooltip-wrap">
2890 2890
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Category display type :', 'geodirectory'); ?>
2891 2891
             <div class="gdcf-tooltip">
2892
-                <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory');?>
2892
+                <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory'); ?>
2893 2893
             </div>
2894 2894
         </label>
2895 2895
         <div class="gd-cf-input-wrap">
@@ -2897,19 +2897,19 @@  discard block
 block discarded – undo
2897 2897
             <select name="cat_display_type" id="cat_display_type">
2898 2898
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {
2899 2899
                     echo 'selected="selected"';
2900
-                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>
2900
+                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory'); ?></option>
2901 2901
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
2902 2902
                     echo 'selected="selected"';
2903
-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
2903
+                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>
2904 2904
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {
2905 2905
                     echo 'selected="selected"';
2906
-                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>
2906
+                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory'); ?></option>
2907 2907
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
2908 2908
                     echo 'selected="selected"';
2909
-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
2909
+                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>
2910 2910
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
2911 2911
                     echo 'selected="selected"';
2912
-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
2912
+                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>
2913 2913
             </select>
2914 2914
         </div>
2915 2915
     </li>
@@ -2918,10 +2918,10 @@  discard block
 block discarded – undo
2918 2918
     $output = ob_get_clean();
2919 2919
     return $output;
2920 2920
 }
2921
-add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);
2921
+add_filter('geodir_cfa_htmlvar_name_taxonomy', 'geodir_cfa_htmlvar_name_taxonomy', 10, 4);
2922 2922
 
2923 2923
 
2924
-function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){
2924
+function geodir_cfa_extra_fields_address($output, $result_str, $cf, $field_info) {
2925 2925
 
2926 2926
     ob_start();
2927 2927
     if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
@@ -2944,32 +2944,32 @@  discard block
 block discarded – undo
2944 2944
         <label for="show_zip" class="gd-cf-tooltip-wrap">
2945 2945
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display zip/post code :', 'geodirectory'); ?>
2946 2946
             <div class="gdcf-tooltip">
2947
-                <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory');?>
2947
+                <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory'); ?>
2948 2948
             </div>
2949 2949
         </label>
2950 2950
         <div class="gd-cf-input-wrap gd-switch">
2951 2951
 
2952
-            <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled"  value="1"
2952
+            <input type="radio" id="show_zip_yes<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-enabled"  value="1"
2953 2953
                 <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {
2954 2954
                     echo 'checked';
2955 2955
                 } ?>/>
2956
-            <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2956
+            <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
2957 2957
 
2958
-            <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0"
2958
+            <input type="radio" id="show_zip_no<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-disabled" value="0"
2959 2959
                 <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {
2960 2960
                     echo 'checked';
2961 2961
                 } ?>/>
2962
-            <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2962
+            <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
2963 2963
 
2964 2964
 
2965 2965
         </div>
2966 2966
     </li>
2967 2967
 
2968
-    <li class="cf-zip-lable"  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'";}?> >
2968
+    <li class="cf-zip-lable"  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'"; }?> >
2969 2969
         <label for="zip_lable" class="gd-cf-tooltip-wrap">
2970 2970
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Zip/Post code label :', 'geodirectory'); ?>
2971 2971
             <div class="gdcf-tooltip">
2972
-                <?php _e('Enter zip/post code field label in address section.', 'geodirectory');?>
2972
+                <?php _e('Enter zip/post code field label in address section.', 'geodirectory'); ?>
2973 2973
             </div>
2974 2974
         </label>
2975 2975
         <div class="gd-cf-input-wrap">
@@ -2987,7 +2987,7 @@  discard block
 block discarded – undo
2987 2987
         <label for="map_lable" class="gd-cf-tooltip-wrap">
2988 2988
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map button label :', 'geodirectory'); ?>
2989 2989
             <div class="gdcf-tooltip">
2990
-                <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory');?>
2990
+                <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory'); ?>
2991 2991
             </div>
2992 2992
         </label>
2993 2993
         <div class="gd-cf-input-wrap">
@@ -3002,22 +3002,22 @@  discard block
 block discarded – undo
3002 3002
         <label for="show_mapzoom" class="gd-cf-tooltip-wrap">
3003 3003
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Use user zoom level:', 'geodirectory'); ?>
3004 3004
             <div class="gdcf-tooltip">
3005
-                <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory');?>
3005
+                <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory'); ?>
3006 3006
             </div>
3007 3007
         </label>
3008 3008
         <div class="gd-cf-input-wrap gd-switch">
3009 3009
 
3010
-            <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"
3010
+            <input type="radio" id="show_mapzoom_yes<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"
3011 3011
                 <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {
3012 3012
                     echo 'checked';
3013 3013
                 } ?>/>
3014
-            <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3014
+            <label for="show_mapzoom_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3015 3015
 
3016
-            <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"
3016
+            <input type="radio" id="show_mapzoom_no<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"
3017 3017
                 <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {
3018 3018
                     echo 'checked';
3019 3019
                 } ?>/>
3020
-            <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3020
+            <label for="show_mapzoom_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3021 3021
 
3022 3022
         </div>
3023 3023
     </li>
@@ -3026,22 +3026,22 @@  discard block
 block discarded – undo
3026 3026
         <label for="show_mapview" class="gd-cf-tooltip-wrap">
3027 3027
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display map view:', 'geodirectory'); ?>
3028 3028
             <div class="gdcf-tooltip">
3029
-                <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory');?>
3029
+                <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory'); ?>
3030 3030
             </div>
3031 3031
         </label>
3032 3032
         <div class="gd-cf-input-wrap gd-switch">
3033 3033
 
3034
-            <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"
3034
+            <input type="radio" id="show_mapview_yes<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"
3035 3035
                 <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {
3036 3036
                     echo 'checked';
3037 3037
                 } ?>/>
3038
-            <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3038
+            <label for="show_mapview_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3039 3039
 
3040
-            <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0"
3040
+            <input type="radio" id="show_mapview_no<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-disabled" value="0"
3041 3041
                 <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {
3042 3042
                     echo 'checked';
3043 3043
                 } ?>/>
3044
-            <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3044
+            <label for="show_mapview_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3045 3045
 
3046 3046
         </div>
3047 3047
     </li>
@@ -3051,7 +3051,7 @@  discard block
 block discarded – undo
3051 3051
         <label for="mapview_lable" class="gd-cf-tooltip-wrap">
3052 3052
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map view label:', 'geodirectory'); ?>
3053 3053
             <div class="gdcf-tooltip">
3054
-                <?php _e('Enter mapview field label in address section.', 'geodirectory');?>
3054
+                <?php _e('Enter mapview field label in address section.', 'geodirectory'); ?>
3055 3055
             </div>
3056 3056
         </label>
3057 3057
         <div class="gd-cf-input-wrap">
@@ -3065,22 +3065,22 @@  discard block
 block discarded – undo
3065 3065
         <label for="show_latlng" class="gd-cf-tooltip-wrap">
3066 3066
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show latitude and longitude', 'geodirectory'); ?>
3067 3067
             <div class="gdcf-tooltip">
3068
-                <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory');?>
3068
+                <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory'); ?>
3069 3069
             </div>
3070 3070
         </label>
3071 3071
         <div class="gd-cf-input-wrap gd-switch">
3072 3072
 
3073
-            <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"
3073
+            <input type="radio" id="show_latlng_yes<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"
3074 3074
                 <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {
3075 3075
                     echo 'checked';
3076 3076
                 } ?>/>
3077
-            <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3077
+            <label for="show_latlng_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3078 3078
 
3079
-            <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0"
3079
+            <input type="radio" id="show_latlng_no<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-disabled" value="0"
3080 3080
                 <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {
3081 3081
                     echo 'checked';
3082 3082
                 } ?>/>
3083
-            <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3083
+            <label for="show_latlng_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3084 3084
 
3085 3085
         </div>
3086 3086
     </li>
@@ -3089,17 +3089,17 @@  discard block
 block discarded – undo
3089 3089
     $html = ob_get_clean();
3090 3090
     return $output.$html;
3091 3091
 }
3092
-add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);
3092
+add_filter('geodir_cfa_extra_fields_address', 'geodir_cfa_extra_fields_address', 10, 4);
3093 3093
 
3094 3094
 
3095
-function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){
3095
+function geodir_cfa_extra_fields_multiselect($output, $result_str, $cf, $field_info) {
3096 3096
     ob_start();
3097 3097
     ?>
3098 3098
     <li>
3099 3099
         <label for="multi_display_type" class="gd-cf-tooltip-wrap">
3100 3100
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>
3101 3101
             <div class="gdcf-tooltip">
3102
-                <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory');?>
3102
+                <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory'); ?>
3103 3103
             </div>
3104 3104
         </label>
3105 3105
         <div class="gd-cf-input-wrap">
@@ -3107,13 +3107,13 @@  discard block
 block discarded – undo
3107 3107
             <select name="multi_display_type" id="multi_display_type">
3108 3108
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {
3109 3109
                     echo 'selected="selected"';
3110
-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>
3110
+                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>
3111 3111
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {
3112 3112
                     echo 'selected="selected"';
3113
-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>
3113
+                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>
3114 3114
                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {
3115 3115
                     echo 'selected="selected"';
3116
-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>
3116
+                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>
3117 3117
             </select>
3118 3118
 
3119 3119
             <br/>
@@ -3124,17 +3124,17 @@  discard block
 block discarded – undo
3124 3124
     $html = ob_get_clean();
3125 3125
     return $output.$html;
3126 3126
 }
3127
-add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);
3127
+add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_multiselect', 10, 4);
3128 3128
 
3129 3129
 
3130
-function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){
3130
+function geodir_cfa_extra_fields_smr($output, $result_str, $cf, $field_info) {
3131 3131
 
3132 3132
     ob_start();
3133 3133
 
3134 3134
     $value = '';
3135 3135
     if (isset($field_info->option_values)) {
3136 3136
         $value = esc_attr($field_info->option_values);
3137
-    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){
3137
+    }elseif (isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']) {
3138 3138
         $value = esc_attr($cf['defaults']['option_values']);
3139 3139
     }
3140 3140
 
@@ -3144,11 +3144,11 @@  discard block
 block discarded – undo
3144 3144
         <label for="option_values" class="gd-cf-tooltip-wrap">
3145 3145
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>
3146 3146
             <div class="gdcf-tooltip">
3147
-                <span><?php _e('Option Values should be separated by comma.', 'geodirectory');?></span>
3147
+                <span><?php _e('Option Values should be separated by comma.', 'geodirectory'); ?></span>
3148 3148
                 <br/>
3149
-                <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory');?></span>
3149
+                <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory'); ?></span>
3150 3150
                     <br/>
3151
-                    <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory');?></span>
3151
+                    <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory'); ?></span>
3152 3152
                     <?php if ($field_type == 'multiselect' || $field_type == 'select') { ?>
3153 3153
                         <br/>
3154 3154
                         <span><?php _e('- If using OPTGROUP tag to grouping options, use "{optgroup}OPTGROUP-LABEL|OPTION-1,OPTION-2{/optgroup}"', 'geodirectory'); ?></span>
@@ -3159,7 +3159,7 @@  discard block
 block discarded – undo
3159 3159
         </label>
3160 3160
         <div class="gd-cf-input-wrap">
3161 3161
             <input type="text" name="option_values" id="option_values"
3162
-                   value="<?php echo $value;?>"/>
3162
+                   value="<?php echo $value; ?>"/>
3163 3163
             <br/>
3164 3164
 
3165 3165
         </div>
@@ -3169,12 +3169,12 @@  discard block
 block discarded – undo
3169 3169
     $html = ob_get_clean();
3170 3170
     return $output.$html;
3171 3171
 }
3172
-add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);
3173
-add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);
3174
-add_filter('geodir_cfa_extra_fields_radio','geodir_cfa_extra_fields_smr',10,4);
3172
+add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_smr', 10, 4);
3173
+add_filter('geodir_cfa_extra_fields_select', 'geodir_cfa_extra_fields_smr', 10, 4);
3174
+add_filter('geodir_cfa_extra_fields_radio', 'geodir_cfa_extra_fields_smr', 10, 4);
3175 3175
 
3176 3176
 
3177
-function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){
3177
+function geodir_cfa_extra_fields_datepicker($output, $result_str, $cf, $field_info) {
3178 3178
     ob_start();
3179 3179
     $extra = array();
3180 3180
     if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {
@@ -3185,7 +3185,7 @@  discard block
 block discarded – undo
3185 3185
         <label for="date_format" class="gd-cf-tooltip-wrap">
3186 3186
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>
3187 3187
             <div class="gdcf-tooltip">
3188
-                <?php _e('Select the date format.', 'geodirectory');?>
3188
+                <?php _e('Select the date format.', 'geodirectory'); ?>
3189 3189
             </div>
3190 3190
         </label>
3191 3191
         <div class="gd-cf-input-wrap" style="overflow:inherit;">
@@ -3205,16 +3205,16 @@  discard block
 block discarded – undo
3205 3205
              * @since 1.6.5
3206 3206
              * @param array $date_formats The PHP date format array.
3207 3207
              */
3208
-            $date_formats = apply_filters('geodir_date_formats',$date_formats);
3208
+            $date_formats = apply_filters('geodir_date_formats', $date_formats);
3209 3209
             ?>
3210 3210
             <select name="extra[date_format]" id="date_format">
3211 3211
                 <?php
3212
-                foreach($date_formats as $format){
3212
+                foreach ($date_formats as $format) {
3213 3213
                     $selected = '';
3214
-                    if(!empty($extra) && esc_attr($extra['date_format'])==$format){
3214
+                    if (!empty($extra) && esc_attr($extra['date_format']) == $format) {
3215 3215
                         $selected = "selected='selected'";
3216 3216
                     }
3217
-                    echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";
3217
+                    echo "<option $selected value='$format'>$format       (".date_i18n($format, time()).")</option>";
3218 3218
                 }
3219 3219
                 ?>
3220 3220
             </select>
@@ -3226,10 +3226,10 @@  discard block
 block discarded – undo
3226 3226
     $html = ob_get_clean();
3227 3227
     return $output.$html;
3228 3228
 }
3229
-add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);
3229
+add_filter('geodir_cfa_extra_fields_datepicker', 'geodir_cfa_extra_fields_datepicker', 10, 4);
3230 3230
 
3231 3231
 
3232
-function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){
3232
+function geodir_cfa_extra_fields_file($output, $result_str, $cf, $field_info) {
3233 3233
     ob_start();
3234 3234
     $allowed_file_types = geodir_allowed_mime_types();
3235 3235
 
@@ -3240,16 +3240,16 @@  discard block
 block discarded – undo
3240 3240
         <label for="gd_file_types" class="gd-cf-tooltip-wrap">
3241 3241
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>
3242 3242
             <div class="gdcf-tooltip">
3243
-                <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory');?>
3243
+                <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory'); ?>
3244 3244
             </div>
3245 3245
         </label>
3246 3246
         <div class="gd-cf-input-wrap">
3247 3247
             <select name="extra[gd_file_types][]" id="gd_file_types" multiple="multiple" style="height:100px;width:90%;">
3248
-                <option value="*" <?php selected(true, in_array('*', $gd_file_types));?>><?php _e('All types', 'geodirectory') ;?></option>
3249
-                <?php foreach ( $allowed_file_types as $format => $types ) { ?>
3250
-                    <optgroup label="<?php echo esc_attr( wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory') ) ) ;?>">
3251
-                        <?php foreach ( $types as $ext => $type ) { ?>
3252
-                            <option value="<?php echo esc_attr($ext) ;?>" <?php selected(true, in_array($ext, $gd_file_types));?>><?php echo '.' . $ext ;?></option>
3248
+                <option value="*" <?php selected(true, in_array('*', $gd_file_types)); ?>><?php _e('All types', 'geodirectory'); ?></option>
3249
+                <?php foreach ($allowed_file_types as $format => $types) { ?>
3250
+                    <optgroup label="<?php echo esc_attr(wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory'))); ?>">
3251
+                        <?php foreach ($types as $ext => $type) { ?>
3252
+                            <option value="<?php echo esc_attr($ext); ?>" <?php selected(true, in_array($ext, $gd_file_types)); ?>><?php echo '.'.$ext; ?></option>
3253 3253
                         <?php } ?>
3254 3254
                     </optgroup>
3255 3255
                 <?php } ?>
@@ -3261,9 +3261,9 @@  discard block
 block discarded – undo
3261 3261
     $html = ob_get_clean();
3262 3262
     return $output.$html;
3263 3263
 }
3264
-add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);
3264
+add_filter('geodir_cfa_extra_fields_file', 'geodir_cfa_extra_fields_file', 10, 4);
3265 3265
 
3266
-function geodir_cfa_extra_fields_text($output,$result_str,$cf,$field_info){
3266
+function geodir_cfa_extra_fields_text($output, $result_str, $cf, $field_info) {
3267 3267
     ob_start();
3268 3268
 
3269 3269
     $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';
@@ -3277,15 +3277,15 @@  discard block
 block discarded – undo
3277 3277
     $value = '';
3278 3278
     if ($extra_fields && isset($extra_fields['is_price'])) {
3279 3279
     $value = esc_attr($extra_fields['is_price']);
3280
-    }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){
3280
+    }elseif (isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']) {
3281 3281
     $value = esc_attr($cf['defaults']['extra_fields']['is_price']);
3282 3282
     }
3283 3283
 
3284
-    $show_price_extra = ($value==1) ? 1 : 0;
3284
+    $show_price_extra = ($value == 1) ? 1 : 0;
3285 3285
 
3286
-    $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0;
3286
+    $show_price = (isset($field_info->data_type) && ($field_info->data_type == 'INT' && $field_info->data_type == 'FLOAT')) ? 1 : 0;
3287 3287
     ?>
3288
-    <li class="gdcf-price-extra-set" <?php if(!$show_price){ echo "style='display:none;'";}?>>
3288
+    <li class="gdcf-price-extra-set" <?php if (!$show_price) { echo "style='display:none;'"; }?>>
3289 3289
         <label for="is_price" class="gd-cf-tooltip-wrap">
3290 3290
             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display as price? :', 'geodirectory'); ?>
3291 3291
             <div class="gdcf-tooltip">
@@ -3294,17 +3294,17 @@  discard block
 block discarded – undo
3294 3294
         </label>
3295 3295
         <div class="gd-cf-input-wrap gd-switch">
3296 3296
 
3297
-            <input type="radio" id="is_price_yes<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-enabled"  value="1"
3297
+            <input type="radio" id="is_price_yes<?php echo $radio_id; ?>" name="extra[is_price]" class="gdri-enabled"  value="1"
3298 3298
                 <?php if ($value == '1') {
3299 3299
                     echo 'checked';
3300 3300
                 } ?>/>
3301
-            <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3301
+            <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>
3302 3302
 
3303
-            <input type="radio" id="is_price_no<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-disabled" value="0"
3303
+            <input type="radio" id="is_price_no<?php echo $radio_id; ?>" name="extra[is_price]" class="gdri-disabled" value="0"
3304 3304
                 <?php if ($value == '0' || !$value) {
3305 3305
                     echo 'checked';
3306 3306
                 } ?>/>
3307
-            <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3307
+            <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>
3308 3308
 
3309 3309
         </div>
3310 3310
     </li>
@@ -3314,24 +3314,24 @@  discard block
 block discarded – undo
3314 3314
     $value = '';
3315 3315
     if ($extra_fields && isset($extra_fields['thousand_separator'])) {
3316 3316
         $value = esc_attr($extra_fields['thousand_separator']);
3317
-    }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){
3317
+    }elseif (isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']) {
3318 3318
         $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']);
3319 3319
     }
3320 3320
     ?>
3321
-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
3322
-        <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory');?>
3321
+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
3322
+        <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory'); ?>
3323 3323
             <div class="gdcf-tooltip">
3324 3324
                 <?php _e('Select the thousand separator.', 'geodirectory'); ?>
3325 3325
             </div>
3326 3326
         </label>
3327 3327
         <div class="gd-cf-input-wrap">
3328 3328
                 <select name="extra[thousand_separator]" id="thousand_separator">
3329
-                    <option value="comma" <?php selected(true, $value == 'comma');?>><?php _e(', (comma)', 'geodirectory'); ?></option>
3330
-                    <option value="slash" <?php selected(true, $value == "slash");?>><?php _e('\ (slash)', 'geodirectory'); ?></option>
3331
-                    <option value="period" <?php selected(true, $value == 'period');?>><?php _e('. (period)', 'geodirectory'); ?></option>
3332
-                    <option value="space" <?php selected(true, $value == 'space');?>><?php _e(' (space)', 'geodirectory'); ?></option>
3333
-                    <option value="apostrophe" <?php selected(true, $value == 'apostrophe');?>><?php _e("' (apostrophe)", 'geodirectory'); ?></option>
3334
-                    <option value="none" <?php selected(true, $value == 'none');?>><?php _e('(none)', 'geodirectory'); ?></option>
3329
+                    <option value="comma" <?php selected(true, $value == 'comma'); ?>><?php _e(', (comma)', 'geodirectory'); ?></option>
3330
+                    <option value="slash" <?php selected(true, $value == "slash"); ?>><?php _e('\ (slash)', 'geodirectory'); ?></option>
3331
+                    <option value="period" <?php selected(true, $value == 'period'); ?>><?php _e('. (period)', 'geodirectory'); ?></option>
3332
+                    <option value="space" <?php selected(true, $value == 'space'); ?>><?php _e(' (space)', 'geodirectory'); ?></option>
3333
+                    <option value="apostrophe" <?php selected(true, $value == 'apostrophe'); ?>><?php _e("' (apostrophe)", 'geodirectory'); ?></option>
3334
+                    <option value="none" <?php selected(true, $value == 'none'); ?>><?php _e('(none)', 'geodirectory'); ?></option>
3335 3335
                 </select>
3336 3336
         </div>
3337 3337
     </li>
@@ -3342,20 +3342,20 @@  discard block
 block discarded – undo
3342 3342
     $value = '';
3343 3343
     if ($extra_fields && isset($extra_fields['decimal_separator'])) {
3344 3344
         $value = esc_attr($extra_fields['decimal_separator']);
3345
-    }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){
3345
+    }elseif (isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']) {
3346 3346
         $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']);
3347 3347
     }
3348 3348
     ?>
3349
-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
3350
-        <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory');?>
3349
+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
3350
+        <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory'); ?>
3351 3351
             <div class="gdcf-tooltip">
3352 3352
                 <?php _e('Select the decimal separator.', 'geodirectory'); ?>
3353 3353
             </div>
3354 3354
         </label>
3355 3355
         <div class="gd-cf-input-wrap">
3356 3356
             <select name="extra[decimal_separator]" id="decimal_separator">
3357
-                <option value="period" <?php selected(true, $value == 'period');?>><?php _e('. (period)', 'geodirectory'); ?></option>
3358
-                <option value="comma" <?php selected(true, $value == "comma");?>><?php _e(', (comma)', 'geodirectory'); ?></option>
3357
+                <option value="period" <?php selected(true, $value == 'period'); ?>><?php _e('. (period)', 'geodirectory'); ?></option>
3358
+                <option value="comma" <?php selected(true, $value == "comma"); ?>><?php _e(', (comma)', 'geodirectory'); ?></option>
3359 3359
             </select>
3360 3360
         </div>
3361 3361
     </li>
@@ -3365,20 +3365,20 @@  discard block
 block discarded – undo
3365 3365
     $value = '';
3366 3366
     if ($extra_fields && isset($extra_fields['decimal_display'])) {
3367 3367
         $value = esc_attr($extra_fields['decimal_display']);
3368
-    }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){
3368
+    }elseif (isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']) {
3369 3369
         $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']);
3370 3370
     }
3371 3371
     ?>
3372
-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
3373
-        <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory');?>
3372
+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
3373
+        <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory'); ?>
3374 3374
             <div class="gdcf-tooltip">
3375 3375
                 <?php _e('Select how the decimal is displayed', 'geodirectory'); ?>
3376 3376
             </div>
3377 3377
         </label>
3378 3378
         <div class="gd-cf-input-wrap">
3379 3379
             <select name="extra[decimal_display]" id="decimal_display">
3380
-                <option value="if" <?php selected(true, $value == 'if');?>><?php _e('If used (not .00)', 'geodirectory'); ?></option>
3381
-                <option value="allways" <?php selected(true, $value == "allways");?>><?php _e('Always (.00)', 'geodirectory'); ?></option>
3380
+                <option value="if" <?php selected(true, $value == 'if'); ?>><?php _e('If used (not .00)', 'geodirectory'); ?></option>
3381
+                <option value="allways" <?php selected(true, $value == "allways"); ?>><?php _e('Always (.00)', 'geodirectory'); ?></option>
3382 3382
             </select>
3383 3383
         </div>
3384 3384
     </li>
@@ -3388,12 +3388,12 @@  discard block
 block discarded – undo
3388 3388
     $value = '';
3389 3389
     if ($extra_fields && isset($extra_fields['currency_symbol'])) {
3390 3390
         $value = esc_attr($extra_fields['currency_symbol']);
3391
-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){
3391
+    }elseif (isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']) {
3392 3392
         $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']);
3393 3393
     }
3394 3394
     ?>
3395
-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
3396
-        <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory');?>
3395
+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
3396
+        <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory'); ?>
3397 3397
             <div class="gdcf-tooltip">
3398 3398
                 <?php _e('Select the currency symbol.', 'geodirectory'); ?>
3399 3399
             </div>
@@ -3409,20 +3409,20 @@  discard block
 block discarded – undo
3409 3409
     $value = '';
3410 3410
     if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {
3411 3411
         $value = esc_attr($extra_fields['currency_symbol_placement']);
3412
-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){
3412
+    }elseif (isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']) {
3413 3413
         $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']);
3414 3414
     }
3415 3415
     ?>
3416
-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>
3417
-        <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory');?>
3416
+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>
3417
+        <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory'); ?>
3418 3418
             <div class="gdcf-tooltip">
3419 3419
                 <?php _e('Select the currency symbol placement.', 'geodirectory'); ?>
3420 3420
             </div>
3421 3421
         </label>
3422 3422
         <div class="gd-cf-input-wrap">
3423 3423
             <select name="extra[currency_symbol_placement]" id="currency_symbol_placement">
3424
-                <option value="left" <?php selected(true, $value == 'left');?>><?php _e('Left', 'geodirectory'); ?></option>
3425
-                <option value="right" <?php selected(true, $value == "right");?>><?php _e('Right', 'geodirectory'); ?></option>
3424
+                <option value="left" <?php selected(true, $value == 'left'); ?>><?php _e('Left', 'geodirectory'); ?></option>
3425
+                <option value="right" <?php selected(true, $value == "right"); ?>><?php _e('Right', 'geodirectory'); ?></option>
3426 3426
             </select>
3427 3427
         </div>
3428 3428
     </li>
@@ -3433,11 +3433,11 @@  discard block
 block discarded – undo
3433 3433
     $html = ob_get_clean();
3434 3434
     return $output.$html;
3435 3435
 }
3436
-add_filter('geodir_cfa_extra_fields_text','geodir_cfa_extra_fields_text',10,4);
3436
+add_filter('geodir_cfa_extra_fields_text', 'geodir_cfa_extra_fields_text', 10, 4);
3437 3437
 
3438
-function geodir_default_custom_fields($post_type='gd_place',$package_id=''){
3438
+function geodir_default_custom_fields($post_type = 'gd_place', $package_id = '') {
3439 3439
     $fields = array();
3440
-    $package = ($package_id=='') ? '' : array($package_id);
3440
+    $package = ($package_id == '') ? '' : array($package_id);
3441 3441
 
3442 3442
     $fields[] = array('listing_type' => $post_type,
3443 3443
                       'data_type' => 'VARCHAR',
@@ -3610,7 +3610,7 @@  discard block
 block discarded – undo
3610 3610
     return  $fields;
3611 3611
 }
3612 3612
 
3613
-function geodir_currency_format_number($number='',$cf=''){
3613
+function geodir_currency_format_number($number = '', $cf = '') {
3614 3614
 
3615 3615
     $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : '';
3616 3616
 
@@ -3619,36 +3619,36 @@  discard block
 block discarded – undo
3619 3619
     $decimal_display = !empty($cf['decimal_display']) ? $cf['decimal_display'] : (!empty($cs['decimal_display']) ? $cs['decimal_display'] : 'if');
3620 3620
     $decimalpoint = '.';
3621 3621
 
3622
-    if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){
3622
+    if (isset($cs['decimal_separator']) && $cs['decimal_separator'] == 'comma') {
3623 3623
         $decimalpoint = ',';
3624 3624
     }
3625 3625
 
3626 3626
     $separator = ',';
3627 3627
 
3628
-    if(isset($cs['thousand_separator'])){
3629
-        if($cs['thousand_separator']=='comma'){$separator = ',';}
3630
-        if($cs['thousand_separator']=='slash'){$separator = '\\';}
3631
-        if($cs['thousand_separator']=='period'){$separator = '.';}
3632
-        if($cs['thousand_separator']=='space'){$separator = ' ';}
3633
-        if($cs['thousand_separator']=='apostrophe'){$separator = "'";}
3634
-        if($cs['thousand_separator']=='none'){$separator = '';}
3628
+    if (isset($cs['thousand_separator'])) {
3629
+        if ($cs['thousand_separator'] == 'comma') {$separator = ','; }
3630
+        if ($cs['thousand_separator'] == 'slash') {$separator = '\\'; }
3631
+        if ($cs['thousand_separator'] == 'period') {$separator = '.'; }
3632
+        if ($cs['thousand_separator'] == 'space') {$separator = ' '; }
3633
+        if ($cs['thousand_separator'] == 'apostrophe') {$separator = "'"; }
3634
+        if ($cs['thousand_separator'] == 'none') {$separator = ''; }
3635 3635
     }
3636 3636
 
3637 3637
     $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';
3638 3638
 
3639
-    if($decimals>0 && $decimal_display=='if'){
3640
-        if(is_int($number) || floor( $number ) == $number)
3639
+    if ($decimals > 0 && $decimal_display == 'if') {
3640
+        if (is_int($number) || floor($number) == $number)
3641 3641
             $decimals = 0;
3642 3642
     }
3643 3643
 
3644
-    $number = number_format($number,$decimals,$decimalpoint,$separator);
3644
+    $number = number_format($number, $decimals, $decimalpoint, $separator);
3645 3645
 
3646 3646
 
3647 3647
 
3648
-    if($currency_symbol_placement=='left'){
3649
-        $number = $symbol . $number;
3650
-    }else{
3651
-        $number = $number . $symbol;
3648
+    if ($currency_symbol_placement == 'left') {
3649
+        $number = $symbol.$number;
3650
+    } else {
3651
+        $number = $number.$symbol;
3652 3652
     }
3653 3653
 
3654 3654
 
Please login to merge, or discard this patch.
geodirectory-widgets/geodirectory_listing_slider_widget.php 3 patches
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
     {
95 95
 
96 96
         //widgetform in backend
97
-        $instance = wp_parse_args((array)$instance,
97
+        $instance = wp_parse_args((array) $instance,
98 98
             array('title' => '',
99 99
                 'post_type' => '',
100 100
                 'category' => '',
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
         ?>
154 154
 
155 155
         <p>
156
-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
156
+            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>
157 157
 
158 158
                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
159 159
                        name="<?php echo $this->get_field_name('title'); ?>" type="text"
@@ -163,7 +163,7 @@  discard block
 block discarded – undo
163 163
 
164 164
         <p>
165 165
             <label
166
-                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory');?>
166
+                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory'); ?>
167 167
 
168 168
                 <?php $postypes = geodir_get_posttypes(); ?>
169 169
 
@@ -187,7 +187,7 @@  discard block
 block discarded – undo
187 187
 
188 188
         <p>
189 189
             <label
190
-                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory');?>
190
+                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory'); ?>
191 191
 
192 192
                 <?php
193 193
                 $category_taxonomy = geodir_get_taxonomies('gd_place');
@@ -224,7 +224,7 @@  discard block
 block discarded – undo
224 224
         </p>
225 225
         <p>
226 226
             <label
227
-                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts(total):', 'geodirectory');?>
227
+                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts(total):', 'geodirectory'); ?>
228 228
                 <input class="widefat" id="<?php echo $this->get_field_id('post_number'); ?>"
229 229
                        name="<?php echo $this->get_field_name('post_number'); ?>" type="text"
230 230
                        value="<?php echo esc_attr($post_number); ?>"/>
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 
234 234
         <p>
235 235
             <label
236
-                for="<?php echo $this->get_field_id('max_show'); ?>"><?php _e('Number of posts(shown at one time, requires a slide width to be set):', 'geodirectory');?>
236
+                for="<?php echo $this->get_field_id('max_show'); ?>"><?php _e('Number of posts(shown at one time, requires a slide width to be set):', 'geodirectory'); ?>
237 237
                 <input class="widefat" id="<?php echo $this->get_field_id('max_show'); ?>"
238 238
                        name="<?php echo $this->get_field_name('max_show'); ?>" type="text"
239 239
                        value="<?php echo esc_attr($max_show); ?>"/>
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 
243 243
         <p>
244 244
             <label
245
-                for="<?php echo $this->get_field_id('slide_width'); ?>"><?php _e('Slide width(leave blank unless showing more than one slide at a time, ex: 210):', 'geodirectory');?>
245
+                for="<?php echo $this->get_field_id('slide_width'); ?>"><?php _e('Slide width(leave blank unless showing more than one slide at a time, ex: 210):', 'geodirectory'); ?>
246 246
                 <input class="widefat" id="<?php echo $this->get_field_id('slide_width'); ?>"
247 247
                        name="<?php echo $this->get_field_name('slide_width'); ?>" type="text"
248 248
                        value="<?php echo esc_attr($slide_width); ?>"/>
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 
252 252
         <p>
253 253
             <label
254
-                for="<?php echo $this->get_field_id('animation'); ?>"><?php _e('Animation:', 'geodirectory');?>
254
+                for="<?php echo $this->get_field_id('animation'); ?>"><?php _e('Animation:', 'geodirectory'); ?>
255 255
 
256 256
                 <select class="widefat" id="<?php echo $this->get_field_id('animation'); ?>"
257 257
                         name="<?php echo $this->get_field_name('animation'); ?>">
@@ -269,7 +269,7 @@  discard block
 block discarded – undo
269 269
 
270 270
         <p>
271 271
             <label
272
-                for="<?php echo $this->get_field_id('slideshowSpeed'); ?>"><?php _e('Slide Show Speed: (milliseconds)', 'geodirectory');?>
272
+                for="<?php echo $this->get_field_id('slideshowSpeed'); ?>"><?php _e('Slide Show Speed: (milliseconds)', 'geodirectory'); ?>
273 273
 
274 274
                 <input class="widefat" id="<?php echo $this->get_field_id('slideshowSpeed'); ?>"
275 275
                        name="<?php echo $this->get_field_name('slideshowSpeed'); ?>" type="text"
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 
280 280
         <p>
281 281
             <label
282
-                for="<?php echo $this->get_field_id('animationSpeed'); ?>"><?php _e('Animation Speed: (milliseconds)', 'geodirectory');?>
282
+                for="<?php echo $this->get_field_id('animationSpeed'); ?>"><?php _e('Animation Speed: (milliseconds)', 'geodirectory'); ?>
283 283
 
284 284
                 <input class="widefat" id="<?php echo $this->get_field_id('animationSpeed'); ?>"
285 285
                        name="<?php echo $this->get_field_name('animationSpeed'); ?>" type="text"
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
 
290 290
         <p>
291 291
             <label
292
-                for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory');?>
292
+                for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory'); ?>
293 293
 
294 294
                 <input type="checkbox" <?php if ($slideshow) {
295 295
                     echo 'checked="checked"';
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 
302 302
         <p>
303 303
             <label
304
-                for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory');?>
304
+                for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory'); ?>
305 305
 
306 306
                 <input type="checkbox" <?php if ($animationLoop) {
307 307
                     echo 'checked="checked"';
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 
314 314
         <p>
315 315
             <label
316
-                for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory');?>
316
+                for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory'); ?>
317 317
 
318 318
                 <input type="checkbox" <?php if ($directionNav) {
319 319
                     echo 'checked="checked"';
@@ -326,7 +326,7 @@  discard block
 block discarded – undo
326 326
 
327 327
         <p>
328 328
             <label
329
-                for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory');?>
329
+                for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory'); ?>
330 330
 
331 331
                 <input type="checkbox" <?php if ($show_title) {
332 332
                     echo 'checked="checked"';
@@ -345,9 +345,9 @@  discard block
 block discarded – undo
345 345
         </p>
346 346
         <p>
347 347
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
348
-                <?php _e('Enable Location Filter:', 'geodirectory');?>
348
+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>
349 349
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
350
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
350
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>
351 351
                        value="1"/>
352 352
             </label>
353 353
         </p>
@@ -368,10 +368,10 @@  discard block
 block discarded – undo
368 368
 
369 369
             }
370 370
 
371
-            <?php if(is_active_widget( false, false, $this->id_base, true )){ ?>
371
+            <?php if (is_active_widget(false, false, $this->id_base, true)) { ?>
372 372
             var post_type = jQuery('#<?php echo $this->get_field_id('post_type'); ?>').val();
373 373
 
374
-            geodir_change_category_list(post_type, '<?php echo $category;?>');
374
+            geodir_change_category_list(post_type, '<?php echo $category; ?>');
375 375
             <?php } ?>
376 376
 
377 377
         </script>
Please login to merge, or discard this patch.
Braces   +13 added lines, -6 removed lines patch added patch discarded remove patch
@@ -74,10 +74,11 @@  discard block
 block discarded – undo
74 74
         $instance['animation'] = $new_instance['animation'];
75 75
         $instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';
76 76
         $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;
77
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
78
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
79
-        else
80
-            $instance['add_location_filter'] = '0';
77
+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
78
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
79
+        } else {
80
+                    $instance['add_location_filter'] = '0';
81
+        }
81 82
 
82 83
         return $instance;
83 84
     }
@@ -339,7 +340,10 @@  discard block
 block discarded – undo
339 340
             <label
340 341
                 for="<?php echo $this->get_field_id('show_featured_only'); ?>"><?php _e('Show only featured listings:', 'geodirectory'); ?>
341 342
                 <input type="checkbox" id="<?php echo $this->get_field_id('show_featured_only'); ?>"
342
-                       name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) echo 'checked="checked"'; ?>
343
+                       name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) {
344
+	echo 'checked="checked"';
345
+}
346
+?>
343 347
                        value="1"/>
344 348
             </label>
345 349
         </p>
@@ -347,7 +351,10 @@  discard block
 block discarded – undo
347 351
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">
348 352
                 <?php _e('Enable Location Filter:', 'geodirectory');?>
349 353
                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"
350
-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>
354
+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
355
+	echo 'checked="checked"';
356
+}
357
+?>
351 358
                        value="1"/>
352 359
             </label>
353 360
         </p>
Please login to merge, or discard this patch.
Indentation   +109 added lines, -109 removed lines patch added patch discarded remove patch
@@ -15,40 +15,40 @@  discard block
 block discarded – undo
15 15
 class geodir_listing_slider_widget extends WP_Widget
16 16
 {
17 17
 
18
-    /**
18
+	/**
19 19
 	 * Register the listing slider widget.
20 20
 	 *
21 21
 	 * @since 1.0.0
22
-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
22
+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
23 23
 	 */
24
-    public function __construct() {
25
-        $widget_ops = array('classname' => 'geodir_listing_slider_view', 'description' => __('GD > Listing Slider', 'geodirectory'));
26
-        parent::__construct(
27
-            'listing_slider_view', // Base ID
28
-            __('GD > Listing Slider', 'geodirectory'), // Name
29
-            $widget_ops// Args
30
-        );
31
-    }
24
+	public function __construct() {
25
+		$widget_ops = array('classname' => 'geodir_listing_slider_view', 'description' => __('GD > Listing Slider', 'geodirectory'));
26
+		parent::__construct(
27
+			'listing_slider_view', // Base ID
28
+			__('GD > Listing Slider', 'geodirectory'), // Name
29
+			$widget_ops// Args
30
+		);
31
+	}
32 32
 	
33 33
 	/**
34 34
 	 * Front-end display content for listing slider widget.
35 35
 	 *
36 36
 	 * @since 1.0.0
37
-     * @since 1.5.1 Declare function public.
37
+	 * @since 1.5.1 Declare function public.
38 38
 	 *
39 39
 	 * @param array $args     Widget arguments.
40 40
 	 * @param array $instance Saved values from database.
41 41
 	 */
42
-    public function widget($args, $instance)
43
-    {
44
-        geodir_listing_slider_widget_output($args, $instance);
45
-    }
42
+	public function widget($args, $instance)
43
+	{
44
+		geodir_listing_slider_widget_output($args, $instance);
45
+	}
46 46
 
47 47
 	/**
48 48
 	 * Sanitize listing slider widget form values as they are saved.
49 49
 	 *
50 50
 	 * @since 1.0.0
51
-     * @since 1.5.1 Declare function public.
51
+	 * @since 1.5.1 Declare function public.
52 52
 	 *
53 53
 	 * @param array $new_instance Values just sent to be saved.
54 54
 	 * @param array $old_instance Previously saved values from database.
@@ -56,101 +56,101 @@  discard block
 block discarded – undo
56 56
 	 * @return array Updated safe values to be saved.
57 57
 	 */
58 58
 	public function update($new_instance, $old_instance)
59
-    {
60
-        //save the widget
61
-        $instance = $old_instance;
62
-        $instance['title'] = strip_tags($new_instance['title']);
63
-        $instance['post_type'] = strip_tags($new_instance['post_type']);
64
-        $instance['category'] = strip_tags($new_instance['category']);
65
-        $instance['post_number'] = strip_tags($new_instance['post_number']);
66
-        $instance['max_show'] = strip_tags($new_instance['max_show']);
67
-        $instance['slide_width'] = strip_tags($new_instance['slide_width']);
68
-        $instance['show_title'] = isset($new_instance['show_title']) ? $new_instance['show_title'] : '';
69
-        $instance['slideshow'] = isset($new_instance['slideshow']) ? $new_instance['slideshow'] : '';
70
-        $instance['animationLoop'] = isset($new_instance['animationLoop']) ? $new_instance['animationLoop'] : '';
71
-        $instance['directionNav'] = isset($new_instance['directionNav']) ? $new_instance['directionNav'] : '';
72
-        $instance['slideshowSpeed'] = $new_instance['slideshowSpeed'];
73
-        $instance['animationSpeed'] = $new_instance['animationSpeed'];
74
-        $instance['animation'] = $new_instance['animation'];
75
-        $instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';
76
-        $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;
77
-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
78
-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
79
-        else
80
-            $instance['add_location_filter'] = '0';
81
-
82
-        return $instance;
83
-    }
59
+	{
60
+		//save the widget
61
+		$instance = $old_instance;
62
+		$instance['title'] = strip_tags($new_instance['title']);
63
+		$instance['post_type'] = strip_tags($new_instance['post_type']);
64
+		$instance['category'] = strip_tags($new_instance['category']);
65
+		$instance['post_number'] = strip_tags($new_instance['post_number']);
66
+		$instance['max_show'] = strip_tags($new_instance['max_show']);
67
+		$instance['slide_width'] = strip_tags($new_instance['slide_width']);
68
+		$instance['show_title'] = isset($new_instance['show_title']) ? $new_instance['show_title'] : '';
69
+		$instance['slideshow'] = isset($new_instance['slideshow']) ? $new_instance['slideshow'] : '';
70
+		$instance['animationLoop'] = isset($new_instance['animationLoop']) ? $new_instance['animationLoop'] : '';
71
+		$instance['directionNav'] = isset($new_instance['directionNav']) ? $new_instance['directionNav'] : '';
72
+		$instance['slideshowSpeed'] = $new_instance['slideshowSpeed'];
73
+		$instance['animationSpeed'] = $new_instance['animationSpeed'];
74
+		$instance['animation'] = $new_instance['animation'];
75
+		$instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';
76
+		$instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;
77
+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')
78
+			$instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
79
+		else
80
+			$instance['add_location_filter'] = '0';
81
+
82
+		return $instance;
83
+	}
84 84
 
85 85
 	/**
86 86
 	 * Back-end listing slider widget settings form.
87 87
 	 *
88 88
 	 * @since 1.0.0
89
-     * @since 1.5.1 Declare function public.
89
+	 * @since 1.5.1 Declare function public.
90 90
 	 *
91 91
 	 * @param array $instance Previously saved values from database.
92 92
 	 */
93 93
 	public function form($instance)
94
-    {
94
+	{
95 95
 
96
-        //widgetform in backend
97
-        $instance = wp_parse_args((array)$instance,
98
-            array('title' => '',
99
-                'post_type' => '',
100
-                'category' => '',
101
-                'post_number' => '5',
102
-                'max_show' => '1',
103
-                'slide_width' => '',
104
-                'show_title' => '',
105
-                'slideshow' => '',
106
-                'animationLoop' => '',
107
-                'directionNav' => '',
108
-                'slideshowSpeed' => 5000,
109
-                'animationSpeed' => 600,
110
-                'animation' => '',
111
-                'list_sort' => 'latest',
112
-                'show_featured_only' => '',
113
-                'add_location_filter' => '0',
114
-            )
115
-        );
96
+		//widgetform in backend
97
+		$instance = wp_parse_args((array)$instance,
98
+			array('title' => '',
99
+				'post_type' => '',
100
+				'category' => '',
101
+				'post_number' => '5',
102
+				'max_show' => '1',
103
+				'slide_width' => '',
104
+				'show_title' => '',
105
+				'slideshow' => '',
106
+				'animationLoop' => '',
107
+				'directionNav' => '',
108
+				'slideshowSpeed' => 5000,
109
+				'animationSpeed' => 600,
110
+				'animation' => '',
111
+				'list_sort' => 'latest',
112
+				'show_featured_only' => '',
113
+				'add_location_filter' => '0',
114
+			)
115
+		);
116 116
 
117
-        $title = strip_tags($instance['title']);
117
+		$title = strip_tags($instance['title']);
118 118
 
119
-        $post_type = strip_tags($instance['post_type']);
119
+		$post_type = strip_tags($instance['post_type']);
120 120
 
121
-        $category = strip_tags($instance['category']);
121
+		$category = strip_tags($instance['category']);
122 122
 
123
-        $post_number = strip_tags($instance['post_number']);
123
+		$post_number = strip_tags($instance['post_number']);
124 124
 
125
-        $max_show = strip_tags($instance['max_show']);
125
+		$max_show = strip_tags($instance['max_show']);
126 126
 
127
-        $slide_width = strip_tags($instance['slide_width']);
127
+		$slide_width = strip_tags($instance['slide_width']);
128 128
 
129
-        $show_title = $instance['show_title'];
129
+		$show_title = $instance['show_title'];
130 130
 
131
-        $slideshow = $instance['slideshow'];
131
+		$slideshow = $instance['slideshow'];
132 132
 
133
-        $animationLoop = $instance['animationLoop'];
133
+		$animationLoop = $instance['animationLoop'];
134 134
 
135
-        $directionNav = $instance['directionNav'];
135
+		$directionNav = $instance['directionNav'];
136 136
 
137
-        $slideshowSpeed = $instance['slideshowSpeed'];
137
+		$slideshowSpeed = $instance['slideshowSpeed'];
138 138
 
139
-        $animationSpeed = $instance['animationSpeed'];
139
+		$animationSpeed = $instance['animationSpeed'];
140 140
 
141
-        $add_location_filter = strip_tags($instance['add_location_filter']);
141
+		$add_location_filter = strip_tags($instance['add_location_filter']);
142 142
 
143
-        $animation = $instance['animation'];
144
-        $list_sort = $instance['list_sort'];
145
-        $show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;
143
+		$animation = $instance['animation'];
144
+		$list_sort = $instance['list_sort'];
145
+		$show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;
146 146
 
147
-        $sort_fields = array();
148
-        $sort_fields[] = array('field' => 'latest', 'label' => __('Latest', 'geodirectory'));
149
-        $sort_fields[] = array('field' => 'featured', 'label' => __('Featured', 'geodirectory'));
150
-        $sort_fields[] = array('field' => 'high_review', 'label' => __('Review', 'geodirectory'));
151
-        $sort_fields[] = array('field' => 'high_rating', 'label' => __('Rating', 'geodirectory'));
152
-        $sort_fields[] = array('field' => 'random', 'label' => __('Random', 'geodirectory'));
153
-        ?>
147
+		$sort_fields = array();
148
+		$sort_fields[] = array('field' => 'latest', 'label' => __('Latest', 'geodirectory'));
149
+		$sort_fields[] = array('field' => 'featured', 'label' => __('Featured', 'geodirectory'));
150
+		$sort_fields[] = array('field' => 'high_review', 'label' => __('Review', 'geodirectory'));
151
+		$sort_fields[] = array('field' => 'high_rating', 'label' => __('Rating', 'geodirectory'));
152
+		$sort_fields[] = array('field' => 'random', 'label' => __('Random', 'geodirectory'));
153
+		?>
154 154
 
155 155
         <p>
156 156
             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>
@@ -174,9 +174,9 @@  discard block
 block discarded – undo
174 174
                     <?php foreach ($postypes as $postypes_obj) { ?>
175 175
 
176 176
                         <option <?php if ($post_type == $postypes_obj) {
177
-                            echo 'selected="selected"';
178
-                        } ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);
179
-                            echo geodir_utf8_ucfirst($extvalue[1]); ?></option>
177
+							echo 'selected="selected"';
178
+						} ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);
179
+							echo geodir_utf8_ucfirst($extvalue[1]); ?></option>
180 180
 
181 181
                     <?php } ?>
182 182
 
@@ -190,20 +190,20 @@  discard block
 block discarded – undo
190 190
                 for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory');?>
191 191
 
192 192
                 <?php
193
-                $category_taxonomy = geodir_get_taxonomies('gd_place');
194
-                $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));
195
-                ?>
193
+				$category_taxonomy = geodir_get_taxonomies('gd_place');
194
+				$categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));
195
+				?>
196 196
 
197 197
                 <select class="widefat" id="<?php echo $this->get_field_id('category'); ?>"
198 198
                         name="<?php echo $this->get_field_name('category'); ?>">
199 199
                     <option <?php if ($category == '0') {
200
-                        echo 'selected="selected"';
201
-                    } ?> value="0"><?php _e('All', 'geodirectory'); ?></option>
200
+						echo 'selected="selected"';
201
+					} ?> value="0"><?php _e('All', 'geodirectory'); ?></option>
202 202
                     <?php foreach ($categories as $category_obj) { ?>
203 203
 
204 204
                         <option <?php if ($category == $category_obj->term_id) {
205
-                            echo 'selected="selected"';
206
-                        } ?>
205
+							echo 'selected="selected"';
206
+						} ?>
207 207
                             value="<?php echo $category_obj->term_id; ?>"><?php echo geodir_utf8_ucfirst($category_obj->name); ?></option>
208 208
 
209 209
                     <?php } ?>
@@ -256,12 +256,12 @@  discard block
 block discarded – undo
256 256
                 <select class="widefat" id="<?php echo $this->get_field_id('animation'); ?>"
257 257
                         name="<?php echo $this->get_field_name('animation'); ?>">
258 258
                     <option <?php if ($animation == 'slide') {
259
-                        echo 'selected="selected"';
260
-                    } ?> value="slide">Slide
259
+						echo 'selected="selected"';
260
+					} ?> value="slide">Slide
261 261
                     </option>
262 262
                     <option <?php if ($animation == 'fade') {
263
-                        echo 'selected="selected"';
264
-                    } ?> value="fade">Fade
263
+						echo 'selected="selected"';
264
+					} ?> value="fade">Fade
265 265
                     </option>
266 266
                 </select>
267 267
             </label>
@@ -292,8 +292,8 @@  discard block
 block discarded – undo
292 292
                 for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory');?>
293 293
 
294 294
                 <input type="checkbox" <?php if ($slideshow) {
295
-                    echo 'checked="checked"';
296
-                } ?> id="<?php echo $this->get_field_id('slideshow'); ?>" value="1"
295
+					echo 'checked="checked"';
296
+				} ?> id="<?php echo $this->get_field_id('slideshow'); ?>" value="1"
297 297
                        name="<?php echo $this->get_field_name('slideshow'); ?>"/>
298 298
 
299 299
             </label>
@@ -304,8 +304,8 @@  discard block
 block discarded – undo
304 304
                 for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory');?>
305 305
 
306 306
                 <input type="checkbox" <?php if ($animationLoop) {
307
-                    echo 'checked="checked"';
308
-                } ?> id="<?php echo $this->get_field_id('animationLoop'); ?>" value="1"
307
+					echo 'checked="checked"';
308
+				} ?> id="<?php echo $this->get_field_id('animationLoop'); ?>" value="1"
309 309
                        name="<?php echo $this->get_field_name('animationLoop'); ?>"/>
310 310
 
311 311
             </label>
@@ -316,8 +316,8 @@  discard block
 block discarded – undo
316 316
                 for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory');?>
317 317
 
318 318
                 <input type="checkbox" <?php if ($directionNav) {
319
-                    echo 'checked="checked"';
320
-                } ?> id="<?php echo $this->get_field_id('directionNav'); ?>" value="1"
319
+					echo 'checked="checked"';
320
+				} ?> id="<?php echo $this->get_field_id('directionNav'); ?>" value="1"
321 321
                        name="<?php echo $this->get_field_name('directionNav'); ?>"/>
322 322
 
323 323
             </label>
@@ -329,8 +329,8 @@  discard block
 block discarded – undo
329 329
                 for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory');?>
330 330
 
331 331
                 <input type="checkbox" <?php if ($show_title) {
332
-                    echo 'checked="checked"';
333
-                } ?> id="<?php echo $this->get_field_id('show_title'); ?>" value="1"
332
+					echo 'checked="checked"';
333
+				} ?> id="<?php echo $this->get_field_id('show_title'); ?>" value="1"
334 334
                        name="<?php echo $this->get_field_name('show_title'); ?>"/>
335 335
 
336 336
             </label>
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 
379 379
 
380 380
     <?php
381
-    }
381
+	}
382 382
 } // class geodir_listing_slider_widget
383 383
 
384 384
 register_widget('geodir_listing_slider_widget');
385 385
\ No newline at end of file
Please login to merge, or discard this patch.
geodirectory-admin/admin_hooks_actions.php 4 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1844,6 +1844,7 @@  discard block
 block discarded – undo
1844 1844
  * @since 1.0.0
1845 1845
  * @package GeoDirectory
1846 1846
  * @global object $current_user Current user object.
1847
+ * @param string|null $input
1847 1848
  * @return array Returns parsed data as array.
1848 1849
  */
1849 1850
 function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")
@@ -2373,7 +2374,6 @@  discard block
 block discarded – undo
2373 2374
  *
2374 2375
  * @since 1.6.9
2375 2376
  *
2376
- * @param array $settings Array of GeoDirectory general settings.
2377 2377
  * @return array Array of settings.
2378 2378
  */
2379 2379
 function geodir_uninstall_settings($general_settings) {
Please login to merge, or discard this patch.
Braces   +61 added lines, -54 removed lines patch added patch discarded remove patch
@@ -24,8 +24,11 @@  discard block
 block discarded – undo
24 24
             global $current_tab;
25 25
             geodir_redirect_to_admin_panel_on_installed();
26 26
             $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';
27
-            if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests
28
-                geodir_handle_option_form_submit($current_tab); // located in admin function.php
27
+            if (!(isset($_REQUEST['action']))) {
28
+            	// this will avoid Ajax requests
29
+                geodir_handle_option_form_submit($current_tab);
30
+            }
31
+            // located in admin function.php
29 32
             /**
30 33
              * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.
31 34
              *
@@ -328,8 +331,9 @@  discard block
 block discarded – undo
328 331
     if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
329 332
 
330 333
         foreach ($notification as $key => $value) {
331
-            if ($value['type'] == 'textarea')
332
-                $notification[$key]['type'] = 'editor';
334
+            if ($value['type'] == 'textarea') {
335
+                            $notification[$key]['type'] = 'editor';
336
+            }
333 337
         }
334 338
 
335 339
     }
@@ -354,8 +358,9 @@  discard block
 block discarded – undo
354 358
     if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
355 359
 
356 360
         foreach ($design_setting as $key => $value) {
357
-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')
358
-                $design_setting[$key]['type'] = 'editor';
361
+            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') {
362
+                            $design_setting[$key]['type'] = 'editor';
363
+            }
359 364
         }
360 365
 
361 366
     }
@@ -474,9 +479,9 @@  discard block
 block discarded – undo
474 479
                    class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">
475 480
                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
476 481
                         echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';
477
-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){
482
+                    } elseif(isset($val['field_icon']) && $val['field_icon'] ){
478 483
                         echo '<b class="gd-cf-icon" style="background-image: url(\''.$val['field_icon'].'\')"></b>';
479
-                    }else{
484
+                    } else{
480 485
                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';
481 486
                     }?>
482 487
                     <?php echo (! empty( $val['admin_title'] ) ? $val['admin_title'] : $val['site_title'] );?>
@@ -706,9 +711,9 @@  discard block
 block discarded – undo
706 711
         <?php
707 712
         if($type=='predefined'){
708 713
             $cfs = geodir_custom_fields_predefined($listing_type);
709
-        }elseif($type=='custom'){
714
+        } elseif($type=='custom'){
710 715
             $cfs = geodir_custom_fields_custom($listing_type);
711
-        }else{
716
+        } else{
712 717
             $cfs = geodir_custom_fields($listing_type);
713 718
             ?>
714 719
             <ul class="full gd-cf-tooltip-wrap">
@@ -763,7 +768,7 @@  discard block
 block discarded – undo
763 768
             </li>
764 769
             <?php
765 770
         }
766
-    }else{
771
+    } else{
767 772
         _e('There are no custom fields here yet.', 'geodirectory');
768 773
     }
769 774
         ?>
@@ -960,8 +965,9 @@  discard block
 block discarded – undo
960 965
 
961 966
     if (!get_option('geodir_remove_unnecessary_fields')) {
962 967
 
963
-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
964
-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
968
+        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'")) {
969
+                    $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
970
+        }
965 971
 
966 972
         update_option('geodir_remove_unnecessary_fields', '1');
967 973
 
@@ -997,8 +1003,9 @@  discard block
 block discarded – undo
997 1003
                 break;
998 1004
 
999 1005
             case 'diagnosis-fix' :
1000
-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')
1001
-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
1006
+                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
1007
+                                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
1008
+                }
1002 1009
                 call_user_func('geodir_diagnose_' . $diagnose_this);
1003 1010
                 exit();
1004 1011
                 break;
@@ -1613,11 +1620,11 @@  discard block
 block discarded – undo
1613 1620
     //////////////////////////////////
1614 1621
     $option_value = get_option('geodir_home_page');
1615 1622
     $page = get_post($option_value);
1616
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1623
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1617 1624
 
1618
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1619
-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
1620
-    else {
1625
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1626
+            $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
1627
+    } else {
1621 1628
         $is_error_during_diagnose = true;
1622 1629
         $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
1623 1630
         if ($fix) {
@@ -1638,11 +1645,11 @@  discard block
 block discarded – undo
1638 1645
     //////////////////////////////////
1639 1646
     $option_value = get_option('geodir_add_listing_page');
1640 1647
     $page = get_post($option_value);
1641
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1648
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1642 1649
 
1643
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1644
-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
1645
-    else {
1650
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1651
+            $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
1652
+    } else {
1646 1653
         $is_error_during_diagnose = true;
1647 1654
         $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
1648 1655
         if ($fix) {
@@ -1664,11 +1671,11 @@  discard block
 block discarded – undo
1664 1671
     //////////////////////////////////
1665 1672
     $option_value = get_option('geodir_preview_page');
1666 1673
     $page = get_post($option_value);
1667
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1674
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1668 1675
 
1669
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1670
-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
1671
-    else {
1676
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1677
+            $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
1678
+    } else {
1672 1679
         $is_error_during_diagnose = true;
1673 1680
         $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
1674 1681
         if ($fix) {
@@ -1689,11 +1696,11 @@  discard block
 block discarded – undo
1689 1696
     //////////////////////////////////
1690 1697
     $option_value = get_option('geodir_success_page');
1691 1698
     $page = get_post($option_value);
1692
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1699
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1693 1700
 
1694
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1695
-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
1696
-    else {
1701
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1702
+            $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
1703
+    } else {
1697 1704
         $is_error_during_diagnose = true;
1698 1705
         $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
1699 1706
         if ($fix) {
@@ -1714,11 +1721,11 @@  discard block
 block discarded – undo
1714 1721
     //////////////////////////////////
1715 1722
     $option_value = get_option('geodir_info_page');
1716 1723
     $page = get_post($option_value);
1717
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1724
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1718 1725
 
1719
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1720
-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
1721
-    else {
1726
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1727
+            $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
1728
+    } else {
1722 1729
         $is_error_during_diagnose = true;
1723 1730
         $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
1724 1731
         if ($fix) {
@@ -1739,11 +1746,11 @@  discard block
 block discarded – undo
1739 1746
     //////////////////////////////////
1740 1747
     $option_value = get_option('geodir_login_page');
1741 1748
     $page = get_post($option_value);
1742
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1749
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1743 1750
 
1744
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1745
-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
1746
-    else {
1751
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1752
+            $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
1753
+    } else {
1747 1754
         $is_error_during_diagnose = true;
1748 1755
         $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
1749 1756
         if ($fix) {
@@ -1764,11 +1771,11 @@  discard block
 block discarded – undo
1764 1771
     //////////////////////////////////
1765 1772
     $option_value = get_option('geodir_location_page');
1766 1773
     $page = get_post($option_value);
1767
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1774
+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}
1768 1775
 
1769
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1770
-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
1771
-    else {
1776
+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
1777
+            $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
1778
+    } else {
1772 1779
         $is_error_during_diagnose = true;
1773 1780
         $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
1774 1781
         if ($fix) {
@@ -2213,8 +2220,9 @@  discard block
 block discarded – undo
2213 2220
                             );
2214 2221
 
2215 2222
                             $post_location_info = $request_info['post_location'];
2216
-                            if ($location_id = geodir_add_new_location($post_location_info))
2217
-                                $post_location_id = $location_id;
2223
+                            if ($location_id = geodir_add_new_location($post_location_info)) {
2224
+                                                            $post_location_id = $location_id;
2225
+                            }
2218 2226
                         } else {
2219 2227
                             $post_location_id = 0;
2220 2228
                         }
@@ -2277,8 +2285,9 @@  discard block
 block discarded – undo
2277 2285
                             $attachment_set = '';
2278 2286
 
2279 2287
                             foreach ($attachment as $key => $val) {
2280
-                                if ($val != '')
2281
-                                    $attachment_set .= $key . " = '" . $val . "', ";
2288
+                                if ($val != '') {
2289
+                                                                    $attachment_set .= $key . " = '" . $val . "', ";
2290
+                                }
2282 2291
                             }
2283 2292
                             $attachment_set = trim($attachment_set, ", ");
2284 2293
 
@@ -2374,8 +2383,7 @@  discard block
 block discarded – undo
2374 2383
 
2375 2384
         $parts = json_decode($response['body']);
2376 2385
         //print_r($parts);
2377
-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
2378
-        else{
2386
+        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;} else{
2379 2387
 
2380 2388
             update_option('gd_ga_access_token', $parts->access_token);
2381 2389
             update_option('gd_ga_refresh_token', $parts->refresh_token);
@@ -2383,17 +2391,16 @@  discard block
 block discarded – undo
2383 2391
         }
2384 2392
 
2385 2393
 
2386
-    }
2387
-    elseif(!empty($response['response']['code'])) {
2394
+    } elseif(!empty($response['response']['code'])) {
2388 2395
         $parts = json_decode($response['body']);
2389 2396
 
2390 2397
         if(isset($parts->error)){
2391 2398
             echo $parts->error.": ".$parts->error_description;exit;
2392
-        }else{
2399
+        } else{
2393 2400
             echo $error_msg." - #2";exit;
2394 2401
         }
2395 2402
 
2396
-    }else{
2403
+    } else{
2397 2404
 
2398 2405
         echo $error_msg." - #3";exit;
2399 2406
 
@@ -2531,7 +2538,7 @@  discard block
 block discarded – undo
2531 2538
         ob_start();
2532 2539
         geodir_diagnose_version_clear();
2533 2540
         ob_end_clean();
2534
-    }else{
2541
+    } else{
2535 2542
         $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
2536 2543
     }
2537 2544
 
Please login to merge, or discard this patch.
Spacing   +253 added lines, -253 removed lines patch added patch discarded remove patch
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
  */
63 63
 function geodir_get_admin_option_form($current_tab)
64 64
 {
65
-    geodir_admin_option_form($current_tab);// defined in admin template tags.php
65
+    geodir_admin_option_form($current_tab); // defined in admin template tags.php
66 66
 }
67 67
 
68 68
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 add_action('geodir_update_options_compatibility_settings', 'geodir_update_options_compatibility_settings');
71 71
 add_action('geodir_update_options_default_location_settings', 'geodir_location_form_submit');
72 72
 add_action('geodir_before_admin_panel', 'geodir_before_admin_panel'); // this function is in admin_functions.php
73
-add_action('geodir_before_update_options', 'geodir_before_update_options',10,2);
73
+add_action('geodir_before_update_options', 'geodir_before_update_options', 10, 2);
74 74
 
75 75
 //add_action('geodir_before_admin_panel', 'geodir_autoinstall_admin_header');
76 76
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
         
100 100
         // Disable VC editor for GD post types.
101 101
         if (class_exists('Vc_Role_Access_Controller')) {
102
-            add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 );
102
+            add_filter('vc_role_access_with_post_types_can', '__return_false', 100);
103 103
         }
104 104
     }
105 105
 
@@ -126,8 +126,8 @@  discard block
 block discarded – undo
126 126
 add_action('admin_panel_init', 'geodir_admin_list_columns', 2);
127 127
 
128 128
 /* --- insert dummy post action ---*/
129
-add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1,3);
130
-add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1,3);
129
+add_action('geodir_insert_dummy_posts', 'geodir_insert_dummy_posts', 1, 3);
130
+add_action('geodir_delete_dummy_posts', 'geodir_delete_dummy_posts', 1, 3);
131 131
 
132 132
 
133 133
 /**
@@ -240,9 +240,9 @@  discard block
 block discarded – undo
240 240
 
241 241
         // Filter-Payment-Manager
242 242
 
243
-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
243
+        add_meta_box('geodir_post_images', $post_typename.' '.__('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
244 244
 
245
-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
245
+        add_meta_box('geodir_post_info', $post_typename.' '.__('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
246 246
 
247 247
         // no need of this box as all fields moved to main information box
248 248
         //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
@@ -251,7 +251,7 @@  discard block
 block discarded – undo
251 251
 
252 252
 }
253 253
 
254
-add_action('save_post', 'geodir_post_information_save',10,2);
254
+add_action('save_post', 'geodir_post_information_save', 10, 2);
255 255
 
256 256
 
257 257
 
@@ -278,10 +278,10 @@  discard block
 block discarded – undo
278 278
 
279 279
             $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);
280 280
 
281
-            if(!empty($gd_taxonomy)) {
281
+            if (!empty($gd_taxonomy)) {
282 282
                 foreach ($gd_taxonomy as $tax) {
283 283
 
284
-                    remove_meta_box($tax . 'div', $geodir_post_type, 'normal');
284
+                    remove_meta_box($tax.'div', $geodir_post_type, 'normal');
285 285
 
286 286
                 }
287 287
             }
@@ -367,14 +367,14 @@  discard block
 block discarded – undo
367 367
 add_action('geodir_manage_available_fields_predefined', 'geodir_manage_available_fields_predefined');
368 368
 add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');
369 369
 
370
-function geodir_manage_available_fields_predefined($sub_tab){
371
-    if($sub_tab=='custom_fields'){
370
+function geodir_manage_available_fields_predefined($sub_tab) {
371
+    if ($sub_tab == 'custom_fields') {
372 372
         geodir_custom_available_fields('predefined');
373 373
     }
374 374
 }
375 375
 
376
-function geodir_manage_available_fields_custom($sub_tab){
377
-    if($sub_tab=='custom_fields'){
376
+function geodir_manage_available_fields_custom($sub_tab) {
377
+    if ($sub_tab == 'custom_fields') {
378 378
         geodir_custom_available_fields('custom');
379 379
     }
380 380
 }
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
     global $wpdb;
445 445
     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
446 446
     ?>
447
-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>
447
+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>
448 448
     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>
449 449
     <ul>
450 450
     <?php
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
 
456 456
             $check_html_variable = $wpdb->get_var(
457 457
                 $wpdb->prepare(
458
-                    "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",
458
+                    "SELECT htmlvar_name FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",
459 459
                     array($val['htmlvar_name'], $listing_type, $val['field_type'])
460 460
                 )
461 461
             );
@@ -463,23 +463,23 @@  discard block
 block discarded – undo
463 463
             $display = $check_html_variable ? ' style="display:none;"' : '';
464 464
            ?>
465 465
 
466
-            <li   class="gd-cf-tooltip-wrap" <?php echo $display;?>>
466
+            <li   class="gd-cf-tooltip-wrap" <?php echo $display; ?>>
467 467
                 <?php
468
-                if(isset($val['description']) && $val['description']){
468
+                if (isset($val['description']) && $val['description']) {
469 469
                     echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';
470 470
                 }?>
471 471
 
472
-                <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>"  data-field-type="<?php echo $val['field_type'];?>"
473
-                   title="<?php echo $val['site_title'];?>"
474
-                   class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">
472
+                <a id="gd-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>" data-field-type-key="<?php echo $val['htmlvar_name']; ?>"  data-field-type="<?php echo $val['field_type']; ?>"
473
+                   title="<?php echo $val['site_title']; ?>"
474
+                   class="gd-draggable-form-items  gd-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>" href="javascript:void(0);">
475 475
                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
476 476
                         echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';
477
-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){
477
+                    }elseif (isset($val['field_icon']) && $val['field_icon']) {
478 478
                         echo '<b class="gd-cf-icon" style="background-image: url(\''.$val['field_icon'].'\')"></b>';
479
-                    }else{
479
+                    } else {
480 480
                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';
481 481
                     }?>
482
-                    <?php echo (! empty( $val['admin_title'] ) ? $val['admin_title'] : $val['site_title'] );?>
482
+                    <?php echo (!empty($val['admin_title']) ? $val['admin_title'] : $val['site_title']); ?>
483 483
                 </a>
484 484
             </li>
485 485
 
@@ -507,7 +507,7 @@  discard block
 block discarded – undo
507 507
     <?php 
508 508
         global $wpdb;
509 509
         
510
-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
510
+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
511 511
 
512 512
         if (!empty($fields)) {
513 513
             foreach ($fields as $field) {
@@ -532,14 +532,14 @@  discard block
 block discarded – undo
532 532
  * @since 1.6.9
533 533
  * @package GeoDirectory
534 534
  */
535
-function geodir_custom_fields_custom($post_type=''){
535
+function geodir_custom_fields_custom($post_type = '') {
536 536
 
537 537
     $custom_fields = array();
538 538
 
539 539
     /**
540 540
      * @see `geodir_custom_fields`
541 541
      */
542
-    return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
542
+    return apply_filters('geodir_custom_fields_custom', $custom_fields, $post_type);
543 543
 }
544 544
 
545 545
 
@@ -550,7 +550,7 @@  discard block
 block discarded – undo
550 550
  * @since 1.6.6
551 551
  * @package GeoDirectory
552 552
  */
553
-function geodir_custom_fields($post_type=''){
553
+function geodir_custom_fields($post_type = '') {
554 554
     
555 555
     $custom_fields = array(
556 556
         'text' => array(
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
685 685
      * }
686 686
      * @param string $post_type The post type requested.
687 687
      */
688
-    return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
688
+    return apply_filters('geodir_custom_fields', $custom_fields, $post_type);
689 689
 }
690 690
 
691 691
 /**
@@ -696,25 +696,25 @@  discard block
 block discarded – undo
696 696
  * @param string $type The custom field type, predefined, custom or blank for default
697 697
  * @package GeoDirectory
698 698
  */
699
-function geodir_custom_available_fields($type='')
699
+function geodir_custom_available_fields($type = '')
700 700
 {
701 701
     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
702 702
     ?>
703
-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>
703
+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>
704 704
     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" />
705 705
 
706 706
         <?php
707
-        if($type=='predefined'){
707
+        if ($type == 'predefined') {
708 708
             $cfs = geodir_custom_fields_predefined($listing_type);
709
-        }elseif($type=='custom'){
709
+        }elseif ($type == 'custom') {
710 710
             $cfs = geodir_custom_fields_custom($listing_type);
711
-        }else{
711
+        } else {
712 712
             $cfs = geodir_custom_fields($listing_type);
713 713
             ?>
714 714
             <ul class="full gd-cf-tooltip-wrap">
715 715
                 <li>
716 716
                     <div class="gdcf-tooltip">
717
-                        <?php _e('This adds a section separator with a title.', 'geodirectory');?>
717
+                        <?php _e('This adds a section separator with a title.', 'geodirectory'); ?>
718 718
                     </div>
719 719
                     <a id="gt-fieldset"
720 720
                        class="gd-draggable-form-items gt-fieldset"
@@ -725,7 +725,7 @@  discard block
 block discarded – undo
725 725
 
726 726
                         <i class="fa fa-long-arrow-left " aria-hidden="true"></i>
727 727
                         <i class="fa fa-long-arrow-right " aria-hidden="true"></i>
728
-                        <?php _e('Fieldset (section separator)', 'geodirectory');?>
728
+                        <?php _e('Fieldset (section separator)', 'geodirectory'); ?>
729 729
                     </a>
730 730
                 </li>
731 731
             </ul>
@@ -733,15 +733,15 @@  discard block
 block discarded – undo
733 733
             <?php
734 734
         }
735 735
 
736
-    if(!empty($cfs)) {
736
+    if (!empty($cfs)) {
737 737
         echo '<ul>';
738
-        foreach ( $cfs as $id => $cf ) {
738
+        foreach ($cfs as $id => $cf) {
739 739
             ?>
740 740
 
741 741
             <li class="gd-cf-tooltip-wrap">
742 742
                 <?php
743
-                if ( isset( $cf['description'] ) && $cf['description'] ) {
744
-                    echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';
743
+                if (isset($cf['description']) && $cf['description']) {
744
+                    echo '<div class="gdcf-tooltip">'.$cf['description'].'</div>';
745 745
                 } ?>
746 746
 
747 747
                 <a id="gd-<?php echo $id; ?>"
@@ -751,10 +751,10 @@  discard block
 block discarded – undo
751 751
                    class="gd-draggable-form-items <?php echo $cf['class']; ?>"
752 752
                    href="javascript:void(0);">
753 753
 
754
-                    <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {
755
-                        echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';
756
-                    } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
757
-                        echo '<b class="gd-cf-icon" style="background-image: url(\'' . $cf['icon'] . '\')"></b>';
754
+                    <?php if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {
755
+                        echo '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';
756
+                    } elseif (isset($cf['icon']) && $cf['icon']) {
757
+                        echo '<b class="gd-cf-icon" style="background-image: url(\''.$cf['icon'].'\')"></b>';
758 758
                     } else {
759 759
                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';
760 760
                     } ?>
@@ -763,7 +763,7 @@  discard block
 block discarded – undo
763 763
             </li>
764 764
             <?php
765 765
         }
766
-    }else{
766
+    } else {
767 767
         _e('There are no custom fields here yet.', 'geodirectory');
768 768
     }
769 769
         ?>
@@ -791,7 +791,7 @@  discard block
 block discarded – undo
791 791
     <ul class="core">
792 792
     <?php 
793 793
         global $wpdb;
794
-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
794
+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
795 795
 
796 796
         if (!empty($fields)) {
797 797
             foreach ($fields as $field) {
@@ -801,7 +801,7 @@  discard block
 block discarded – undo
801 801
                 $field_type_key = $field->field_type_key;
802 802
                 $field_ins_upd = 'display';
803 803
 
804
-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);
804
+                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd, $field_type_key);
805 805
             }
806 806
         }
807 807
         ?></ul>
@@ -960,8 +960,8 @@  discard block
 block discarded – undo
960 960
 
961 961
     if (!get_option('geodir_remove_unnecessary_fields')) {
962 962
 
963
-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
964
-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
963
+        if ($wpdb->get_var("SHOW COLUMNS FROM ".$plugin_prefix."gd_place_detail WHERE field = 'categories'"))
964
+            $wpdb->query("ALTER TABLE `".$plugin_prefix."gd_place_detail` DROP `categories`");
965 965
 
966 966
         update_option('geodir_remove_unnecessary_fields', '1');
967 967
 
@@ -990,7 +990,7 @@  discard block
 block discarded – undo
990 990
             case 'diagnosis' :
991 991
                 if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
992 992
                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
993
-                    call_user_func('geodir_diagnose_' . $diagnose_this);
993
+                    call_user_func('geodir_diagnose_'.$diagnose_this);
994 994
 
995 995
                 }
996 996
                 exit();
@@ -999,7 +999,7 @@  discard block
 block discarded – undo
999 999
             case 'diagnosis-fix' :
1000 1000
                 if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')
1001 1001
                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
1002
-                call_user_func('geodir_diagnose_' . $diagnose_this);
1002
+                call_user_func('geodir_diagnose_'.$diagnose_this);
1003 1003
                 exit();
1004 1004
                 break;
1005 1005
         }
@@ -1024,50 +1024,50 @@  discard block
 block discarded – undo
1024 1024
 {
1025 1025
     global $wpdb;
1026 1026
     //$filter_arr['output_str'] .='###'.$table.'###';
1027
-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
1028
-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
1027
+    if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0) {
1028
+        $filter_arr['output_str'] .= "<li>".__('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory')."</li>";
1029 1029
         $filter_arr['is_error_during_diagnose'] = true;
1030 1030
 
1031
-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
1032
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
1031
+    } elseif ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {
1032
+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name)."</li>";
1033 1033
         $filter_arr['is_error_during_diagnose'] = true;
1034
-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
1034
+        $filter_arr['output_str'] .= "<li>".__('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory')."</li>";
1035 1035
         $filter_arr['is_error_during_diagnose'] = true;
1036 1036
 
1037 1037
         if ($fix) {
1038
-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
1039
-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
1038
+            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$table."_ms_bak"); // get backup table count
1039
+            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table"); // get new table count
1040 1040
 
1041 1041
             if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
1042 1042
                 //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
1043 1043
 
1044
-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
1044
+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename bak table to new table
1045 1045
 
1046
-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
1047
-                    $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
1046
+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {
1047
+                    $filter_arr['output_str'] .= "<li>".__('-->FIXED: Renamed and backed up the tables', 'geodirectory')."</li>";
1048 1048
                 } else {
1049
-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1049
+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
1050 1050
                 }
1051 1051
 
1052 1052
             } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
1053 1053
 
1054
-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
1055
-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
1054
+                $wpdb->query("RENAME TABLE ".$wpdb->prefix."$table TO ".$table."_ms_bak2"); // rename new table to bak2
1055
+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$wpdb->prefix."$table"); // rename bak table to new table
1056 1056
 
1057
-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1058
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
1057
+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1058
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table)."</li>";
1059 1059
                 } else {
1060
-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1060
+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
1061 1061
                 }
1062 1062
 
1063 1063
             } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
1064 1064
 
1065
-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
1065
+                $wpdb->query("RENAME TABLE ".$table."_ms_bak TO ".$table."_ms_bak2"); // rename ms_bak table to ms_bak2
1066 1066
 
1067
-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
1068
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
1067
+                if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") == 0) {
1068
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table)."</li>";
1069 1069
                 } else {
1070
-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1070
+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";
1071 1071
                 }
1072 1072
 
1073 1073
             }
@@ -1075,54 +1075,54 @@  discard block
 block discarded – undo
1075 1075
         }
1076 1076
 
1077 1077
 
1078
-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
1079
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
1078
+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {
1079
+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name)."</li>";
1080 1080
         $filter_arr['is_error_during_diagnose'] = true;
1081 1081
 
1082 1082
         if ($fix) {
1083 1083
             if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
1084 1084
                 if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
1085
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
1085
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table)."</li>";
1086 1086
                 } else {
1087
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
1087
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table)."</li>";
1088 1088
                 }
1089 1089
 
1090
-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
1091
-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
1092
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
1090
+            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table") == 0) {// if main table is empty but original is not, delete main and rename original
1091
+                if ($wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."$table")) {
1092
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix.$table)."</li>";
1093 1093
                 } else {
1094
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
1094
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix.$table)."</li>";
1095 1095
                 }
1096
-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1097
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1096
+                if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1097
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
1098 1098
                 } else {
1099
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1099
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
1100 1100
                 }
1101 1101
             } else {// else rename the original table to _ms_bak
1102
-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1103
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
1102
+                if ($wpdb->query("RENAME TABLE $table TO ".$table."_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1103
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table."_ms_bak")."</li>";
1104 1104
                 } else {
1105
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
1105
+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table."_ms_bak")."</li>";
1106 1106
                 }
1107 1107
             }
1108 1108
         }
1109 1109
 
1110
-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
1111
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
1110
+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {
1111
+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name)."</li>";
1112 1112
         $filter_arr['is_error_during_diagnose'] = true;
1113 1113
 
1114 1114
         if ($fix) {
1115 1115
             // if original table exists but new does not, rename
1116
-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1117
-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1116
+            if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1117
+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
1118 1118
             } else {
1119
-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1119
+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";
1120 1120
             }
1121 1121
 
1122 1122
         }
1123 1123
 
1124
-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
1125
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
1124
+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {
1125
+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name)."</li>";
1126 1126
         $filter_arr['is_error_during_diagnose'] = true;
1127 1127
 
1128 1128
         if ($fix) {
@@ -1136,11 +1136,11 @@  discard block
 block discarded – undo
1136 1136
             delete_option('geodir_custom_posts_db_version');
1137 1137
             delete_option('geodir_reviewratings_db_version');
1138 1138
             delete_option('geodiradvancesearch_db_version');
1139
-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
1139
+            $filter_arr['output_str'] .= "<li>".__('-->TRY: Please refresh page to run table install functions', 'geodirectory')."</li>";
1140 1140
         }
1141 1141
 
1142 1142
     } else {
1143
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
1143
+        $filter_arr['output_str'] .= "<li>".sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name)."</li>";
1144 1144
     }
1145 1145
     return $filter_arr;
1146 1146
 }
@@ -1181,21 +1181,21 @@  discard block
 block discarded – undo
1181 1181
     }
1182 1182
 
1183 1183
     if ($stepped_process) {
1184
-        $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset );
1185
-        $posts = $wpdb->get_results( $sql );
1184
+        $sql = $wpdb->prepare("SELECT * FROM ".$wpdb->prefix."geodir_".$ptype."_detail LIMIT %d OFFSET %d", $step_max_items, $offset);
1185
+        $posts = $wpdb->get_results($sql);
1186 1186
 
1187 1187
         if (!empty($posts)) {
1188 1188
 
1189 1189
             foreach ($posts as $p) {
1190 1190
                 $p->post_type = $ptype;
1191
-                $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
1191
+                $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));
1192 1192
                 if (empty($raw_tags)) {
1193 1193
                     $post_tags = '';
1194 1194
                 } else {
1195 1195
                     $post_tags = implode(",", $raw_tags);
1196 1196
                 }
1197
-                $tablename = $plugin_prefix . $p->post_type . '_detail';
1198
-                $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
1197
+                $tablename = $plugin_prefix.$p->post_type.'_detail';
1198
+                $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
1199 1199
 
1200 1200
             }
1201 1201
             if ($step >= $max_step) {
@@ -1211,23 +1211,23 @@  discard block
 block discarded – undo
1211 1211
         if (!empty($all_postypes)) {
1212 1212
             foreach ($all_postypes as $key) {
1213 1213
                 // update each GD CPT
1214
-                $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail");
1214
+                $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail");
1215 1215
 
1216 1216
                 if (!empty($posts)) {
1217 1217
 
1218 1218
                     foreach ($posts as $p) {
1219 1219
                         $p->post_type = $key;
1220
-                        $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
1220
+                        $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));
1221 1221
                         if (empty($raw_tags)) {
1222 1222
                             $post_tags = '';
1223 1223
                         } else {
1224 1224
                             $post_tags = implode(",", $raw_tags);
1225 1225
                         }
1226
-                        $tablename = $plugin_prefix . $p->post_type . '_detail';
1227
-                        $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
1226
+                        $tablename = $plugin_prefix.$p->post_type.'_detail';
1227
+                        $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
1228 1228
 
1229 1229
                     }
1230
-                    $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
1230
+                    $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";
1231 1231
                 }
1232 1232
 
1233 1233
             }
@@ -1238,14 +1238,14 @@  discard block
 block discarded – undo
1238 1238
 
1239 1239
     if ($is_error_during_diagnose) {
1240 1240
         $info_div_class = "geodir_problem_info";
1241
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1241
+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1242 1242
     } else {
1243 1243
         $info_div_class = "geodir_noproblem_info";
1244 1244
         $fix_button_txt = '';
1245 1245
     }
1246 1246
 
1247 1247
     if ($stepped_process) {
1248
-        $percent = ($step/$max_step) * 100;
1248
+        $percent = ($step / $max_step) * 100;
1249 1249
         if ($output_str == 'done') {
1250 1250
             echo $output_str;
1251 1251
         } else {
@@ -1288,29 +1288,29 @@  discard block
 block discarded – undo
1288 1288
     if (!empty($all_postypes)) {
1289 1289
         foreach ($all_postypes as $key) {
1290 1290
             // update each GD CTP
1291
-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
1291
+            $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d WHERE d.".$key."category='' ");
1292 1292
 
1293 1293
             if (!empty($posts)) {
1294 1294
 
1295 1295
                 foreach ($posts as $p) {
1296 1296
                     $p->post_type = $key;
1297
-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
1297
+                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type.'category', array('fields' => 'ids'));
1298 1298
 
1299 1299
                     if (empty($raw_cats)) {
1300 1300
                         $post_categories = get_post_meta($p->post_id, 'post_categories', true);
1301 1301
 
1302
-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
1303
-                            $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
1304
-                            foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
1302
+                        if (!empty($post_categories) && !empty($post_categories[$p->post_type.'category'])) {
1303
+                            $post_categories[$p->post_type.'category'] = str_replace("d:", "", $post_categories[$p->post_type.'category']);
1304
+                            foreach (explode(",", $post_categories[$p->post_type.'category']) as $cat_part) {
1305 1305
                                 if (is_numeric($cat_part)) {
1306
-                                    $raw_cats[] = (int)$cat_part;
1306
+                                    $raw_cats[] = (int) $cat_part;
1307 1307
                                 }
1308 1308
                             }
1309 1309
 
1310 1310
                         }
1311 1311
 
1312 1312
                         if (!empty($raw_cats)) {
1313
-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');
1313
+                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type.'category');
1314 1314
 
1315 1315
                         }
1316 1316
 
@@ -1320,14 +1320,14 @@  discard block
 block discarded – undo
1320 1320
                     if (empty($raw_cats)) {
1321 1321
                         $post_cats = '';
1322 1322
                     } else {
1323
-                        $post_cats = ',' . implode(",", $raw_cats) . ',';
1323
+                        $post_cats = ','.implode(",", $raw_cats).',';
1324 1324
                     }
1325
-                    $tablename = $plugin_prefix . $p->post_type . '_detail';
1326
-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
1325
+                    $tablename = $plugin_prefix.$p->post_type.'_detail';
1326
+                    $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET ".$p->post_type."category=%s WHERE post_id =%d", $post_cats, $p->post_id));
1327 1327
                 }
1328 1328
 
1329 1329
             }
1330
-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
1330
+            $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";
1331 1331
 
1332 1332
         }
1333 1333
 
@@ -1335,7 +1335,7 @@  discard block
 block discarded – undo
1335 1335
 
1336 1336
     if ($is_error_during_diagnose) {
1337 1337
         $info_div_class = "geodir_problem_info";
1338
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1338
+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1339 1339
     } else {
1340 1340
         $info_div_class = "geodir_noproblem_info";
1341 1341
         $fix_button_txt = '';
@@ -1388,15 +1388,15 @@  discard block
 block discarded – undo
1388 1388
     if (!empty($ver_arr)) {
1389 1389
         foreach ($ver_arr as $key => $val) {
1390 1390
             if (delete_option($val)) {
1391
-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
1391
+                $output_str .= "<li>".$key.__(' Version: Deleted', 'geodirectory')."</li>";
1392 1392
             } else {
1393
-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
1393
+                $output_str .= "<li>".$key.__(' Version: Not Found', 'geodirectory')."</li>";
1394 1394
             }
1395 1395
 
1396 1396
         }
1397 1397
 
1398 1398
         if ($output_str) {
1399
-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
1399
+            $output_str .= "<li><strong>".__(' Upgrade/install scripts will run on next page reload.', 'geodirectory')."</strong></li>";
1400 1400
         }
1401 1401
 
1402 1402
     }
@@ -1433,43 +1433,43 @@  discard block
 block discarded – undo
1433 1433
     $output_str = '';
1434 1434
 
1435 1435
     // check review locations
1436
-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
1437
-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
1436
+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
1437
+        $output_str .= "<li>".__('Review locations missing or broken', 'geodirectory')."</li>";
1438 1438
         $is_error_during_diagnose = true;
1439 1439
 
1440 1440
         if ($fix) {
1441 1441
             if (geodir_fix_review_location()) {
1442
-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
1442
+                $output_str .= "<li><strong>".__('-->FIXED: Review locations fixed', 'geodirectory')."</strong></li>";
1443 1443
             } else {
1444
-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
1444
+                $output_str .= "<li><strong>".__('-->FAILED: Review locations fix failed', 'geodirectory')."</strong></li>";
1445 1445
             }
1446 1446
         }
1447 1447
 
1448 1448
     } else {
1449
-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
1449
+        $output_str .= "<li>".__('Review locations ok', 'geodirectory')."</li>";
1450 1450
     }
1451 1451
 
1452 1452
     // check review content
1453
-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
1454
-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
1453
+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_content IS NULL")) {
1454
+        $output_str .= "<li>".__('Review content missing or broken', 'geodirectory')."</li>";
1455 1455
         $is_error_during_diagnose = true;
1456 1456
 
1457 1457
         if ($fix) {
1458 1458
             if (geodir_fix_review_content()) {
1459
-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
1459
+                $output_str .= "<li><strong>".__('-->FIXED: Review content fixed', 'geodirectory')."</strong></li>";
1460 1460
             } else {
1461
-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
1461
+                $output_str .= "<li><strong>".__('-->FAILED: Review content fix failed', 'geodirectory')."</strong></li>";
1462 1462
             }
1463 1463
         }
1464 1464
 
1465 1465
     } else {
1466
-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
1466
+        $output_str .= "<li>".__('Review content ok', 'geodirectory')."</li>";
1467 1467
     }
1468 1468
 
1469 1469
 
1470 1470
     if ($is_error_during_diagnose) {
1471 1471
         $info_div_class = "geodir_problem_info";
1472
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1472
+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1473 1473
     } else {
1474 1474
         $info_div_class = "geodir_noproblem_info";
1475 1475
         $fix_button_txt = '';
@@ -1533,7 +1533,7 @@  discard block
 block discarded – undo
1533 1533
 
1534 1534
     if ($is_error_during_diagnose) {
1535 1535
         $info_div_class = "geodir_problem_info";
1536
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
1536
+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
1537 1537
     } else {
1538 1538
         $info_div_class = "geodir_noproblem_info";
1539 1539
         $fix_button_txt = '';
@@ -1567,7 +1567,7 @@  discard block
 block discarded – undo
1567 1567
     else {
1568 1568
         $page_found = $wpdb->get_var(
1569 1569
             $wpdb->prepare(
1570
-                "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",
1570
+                "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",
1571 1571
                 array($slug)
1572 1572
             )
1573 1573
         );
@@ -1613,18 +1613,18 @@  discard block
 block discarded – undo
1613 1613
     //////////////////////////////////
1614 1614
     $option_value = get_option('geodir_home_page');
1615 1615
     $page = get_post($option_value);
1616
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1616
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1617 1617
 
1618
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1619
-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
1618
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1619
+        $output_str .= "<li>".__('GD Home page exists with proper setting.', 'geodirectory')."</li>";
1620 1620
     else {
1621 1621
         $is_error_during_diagnose = true;
1622
-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
1622
+        $output_str .= "<li><strong>".__('GD Home page is missing.', 'geodirectory')."</strong></li>";
1623 1623
         if ($fix) {
1624 1624
             if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
1625
-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
1625
+                $output_str .= "<li><strong>".__('-->FIXED: GD Home page fixed', 'geodirectory')."</strong></li>";
1626 1626
             } else {
1627
-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
1627
+                $output_str .= "<li><strong>".__('-->FAILED: GD Home page fix failed', 'geodirectory')."</strong></li>";
1628 1628
             }
1629 1629
         }
1630 1630
     }
@@ -1638,18 +1638,18 @@  discard block
 block discarded – undo
1638 1638
     //////////////////////////////////
1639 1639
     $option_value = get_option('geodir_add_listing_page');
1640 1640
     $page = get_post($option_value);
1641
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1641
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1642 1642
 
1643
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1644
-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
1643
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1644
+        $output_str .= "<li>".__('Add Listing page exists with proper setting.', 'geodirectory')."</li>";
1645 1645
     else {
1646 1646
         $is_error_during_diagnose = true;
1647
-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
1647
+        $output_str .= "<li><strong>".__('Add Listing page is missing.', 'geodirectory')."</strong></li>";
1648 1648
         if ($fix) {
1649 1649
             if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
1650
-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
1650
+                $output_str .= "<li><strong>".__('-->FIXED: Add Listing page fixed', 'geodirectory')."</strong></li>";
1651 1651
             } else {
1652
-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
1652
+                $output_str .= "<li><strong>".__('-->FAILED: Add Listing page fix failed', 'geodirectory')."</strong></li>";
1653 1653
             }
1654 1654
         }
1655 1655
     }
@@ -1664,18 +1664,18 @@  discard block
 block discarded – undo
1664 1664
     //////////////////////////////////
1665 1665
     $option_value = get_option('geodir_preview_page');
1666 1666
     $page = get_post($option_value);
1667
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1667
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1668 1668
 
1669
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1670
-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
1669
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1670
+        $output_str .= "<li>".__('Listing Preview page exists with proper setting.', 'geodirectory')."</li>";
1671 1671
     else {
1672 1672
         $is_error_during_diagnose = true;
1673
-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
1673
+        $output_str .= "<li><strong>".__('Listing Preview page is missing.', 'geodirectory')."</strong></li>";
1674 1674
         if ($fix) {
1675 1675
             if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
1676
-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
1676
+                $output_str .= "<li><strong>".__('-->FIXED: Listing Preview page fixed', 'geodirectory')."</strong></li>";
1677 1677
             } else {
1678
-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
1678
+                $output_str .= "<li><strong>".__('-->FAILED: Listing Preview page fix failed', 'geodirectory')."</strong></li>";
1679 1679
             }
1680 1680
         }
1681 1681
     }
@@ -1689,18 +1689,18 @@  discard block
 block discarded – undo
1689 1689
     //////////////////////////////////
1690 1690
     $option_value = get_option('geodir_success_page');
1691 1691
     $page = get_post($option_value);
1692
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1692
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1693 1693
 
1694
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1695
-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
1694
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1695
+        $output_str .= "<li>".__('Listing Success page exists with proper setting.', 'geodirectory')."</li>";
1696 1696
     else {
1697 1697
         $is_error_during_diagnose = true;
1698
-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
1698
+        $output_str .= "<li><strong>".__('Listing Success page is missing.', 'geodirectory')."</strong></li>";
1699 1699
         if ($fix) {
1700 1700
             if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
1701
-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
1701
+                $output_str .= "<li><strong>".__('-->FIXED: Listing Success page fixed', 'geodirectory')."</strong></li>";
1702 1702
             } else {
1703
-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
1703
+                $output_str .= "<li><strong>".__('-->FAILED: Listing Success page fix failed', 'geodirectory')."</strong></li>";
1704 1704
             }
1705 1705
         }
1706 1706
     }
@@ -1714,18 +1714,18 @@  discard block
 block discarded – undo
1714 1714
     //////////////////////////////////
1715 1715
     $option_value = get_option('geodir_info_page');
1716 1716
     $page = get_post($option_value);
1717
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1717
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1718 1718
 
1719
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1720
-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
1719
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1720
+        $output_str .= "<li>".__('Info page exists with proper setting.', 'geodirectory')."</li>";
1721 1721
     else {
1722 1722
         $is_error_during_diagnose = true;
1723
-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
1723
+        $output_str .= "<li><strong>".__('Info page is missing.', 'geodirectory')."</strong></li>";
1724 1724
         if ($fix) {
1725 1725
             if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
1726
-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
1726
+                $output_str .= "<li><strong>".__('-->FIXED: Info page fixed', 'geodirectory')."</strong></li>";
1727 1727
             } else {
1728
-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
1728
+                $output_str .= "<li><strong>".__('-->FAILED: Info page fix failed', 'geodirectory')."</strong></li>";
1729 1729
             }
1730 1730
         }
1731 1731
     }
@@ -1739,18 +1739,18 @@  discard block
 block discarded – undo
1739 1739
     //////////////////////////////////
1740 1740
     $option_value = get_option('geodir_login_page');
1741 1741
     $page = get_post($option_value);
1742
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1742
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1743 1743
 
1744
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1745
-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
1744
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1745
+        $output_str .= "<li>".__('Login page exists with proper setting.', 'geodirectory')."</li>";
1746 1746
     else {
1747 1747
         $is_error_during_diagnose = true;
1748
-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
1748
+        $output_str .= "<li><strong>".__('Login page is missing.', 'geodirectory')."</strong></li>";
1749 1749
         if ($fix) {
1750 1750
             if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
1751
-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
1751
+                $output_str .= "<li><strong>".__('-->FIXED: Login page fixed', 'geodirectory')."</strong></li>";
1752 1752
             } else {
1753
-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
1753
+                $output_str .= "<li><strong>".__('-->FAILED: Login page fix failed', 'geodirectory')."</strong></li>";
1754 1754
             }
1755 1755
         }
1756 1756
     }
@@ -1764,18 +1764,18 @@  discard block
 block discarded – undo
1764 1764
     //////////////////////////////////
1765 1765
     $option_value = get_option('geodir_location_page');
1766 1766
     $page = get_post($option_value);
1767
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1767
+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }
1768 1768
 
1769
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1770
-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
1769
+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')
1770
+        $output_str .= "<li>".__('Location page exists with proper setting.', 'geodirectory')."</li>";
1771 1771
     else {
1772 1772
         $is_error_during_diagnose = true;
1773
-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
1773
+        $output_str .= "<li><strong>".__('Location page is missing.', 'geodirectory')."</strong></li>";
1774 1774
         if ($fix) {
1775 1775
             if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
1776
-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
1776
+                $output_str .= "<li><strong>".__('-->FIXED: Location page fixed', 'geodirectory')."</strong></li>";
1777 1777
             } else {
1778
-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
1778
+                $output_str .= "<li><strong>".__('-->FAILED: Location page fix failed', 'geodirectory')."</strong></li>";
1779 1779
             }
1780 1780
         }
1781 1781
     }
@@ -1784,13 +1784,13 @@  discard block
 block discarded – undo
1784 1784
     /* Diagnose Location Page Ends */
1785 1785
     ////////////////////////////////
1786 1786
 
1787
-    $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
1787
+    $page_chk_arr = array('output_str'=>$output_str, 'is_error_during_diagnose'=>$is_error_during_diagnose);
1788 1788
     /**
1789 1789
      * This action is called at the end of the GD Tools page check function.
1790 1790
      *
1791 1791
      * @since 1.5.2
1792 1792
      */
1793
-    $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
1793
+    $page_chk_arr = apply_filters('geodir_diagnose_default_pages', $page_chk_arr);
1794 1794
 
1795 1795
     $output_str = $page_chk_arr['output_str'];
1796 1796
     $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];
@@ -1800,7 +1800,7 @@  discard block
 block discarded – undo
1800 1800
             flush_rewrite_rules();
1801 1801
         }
1802 1802
         $info_div_class = "geodir_problem_info";
1803
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
1803
+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
1804 1804
     } else {
1805 1805
         $info_div_class = "geodir_noproblem_info";
1806 1806
         $fix_button_txt = '';
@@ -1828,10 +1828,10 @@  discard block
 block discarded – undo
1828 1828
     $fix_button_txt = '';
1829 1829
 
1830 1830
     if ($is_error_during_diagnose) {
1831
-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
1831
+        $output_str .= "<li>".__('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory').' '.geodir_plugin_path().'/db-language.php'."</li>";
1832 1832
 		$info_div_class = "geodir_problem_info";
1833 1833
     } else {
1834
-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
1834
+        $output_str .= "<li>".__('Load custom fields in to file for translation: ok', 'geodirectory')."</li>";
1835 1835
 		$info_div_class = "geodir_noproblem_info";
1836 1836
         $fix_button_txt = '';
1837 1837
     }
@@ -1873,17 +1873,17 @@  discard block
 block discarded – undo
1873 1873
     global $wpdb, $wp_query, $plugin_prefix;
1874 1874
 
1875 1875
     if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
1876
-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';
1876
+        $table = $plugin_prefix.$wp_query->query_vars['post_type'].'_detail';
1877 1877
 
1878
-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';
1878
+        $join = $clauses['join'].' INNER JOIN '.$table.' AS gd_posts ON (gd_posts.post_id = '.$wpdb->posts.'.ID)';
1879 1879
         $clauses['join'] = $join;
1880 1880
 
1881
-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';
1881
+        $fields = $clauses['fields'] != '' ? $clauses['fields'].', ' : '';
1882 1882
         $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';
1883 1883
         $clauses['fields'] = $fields;
1884 1884
 
1885 1885
         $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';
1886
-        $orderby = 'gd_expire ' . $order;
1886
+        $orderby = 'gd_expire '.$order;
1887 1887
         $clauses['orderby'] = $orderby;
1888 1888
     }
1889 1889
     return $clauses;
@@ -1926,7 +1926,7 @@  discard block
 block discarded – undo
1926 1926
         global $current_user;
1927 1927
         $upload_dir = wp_upload_dir();
1928 1928
 
1929
-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';
1929
+        $file = $upload_dir['path'].'/temp_'.$current_user->data->ID.'/geodir_tmp.csv';
1930 1930
         $handle = fopen($file, 'w');
1931 1931
 
1932 1932
         fwrite($handle, $input);
@@ -1971,7 +1971,7 @@  discard block
 block discarded – undo
1971 1971
     $uploads_dir = $uploads['path'];
1972 1972
     $image_name_arr = explode('/', $filename);
1973 1973
     $filename = end($image_name_arr);
1974
-    $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1974
+    $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;
1975 1975
     $return = array();
1976 1976
     $return['file'] = $uploadedFile;
1977 1977
     $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
@@ -1988,8 +1988,8 @@  discard block
 block discarded – undo
1988 1988
 
1989 1989
                 if (($handle = fopen($target_path, "r")) !== FALSE) {
1990 1990
                     while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
1991
-                        if(is_array($data) && !empty($data)) {
1992
-                            $file[] = '"' . implode('","', $data) . '"';
1991
+                        if (is_array($data) && !empty($data)) {
1992
+                            $file[] = '"'.implode('","', $data).'"';
1993 1993
                         }
1994 1994
                     }
1995 1995
                     fclose($handle);
@@ -2106,10 +2106,10 @@  discard block
 block discarded – undo
2106 2106
                     $tag_arr = explode(',', $post_tags);
2107 2107
                 }
2108 2108
 
2109
-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database
2109
+                $table = $plugin_prefix.$buffer[5].'_detail'; // check table in database
2110 2110
 
2111 2111
                 $error = '';
2112
-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
2112
+                if ($wpdb->get_var("SHOW TABLES LIKE '".$table."'") != $table) {
2113 2113
                     $invalid_post_type++;
2114 2114
                     continue;
2115 2115
                 }
@@ -2135,7 +2135,7 @@  discard block
 block discarded – undo
2135 2135
                             if ($buffer[$c] != '0' && $buffer[$c] != '') {
2136 2136
                                 $submitdata = date('Y-m-d');
2137 2137
 
2138
-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
2138
+                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata."+".addslashes($buffer[$c])." days"));
2139 2139
                             } else {
2140 2140
                                 $gd_post_info['expire_date'] = 'Never';
2141 2141
                             }
@@ -2163,7 +2163,7 @@  discard block
 block discarded – undo
2163 2163
 						
2164 2164
 						// Post status
2165 2165
 						if ($customKeyarray[$c] == 'post_status') {
2166
-                            $post_status = sanitize_key( $buffer[$c] );
2166
+                            $post_status = sanitize_key($buffer[$c]);
2167 2167
                         }
2168 2168
                     }
2169 2169
 
@@ -2181,8 +2181,8 @@  discard block
 block discarded – undo
2181 2181
 					
2182 2182
 					// Default post status
2183 2183
 					$default_status = 'publish';
2184
-					$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;
2185
-					$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;
2184
+					$post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;
2185
+					$post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;
2186 2186
 
2187 2187
                     $my_post['post_title'] = $post_title;
2188 2188
                     $my_post['post_content'] = $post_desc;
@@ -2226,7 +2226,7 @@  discard block
 block discarded – undo
2226 2226
                     $payment_info = array();
2227 2227
                     $package_info = array();
2228 2228
 
2229
-                    $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);
2229
+                    $package_info = (array) geodir_post_package_info($package_info, '', $buffer[5]);
2230 2230
                     $package_id = '';
2231 2231
                     if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
2232 2232
                         $package_id = $gd_post_info['package_id'];
@@ -2236,7 +2236,7 @@  discard block
 block discarded – undo
2236 2236
                         $payment_info['package_id'] = $package_info['pid'];
2237 2237
 
2238 2238
                         if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
2239
-                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
2239
+                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['alive_days']." days"));
2240 2240
                         } else {
2241 2241
                             $payment_info['expire_date'] = 'Never';
2242 2242
                         }
@@ -2248,7 +2248,7 @@  discard block
 block discarded – undo
2248 2248
 
2249 2249
                     $post_type = get_post_type($last_postid);
2250 2250
 
2251
-                    $table = $plugin_prefix . $post_type . '_detail';
2251
+                    $table = $plugin_prefix.$post_type.'_detail';
2252 2252
 
2253 2253
                     geodir_save_post_info($last_postid, $gd_post_info);
2254 2254
 
@@ -2269,7 +2269,7 @@  discard block
 block discarded – undo
2269 2269
                             $attachment['post_id'] = $last_postid;
2270 2270
                             $attachment['title'] = $img_name_arr[0];
2271 2271
                             $attachment['content'] = '';
2272
-                            $attachment['file'] = $sub_dir . '/' . $image_name;
2272
+                            $attachment['file'] = $sub_dir.'/'.$image_name;
2273 2273
                             $attachment['mime_type'] = $uploaded_file_type;
2274 2274
                             $attachment['menu_order'] = $menu_order;
2275 2275
                             $attachment['is_featured'] = 0;
@@ -2278,15 +2278,15 @@  discard block
 block discarded – undo
2278 2278
 
2279 2279
                             foreach ($attachment as $key => $val) {
2280 2280
                                 if ($val != '')
2281
-                                    $attachment_set .= $key . " = '" . $val . "', ";
2281
+                                    $attachment_set .= $key." = '".$val."', ";
2282 2282
                             }
2283 2283
                             $attachment_set = trim($attachment_set, ", ");
2284 2284
 
2285
-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
2285
+                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);
2286 2286
 
2287 2287
                             if ($menu_order == 1) {
2288 2288
                                 $post_type = get_post_type($last_postid);
2289
-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
2289
+                                $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($sub_dir.'/'.$image_name, $last_postid)));
2290 2290
                             }
2291 2291
                             $menu_order++;
2292 2292
                         }
@@ -2327,11 +2327,11 @@  discard block
 block discarded – undo
2327 2327
 }
2328 2328
 
2329 2329
 // Add the tab in left sidebar menu fro import & export page.
2330
-add_filter( 'geodir_settings_tabs_array', 'geodir_import_export_tab', 94 );
2330
+add_filter('geodir_settings_tabs_array', 'geodir_import_export_tab', 94);
2331 2331
 
2332 2332
 // Handle ajax request for import/export.
2333
-add_action( 'wp_ajax_geodir_import_export', 'geodir_ajax_import_export' );
2334
-add_action( 'wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export' );
2333
+add_action('wp_ajax_geodir_import_export', 'geodir_ajax_import_export');
2334
+add_action('wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export');
2335 2335
 
2336 2336
 
2337 2337
 /**
@@ -2342,40 +2342,40 @@  discard block
 block discarded – undo
2342 2342
  * @param $post_id int $post_id The post ID of the post being saved.
2343 2343
  * @param $post object $post The post object of the post being saved.
2344 2344
  */
2345
-function geodir_update_location_prefix($post_id,$post){
2346
-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
2347
-        update_option('geodir_location_prefix',$post->post_name);
2345
+function geodir_update_location_prefix($post_id, $post) {
2346
+    if ($post->post_type == 'page' && $post->post_name && $post_id == get_option('geodir_location_page')) {
2347
+        update_option('geodir_location_prefix', $post->post_name);
2348 2348
     }
2349 2349
 
2350 2350
 }
2351 2351
 
2352
-add_action('save_post', 'geodir_update_location_prefix',10,2);
2352
+add_action('save_post', 'geodir_update_location_prefix', 10, 2);
2353 2353
 
2354
-add_action( 'wp_ajax_geodir_ga_callback', 'geodir_ga_callback' );
2354
+add_action('wp_ajax_geodir_ga_callback', 'geodir_ga_callback');
2355 2355
 
2356
-function geodir_ga_callback(){
2356
+function geodir_ga_callback() {
2357 2357
 
2358
-if(isset($_REQUEST['code']) && $_REQUEST['code']) {
2358
+if (isset($_REQUEST['code']) && $_REQUEST['code']) {
2359 2359
     $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";
2360 2360
     $code = "code=".$_REQUEST['code'];
2361 2361
     $grant_type = "&grant_type=authorization_code";
2362
-    $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
2362
+    $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";
2363 2363
     $client_id = "&client_id=".get_option('geodir_ga_client_id');
2364 2364
     $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
2365 2365
 
2366
-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;
2366
+    $auth_url = $oAuthURL.$code.$redirect_uri.$grant_type.$client_id.$client_secret;
2367 2367
 
2368 2368
     $response = wp_remote_post($auth_url, array('timeout' => 15));
2369 2369
 
2370 2370
     //print_r($response);
2371 2371
 
2372
-    $error_msg =  __('Something went wrong','geodirectory');
2373
-    if(!empty($response['response']['code']) && $response['response']['code']==200){
2372
+    $error_msg = __('Something went wrong', 'geodirectory');
2373
+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {
2374 2374
 
2375 2375
         $parts = json_decode($response['body']);
2376 2376
         //print_r($parts);
2377
-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
2378
-        else{
2377
+        if (!isset($parts->access_token)) {echo $error_msg." - #1"; exit; }
2378
+        else {
2379 2379
 
2380 2380
             update_option('gd_ga_access_token', $parts->access_token);
2381 2381
             update_option('gd_ga_refresh_token', $parts->refresh_token);
@@ -2384,18 +2384,18 @@  discard block
 block discarded – undo
2384 2384
 
2385 2385
 
2386 2386
     }
2387
-    elseif(!empty($response['response']['code'])) {
2387
+    elseif (!empty($response['response']['code'])) {
2388 2388
         $parts = json_decode($response['body']);
2389 2389
 
2390
-        if(isset($parts->error)){
2391
-            echo $parts->error.": ".$parts->error_description;exit;
2392
-        }else{
2393
-            echo $error_msg." - #2";exit;
2390
+        if (isset($parts->error)) {
2391
+            echo $parts->error.": ".$parts->error_description; exit;
2392
+        } else {
2393
+            echo $error_msg." - #2"; exit;
2394 2394
         }
2395 2395
 
2396
-    }else{
2396
+    } else {
2397 2397
 
2398
-        echo $error_msg." - #3";exit;
2398
+        echo $error_msg." - #3"; exit;
2399 2399
 
2400 2400
     }
2401 2401
 }
@@ -2417,7 +2417,7 @@  discard block
 block discarded – undo
2417 2417
 function geodir_uninstall_settings($general_settings) {
2418 2418
     $settings   = array();
2419 2419
     $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
2420
-    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
2420
+    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory'));
2421 2421
     
2422 2422
     $plugins    = get_plugins();
2423 2423
     $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
@@ -2429,7 +2429,7 @@  discard block
 block discarded – undo
2429 2429
             if (in_array($plugin_name, $un_plugins)) {
2430 2430
                 $settings[] = array(
2431 2431
                     'type' => 'checkbox',
2432
-                    'id' => 'geodir_un_' . $plugin_name,
2432
+                    'id' => 'geodir_un_'.$plugin_name,
2433 2433
                     'name' => $data['Name'],
2434 2434
                     'desc' => __('Remove all data when deleted?', 'geodirectory'),
2435 2435
                     'std' => '0'
@@ -2463,7 +2463,7 @@  discard block
 block discarded – undo
2463 2463
  * @since 1.6.9
2464 2464
  */
2465 2465
 function geodir_uninstall_settings_desc() {
2466
-    echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';
2466
+    echo '<p class="gd-un-settings-desc">'.__('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory').'</p>';
2467 2467
 }
2468 2468
 add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');
2469 2469
 
@@ -2527,12 +2527,12 @@  discard block
 block discarded – undo
2527 2527
 
2528 2528
 
2529 2529
     if ($delete) {
2530
-            $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";
2530
+            $output_str .= "<li><strong>".__('Table dropped, refresh page to reinstall.', 'geodirectory')."</strong></li>";
2531 2531
         ob_start();
2532 2532
         geodir_diagnose_version_clear();
2533 2533
         ob_end_clean();
2534
-    }else{
2535
-        $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
2534
+    } else {
2535
+        $output_str .= "<li><strong>".__('Something went wrong.', 'geodirectory')."</strong></li>";
2536 2536
     }
2537 2537
 
2538 2538
     if ($is_error_during_diagnose) {
@@ -2557,9 +2557,9 @@  discard block
 block discarded – undo
2557 2557
  * @param object $row The post|taxonomy object.
2558 2558
  * @return array Filtered actions.
2559 2559
  */
2560
-function geodir_disable_quick_edit( $actions = array(), $row = null ) {
2561
-    if ( isset( $actions['inline hide-if-no-js'] ) ) {
2562
-        unset( $actions['inline hide-if-no-js'] );
2560
+function geodir_disable_quick_edit($actions = array(), $row = null) {
2561
+    if (isset($actions['inline hide-if-no-js'])) {
2562
+        unset($actions['inline hide-if-no-js']);
2563 2563
     }
2564 2564
 
2565 2565
     return $actions;
@@ -2578,26 +2578,26 @@  discard block
 block discarded – undo
2578 2578
 function geodir_check_quick_edit() {
2579 2579
     global $pagenow, $current_screen, $gd_cpt_screen;
2580 2580
 
2581
-    if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {
2582
-        if ( empty( $gd_cpt_screen ) ) {
2583
-            if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {
2581
+    if (($pagenow == 'edit.php' || $pagenow == 'edit-tags.php') && !empty($current_screen->post_type)) {
2582
+        if (empty($gd_cpt_screen)) {
2583
+            if (in_array($current_screen->post_type, geodir_get_posttypes())) {
2584 2584
                 $gd_cpt_screen = 'y';
2585 2585
             } else {
2586 2586
                 $gd_cpt_screen = 'n';
2587 2587
             }
2588 2588
         }
2589 2589
 
2590
-        if ( $gd_cpt_screen == 'y' ) {
2591
-            if ( $pagenow == 'edit.php' ) {
2592
-                add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 );
2593
-                add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 );
2594
-            } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {
2595
-                add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 );
2590
+        if ($gd_cpt_screen == 'y') {
2591
+            if ($pagenow == 'edit.php') {
2592
+                add_filter('post_row_actions', 'geodir_disable_quick_edit', 10, 2);
2593
+                add_filter('page_row_actions', 'geodir_disable_quick_edit', 10, 2);
2594
+            } elseif ($pagenow == 'edit-tags.php' && !empty($current_screen->taxonomy)) {
2595
+                add_filter($current_screen->taxonomy.'_row_actions', 'geodir_disable_quick_edit', 10, 2);
2596 2596
             }
2597 2597
         }
2598 2598
     }
2599 2599
 }
2600
-add_action( 'admin_head', 'geodir_check_quick_edit', 10 );
2600
+add_action('admin_head', 'geodir_check_quick_edit', 10);
2601 2601
 
2602 2602
 /**
2603 2603
  * Filter the bulk actions for GD CPT.
@@ -2608,9 +2608,9 @@  discard block
 block discarded – undo
2608 2608
  * @param array $actions An array of the available bulk actions.
2609 2609
  * @return array Filtered bulk actions.
2610 2610
  */
2611
-function geodir_filter_bulk_actions( $actions ) {
2612
-    if ( isset( $actions['edit'] ) ) {
2613
-        unset( $actions['edit'] );
2611
+function geodir_filter_bulk_actions($actions) {
2612
+    if (isset($actions['edit'])) {
2613
+        unset($actions['edit']);
2614 2614
     }
2615 2615
     
2616 2616
     return $actions;
@@ -2623,15 +2623,15 @@  discard block
 block discarded – undo
2623 2623
  *
2624 2624
  * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance, passed by reference
2625 2625
  */
2626
-function geodir_admin_bar_menu_set_post( $wp_admin_bar ) {
2626
+function geodir_admin_bar_menu_set_post($wp_admin_bar) {
2627 2627
 	global $post, $gd_admin_bar_post, $pagenow;
2628 2628
 
2629
-	if ( $pagenow == 'post.php' && ! empty( $post ) && is_object( $post ) && ! empty( $post->ID ) && ! is_a( $post, 'WP_Post' ) && isset( $post->post_id ) ) {
2629
+	if ($pagenow == 'post.php' && !empty($post) && is_object($post) && !empty($post->ID) && !is_a($post, 'WP_Post') && isset($post->post_id)) {
2630 2630
 		$gd_admin_bar_post = $post;
2631
-		$post = get_post( $post->ID );
2631
+		$post = get_post($post->ID);
2632 2632
 	}
2633 2633
 }
2634
-add_action( 'admin_bar_menu', 'geodir_admin_bar_menu_set_post', 94, 1 );
2634
+add_action('admin_bar_menu', 'geodir_admin_bar_menu_set_post', 94, 1);
2635 2635
 
2636 2636
 /**
2637 2637
  * Reset $post to original.
@@ -2641,9 +2641,9 @@  discard block
 block discarded – undo
2641 2641
 function geodir_admin_bar_menu_reset_post() {
2642 2642
 	global $post, $gd_admin_bar_post;
2643 2643
 
2644
-	if ( ! empty( $gd_admin_bar_post ) && ! empty( $post ) ) {
2644
+	if (!empty($gd_admin_bar_post) && !empty($post)) {
2645 2645
 		$post = $gd_admin_bar_post;
2646 2646
 		$gd_admin_bar_post = NULL;
2647 2647
 	}
2648 2648
 }
2649
-add_action( 'wp_after_admin_bar_render', 'geodir_admin_bar_menu_reset_post', 9999 );
2650 2649
\ No newline at end of file
2650
+add_action('wp_after_admin_bar_render', 'geodir_admin_bar_menu_reset_post', 9999);
2651 2651
\ No newline at end of file
Please login to merge, or discard this patch.
Indentation   +1649 added lines, -1649 removed lines patch added patch discarded remove patch
@@ -10,33 +10,33 @@  discard block
 block discarded – undo
10 10
 
11 11
 add_action('admin_init', 'geodir_admin_init');
12 12
 if (!function_exists('geodir_admin_init')) {
13
-    /**
14
-     * Adds GD setting pages in admin.
15
-     *
16
-     * @since 1.0.0
17
-     * @package GeoDirectory
18
-     * @global string $current_tab The current settings tab name.
19
-     */
20
-    function geodir_admin_init()
21
-    {
22
-
23
-        if (is_admin()):
24
-            global $current_tab;
25
-            geodir_redirect_to_admin_panel_on_installed();
26
-            $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';
27
-            if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests
28
-                geodir_handle_option_form_submit($current_tab); // located in admin function.php
29
-            /**
30
-             * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.
31
-             *
32
-             * @since 1.0.0
33
-             */
34
-            do_action('admin_panel_init');
35
-            add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);
36
-
37
-
38
-        endif;
39
-    }
13
+	/**
14
+	 * Adds GD setting pages in admin.
15
+	 *
16
+	 * @since 1.0.0
17
+	 * @package GeoDirectory
18
+	 * @global string $current_tab The current settings tab name.
19
+	 */
20
+	function geodir_admin_init()
21
+	{
22
+
23
+		if (is_admin()):
24
+			global $current_tab;
25
+			geodir_redirect_to_admin_panel_on_installed();
26
+			$current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';
27
+			if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests
28
+				geodir_handle_option_form_submit($current_tab); // located in admin function.php
29
+			/**
30
+			 * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.
31
+			 *
32
+			 * @since 1.0.0
33
+			 */
34
+			do_action('admin_panel_init');
35
+			add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);
36
+
37
+
38
+		endif;
39
+	}
40 40
 }
41 41
 
42 42
 /**
@@ -47,10 +47,10 @@  discard block
 block discarded – undo
47 47
  */
48 48
 function geodir_redirect_to_admin_panel_on_installed()
49 49
 {
50
-    if (get_option('geodir_installation_redirect', false)) {
51
-        delete_option('geodir_installation_redirect');
52
-        wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));
53
-    }
50
+	if (get_option('geodir_installation_redirect', false)) {
51
+		delete_option('geodir_installation_redirect');
52
+		wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));
53
+	}
54 54
 }
55 55
 
56 56
 /**
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
  */
63 63
 function geodir_get_admin_option_form($current_tab)
64 64
 {
65
-    geodir_admin_option_form($current_tab);// defined in admin template tags.php
65
+	geodir_admin_option_form($current_tab);// defined in admin template tags.php
66 66
 }
67 67
 
68 68
 
@@ -86,24 +86,24 @@  discard block
 block discarded – undo
86 86
  */
87 87
 function geodir_conditional_admin_script_load()
88 88
 {
89
-    global $pagenow;
89
+	global $pagenow;
90 90
 	
91 91
 	// Get the current post type
92 92
 	$post_type = geodir_admin_current_post_type();
93 93
 	$geodir_post_types = geodir_get_posttypes();
94 94
     
95 95
 	if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'term.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {
96
-        add_action('admin_enqueue_scripts', 'geodir_admin_scripts');
97
-        add_action('admin_enqueue_scripts', 'geodir_admin_styles');
98
-        add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);
96
+		add_action('admin_enqueue_scripts', 'geodir_admin_scripts');
97
+		add_action('admin_enqueue_scripts', 'geodir_admin_styles');
98
+		add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);
99 99
         
100
-        // Disable VC editor for GD post types.
101
-        if (class_exists('Vc_Role_Access_Controller')) {
102
-            add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 );
103
-        }
104
-    }
100
+		// Disable VC editor for GD post types.
101
+		if (class_exists('Vc_Role_Access_Controller')) {
102
+			add_filter( 'vc_role_access_with_post_types_can', '__return_false', 100 );
103
+		}
104
+	}
105 105
 
106
-    add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');
106
+	add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');
107 107
 
108 108
 }
109 109
 
@@ -138,12 +138,12 @@  discard block
 block discarded – undo
138 138
  */
139 139
 function create_default_admin_main_nav()
140 140
 {
141
-    add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);
142
-    add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);
143
-    add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);
144
-    add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);
145
-    add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);
146
-    //add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);
141
+	add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);
142
+	add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);
143
+	add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);
144
+	add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);
145
+	add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);
146
+	//add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);
147 147
 
148 148
 }
149 149
 
@@ -157,19 +157,19 @@  discard block
 block discarded – undo
157 157
  */
158 158
 function geodir_admin_list_columns()
159 159
 {
160
-    if ($post_types = geodir_get_posttypes()) {
160
+	if ($post_types = geodir_get_posttypes()) {
161 161
 
162
-        foreach ($post_types as $post_type):
163
-            add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);
164
-            //Filter-Payment-Manager to show Package
165
-            add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);
162
+		foreach ($post_types as $post_type):
163
+			add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);
164
+			//Filter-Payment-Manager to show Package
165
+			add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);
166 166
 
167
-            add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');
167
+			add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');
168 168
             
169
-            // Filter bulk actions
170
-            add_filter("bulk_actions-edit-{$post_type}", 'geodir_filter_bulk_actions', 10, 1);
171
-        endforeach;
172
-    }
169
+			// Filter bulk actions
170
+			add_filter("bulk_actions-edit-{$post_type}", 'geodir_filter_bulk_actions', 10, 1);
171
+		endforeach;
172
+	}
173 173
 }
174 174
 
175 175
 /**
@@ -182,15 +182,15 @@  discard block
 block discarded – undo
182 182
  */
183 183
 function geodir_default_admin_main_tabs($tabs)
184 184
 {
185
-    return $tabs = array(
186
-        'general_settings' => array('label' => __('General', 'geodirectory')),
187
-        'design_settings' => array('label' => __('Design', 'geodirectory')),
188
-        'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),
189
-        'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),
190
-        'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),
191
-        'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),
192
-
193
-    );
185
+	return $tabs = array(
186
+		'general_settings' => array('label' => __('General', 'geodirectory')),
187
+		'design_settings' => array('label' => __('Design', 'geodirectory')),
188
+		'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),
189
+		'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),
190
+		'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),
191
+		'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),
192
+
193
+	);
194 194
 }
195 195
 
196 196
 add_action('do_meta_boxes', 'geodir_remove_image_box');
@@ -203,16 +203,16 @@  discard block
 block discarded – undo
203 203
  */
204 204
 function geodir_remove_image_box()
205 205
 {
206
-    global $post;
206
+	global $post;
207 207
 
208
-    $geodir_posttypes = geodir_get_posttypes();
208
+	$geodir_posttypes = geodir_get_posttypes();
209 209
 
210
-    if (isset($post) && in_array($post->post_type, $geodir_posttypes)):
210
+	if (isset($post) && in_array($post->post_type, $geodir_posttypes)):
211 211
 
212
-        remove_meta_box('postimagediv', $post->post_type, 'side');
213
-        remove_meta_box('revisionsdiv', $post->post_type, 'normal');
212
+		remove_meta_box('postimagediv', $post->post_type, 'side');
213
+		remove_meta_box('revisionsdiv', $post->post_type, 'normal');
214 214
 
215
-    endif;
215
+	endif;
216 216
 
217 217
 }
218 218
 
@@ -227,27 +227,27 @@  discard block
 block discarded – undo
227 227
  */
228 228
 function geodir_meta_box_add()
229 229
 {
230
-    global $post;
230
+	global $post;
231 231
 
232
-    $geodir_post_types = geodir_get_posttypes('array');
233
-    $geodir_posttypes = array_keys($geodir_post_types);
232
+	$geodir_post_types = geodir_get_posttypes('array');
233
+	$geodir_posttypes = array_keys($geodir_post_types);
234 234
 
235
-    if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)):
235
+	if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)):
236 236
 
237
-        $geodir_posttype = $post->post_type;
238
-        $post_typename = __($geodir_post_types[$geodir_posttype]['labels']['singular_name'], 'geodirectory');
239
-        $post_typename = geodir_ucwords($post_typename);
237
+		$geodir_posttype = $post->post_type;
238
+		$post_typename = __($geodir_post_types[$geodir_posttype]['labels']['singular_name'], 'geodirectory');
239
+		$post_typename = geodir_ucwords($post_typename);
240 240
 
241
-        // Filter-Payment-Manager
241
+		// Filter-Payment-Manager
242 242
 
243
-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
243
+		add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');
244 244
 
245
-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
245
+		add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');
246 246
 
247
-        // no need of this box as all fields moved to main information box
248
-        //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
247
+		// no need of this box as all fields moved to main information box
248
+		//add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );
249 249
 
250
-    endif;
250
+	endif;
251 251
 
252 252
 }
253 253
 
@@ -271,23 +271,23 @@  discard block
 block discarded – undo
271 271
 function geodir_hide_post_taxonomy_meta_boxes()
272 272
 {
273 273
 
274
-    $geodir_post_types = get_option('geodir_post_types');
274
+	$geodir_post_types = get_option('geodir_post_types');
275 275
 
276
-    if (!empty($geodir_post_types)) {
277
-        foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {
276
+	if (!empty($geodir_post_types)) {
277
+		foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {
278 278
 
279
-            $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);
279
+			$gd_taxonomy = geodir_get_taxonomies($geodir_post_type);
280 280
 
281
-            if(!empty($gd_taxonomy)) {
282
-                foreach ($gd_taxonomy as $tax) {
281
+			if(!empty($gd_taxonomy)) {
282
+				foreach ($gd_taxonomy as $tax) {
283 283
 
284
-                    remove_meta_box($tax . 'div', $geodir_post_type, 'normal');
284
+					remove_meta_box($tax . 'div', $geodir_post_type, 'normal');
285 285
 
286
-                }
287
-            }
286
+				}
287
+			}
288 288
 
289
-        }
290
-    }
289
+		}
290
+	}
291 291
 }
292 292
 
293 293
 add_filter('geodir_add_listing_map_restrict', 'geodir_add_listing_map_restrict');
@@ -301,12 +301,12 @@  discard block
 block discarded – undo
301 301
  */
302 302
 function geodir_add_listing_map_restrict($map_restirct)
303 303
 {
304
-    if (is_admin()) {
305
-        if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {
306
-            $map_restirct = false;
307
-        }
308
-    }
309
-    return $map_restirct;
304
+	if (is_admin()) {
305
+		if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {
306
+			$map_restirct = false;
307
+		}
308
+	}
309
+	return $map_restirct;
310 310
 }
311 311
 
312 312
 
@@ -325,16 +325,16 @@  discard block
 block discarded – undo
325 325
 function geodir_enable_editor_on_notifications($notification)
326 326
 {
327 327
 
328
-    if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
328
+	if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {
329 329
 
330
-        foreach ($notification as $key => $value) {
331
-            if ($value['type'] == 'textarea')
332
-                $notification[$key]['type'] = 'editor';
333
-        }
330
+		foreach ($notification as $key => $value) {
331
+			if ($value['type'] == 'textarea')
332
+				$notification[$key]['type'] = 'editor';
333
+		}
334 334
 
335
-    }
335
+	}
336 336
 
337
-    return $notification;
337
+	return $notification;
338 338
 }
339 339
 
340 340
 
@@ -351,16 +351,16 @@  discard block
 block discarded – undo
351 351
 function geodir_enable_editor_on_design_settings($design_setting)
352 352
 {
353 353
 
354
-    if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
354
+	if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {
355 355
 
356
-        foreach ($design_setting as $key => $value) {
357
-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')
358
-                $design_setting[$key]['type'] = 'editor';
359
-        }
356
+		foreach ($design_setting as $key => $value) {
357
+			if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')
358
+				$design_setting[$key]['type'] = 'editor';
359
+		}
360 360
 
361
-    }
361
+	}
362 362
 
363
-    return $design_setting;
363
+	return $design_setting;
364 364
 }
365 365
 
366 366
 /* ----------- START MANAGE CUSTOM FIELDS ---------------- */
@@ -368,15 +368,15 @@  discard block
 block discarded – undo
368 368
 add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');
369 369
 
370 370
 function geodir_manage_available_fields_predefined($sub_tab){
371
-    if($sub_tab=='custom_fields'){
372
-        geodir_custom_available_fields('predefined');
373
-    }
371
+	if($sub_tab=='custom_fields'){
372
+		geodir_custom_available_fields('predefined');
373
+	}
374 374
 }
375 375
 
376 376
 function geodir_manage_available_fields_custom($sub_tab){
377
-    if($sub_tab=='custom_fields'){
378
-        geodir_custom_available_fields('custom');
379
-    }
377
+	if($sub_tab=='custom_fields'){
378
+		geodir_custom_available_fields('custom');
379
+	}
380 380
 }
381 381
 
382 382
 
@@ -395,16 +395,16 @@  discard block
 block discarded – undo
395 395
 function geodir_manage_available_fields($sub_tab)
396 396
 {
397 397
 
398
-    switch ($sub_tab) {
399
-        case 'custom_fields':
400
-            geodir_custom_available_fields();
401
-            break;
398
+	switch ($sub_tab) {
399
+		case 'custom_fields':
400
+			geodir_custom_available_fields();
401
+			break;
402 402
 
403
-        case 'sorting_options':
404
-            geodir_sorting_options_available_fields();
405
-            break;
403
+		case 'sorting_options':
404
+			geodir_sorting_options_available_fields();
405
+			break;
406 406
 
407
-    }
407
+	}
408 408
 }
409 409
 
410 410
 
@@ -420,16 +420,16 @@  discard block
 block discarded – undo
420 420
 function geodir_manage_selected_fields($sub_tab)
421 421
 {
422 422
 
423
-    switch ($sub_tab) {
424
-        case 'custom_fields':
425
-            geodir_custom_selected_fields();
426
-            break;
423
+	switch ($sub_tab) {
424
+		case 'custom_fields':
425
+			geodir_custom_selected_fields();
426
+			break;
427 427
 
428
-        case 'sorting_options':
429
-            geodir_sorting_options_selected_fields();
430
-            break;
428
+		case 'sorting_options':
429
+			geodir_sorting_options_selected_fields();
430
+			break;
431 431
 
432
-    }
432
+	}
433 433
 }
434 434
 
435 435
 /**
@@ -441,52 +441,52 @@  discard block
 block discarded – undo
441 441
  */
442 442
 function geodir_sorting_options_available_fields()
443 443
 {
444
-    global $wpdb;
445
-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
446
-    ?>
444
+	global $wpdb;
445
+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
446
+	?>
447 447
     <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>
448 448
     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>
449 449
     <ul>
450 450
     <?php
451
-        $sort_options = geodir_get_custom_sort_options($listing_type);
451
+		$sort_options = geodir_get_custom_sort_options($listing_type);
452 452
         
453
-        foreach ($sort_options as $key => $val) {
454
-            $val = stripslashes_deep($val); // strip slashes
455
-
456
-            $check_html_variable = $wpdb->get_var(
457
-                $wpdb->prepare(
458
-                    "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",
459
-                    array($val['htmlvar_name'], $listing_type, $val['field_type'])
460
-                )
461
-            );
453
+		foreach ($sort_options as $key => $val) {
454
+			$val = stripslashes_deep($val); // strip slashes
455
+
456
+			$check_html_variable = $wpdb->get_var(
457
+				$wpdb->prepare(
458
+					"SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",
459
+					array($val['htmlvar_name'], $listing_type, $val['field_type'])
460
+				)
461
+			);
462 462
             
463
-            $display = $check_html_variable ? ' style="display:none;"' : '';
464
-           ?>
463
+			$display = $check_html_variable ? ' style="display:none;"' : '';
464
+		   ?>
465 465
 
466 466
             <li   class="gd-cf-tooltip-wrap" <?php echo $display;?>>
467 467
                 <?php
468
-                if(isset($val['description']) && $val['description']){
469
-                    echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';
470
-                }?>
468
+				if(isset($val['description']) && $val['description']){
469
+					echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';
470
+				}?>
471 471
 
472 472
                 <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>"  data-field-type="<?php echo $val['field_type'];?>"
473 473
                    title="<?php echo $val['site_title'];?>"
474 474
                    class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">
475 475
                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {
476
-                        echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';
477
-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){
478
-                        echo '<b class="gd-cf-icon" style="background-image: url(\''.$val['field_icon'].'\')"></b>';
479
-                    }else{
480
-                        echo '<i class="fa fa-cog" aria-hidden="true"></i>';
481
-                    }?>
476
+						echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';
477
+					}elseif(isset($val['field_icon']) && $val['field_icon'] ){
478
+						echo '<b class="gd-cf-icon" style="background-image: url(\''.$val['field_icon'].'\')"></b>';
479
+					}else{
480
+						echo '<i class="fa fa-cog" aria-hidden="true"></i>';
481
+					}?>
482 482
                     <?php echo (! empty( $val['admin_title'] ) ? $val['admin_title'] : $val['site_title'] );?>
483 483
                 </a>
484 484
             </li>
485 485
 
486 486
 
487 487
             <?php
488
-        }
489
-    ?>
488
+		}
489
+	?>
490 490
     </ul>
491 491
     <?php
492 492
 }
@@ -500,28 +500,28 @@  discard block
 block discarded – undo
500 500
  */
501 501
 function geodir_sorting_options_selected_fields()
502 502
 {
503
-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
504
-    ?>
503
+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
504
+	?>
505 505
     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>
506 506
     <ul class="core">
507 507
     <?php 
508
-        global $wpdb;
508
+		global $wpdb;
509 509
         
510
-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
510
+		$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));
511 511
 
512
-        if (!empty($fields)) {
513
-            foreach ($fields as $field) {
514
-                //$result_str = $field->id;
515
-                $result_str = $field;
516
-                $field_type = $field->field_type;
517
-                $field_ins_upd = 'display';
512
+		if (!empty($fields)) {
513
+			foreach ($fields as $field) {
514
+				//$result_str = $field->id;
515
+				$result_str = $field;
516
+				$field_type = $field->field_type;
517
+				$field_ins_upd = 'display';
518 518
 
519
-                $default = false;
519
+				$default = false;
520 520
 
521
-                geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default);
522
-            }
523
-        }
524
-    ?>
521
+				geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default);
522
+			}
523
+		}
524
+	?>
525 525
     </ul>
526 526
     <?php
527 527
 }
@@ -534,12 +534,12 @@  discard block
 block discarded – undo
534 534
  */
535 535
 function geodir_custom_fields_custom($post_type=''){
536 536
 
537
-    $custom_fields = array();
537
+	$custom_fields = array();
538 538
 
539
-    /**
540
-     * @see `geodir_custom_fields`
541
-     */
542
-    return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
539
+	/**
540
+	 * @see `geodir_custom_fields`
541
+	 */
542
+	return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);
543 543
 }
544 544
 
545 545
 
@@ -552,140 +552,140 @@  discard block
 block discarded – undo
552 552
  */
553 553
 function geodir_custom_fields($post_type=''){
554 554
     
555
-    $custom_fields = array(
556
-        'text' => array(
557
-            'field_type'  =>  'text',
558
-            'class' =>  'gd-text',
559
-            'icon'  =>  'fa fa-minus',
560
-            'name'  =>  __('Text', 'geodirectory'),
561
-            'description' =>  __('Add any sort of text field, text or numbers', 'geodirectory')
562
-        ),
563
-        'datepicker' => array(
564
-            'field_type'  =>  'datepicker',
565
-            'class' =>  'gd-datepicker',
566
-            'icon'  =>  'fa fa-calendar',
567
-            'name'  =>  __('Date', 'geodirectory'),
568
-            'description' =>  __('Adds a date picker.', 'geodirectory')
569
-        ),
570
-        'textarea' => array(
571
-            'field_type'  =>  'textarea',
572
-            'class' =>  'gd-textarea',
573
-            'icon'  =>  'fa fa-bars',
574
-            'name'  =>  __('Textarea', 'geodirectory'),
575
-            'description' =>  __('Adds a textarea', 'geodirectory')
576
-        ),
577
-        'time' => array(
578
-            'field_type'  =>  'time',
579
-            'class' =>  'gd-time',
580
-            'icon' =>  'fa fa-clock-o',
581
-            'name'  =>  __('Time', 'geodirectory'),
582
-            'description' =>  __('Adds a time picker', 'geodirectory')
583
-        ),
584
-        'checkbox' => array(
585
-            'field_type'  =>  'checkbox',
586
-            'class' =>  'gd-checkbox',
587
-            'icon' =>  'fa fa-check-square-o',
588
-            'name'  =>  __('Checkbox', 'geodirectory'),
589
-            'description' =>  __('Adds a checkbox', 'geodirectory')
590
-        ),
591
-        'phone' => array(
592
-            'field_type'  =>  'phone',
593
-            'class' =>  'gd-phone',
594
-            'icon' =>  'fa fa-phone',
595
-            'name'  =>  __('Phone', 'geodirectory'),
596
-            'description' =>  __('Adds a phone input', 'geodirectory')
597
-        ),
598
-        'radio' => array(
599
-            'field_type'  =>  'radio',
600
-            'class' =>  'gd-radio',
601
-            'icon' =>  'fa fa-dot-circle-o',
602
-            'name'  =>  __('Radio', 'geodirectory'),
603
-            'description' =>  __('Adds a radio input', 'geodirectory')
604
-        ),
605
-        'email' => array(
606
-            'field_type'  =>  'email',
607
-            'class' =>  'gd-email',
608
-            'icon' =>  'fa fa-envelope-o',
609
-            'name'  =>  __('Email', 'geodirectory'),
610
-            'description' =>  __('Adds a email input', 'geodirectory')
611
-        ),
612
-        'select' => array(
613
-            'field_type'  =>  'select',
614
-            'class' =>  'gd-select',
615
-            'icon' =>  'fa fa-caret-square-o-down',
616
-            'name'  =>  __('Select', 'geodirectory'),
617
-            'description' =>  __('Adds a select input', 'geodirectory')
618
-        ),
619
-        'multiselect' => array(
620
-            'field_type'  =>  'multiselect',
621
-            'class' =>  'gd-multiselect',
622
-            'icon' =>  'fa fa-caret-square-o-down',
623
-            'name'  =>  __('Multi Select', 'geodirectory'),
624
-            'description' =>  __('Adds a multiselect input', 'geodirectory')
625
-        ),
626
-        'url' => array(
627
-            'field_type'  =>  'url',
628
-            'class' =>  'gd-url',
629
-            'icon' =>  'fa fa-link',
630
-            'name'  =>  __('URL', 'geodirectory'),
631
-            'description' =>  __('Adds a url input', 'geodirectory')
632
-        ),
633
-        'html' => array(
634
-            'field_type'  =>  'html',
635
-            'class' =>  'gd-html',
636
-            'icon' =>  'fa fa-code',
637
-            'name'  =>  __('HTML', 'geodirectory'),
638
-            'description' =>  __('Adds a html input textarea', 'geodirectory')
639
-        ),
640
-        'file' => array(
641
-            'field_type'  =>  'file',
642
-            'class' =>  'gd-file',
643
-            'icon' =>  'fa fa-file',
644
-            'name'  =>  __('File Upload', 'geodirectory'),
645
-            'description' =>  __('Adds a file input', 'geodirectory')
646
-        )
647
-    );
648
-
649
-    /**
650
-     * Filter the custom fields array to be able to add or remove items.
651
-     * 
652
-     * @since 1.6.6
653
-     *
654
-     * @param array $custom_fields {
655
-     *     The custom fields array to be filtered.
656
-     *
657
-     *     @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file.
658
-     *     @type string $class The class for the field in backend.
659
-     *     @type string $icon Can be font-awesome class name or icon image url.
660
-     *     @type string $name The name of the field.
661
-     *     @type string $description A short description about the field.
662
-     *     @type array $defaults {
663
-     *                    Optional. Used to set the default value of the field.
664
-     *
665
-     *                    @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE
666
-     *                    @type int decimal_point limit if using FLOAT data_type
667
-     *                    @type string admin_title The admin title for the field.
668
-     *                    @type string site_title This will be the title for the field on the frontend.
669
-     *                    @type string admin_desc This will be shown below the field on the add listing form.
670
-     *                    @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.
671
-     *                    @type bool is_active If false the field will not be displayed anywhere.
672
-     *                    @type bool for_admin_use If true then only site admin can see and edit this field.
673
-     *                    @type string default_value The default value for the input on the add listing page.
674
-     *                    @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble]
675
-     *                    @type bool is_required If true the field will be required on the add listing page.
676
-     *                    @type string option_values The option values for select and multiselect only
677
-     *                    @type string validation_pattern HTML5 validation pattern (text input only by default).
678
-     *                    @type string validation_msg HTML5 validation message (text input only by default).
679
-     *                    @type string required_msg Required warning message.
680
-     *                    @type string field_icon Icon url or font awesome class.
681
-     *                    @type string css_class Field custom css class for field custom style.
682
-     *                    @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option.
683
-     *                    @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required)
684
-     *     }
685
-     * }
686
-     * @param string $post_type The post type requested.
687
-     */
688
-    return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
555
+	$custom_fields = array(
556
+		'text' => array(
557
+			'field_type'  =>  'text',
558
+			'class' =>  'gd-text',
559
+			'icon'  =>  'fa fa-minus',
560
+			'name'  =>  __('Text', 'geodirectory'),
561
+			'description' =>  __('Add any sort of text field, text or numbers', 'geodirectory')
562
+		),
563
+		'datepicker' => array(
564
+			'field_type'  =>  'datepicker',
565
+			'class' =>  'gd-datepicker',
566
+			'icon'  =>  'fa fa-calendar',
567
+			'name'  =>  __('Date', 'geodirectory'),
568
+			'description' =>  __('Adds a date picker.', 'geodirectory')
569
+		),
570
+		'textarea' => array(
571
+			'field_type'  =>  'textarea',
572
+			'class' =>  'gd-textarea',
573
+			'icon'  =>  'fa fa-bars',
574
+			'name'  =>  __('Textarea', 'geodirectory'),
575
+			'description' =>  __('Adds a textarea', 'geodirectory')
576
+		),
577
+		'time' => array(
578
+			'field_type'  =>  'time',
579
+			'class' =>  'gd-time',
580
+			'icon' =>  'fa fa-clock-o',
581
+			'name'  =>  __('Time', 'geodirectory'),
582
+			'description' =>  __('Adds a time picker', 'geodirectory')
583
+		),
584
+		'checkbox' => array(
585
+			'field_type'  =>  'checkbox',
586
+			'class' =>  'gd-checkbox',
587
+			'icon' =>  'fa fa-check-square-o',
588
+			'name'  =>  __('Checkbox', 'geodirectory'),
589
+			'description' =>  __('Adds a checkbox', 'geodirectory')
590
+		),
591
+		'phone' => array(
592
+			'field_type'  =>  'phone',
593
+			'class' =>  'gd-phone',
594
+			'icon' =>  'fa fa-phone',
595
+			'name'  =>  __('Phone', 'geodirectory'),
596
+			'description' =>  __('Adds a phone input', 'geodirectory')
597
+		),
598
+		'radio' => array(
599
+			'field_type'  =>  'radio',
600
+			'class' =>  'gd-radio',
601
+			'icon' =>  'fa fa-dot-circle-o',
602
+			'name'  =>  __('Radio', 'geodirectory'),
603
+			'description' =>  __('Adds a radio input', 'geodirectory')
604
+		),
605
+		'email' => array(
606
+			'field_type'  =>  'email',
607
+			'class' =>  'gd-email',
608
+			'icon' =>  'fa fa-envelope-o',
609
+			'name'  =>  __('Email', 'geodirectory'),
610
+			'description' =>  __('Adds a email input', 'geodirectory')
611
+		),
612
+		'select' => array(
613
+			'field_type'  =>  'select',
614
+			'class' =>  'gd-select',
615
+			'icon' =>  'fa fa-caret-square-o-down',
616
+			'name'  =>  __('Select', 'geodirectory'),
617
+			'description' =>  __('Adds a select input', 'geodirectory')
618
+		),
619
+		'multiselect' => array(
620
+			'field_type'  =>  'multiselect',
621
+			'class' =>  'gd-multiselect',
622
+			'icon' =>  'fa fa-caret-square-o-down',
623
+			'name'  =>  __('Multi Select', 'geodirectory'),
624
+			'description' =>  __('Adds a multiselect input', 'geodirectory')
625
+		),
626
+		'url' => array(
627
+			'field_type'  =>  'url',
628
+			'class' =>  'gd-url',
629
+			'icon' =>  'fa fa-link',
630
+			'name'  =>  __('URL', 'geodirectory'),
631
+			'description' =>  __('Adds a url input', 'geodirectory')
632
+		),
633
+		'html' => array(
634
+			'field_type'  =>  'html',
635
+			'class' =>  'gd-html',
636
+			'icon' =>  'fa fa-code',
637
+			'name'  =>  __('HTML', 'geodirectory'),
638
+			'description' =>  __('Adds a html input textarea', 'geodirectory')
639
+		),
640
+		'file' => array(
641
+			'field_type'  =>  'file',
642
+			'class' =>  'gd-file',
643
+			'icon' =>  'fa fa-file',
644
+			'name'  =>  __('File Upload', 'geodirectory'),
645
+			'description' =>  __('Adds a file input', 'geodirectory')
646
+		)
647
+	);
648
+
649
+	/**
650
+	 * Filter the custom fields array to be able to add or remove items.
651
+	 * 
652
+	 * @since 1.6.6
653
+	 *
654
+	 * @param array $custom_fields {
655
+	 *     The custom fields array to be filtered.
656
+	 *
657
+	 *     @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file.
658
+	 *     @type string $class The class for the field in backend.
659
+	 *     @type string $icon Can be font-awesome class name or icon image url.
660
+	 *     @type string $name The name of the field.
661
+	 *     @type string $description A short description about the field.
662
+	 *     @type array $defaults {
663
+	 *                    Optional. Used to set the default value of the field.
664
+	 *
665
+	 *                    @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE
666
+	 *                    @type int decimal_point limit if using FLOAT data_type
667
+	 *                    @type string admin_title The admin title for the field.
668
+	 *                    @type string site_title This will be the title for the field on the frontend.
669
+	 *                    @type string admin_desc This will be shown below the field on the add listing form.
670
+	 *                    @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.
671
+	 *                    @type bool is_active If false the field will not be displayed anywhere.
672
+	 *                    @type bool for_admin_use If true then only site admin can see and edit this field.
673
+	 *                    @type string default_value The default value for the input on the add listing page.
674
+	 *                    @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble]
675
+	 *                    @type bool is_required If true the field will be required on the add listing page.
676
+	 *                    @type string option_values The option values for select and multiselect only
677
+	 *                    @type string validation_pattern HTML5 validation pattern (text input only by default).
678
+	 *                    @type string validation_msg HTML5 validation message (text input only by default).
679
+	 *                    @type string required_msg Required warning message.
680
+	 *                    @type string field_icon Icon url or font awesome class.
681
+	 *                    @type string css_class Field custom css class for field custom style.
682
+	 *                    @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option.
683
+	 *                    @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required)
684
+	 *     }
685
+	 * }
686
+	 * @param string $post_type The post type requested.
687
+	 */
688
+	return apply_filters('geodir_custom_fields',$custom_fields,$post_type);
689 689
 }
690 690
 
691 691
 /**
@@ -698,19 +698,19 @@  discard block
 block discarded – undo
698 698
  */
699 699
 function geodir_custom_available_fields($type='')
700 700
 {
701
-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
702
-    ?>
701
+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
702
+	?>
703 703
     <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>
704 704
     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>" />
705 705
 
706 706
         <?php
707
-        if($type=='predefined'){
708
-            $cfs = geodir_custom_fields_predefined($listing_type);
709
-        }elseif($type=='custom'){
710
-            $cfs = geodir_custom_fields_custom($listing_type);
711
-        }else{
712
-            $cfs = geodir_custom_fields($listing_type);
713
-            ?>
707
+		if($type=='predefined'){
708
+			$cfs = geodir_custom_fields_predefined($listing_type);
709
+		}elseif($type=='custom'){
710
+			$cfs = geodir_custom_fields_custom($listing_type);
711
+		}else{
712
+			$cfs = geodir_custom_fields($listing_type);
713
+			?>
714 714
             <ul class="full gd-cf-tooltip-wrap">
715 715
                 <li>
716 716
                     <div class="gdcf-tooltip">
@@ -731,18 +731,18 @@  discard block
 block discarded – undo
731 731
             </ul>
732 732
 
733 733
             <?php
734
-        }
734
+		}
735 735
 
736
-    if(!empty($cfs)) {
737
-        echo '<ul>';
738
-        foreach ( $cfs as $id => $cf ) {
739
-            ?>
736
+	if(!empty($cfs)) {
737
+		echo '<ul>';
738
+		foreach ( $cfs as $id => $cf ) {
739
+			?>
740 740
 
741 741
             <li class="gd-cf-tooltip-wrap">
742 742
                 <?php
743
-                if ( isset( $cf['description'] ) && $cf['description'] ) {
744
-                    echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';
745
-                } ?>
743
+				if ( isset( $cf['description'] ) && $cf['description'] ) {
744
+					echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';
745
+				} ?>
746 746
 
747 747
                 <a id="gd-<?php echo $id; ?>"
748 748
                    data-field-custom-type="<?php echo $type; ?>"
@@ -752,21 +752,21 @@  discard block
 block discarded – undo
752 752
                    href="javascript:void(0);">
753 753
 
754 754
                     <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {
755
-                        echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';
756
-                    } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
757
-                        echo '<b class="gd-cf-icon" style="background-image: url(\'' . $cf['icon'] . '\')"></b>';
758
-                    } else {
759
-                        echo '<i class="fa fa-cog" aria-hidden="true"></i>';
760
-                    } ?>
755
+						echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';
756
+					} elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {
757
+						echo '<b class="gd-cf-icon" style="background-image: url(\'' . $cf['icon'] . '\')"></b>';
758
+					} else {
759
+						echo '<i class="fa fa-cog" aria-hidden="true"></i>';
760
+					} ?>
761 761
                     <?php echo $cf['name']; ?>
762 762
                 </a>
763 763
             </li>
764 764
             <?php
765
-        }
766
-    }else{
767
-        _e('There are no custom fields here yet.', 'geodirectory');
768
-    }
769
-        ?>
765
+		}
766
+	}else{
767
+		_e('There are no custom fields here yet.', 'geodirectory');
768
+	}
769
+		?>
770 770
 
771 771
 
772 772
     </ul>
@@ -785,26 +785,26 @@  discard block
 block discarded – undo
785 785
  */
786 786
 function geodir_custom_selected_fields()
787 787
 {
788
-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
789
-    ?>
788
+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';
789
+	?>
790 790
     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>
791 791
     <ul class="core">
792 792
     <?php 
793
-        global $wpdb;
794
-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
795
-
796
-        if (!empty($fields)) {
797
-            foreach ($fields as $field) {
798
-                //$result_str = $field->id;
799
-                $result_str = $field;
800
-                $field_type = $field->field_type;
801
-                $field_type_key = $field->field_type_key;
802
-                $field_ins_upd = 'display';
803
-
804
-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);
805
-            }
806
-        }
807
-        ?></ul>
793
+		global $wpdb;
794
+		$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));
795
+
796
+		if (!empty($fields)) {
797
+			foreach ($fields as $field) {
798
+				//$result_str = $field->id;
799
+				$result_str = $field;
800
+				$field_type = $field->field_type;
801
+				$field_type_key = $field->field_type_key;
802
+				$field_ins_upd = 'display';
803
+
804
+				geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);
805
+			}
806
+		}
807
+		?></ul>
808 808
 <?php
809 809
 
810 810
 }
@@ -823,16 +823,16 @@  discard block
 block discarded – undo
823 823
 function geodir_custom_fields_panel_head($heading, $sub_tab, $listing_type)
824 824
 {
825 825
 
826
-    switch ($sub_tab) {
827
-        case 'custom_fields':
828
-            $heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
829
-            break;
826
+	switch ($sub_tab) {
827
+		case 'custom_fields':
828
+			$heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
829
+			break;
830 830
 
831
-        case 'sorting_options':
832
-            $heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
833
-            break;
834
-    }
835
-    return $heading;
831
+		case 'sorting_options':
832
+			$heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
833
+			break;
834
+	}
835
+	return $heading;
836 836
 }
837 837
 
838 838
 
@@ -850,16 +850,16 @@  discard block
 block discarded – undo
850 850
 function geodir_cf_panel_available_fields_head($heading, $sub_tab, $listing_type)
851 851
 {
852 852
 
853
-    switch ($sub_tab) {
854
-        case 'custom_fields':
855
-            $heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
856
-            break;
853
+	switch ($sub_tab) {
854
+		case 'custom_fields':
855
+			$heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
856
+			break;
857 857
 
858
-        case 'sorting_options':
859
-            $heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
860
-            break;
861
-    }
862
-    return $heading;
858
+		case 'sorting_options':
859
+			$heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
860
+			break;
861
+	}
862
+	return $heading;
863 863
 }
864 864
 
865 865
 
@@ -877,16 +877,16 @@  discard block
 block discarded – undo
877 877
 function geodir_cf_panel_available_fields_note($note, $sub_tab, $listing_type)
878 878
 {
879 879
 
880
-    switch ($sub_tab) {
881
-        case 'custom_fields':
882
-            $note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
883
-            break;
880
+	switch ($sub_tab) {
881
+		case 'custom_fields':
882
+			$note = sprintf(__('Click on any box below to add a field of that type to the add %s listing form. You can use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
883
+			break;
884 884
 
885
-        case 'sorting_options':
886
-            $note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing page.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
887
-            break;
888
-    }
889
-    return $note;
885
+		case 'sorting_options':
886
+			$note = sprintf(__('Click on any box below to make it appear in the sorting option dropdown on %s listing page.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
887
+			break;
888
+	}
889
+	return $note;
890 890
 }
891 891
 
892 892
 
@@ -904,16 +904,16 @@  discard block
 block discarded – undo
904 904
 function geodir_cf_panel_selected_fields_head($heading, $sub_tab, $listing_type)
905 905
 {
906 906
 
907
-    switch ($sub_tab) {
908
-        case 'custom_fields':
909
-            $heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
910
-            break;
907
+	switch ($sub_tab) {
908
+		case 'custom_fields':
909
+			$heading = sprintf(__('List of fields that will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
910
+			break;
911 911
 
912
-        case 'sorting_options':
913
-            $heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
914
-            break;
915
-    }
916
-    return $heading;
912
+		case 'sorting_options':
913
+			$heading = sprintf(__('List of fields that will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
914
+			break;
915
+	}
916
+	return $heading;
917 917
 }
918 918
 
919 919
 
@@ -931,16 +931,16 @@  discard block
 block discarded – undo
931 931
 function geodir_cf_panel_selected_fields_note($note, $sub_tab, $listing_type)
932 932
 {
933 933
 
934
-    switch ($sub_tab) {
935
-        case 'custom_fields':
936
-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
937
-            break;
934
+	switch ($sub_tab) {
935
+		case 'custom_fields':
936
+			$note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
937
+			break;
938 938
 
939
-        case 'sorting_options':
940
-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing page.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
941
-            break;
942
-    }
943
-    return $note;
939
+		case 'sorting_options':
940
+			$note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing page.', 'geodirectory'), get_post_type_singular_label($listing_type, false, true));
941
+			break;
942
+	}
943
+	return $note;
944 944
 }
945 945
 
946 946
 
@@ -956,16 +956,16 @@  discard block
 block discarded – undo
956 956
  */
957 957
 function geodir_remove_unnecessary_fields()
958 958
 {
959
-    global $wpdb, $plugin_prefix;
959
+	global $wpdb, $plugin_prefix;
960 960
 
961
-    if (!get_option('geodir_remove_unnecessary_fields')) {
961
+	if (!get_option('geodir_remove_unnecessary_fields')) {
962 962
 
963
-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
964
-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
963
+		if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))
964
+			$wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
965 965
 
966
-        update_option('geodir_remove_unnecessary_fields', '1');
966
+		update_option('geodir_remove_unnecessary_fields', '1');
967 967
 
968
-    }
968
+	}
969 969
 
970 970
 }
971 971
 
@@ -983,28 +983,28 @@  discard block
 block discarded – undo
983 983
  */
984 984
 function geodir_admin_ajax_handler()
985 985
 {
986
-    if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {
987
-        $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];
988
-        $diagnose_this = "";
989
-        switch ($geodir_admin_ajax_action) {
990
-            case 'diagnosis' :
991
-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
992
-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
993
-                    call_user_func('geodir_diagnose_' . $diagnose_this);
994
-
995
-                }
996
-                exit();
997
-                break;
998
-
999
-            case 'diagnosis-fix' :
1000
-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')
1001
-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
1002
-                call_user_func('geodir_diagnose_' . $diagnose_this);
1003
-                exit();
1004
-                break;
1005
-        }
1006
-    }
1007
-    exit();
986
+	if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {
987
+		$geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];
988
+		$diagnose_this = "";
989
+		switch ($geodir_admin_ajax_action) {
990
+			case 'diagnosis' :
991
+				if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
992
+					$diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
993
+					call_user_func('geodir_diagnose_' . $diagnose_this);
994
+
995
+				}
996
+				exit();
997
+				break;
998
+
999
+			case 'diagnosis-fix' :
1000
+				if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')
1001
+					$diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
1002
+				call_user_func('geodir_diagnose_' . $diagnose_this);
1003
+				exit();
1004
+				break;
1005
+		}
1006
+	}
1007
+	exit();
1008 1008
 }
1009 1009
 
1010 1010
 
@@ -1022,127 +1022,127 @@  discard block
 block discarded – undo
1022 1022
  */
1023 1023
 function geodir_diagnose_multisite_table($filter_arr, $table, $tabel_name, $fix)
1024 1024
 {
1025
-    global $wpdb;
1026
-    //$filter_arr['output_str'] .='###'.$table.'###';
1027
-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
1028
-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
1029
-        $filter_arr['is_error_during_diagnose'] = true;
1030
-
1031
-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
1032
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
1033
-        $filter_arr['is_error_during_diagnose'] = true;
1034
-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
1035
-        $filter_arr['is_error_during_diagnose'] = true;
1036
-
1037
-        if ($fix) {
1038
-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
1039
-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
1040
-
1041
-            if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
1042
-                //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
1043
-
1044
-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
1045
-
1046
-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
1047
-                    $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
1048
-                } else {
1049
-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1050
-                }
1051
-
1052
-            } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
1053
-
1054
-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
1055
-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
1056
-
1057
-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1058
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
1059
-                } else {
1060
-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1061
-                }
1062
-
1063
-            } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
1064
-
1065
-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
1066
-
1067
-                if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
1068
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
1069
-                } else {
1070
-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1071
-                }
1072
-
1073
-            }
1074
-
1075
-        }
1076
-
1077
-
1078
-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
1079
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
1080
-        $filter_arr['is_error_during_diagnose'] = true;
1081
-
1082
-        if ($fix) {
1083
-            if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
1084
-                if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
1085
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
1086
-                } else {
1087
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
1088
-                }
1089
-
1090
-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
1091
-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
1092
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
1093
-                } else {
1094
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
1095
-                }
1096
-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1097
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1098
-                } else {
1099
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1100
-                }
1101
-            } else {// else rename the original table to _ms_bak
1102
-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1103
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
1104
-                } else {
1105
-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
1106
-                }
1107
-            }
1108
-        }
1109
-
1110
-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
1111
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
1112
-        $filter_arr['is_error_during_diagnose'] = true;
1113
-
1114
-        if ($fix) {
1115
-            // if original table exists but new does not, rename
1116
-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1117
-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1118
-            } else {
1119
-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1120
-            }
1121
-
1122
-        }
1123
-
1124
-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
1125
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
1126
-        $filter_arr['is_error_during_diagnose'] = true;
1127
-
1128
-        if ($fix) {
1129
-            // if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run;
1130
-            delete_option('geodirlocation_db_version');
1131
-            delete_option('geodirevents_db_version');
1132
-            delete_option('geodir_reviewrating_db_version');
1133
-            delete_option('gdevents_db_version');
1134
-            delete_option('geodirectory_db_version');
1135
-            delete_option('geodirclaim_db_version');
1136
-            delete_option('geodir_custom_posts_db_version');
1137
-            delete_option('geodir_reviewratings_db_version');
1138
-            delete_option('geodiradvancesearch_db_version');
1139
-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
1140
-        }
1141
-
1142
-    } else {
1143
-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
1144
-    }
1145
-    return $filter_arr;
1025
+	global $wpdb;
1026
+	//$filter_arr['output_str'] .='###'.$table.'###';
1027
+	if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {
1028
+		$filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";
1029
+		$filter_arr['is_error_during_diagnose'] = true;
1030
+
1031
+	} elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
1032
+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";
1033
+		$filter_arr['is_error_during_diagnose'] = true;
1034
+		$filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";
1035
+		$filter_arr['is_error_during_diagnose'] = true;
1036
+
1037
+		if ($fix) {
1038
+			$ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count
1039
+			$new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count
1040
+
1041
+			if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2
1042
+				//$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;
1043
+
1044
+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table
1045
+
1046
+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
1047
+					$filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";
1048
+				} else {
1049
+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1050
+				}
1051
+
1052
+			} elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it
1053
+
1054
+				$wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2
1055
+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table
1056
+
1057
+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1058
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";
1059
+				} else {
1060
+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1061
+				}
1062
+
1063
+			} elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors
1064
+
1065
+				$wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2
1066
+
1067
+				if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {
1068
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";
1069
+				} else {
1070
+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";
1071
+				}
1072
+
1073
+			}
1074
+
1075
+		}
1076
+
1077
+
1078
+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {
1079
+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";
1080
+		$filter_arr['is_error_during_diagnose'] = true;
1081
+
1082
+		if ($fix) {
1083
+			if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it
1084
+				if ($wpdb->query("DROP TABLE IF EXISTS $table")) {
1085
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";
1086
+				} else {
1087
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";
1088
+				}
1089
+
1090
+			} elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original
1091
+				if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {
1092
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
1093
+				} else {
1094
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";
1095
+				}
1096
+				if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1097
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1098
+				} else {
1099
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1100
+				}
1101
+			} else {// else rename the original table to _ms_bak
1102
+				if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1103
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
1104
+				} else {
1105
+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";
1106
+				}
1107
+			}
1108
+		}
1109
+
1110
+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
1111
+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";
1112
+		$filter_arr['is_error_during_diagnose'] = true;
1113
+
1114
+		if ($fix) {
1115
+			// if original table exists but new does not, rename
1116
+			if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {
1117
+				$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1118
+			} else {
1119
+				$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";
1120
+			}
1121
+
1122
+		}
1123
+
1124
+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {
1125
+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";
1126
+		$filter_arr['is_error_during_diagnose'] = true;
1127
+
1128
+		if ($fix) {
1129
+			// if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run;
1130
+			delete_option('geodirlocation_db_version');
1131
+			delete_option('geodirevents_db_version');
1132
+			delete_option('geodir_reviewrating_db_version');
1133
+			delete_option('gdevents_db_version');
1134
+			delete_option('geodirectory_db_version');
1135
+			delete_option('geodirclaim_db_version');
1136
+			delete_option('geodir_custom_posts_db_version');
1137
+			delete_option('geodir_reviewratings_db_version');
1138
+			delete_option('geodiradvancesearch_db_version');
1139
+			$filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";
1140
+		}
1141
+
1142
+	} else {
1143
+		$filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";
1144
+	}
1145
+	return $filter_arr;
1146 1146
 }
1147 1147
 
1148 1148
 
@@ -1156,111 +1156,111 @@  discard block
 block discarded – undo
1156 1156
  */
1157 1157
 function geodir_diagnose_tags_sync()
1158 1158
 {
1159
-    global $wpdb, $plugin_prefix;
1160
-    $fix = isset($_POST['fix']) ? true : false;
1161
-    $step = isset($_POST['step']) ? strip_tags(esc_sql($_POST['step'])) : 0;
1162
-    $step_max_items = geodir_get_diagnose_step_max_items();
1163
-    $offset = (int) $step * $step_max_items;
1164
-    $ptype = isset($_POST['ptype']) ? strip_tags(esc_sql($_POST['ptype'])) : false;
1165
-
1166
-    $total_listings = geodir_total_listings_count();
1167
-    $total_ptype_listings = 0;
1168
-    if ($ptype) {
1169
-        $total_ptype_listings = geodir_total_listings_count($ptype);
1170
-    }
1171
-    $max_step = ceil($total_ptype_listings / $step_max_items) - 1;
1159
+	global $wpdb, $plugin_prefix;
1160
+	$fix = isset($_POST['fix']) ? true : false;
1161
+	$step = isset($_POST['step']) ? strip_tags(esc_sql($_POST['step'])) : 0;
1162
+	$step_max_items = geodir_get_diagnose_step_max_items();
1163
+	$offset = (int) $step * $step_max_items;
1164
+	$ptype = isset($_POST['ptype']) ? strip_tags(esc_sql($_POST['ptype'])) : false;
1165
+
1166
+	$total_listings = geodir_total_listings_count();
1167
+	$total_ptype_listings = 0;
1168
+	if ($ptype) {
1169
+		$total_ptype_listings = geodir_total_listings_count($ptype);
1170
+	}
1171
+	$max_step = ceil($total_ptype_listings / $step_max_items) - 1;
1172 1172
     
1173
-    //if($fix){echo 'true';}else{echo 'false';}
1174
-    $is_error_during_diagnose = false;
1175
-    $output_str = '';
1173
+	//if($fix){echo 'true';}else{echo 'false';}
1174
+	$is_error_during_diagnose = false;
1175
+	$output_str = '';
1176 1176
     
1177
-    if ($ptype && !empty($ptype) && $total_listings > $step_max_items) {
1178
-        $stepped_process = true;
1179
-    } else {
1180
-        $stepped_process = false;
1181
-    }
1182
-
1183
-    if ($stepped_process) {
1184
-        $sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset );
1185
-        $posts = $wpdb->get_results( $sql );
1186
-
1187
-        if (!empty($posts)) {
1188
-
1189
-            foreach ($posts as $p) {
1190
-                $p->post_type = $ptype;
1191
-                $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
1192
-                if (empty($raw_tags)) {
1193
-                    $post_tags = '';
1194
-                } else {
1195
-                    $post_tags = implode(",", $raw_tags);
1196
-                }
1197
-                $tablename = $plugin_prefix . $p->post_type . '_detail';
1198
-                $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
1199
-
1200
-            }
1201
-            if ($step >= $max_step) {
1202
-                $output_str = "done";    
1203
-            } else {
1204
-                $output_str = $step + 1;
1205
-            }
1206
-        }
1207
-
1208
-    } else {
1209
-        $all_postypes = geodir_get_posttypes();
1210
-
1211
-        if (!empty($all_postypes)) {
1212
-            foreach ($all_postypes as $key) {
1213
-                // update each GD CPT
1214
-                $posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail");
1215
-
1216
-                if (!empty($posts)) {
1217
-
1218
-                    foreach ($posts as $p) {
1219
-                        $p->post_type = $key;
1220
-                        $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
1221
-                        if (empty($raw_tags)) {
1222
-                            $post_tags = '';
1223
-                        } else {
1224
-                            $post_tags = implode(",", $raw_tags);
1225
-                        }
1226
-                        $tablename = $plugin_prefix . $p->post_type . '_detail';
1227
-                        $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
1228
-
1229
-                    }
1230
-                    $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
1231
-                }
1232
-
1233
-            }
1234
-
1235
-        }
1236
-    }
1237
-
1238
-
1239
-    if ($is_error_during_diagnose) {
1240
-        $info_div_class = "geodir_problem_info";
1241
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1242
-    } else {
1243
-        $info_div_class = "geodir_noproblem_info";
1244
-        $fix_button_txt = '';
1245
-    }
1246
-
1247
-    if ($stepped_process) {
1248
-        $percent = ($step/$max_step) * 100;
1249
-        if ($output_str == 'done') {
1250
-            echo $output_str;
1251
-        } else {
1252
-            $output = array(
1253
-                'step' => $output_str,
1254
-                'percent' => $percent
1255
-            );
1256
-            echo json_encode($output);
1257
-        }
1258
-    } else {
1259
-        echo "<ul class='$info_div_class'>";
1260
-        echo $output_str;
1261
-        echo $fix_button_txt;
1262
-        echo "</ul>";
1263
-    }
1177
+	if ($ptype && !empty($ptype) && $total_listings > $step_max_items) {
1178
+		$stepped_process = true;
1179
+	} else {
1180
+		$stepped_process = false;
1181
+	}
1182
+
1183
+	if ($stepped_process) {
1184
+		$sql = $wpdb->prepare( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $ptype . "_detail LIMIT %d OFFSET %d", $step_max_items, $offset );
1185
+		$posts = $wpdb->get_results( $sql );
1186
+
1187
+		if (!empty($posts)) {
1188
+
1189
+			foreach ($posts as $p) {
1190
+				$p->post_type = $ptype;
1191
+				$raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
1192
+				if (empty($raw_tags)) {
1193
+					$post_tags = '';
1194
+				} else {
1195
+					$post_tags = implode(",", $raw_tags);
1196
+				}
1197
+				$tablename = $plugin_prefix . $p->post_type . '_detail';
1198
+				$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
1199
+
1200
+			}
1201
+			if ($step >= $max_step) {
1202
+				$output_str = "done";    
1203
+			} else {
1204
+				$output_str = $step + 1;
1205
+			}
1206
+		}
1207
+
1208
+	} else {
1209
+		$all_postypes = geodir_get_posttypes();
1210
+
1211
+		if (!empty($all_postypes)) {
1212
+			foreach ($all_postypes as $key) {
1213
+				// update each GD CPT
1214
+				$posts = $wpdb->get_results( "SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail");
1215
+
1216
+				if (!empty($posts)) {
1217
+
1218
+					foreach ($posts as $p) {
1219
+						$p->post_type = $key;
1220
+						$raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));
1221
+						if (empty($raw_tags)) {
1222
+							$post_tags = '';
1223
+						} else {
1224
+							$post_tags = implode(",", $raw_tags);
1225
+						}
1226
+						$tablename = $plugin_prefix . $p->post_type . '_detail';
1227
+						$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));
1228
+
1229
+					}
1230
+					$output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
1231
+				}
1232
+
1233
+			}
1234
+
1235
+		}
1236
+	}
1237
+
1238
+
1239
+	if ($is_error_during_diagnose) {
1240
+		$info_div_class = "geodir_problem_info";
1241
+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1242
+	} else {
1243
+		$info_div_class = "geodir_noproblem_info";
1244
+		$fix_button_txt = '';
1245
+	}
1246
+
1247
+	if ($stepped_process) {
1248
+		$percent = ($step/$max_step) * 100;
1249
+		if ($output_str == 'done') {
1250
+			echo $output_str;
1251
+		} else {
1252
+			$output = array(
1253
+				'step' => $output_str,
1254
+				'percent' => $percent
1255
+			);
1256
+			echo json_encode($output);
1257
+		}
1258
+	} else {
1259
+		echo "<ul class='$info_div_class'>";
1260
+		echo $output_str;
1261
+		echo $fix_button_txt;
1262
+		echo "</ul>";
1263
+	}
1264 1264
 }
1265 1265
 
1266 1266
 /**
@@ -1275,75 +1275,75 @@  discard block
 block discarded – undo
1275 1275
  */
1276 1276
 function geodir_diagnose_cats_sync()
1277 1277
 {
1278
-    global $wpdb, $plugin_prefix;
1279
-    $fix = isset($_POST['fix']) ? true : false;
1278
+	global $wpdb, $plugin_prefix;
1279
+	$fix = isset($_POST['fix']) ? true : false;
1280 1280
 
1281
-    //if($fix){echo 'true';}else{echo 'false';}
1282
-    $is_error_during_diagnose = false;
1283
-    $output_str = '';
1281
+	//if($fix){echo 'true';}else{echo 'false';}
1282
+	$is_error_during_diagnose = false;
1283
+	$output_str = '';
1284 1284
 
1285 1285
 
1286
-    $all_postypes = geodir_get_posttypes();
1286
+	$all_postypes = geodir_get_posttypes();
1287 1287
 
1288
-    if (!empty($all_postypes)) {
1289
-        foreach ($all_postypes as $key) {
1290
-            // update each GD CTP
1291
-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
1288
+	if (!empty($all_postypes)) {
1289
+		foreach ($all_postypes as $key) {
1290
+			// update each GD CTP
1291
+			$posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");
1292 1292
 
1293
-            if (!empty($posts)) {
1293
+			if (!empty($posts)) {
1294 1294
 
1295
-                foreach ($posts as $p) {
1296
-                    $p->post_type = $key;
1297
-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
1295
+				foreach ($posts as $p) {
1296
+					$p->post_type = $key;
1297
+					$raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));
1298 1298
 
1299
-                    if (empty($raw_cats)) {
1300
-                        $post_categories = get_post_meta($p->post_id, 'post_categories', true);
1299
+					if (empty($raw_cats)) {
1300
+						$post_categories = get_post_meta($p->post_id, 'post_categories', true);
1301 1301
 
1302
-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
1303
-                            $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
1304
-                            foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
1305
-                                if (is_numeric($cat_part)) {
1306
-                                    $raw_cats[] = (int)$cat_part;
1307
-                                }
1308
-                            }
1302
+						if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {
1303
+							$post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);
1304
+							foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {
1305
+								if (is_numeric($cat_part)) {
1306
+									$raw_cats[] = (int)$cat_part;
1307
+								}
1308
+							}
1309 1309
 
1310
-                        }
1310
+						}
1311 1311
 
1312
-                        if (!empty($raw_cats)) {
1313
-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');
1312
+						if (!empty($raw_cats)) {
1313
+							$term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');
1314 1314
 
1315
-                        }
1315
+						}
1316 1316
 
1317
-                    }
1317
+					}
1318 1318
 
1319 1319
 
1320
-                    if (empty($raw_cats)) {
1321
-                        $post_cats = '';
1322
-                    } else {
1323
-                        $post_cats = ',' . implode(",", $raw_cats) . ',';
1324
-                    }
1325
-                    $tablename = $plugin_prefix . $p->post_type . '_detail';
1326
-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
1327
-                }
1320
+					if (empty($raw_cats)) {
1321
+						$post_cats = '';
1322
+					} else {
1323
+						$post_cats = ',' . implode(",", $raw_cats) . ',';
1324
+					}
1325
+					$tablename = $plugin_prefix . $p->post_type . '_detail';
1326
+					$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));
1327
+				}
1328 1328
 
1329
-            }
1330
-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
1329
+			}
1330
+			$output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";
1331 1331
 
1332
-        }
1332
+		}
1333 1333
 
1334
-    }
1334
+	}
1335 1335
 
1336
-    if ($is_error_during_diagnose) {
1337
-        $info_div_class = "geodir_problem_info";
1338
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1339
-    } else {
1340
-        $info_div_class = "geodir_noproblem_info";
1341
-        $fix_button_txt = '';
1342
-    }
1343
-    echo "<ul class='$info_div_class'>";
1344
-    echo $output_str;
1345
-    echo $fix_button_txt;
1346
-    echo "</ul>";
1336
+	if ($is_error_during_diagnose) {
1337
+		$info_div_class = "geodir_problem_info";
1338
+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1339
+	} else {
1340
+		$info_div_class = "geodir_noproblem_info";
1341
+		$fix_button_txt = '';
1342
+	}
1343
+	echo "<ul class='$info_div_class'>";
1344
+	echo $output_str;
1345
+	echo $fix_button_txt;
1346
+	echo "</ul>";
1347 1347
 
1348 1348
 }
1349 1349
 
@@ -1357,61 +1357,61 @@  discard block
 block discarded – undo
1357 1357
  */
1358 1358
 function geodir_diagnose_version_clear()
1359 1359
 {
1360
-    global $wpdb, $plugin_prefix;
1361
-    $fix = isset($_POST['fix']) ? true : false;
1362
-
1363
-    //if($fix){echo 'true';}else{echo 'false';}
1364
-    $is_error_during_diagnose = false;
1365
-    $output_str = '';
1366
-
1367
-
1368
-    $gd_arr = array('GeoDirectory' => 'geodirectory_db_version',
1369
-        'Payment Manager' => 'geodir_payments_db_version',
1370
-        'GeoDirectory Framework' => 'gdf_db_version',
1371
-        'Advanced Search' => 'geodiradvancesearch_db_version',
1372
-        'Review Rating Manager' => 'geodir_reviewratings_db_version',
1373
-        'Claim Manager' => 'geodirclaim_db_version',
1374
-        'CPT Manager' => 'geodir_custom_posts_db_version',
1375
-        'Location Manager' => 'geodirlocation_db_version',
1376
-        'Payment Manager' => 'geodir_payments_db_version',
1377
-        'Events Manager' => 'geodirevents_db_version',
1378
-    );
1379
-
1380
-    /**
1381
-     * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers.
1382
-     *
1383
-     * @since 1.0.0
1384
-     * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...
1385
-     */
1386
-    $ver_arr = apply_filters('geodir_db_version_name', $gd_arr);
1387
-
1388
-    if (!empty($ver_arr)) {
1389
-        foreach ($ver_arr as $key => $val) {
1390
-            if (delete_option($val)) {
1391
-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
1392
-            } else {
1393
-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
1394
-            }
1395
-
1396
-        }
1397
-
1398
-        if ($output_str) {
1399
-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
1400
-        }
1401
-
1402
-    }
1403
-
1404
-    if ($is_error_during_diagnose) {
1405
-        $info_div_class = "geodir_problem_info";
1406
-        $fix_button_txt = "";
1407
-    } else {
1408
-        $info_div_class = "geodir_noproblem_info";
1409
-        $fix_button_txt = '';
1410
-    }
1411
-    echo "<ul class='$info_div_class'>";
1412
-    echo $output_str;
1413
-    echo $fix_button_txt;
1414
-    echo "</ul>";
1360
+	global $wpdb, $plugin_prefix;
1361
+	$fix = isset($_POST['fix']) ? true : false;
1362
+
1363
+	//if($fix){echo 'true';}else{echo 'false';}
1364
+	$is_error_during_diagnose = false;
1365
+	$output_str = '';
1366
+
1367
+
1368
+	$gd_arr = array('GeoDirectory' => 'geodirectory_db_version',
1369
+		'Payment Manager' => 'geodir_payments_db_version',
1370
+		'GeoDirectory Framework' => 'gdf_db_version',
1371
+		'Advanced Search' => 'geodiradvancesearch_db_version',
1372
+		'Review Rating Manager' => 'geodir_reviewratings_db_version',
1373
+		'Claim Manager' => 'geodirclaim_db_version',
1374
+		'CPT Manager' => 'geodir_custom_posts_db_version',
1375
+		'Location Manager' => 'geodirlocation_db_version',
1376
+		'Payment Manager' => 'geodir_payments_db_version',
1377
+		'Events Manager' => 'geodirevents_db_version',
1378
+	);
1379
+
1380
+	/**
1381
+	 * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers.
1382
+	 *
1383
+	 * @since 1.0.0
1384
+	 * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...
1385
+	 */
1386
+	$ver_arr = apply_filters('geodir_db_version_name', $gd_arr);
1387
+
1388
+	if (!empty($ver_arr)) {
1389
+		foreach ($ver_arr as $key => $val) {
1390
+			if (delete_option($val)) {
1391
+				$output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";
1392
+			} else {
1393
+				$output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";
1394
+			}
1395
+
1396
+		}
1397
+
1398
+		if ($output_str) {
1399
+			$output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";
1400
+		}
1401
+
1402
+	}
1403
+
1404
+	if ($is_error_during_diagnose) {
1405
+		$info_div_class = "geodir_problem_info";
1406
+		$fix_button_txt = "";
1407
+	} else {
1408
+		$info_div_class = "geodir_noproblem_info";
1409
+		$fix_button_txt = '';
1410
+	}
1411
+	echo "<ul class='$info_div_class'>";
1412
+	echo $output_str;
1413
+	echo $fix_button_txt;
1414
+	echo "</ul>";
1415 1415
 
1416 1416
 }
1417 1417
 
@@ -1425,59 +1425,59 @@  discard block
 block discarded – undo
1425 1425
  */
1426 1426
 function geodir_diagnose_ratings()
1427 1427
 {
1428
-    global $wpdb;
1429
-    $fix = isset($_POST['fix']) ? true : false;
1430
-
1431
-    //if($fix){echo 'true';}else{echo 'false';}
1432
-    $is_error_during_diagnose = false;
1433
-    $output_str = '';
1434
-
1435
-    // check review locations
1436
-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
1437
-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
1438
-        $is_error_during_diagnose = true;
1439
-
1440
-        if ($fix) {
1441
-            if (geodir_fix_review_location()) {
1442
-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
1443
-            } else {
1444
-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
1445
-            }
1446
-        }
1447
-
1448
-    } else {
1449
-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
1450
-    }
1451
-
1452
-    // check review content
1453
-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
1454
-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
1455
-        $is_error_during_diagnose = true;
1456
-
1457
-        if ($fix) {
1458
-            if (geodir_fix_review_content()) {
1459
-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
1460
-            } else {
1461
-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
1462
-            }
1463
-        }
1464
-
1465
-    } else {
1466
-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
1467
-    }
1468
-
1469
-
1470
-    if ($is_error_during_diagnose) {
1471
-        $info_div_class = "geodir_problem_info";
1472
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1473
-    } else {
1474
-        $info_div_class = "geodir_noproblem_info";
1475
-        $fix_button_txt = '';
1476
-    }
1477
-    echo "<ul class='$info_div_class'>";
1478
-    echo $output_str;
1479
-    echo $fix_button_txt;
1480
-    echo "</ul>";
1428
+	global $wpdb;
1429
+	$fix = isset($_POST['fix']) ? true : false;
1430
+
1431
+	//if($fix){echo 'true';}else{echo 'false';}
1432
+	$is_error_during_diagnose = false;
1433
+	$output_str = '';
1434
+
1435
+	// check review locations
1436
+	if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {
1437
+		$output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";
1438
+		$is_error_during_diagnose = true;
1439
+
1440
+		if ($fix) {
1441
+			if (geodir_fix_review_location()) {
1442
+				$output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";
1443
+			} else {
1444
+				$output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";
1445
+			}
1446
+		}
1447
+
1448
+	} else {
1449
+		$output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";
1450
+	}
1451
+
1452
+	// check review content
1453
+	if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {
1454
+		$output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";
1455
+		$is_error_during_diagnose = true;
1456
+
1457
+		if ($fix) {
1458
+			if (geodir_fix_review_content()) {
1459
+				$output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";
1460
+			} else {
1461
+				$output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";
1462
+			}
1463
+		}
1464
+
1465
+	} else {
1466
+		$output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";
1467
+	}
1468
+
1469
+
1470
+	if ($is_error_during_diagnose) {
1471
+		$info_div_class = "geodir_problem_info";
1472
+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";
1473
+	} else {
1474
+		$info_div_class = "geodir_noproblem_info";
1475
+		$fix_button_txt = '';
1476
+	}
1477
+	echo "<ul class='$info_div_class'>";
1478
+	echo $output_str;
1479
+	echo $fix_button_txt;
1480
+	echo "</ul>";
1481 1481
 
1482 1482
 }
1483 1483
 
@@ -1491,57 +1491,57 @@  discard block
 block discarded – undo
1491 1491
  */
1492 1492
 function geodir_diagnose_multisite_conversion()
1493 1493
 {
1494
-    global $wpdb;
1495
-    $fix = isset($_POST['fix']) ? true : false;
1496
-    //if($fix){echo 'true';}else{echo 'false';}
1497
-    $is_error_during_diagnose = false;
1498
-    $output_str = '';
1499
-
1500
-    $filter_arr = array();
1501
-    $filter_arr['output_str'] = $output_str;
1502
-    $filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose;
1503
-    $table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),
1504
-        'geodir_custom_fields' => __('Custom fields', 'geodirectory'),
1505
-        'geodir_post_icon' => __('Post icon', 'geodirectory'),
1506
-        'geodir_attachments' => __('Attachments', 'geodirectory'),
1507
-        'geodir_post_review' => __('Reviews', 'geodirectory'),
1508
-        'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),
1509
-        'geodir_gd_place_detail' => __('Place detail', 'geodirectory')
1510
-    );
1511
-
1512
-    // allow other addons to hook in and add their checks
1513
-
1514
-    /**
1515
-     * Filter the array of tables.
1516
-     *
1517
-     * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks.
1518
-     *
1519
-     * @since 1.0.0
1520
-     * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...
1521
-     */
1522
-    $table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);
1523
-
1524
-    foreach ($table_arr as $table => $table_name) {
1525
-        // Diagnose table
1526
-        $filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix);
1527
-    }
1528
-
1529
-
1530
-    $output_str = $filter_arr['output_str'];
1531
-    $is_error_during_diagnose = $filter_arr['is_error_during_diagnose'];
1532
-
1533
-
1534
-    if ($is_error_during_diagnose) {
1535
-        $info_div_class = "geodir_problem_info";
1536
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
1537
-    } else {
1538
-        $info_div_class = "geodir_noproblem_info";
1539
-        $fix_button_txt = '';
1540
-    }
1541
-    echo "<ul class='$info_div_class'>";
1542
-    echo $output_str;
1543
-    echo $fix_button_txt;
1544
-    echo "</ul>";
1494
+	global $wpdb;
1495
+	$fix = isset($_POST['fix']) ? true : false;
1496
+	//if($fix){echo 'true';}else{echo 'false';}
1497
+	$is_error_during_diagnose = false;
1498
+	$output_str = '';
1499
+
1500
+	$filter_arr = array();
1501
+	$filter_arr['output_str'] = $output_str;
1502
+	$filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose;
1503
+	$table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),
1504
+		'geodir_custom_fields' => __('Custom fields', 'geodirectory'),
1505
+		'geodir_post_icon' => __('Post icon', 'geodirectory'),
1506
+		'geodir_attachments' => __('Attachments', 'geodirectory'),
1507
+		'geodir_post_review' => __('Reviews', 'geodirectory'),
1508
+		'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),
1509
+		'geodir_gd_place_detail' => __('Place detail', 'geodirectory')
1510
+	);
1511
+
1512
+	// allow other addons to hook in and add their checks
1513
+
1514
+	/**
1515
+	 * Filter the array of tables.
1516
+	 *
1517
+	 * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks.
1518
+	 *
1519
+	 * @since 1.0.0
1520
+	 * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...
1521
+	 */
1522
+	$table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);
1523
+
1524
+	foreach ($table_arr as $table => $table_name) {
1525
+		// Diagnose table
1526
+		$filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix);
1527
+	}
1528
+
1529
+
1530
+	$output_str = $filter_arr['output_str'];
1531
+	$is_error_during_diagnose = $filter_arr['is_error_during_diagnose'];
1532
+
1533
+
1534
+	if ($is_error_during_diagnose) {
1535
+		$info_div_class = "geodir_problem_info";
1536
+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";
1537
+	} else {
1538
+		$info_div_class = "geodir_noproblem_info";
1539
+		$fix_button_txt = '';
1540
+	}
1541
+	echo "<ul class='$info_div_class'>";
1542
+	echo $output_str;
1543
+	echo $fix_button_txt;
1544
+	echo "</ul>";
1545 1545
 }
1546 1546
 
1547 1547
 /**
@@ -1559,39 +1559,39 @@  discard block
 block discarded – undo
1559 1559
  */
1560 1560
 function geodir_fix_virtual_page($slug, $page_title, $old_id, $option)
1561 1561
 {
1562
-    global $wpdb, $current_user;
1563
-
1564
-    if (!empty($old_id)) {
1565
-        wp_delete_post($old_id, true);
1566
-    }//delete post if already there
1567
-    else {
1568
-        $page_found = $wpdb->get_var(
1569
-            $wpdb->prepare(
1570
-                "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",
1571
-                array($slug)
1572
-            )
1573
-        );
1574
-        wp_delete_post($page_found, true);
1575
-
1576
-    }
1577
-
1578
-    $page_data = array(
1579
-        'post_status' => 'publish',
1580
-        'post_type' => 'page',
1581
-        'post_author' => $current_user->ID,
1582
-        'post_name' => $slug,
1583
-        'post_title' => $page_title,
1584
-        'post_content' => '',
1585
-        'post_parent' => 0,
1586
-        'comment_status' => 'closed'
1587
-    );
1588
-    $page_id = wp_insert_post($page_data);
1589
-    update_option($option, $page_id);
1590
-    if ($page_id) {
1591
-        return true;
1592
-    } else {
1593
-        return false;
1594
-    }
1562
+	global $wpdb, $current_user;
1563
+
1564
+	if (!empty($old_id)) {
1565
+		wp_delete_post($old_id, true);
1566
+	}//delete post if already there
1567
+	else {
1568
+		$page_found = $wpdb->get_var(
1569
+			$wpdb->prepare(
1570
+				"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",
1571
+				array($slug)
1572
+			)
1573
+		);
1574
+		wp_delete_post($page_found, true);
1575
+
1576
+	}
1577
+
1578
+	$page_data = array(
1579
+		'post_status' => 'publish',
1580
+		'post_type' => 'page',
1581
+		'post_author' => $current_user->ID,
1582
+		'post_name' => $slug,
1583
+		'post_title' => $page_title,
1584
+		'post_content' => '',
1585
+		'post_parent' => 0,
1586
+		'comment_status' => 'closed'
1587
+	);
1588
+	$page_id = wp_insert_post($page_data);
1589
+	update_option($option, $page_id);
1590
+	if ($page_id) {
1591
+		return true;
1592
+	} else {
1593
+		return false;
1594
+	}
1595 1595
 }
1596 1596
 
1597 1597
 /**
@@ -1603,212 +1603,212 @@  discard block
 block discarded – undo
1603 1603
  */
1604 1604
 function geodir_diagnose_default_pages()
1605 1605
 {
1606
-    global $wpdb;
1607
-    $is_error_during_diagnose = false;
1608
-    $output_str = '';
1609
-    $fix = isset($_POST['fix']) ? true : false;
1610
-
1611
-    //////////////////////////////////
1612
-    /* Diagnose GD Home Page Starts */
1613
-    //////////////////////////////////
1614
-    $option_value = get_option('geodir_home_page');
1615
-    $page = get_post($option_value);
1616
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1617
-
1618
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1619
-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
1620
-    else {
1621
-        $is_error_during_diagnose = true;
1622
-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
1623
-        if ($fix) {
1624
-            if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
1625
-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
1626
-            } else {
1627
-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
1628
-            }
1629
-        }
1630
-    }
1631
-
1632
-    ////////////////////////////////
1633
-    /* Diagnose GD Home Page Ends */
1634
-    ////////////////////////////////
1635
-
1636
-    //////////////////////////////////
1637
-    /* Diagnose Add Listing Page Starts */
1638
-    //////////////////////////////////
1639
-    $option_value = get_option('geodir_add_listing_page');
1640
-    $page = get_post($option_value);
1641
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1642
-
1643
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1644
-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
1645
-    else {
1646
-        $is_error_during_diagnose = true;
1647
-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
1648
-        if ($fix) {
1649
-            if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
1650
-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
1651
-            } else {
1652
-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
1653
-            }
1654
-        }
1655
-    }
1656
-
1657
-    ////////////////////////////////
1658
-    /* Diagnose Add Listing Page Ends */
1659
-    ////////////////////////////////
1660
-
1661
-
1662
-    //////////////////////////////////
1663
-    /* Diagnose Listing Preview Page Starts */
1664
-    //////////////////////////////////
1665
-    $option_value = get_option('geodir_preview_page');
1666
-    $page = get_post($option_value);
1667
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1668
-
1669
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1670
-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
1671
-    else {
1672
-        $is_error_during_diagnose = true;
1673
-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
1674
-        if ($fix) {
1675
-            if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
1676
-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
1677
-            } else {
1678
-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
1679
-            }
1680
-        }
1681
-    }
1682
-
1683
-    ////////////////////////////////
1684
-    /* Diagnose Listing Preview Page Ends */
1685
-    ////////////////////////////////
1686
-
1687
-    //////////////////////////////////
1688
-    /* Diagnose Listing Success Page Starts */
1689
-    //////////////////////////////////
1690
-    $option_value = get_option('geodir_success_page');
1691
-    $page = get_post($option_value);
1692
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1693
-
1694
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1695
-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
1696
-    else {
1697
-        $is_error_during_diagnose = true;
1698
-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
1699
-        if ($fix) {
1700
-            if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
1701
-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
1702
-            } else {
1703
-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
1704
-            }
1705
-        }
1706
-    }
1707
-
1708
-    ////////////////////////////////
1709
-    /* Diagnose Listing Sucess Page Ends */
1710
-    ////////////////////////////////
1711
-
1712
-    //////////////////////////////////
1713
-    /* Diagnose Info Page Starts */
1714
-    //////////////////////////////////
1715
-    $option_value = get_option('geodir_info_page');
1716
-    $page = get_post($option_value);
1717
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1718
-
1719
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1720
-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
1721
-    else {
1722
-        $is_error_during_diagnose = true;
1723
-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
1724
-        if ($fix) {
1725
-            if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
1726
-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
1727
-            } else {
1728
-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
1729
-            }
1730
-        }
1731
-    }
1732
-
1733
-    ////////////////////////////////
1734
-    /* Diagnose Info Page Ends */
1735
-    ////////////////////////////////
1736
-
1737
-    //////////////////////////////////
1738
-    /* Diagnose Login Page Starts */
1739
-    //////////////////////////////////
1740
-    $option_value = get_option('geodir_login_page');
1741
-    $page = get_post($option_value);
1742
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1743
-
1744
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1745
-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
1746
-    else {
1747
-        $is_error_during_diagnose = true;
1748
-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
1749
-        if ($fix) {
1750
-            if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
1751
-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
1752
-            } else {
1753
-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
1754
-            }
1755
-        }
1756
-    }
1757
-
1758
-    ////////////////////////////////
1759
-    /* Diagnose Info Page Ends */
1760
-    ////////////////////////////////
1761
-
1762
-    //////////////////////////////////
1763
-    /* Diagnose Location Page Starts */
1764
-    //////////////////////////////////
1765
-    $option_value = get_option('geodir_location_page');
1766
-    $page = get_post($option_value);
1767
-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1768
-
1769
-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1770
-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
1771
-    else {
1772
-        $is_error_during_diagnose = true;
1773
-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
1774
-        if ($fix) {
1775
-            if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
1776
-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
1777
-            } else {
1778
-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
1779
-            }
1780
-        }
1781
-    }
1782
-
1783
-    ////////////////////////////////
1784
-    /* Diagnose Location Page Ends */
1785
-    ////////////////////////////////
1786
-
1787
-    $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
1788
-    /**
1789
-     * This action is called at the end of the GD Tools page check function.
1790
-     *
1791
-     * @since 1.5.2
1792
-     */
1793
-    $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
1794
-
1795
-    $output_str = $page_chk_arr['output_str'];
1796
-    $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];
1797
-
1798
-    if ($is_error_during_diagnose) {
1799
-        if ($fix) {
1800
-            flush_rewrite_rules();
1801
-        }
1802
-        $info_div_class = "geodir_problem_info";
1803
-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
1804
-    } else {
1805
-        $info_div_class = "geodir_noproblem_info";
1806
-        $fix_button_txt = '';
1807
-    }
1808
-    echo "<ul class='$info_div_class'>";
1809
-    echo $output_str;
1810
-    echo $fix_button_txt;
1811
-    echo "</ul>";
1606
+	global $wpdb;
1607
+	$is_error_during_diagnose = false;
1608
+	$output_str = '';
1609
+	$fix = isset($_POST['fix']) ? true : false;
1610
+
1611
+	//////////////////////////////////
1612
+	/* Diagnose GD Home Page Starts */
1613
+	//////////////////////////////////
1614
+	$option_value = get_option('geodir_home_page');
1615
+	$page = get_post($option_value);
1616
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1617
+
1618
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1619
+		$output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
1620
+	else {
1621
+		$is_error_during_diagnose = true;
1622
+		$output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";
1623
+		if ($fix) {
1624
+			if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {
1625
+				$output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";
1626
+			} else {
1627
+				$output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";
1628
+			}
1629
+		}
1630
+	}
1631
+
1632
+	////////////////////////////////
1633
+	/* Diagnose GD Home Page Ends */
1634
+	////////////////////////////////
1635
+
1636
+	//////////////////////////////////
1637
+	/* Diagnose Add Listing Page Starts */
1638
+	//////////////////////////////////
1639
+	$option_value = get_option('geodir_add_listing_page');
1640
+	$page = get_post($option_value);
1641
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1642
+
1643
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1644
+		$output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
1645
+	else {
1646
+		$is_error_during_diagnose = true;
1647
+		$output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";
1648
+		if ($fix) {
1649
+			if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {
1650
+				$output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";
1651
+			} else {
1652
+				$output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";
1653
+			}
1654
+		}
1655
+	}
1656
+
1657
+	////////////////////////////////
1658
+	/* Diagnose Add Listing Page Ends */
1659
+	////////////////////////////////
1660
+
1661
+
1662
+	//////////////////////////////////
1663
+	/* Diagnose Listing Preview Page Starts */
1664
+	//////////////////////////////////
1665
+	$option_value = get_option('geodir_preview_page');
1666
+	$page = get_post($option_value);
1667
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1668
+
1669
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1670
+		$output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
1671
+	else {
1672
+		$is_error_during_diagnose = true;
1673
+		$output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";
1674
+		if ($fix) {
1675
+			if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {
1676
+				$output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";
1677
+			} else {
1678
+				$output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";
1679
+			}
1680
+		}
1681
+	}
1682
+
1683
+	////////////////////////////////
1684
+	/* Diagnose Listing Preview Page Ends */
1685
+	////////////////////////////////
1686
+
1687
+	//////////////////////////////////
1688
+	/* Diagnose Listing Success Page Starts */
1689
+	//////////////////////////////////
1690
+	$option_value = get_option('geodir_success_page');
1691
+	$page = get_post($option_value);
1692
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1693
+
1694
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1695
+		$output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
1696
+	else {
1697
+		$is_error_during_diagnose = true;
1698
+		$output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";
1699
+		if ($fix) {
1700
+			if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {
1701
+				$output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";
1702
+			} else {
1703
+				$output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";
1704
+			}
1705
+		}
1706
+	}
1707
+
1708
+	////////////////////////////////
1709
+	/* Diagnose Listing Sucess Page Ends */
1710
+	////////////////////////////////
1711
+
1712
+	//////////////////////////////////
1713
+	/* Diagnose Info Page Starts */
1714
+	//////////////////////////////////
1715
+	$option_value = get_option('geodir_info_page');
1716
+	$page = get_post($option_value);
1717
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1718
+
1719
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1720
+		$output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
1721
+	else {
1722
+		$is_error_during_diagnose = true;
1723
+		$output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";
1724
+		if ($fix) {
1725
+			if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {
1726
+				$output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";
1727
+			} else {
1728
+				$output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";
1729
+			}
1730
+		}
1731
+	}
1732
+
1733
+	////////////////////////////////
1734
+	/* Diagnose Info Page Ends */
1735
+	////////////////////////////////
1736
+
1737
+	//////////////////////////////////
1738
+	/* Diagnose Login Page Starts */
1739
+	//////////////////////////////////
1740
+	$option_value = get_option('geodir_login_page');
1741
+	$page = get_post($option_value);
1742
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1743
+
1744
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1745
+		$output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
1746
+	else {
1747
+		$is_error_during_diagnose = true;
1748
+		$output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";
1749
+		if ($fix) {
1750
+			if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {
1751
+				$output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";
1752
+			} else {
1753
+				$output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";
1754
+			}
1755
+		}
1756
+	}
1757
+
1758
+	////////////////////////////////
1759
+	/* Diagnose Info Page Ends */
1760
+	////////////////////////////////
1761
+
1762
+	//////////////////////////////////
1763
+	/* Diagnose Location Page Starts */
1764
+	//////////////////////////////////
1765
+	$option_value = get_option('geodir_location_page');
1766
+	$page = get_post($option_value);
1767
+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}
1768
+
1769
+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')
1770
+		$output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
1771
+	else {
1772
+		$is_error_during_diagnose = true;
1773
+		$output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";
1774
+		if ($fix) {
1775
+			if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {
1776
+				$output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";
1777
+			} else {
1778
+				$output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";
1779
+			}
1780
+		}
1781
+	}
1782
+
1783
+	////////////////////////////////
1784
+	/* Diagnose Location Page Ends */
1785
+	////////////////////////////////
1786
+
1787
+	$page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );
1788
+	/**
1789
+	 * This action is called at the end of the GD Tools page check function.
1790
+	 *
1791
+	 * @since 1.5.2
1792
+	 */
1793
+	$page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);
1794
+
1795
+	$output_str = $page_chk_arr['output_str'];
1796
+	$is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];
1797
+
1798
+	if ($is_error_during_diagnose) {
1799
+		if ($fix) {
1800
+			flush_rewrite_rules();
1801
+		}
1802
+		$info_div_class = "geodir_problem_info";
1803
+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";
1804
+	} else {
1805
+		$info_div_class = "geodir_noproblem_info";
1806
+		$fix_button_txt = '';
1807
+	}
1808
+	echo "<ul class='$info_div_class'>";
1809
+	echo $output_str;
1810
+	echo $fix_button_txt;
1811
+	echo "</ul>";
1812 1812
 
1813 1813
 }
1814 1814
 
@@ -1820,26 +1820,26 @@  discard block
 block discarded – undo
1820 1820
  * @global object $wpdb WordPress Database object.
1821 1821
  */
1822 1822
 function geodir_diagnose_load_db_language() {
1823
-    global $wpdb;
1823
+	global $wpdb;
1824 1824
 	
1825 1825
 	$is_error_during_diagnose = geodirectory_load_db_language();
1826 1826
 
1827
-    $output_str = '';
1828
-    $fix_button_txt = '';
1827
+	$output_str = '';
1828
+	$fix_button_txt = '';
1829 1829
 
1830
-    if ($is_error_during_diagnose) {
1831
-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
1830
+	if ($is_error_during_diagnose) {
1831
+		$output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";
1832 1832
 		$info_div_class = "geodir_problem_info";
1833
-    } else {
1834
-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
1833
+	} else {
1834
+		$output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";
1835 1835
 		$info_div_class = "geodir_noproblem_info";
1836
-        $fix_button_txt = '';
1837
-    }
1836
+		$fix_button_txt = '';
1837
+	}
1838 1838
     
1839 1839
 	echo "<ul class='$info_div_class'>";
1840
-    echo $output_str;
1841
-    echo $fix_button_txt;
1842
-    echo "</ul>";
1840
+	echo $output_str;
1841
+	echo $fix_button_txt;
1842
+	echo "</ul>";
1843 1843
 
1844 1844
 }
1845 1845
 
@@ -1870,23 +1870,23 @@  discard block
 block discarded – undo
1870 1870
  */
1871 1871
 function geodir_posts_clauses_request($clauses)
1872 1872
 {
1873
-    global $wpdb, $wp_query, $plugin_prefix;
1873
+	global $wpdb, $wp_query, $plugin_prefix;
1874 1874
 
1875
-    if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
1876
-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';
1875
+	if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {
1876
+		$table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';
1877 1877
 
1878
-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';
1879
-        $clauses['join'] = $join;
1878
+		$join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';
1879
+		$clauses['join'] = $join;
1880 1880
 
1881
-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';
1882
-        $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';
1883
-        $clauses['fields'] = $fields;
1881
+		$fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';
1882
+		$fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';
1883
+		$clauses['fields'] = $fields;
1884 1884
 
1885
-        $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';
1886
-        $orderby = 'gd_expire ' . $order;
1887
-        $clauses['orderby'] = $orderby;
1888
-    }
1889
-    return $clauses;
1885
+		$order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';
1886
+		$orderby = 'gd_expire ' . $order;
1887
+		$clauses['orderby'] = $orderby;
1888
+	}
1889
+	return $clauses;
1890 1890
 }
1891 1891
 
1892 1892
 
@@ -1907,7 +1907,7 @@  discard block
 block discarded – undo
1907 1907
  */
1908 1908
 function gd_theme_switch_compat_check()
1909 1909
 {
1910
-    gd_set_theme_compat();
1910
+	gd_set_theme_compat();
1911 1911
 }
1912 1912
 
1913 1913
 /**
@@ -1920,27 +1920,27 @@  discard block
 block discarded – undo
1920 1920
  */
1921 1921
 function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")
1922 1922
 {
1923
-    if (function_exists('str_getcsv')) {
1924
-        $fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape);
1925
-    } else {
1926
-        global $current_user;
1927
-        $upload_dir = wp_upload_dir();
1928
-
1929
-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';
1930
-        $handle = fopen($file, 'w');
1931
-
1932
-        fwrite($handle, $input);
1933
-        fclose($handle);
1934
-
1935
-        $handle = fopen($file, 'rt');
1936
-        if (PHP_VERSION >= '5.3.0') {
1937
-            $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape);
1938
-        } else {
1939
-            $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure);
1940
-        }
1941
-        fclose($handle);
1942
-    }
1943
-    return $fgetcsv;
1923
+	if (function_exists('str_getcsv')) {
1924
+		$fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape);
1925
+	} else {
1926
+		global $current_user;
1927
+		$upload_dir = wp_upload_dir();
1928
+
1929
+		$file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';
1930
+		$handle = fopen($file, 'w');
1931
+
1932
+		fwrite($handle, $input);
1933
+		fclose($handle);
1934
+
1935
+		$handle = fopen($file, 'rt');
1936
+		if (PHP_VERSION >= '5.3.0') {
1937
+			$fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape);
1938
+		} else {
1939
+			$fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure);
1940
+		}
1941
+		fclose($handle);
1942
+	}
1943
+	return $fgetcsv;
1944 1944
 }
1945 1945
 
1946 1946
 add_action('wp_ajax_gdImportCsv', 'geodir_ajax_import_csv');
@@ -1955,375 +1955,375 @@  discard block
 block discarded – undo
1955 1955
  */
1956 1956
 function geodir_ajax_import_csv()
1957 1957
 {
1958
-    error_reporting(0); // hide error to get clean json response
1958
+	error_reporting(0); // hide error to get clean json response
1959 1959
 
1960
-    global $wpdb, $plugin_prefix, $current_user;
1961
-    $uploads = wp_upload_dir();
1962
-    @ini_set('auto_detect_line_endings', true);
1960
+	global $wpdb, $plugin_prefix, $current_user;
1961
+	$uploads = wp_upload_dir();
1962
+	@ini_set('auto_detect_line_endings', true);
1963 1963
 	
1964 1964
 	$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.
1965 1965
 
1966
-    $task = isset($_POST['task']) ? $_POST['task'] : '';
1967
-    $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;
1968
-    $filename = $uploadedFile;
1969
-
1970
-    $uploads = wp_upload_dir();
1971
-    $uploads_dir = $uploads['path'];
1972
-    $image_name_arr = explode('/', $filename);
1973
-    $filename = end($image_name_arr);
1974
-    $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1975
-    $return = array();
1976
-    $return['file'] = $uploadedFile;
1977
-    $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
1978
-
1979
-    if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {
1980
-        $wp_filetype = wp_check_filetype_and_ext($target_path, $filename);
1981
-
1982
-        if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
1983
-            $return['error'] = NULL;
1984
-
1985
-            $return['rows'] = 0;
1986
-
1987
-
1988
-
1989
-                if (($handle = fopen($target_path, "r")) !== FALSE) {
1990
-                    while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
1991
-                        if(is_array($data) && !empty($data)) {
1992
-                            $file[] = '"' . implode('","', $data) . '"';
1993
-                        }
1994
-                    }
1995
-                    fclose($handle);
1996
-                    $file = $file;
1997
-                }
1998
-
1999
-
2000
-
2001
-                $return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;
2002
-
2003
-
2004
-            if (!$return['rows'] > 0) {
2005
-                $return['error'] = __('No data found in csv file.', 'geodirectory');
2006
-            }
2007
-        }
2008
-    }
2009
-    if ($task == 'prepare' || !empty($return['error'])) {
2010
-        echo json_encode($return);
2011
-        exit;
2012
-    }
2013
-
2014
-    $totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL;
2015
-    $importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1;
2016
-    $count = $importlimit;
2017
-    $requested_limit = $importlimit;
2018
-    $tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0;
2019
-
2020
-    if ($count < $totRecords) {
2021
-        $count = $tmpCnt + $count;
2022
-        if ($count > $totRecords) {
2023
-            $count = $totRecords;
2024
-        }
2025
-    } else {
2026
-        $count = $totRecords;
2027
-    }
2028
-
2029
-    $total_records = 0;
2030
-    $rowcount = 0;
2031
-    $address_invalid = 0;
2032
-    $blank_address = 0;
2033
-    $upload_files = 0;
2034
-    $invalid_post_type = 0;
2035
-    $invalid_title = 0;
2036
-    $customKeyarray = array();
2037
-    $gd_post_info = array();
2038
-    $post_location = array();
2039
-    $countpost = 0;
2040
-
2041
-    if (!empty($file)) {
2042
-        $columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL;
2043
-        $customKeyarray = $columns;
2044
-
2045
-        if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
2046
-            $return['error'] = CSV_INVAILD_FILE;
2047
-            echo json_encode($return);
2048
-            exit;
2049
-        }
2050
-
2051
-        for ($i = 1; $i <= $importlimit; $i++) {
2052
-            $current_index = $tmpCnt + $i;
2053
-            if (isset($file[$current_index])) {
2054
-                $total_records++;
2055
-
2056
-                $buffer = geodir_str_getcsv($file[$current_index]);
2057
-                $post_title = addslashes($buffer[0]);
2058
-                $current_post_author = $buffer[1];
2059
-                $post_desc = addslashes($buffer[2]);
2060
-                $post_cat = array();
2061
-                $catids_arr = array();
2062
-                $post_cat = trim($buffer[3]); // comma seperated category name
2063
-
2064
-                if ($post_cat) {
2065
-                    $post_cat_arr = explode(',', $post_cat);
2066
-
2067
-                    for ($c = 0; $c < count($post_cat_arr); $c++) {
2068
-                        $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));
2069
-
2070
-                        if (!empty($buffer[5])) {
2071
-                            if (in_array($buffer[5], geodir_get_posttypes())) {
2072
-
2073
-                                $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));
2074
-
2075
-                                if (get_term_by('name', $catid, $p_taxonomy[0])) {
2076
-                                    $cat = get_term_by('name', $catid, $p_taxonomy[0]);
2077
-                                    $catids_arr[] = $cat->slug;
2078
-                                } else if (get_term_by('slug', $catid, $p_taxonomy[0])) {
2079
-                                    $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
2080
-                                    $catids_arr[] = $cat->slug;
2081
-                                } else {
2082
-                                    $ret = wp_insert_term($catid, $p_taxonomy[0]);
2083
-                                    if ($ret && !is_wp_error($ret)) {
2084
-                                        if (get_term_by('name', $catid, $p_taxonomy[0])) {
2085
-                                            $cat = get_term_by('name', $catid, $p_taxonomy[0]);
2086
-                                            $catids_arr[] = $cat->slug;
2087
-                                        } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {
2088
-                                            $cat = get_term_by('slug', $catid, $p_taxonomy[0]);
2089
-                                            $catids_arr[] = $cat->slug;
2090
-                                        }
2091
-                                    }
2092
-                                }
2093
-                            }
2094
-                        }
2095
-                    }
2096
-                }
2097
-
2098
-                if (!$catids_arr) {
2099
-                    $catids_arr[] = 1;
2100
-                }
2101
-
2102
-                $post_tags = trim($buffer[4]); // comma seperated tags
2103
-
2104
-                $tag_arr = '';
2105
-                if ($post_tags) {
2106
-                    $tag_arr = explode(',', $post_tags);
2107
-                }
2108
-
2109
-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database
2110
-
2111
-                $error = '';
2112
-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
2113
-                    $invalid_post_type++;
2114
-                    continue;
2115
-                }
2116
-
2117
-                if ($post_title != '') {
2118
-                    $menu_order = 0;
2119
-                    $image_folder_name = 'uplaod/';
2120
-
2121
-                    $image_names = array();
2122
-
2123
-                    for ($c = 5; $c < count($customKeyarray); $c++) {
2124
-                        $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);
2125
-
2126
-                        if ($customKeyarray[$c] == 'IMAGE') {
2127
-                            $buffer[$c] = trim($buffer[$c]);
2128
-
2129
-                            if (!empty($buffer[$c])) {
2130
-                                $image_names[] = $buffer[$c];
2131
-                            }
2132
-                        }
2133
-
2134
-                        if ($customKeyarray[$c] == 'alive_days') {
2135
-                            if ($buffer[$c] != '0' && $buffer[$c] != '') {
2136
-                                $submitdata = date('Y-m-d');
2137
-
2138
-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
2139
-                            } else {
2140
-                                $gd_post_info['expire_date'] = 'Never';
2141
-                            }
2142
-                        }
2143
-
2144
-                        if ($customKeyarray[$c] == 'post_city') {
2145
-                            $post_city = addslashes($buffer[$c]);
2146
-                        }
2147
-
2148
-                        if ($customKeyarray[$c] == 'post_region') {
2149
-                            $post_region = addslashes($buffer[$c]);
2150
-                        }
2151
-
2152
-                        if ($customKeyarray[$c] == 'post_country') {
2153
-                            $post_country = addslashes($buffer[$c]);
2154
-                        }
2155
-
2156
-                        if ($customKeyarray[$c] == 'post_latitude') {
2157
-                            $post_latitude = addslashes($buffer[$c]);
2158
-                        }
2159
-
2160
-                        if ($customKeyarray[$c] == 'post_longitude') {
2161
-                            $post_longitude = addslashes($buffer[$c]);
2162
-                        }
1966
+	$task = isset($_POST['task']) ? $_POST['task'] : '';
1967
+	$uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;
1968
+	$filename = $uploadedFile;
1969
+
1970
+	$uploads = wp_upload_dir();
1971
+	$uploads_dir = $uploads['path'];
1972
+	$image_name_arr = explode('/', $filename);
1973
+	$filename = end($image_name_arr);
1974
+	$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;
1975
+	$return = array();
1976
+	$return['file'] = $uploadedFile;
1977
+	$return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');
1978
+
1979
+	if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {
1980
+		$wp_filetype = wp_check_filetype_and_ext($target_path, $filename);
1981
+
1982
+		if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {
1983
+			$return['error'] = NULL;
1984
+
1985
+			$return['rows'] = 0;
1986
+
1987
+
1988
+
1989
+				if (($handle = fopen($target_path, "r")) !== FALSE) {
1990
+					while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
1991
+						if(is_array($data) && !empty($data)) {
1992
+							$file[] = '"' . implode('","', $data) . '"';
1993
+						}
1994
+					}
1995
+					fclose($handle);
1996
+					$file = $file;
1997
+				}
1998
+
1999
+
2000
+
2001
+				$return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;
2002
+
2003
+
2004
+			if (!$return['rows'] > 0) {
2005
+				$return['error'] = __('No data found in csv file.', 'geodirectory');
2006
+			}
2007
+		}
2008
+	}
2009
+	if ($task == 'prepare' || !empty($return['error'])) {
2010
+		echo json_encode($return);
2011
+		exit;
2012
+	}
2013
+
2014
+	$totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL;
2015
+	$importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1;
2016
+	$count = $importlimit;
2017
+	$requested_limit = $importlimit;
2018
+	$tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0;
2019
+
2020
+	if ($count < $totRecords) {
2021
+		$count = $tmpCnt + $count;
2022
+		if ($count > $totRecords) {
2023
+			$count = $totRecords;
2024
+		}
2025
+	} else {
2026
+		$count = $totRecords;
2027
+	}
2028
+
2029
+	$total_records = 0;
2030
+	$rowcount = 0;
2031
+	$address_invalid = 0;
2032
+	$blank_address = 0;
2033
+	$upload_files = 0;
2034
+	$invalid_post_type = 0;
2035
+	$invalid_title = 0;
2036
+	$customKeyarray = array();
2037
+	$gd_post_info = array();
2038
+	$post_location = array();
2039
+	$countpost = 0;
2040
+
2041
+	if (!empty($file)) {
2042
+		$columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL;
2043
+		$customKeyarray = $columns;
2044
+
2045
+		if (empty($columns) || (!empty($columns) && $columns[0] == '')) {
2046
+			$return['error'] = CSV_INVAILD_FILE;
2047
+			echo json_encode($return);
2048
+			exit;
2049
+		}
2050
+
2051
+		for ($i = 1; $i <= $importlimit; $i++) {
2052
+			$current_index = $tmpCnt + $i;
2053
+			if (isset($file[$current_index])) {
2054
+				$total_records++;
2055
+
2056
+				$buffer = geodir_str_getcsv($file[$current_index]);
2057
+				$post_title = addslashes($buffer[0]);
2058
+				$current_post_author = $buffer[1];
2059
+				$post_desc = addslashes($buffer[2]);
2060
+				$post_cat = array();
2061
+				$catids_arr = array();
2062
+				$post_cat = trim($buffer[3]); // comma seperated category name
2063
+
2064
+				if ($post_cat) {
2065
+					$post_cat_arr = explode(',', $post_cat);
2066
+
2067
+					for ($c = 0; $c < count($post_cat_arr); $c++) {
2068
+						$catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));
2069
+
2070
+						if (!empty($buffer[5])) {
2071
+							if (in_array($buffer[5], geodir_get_posttypes())) {
2072
+
2073
+								$p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));
2074
+
2075
+								if (get_term_by('name', $catid, $p_taxonomy[0])) {
2076
+									$cat = get_term_by('name', $catid, $p_taxonomy[0]);
2077
+									$catids_arr[] = $cat->slug;
2078
+								} else if (get_term_by('slug', $catid, $p_taxonomy[0])) {
2079
+									$cat = get_term_by('slug', $catid, $p_taxonomy[0]);
2080
+									$catids_arr[] = $cat->slug;
2081
+								} else {
2082
+									$ret = wp_insert_term($catid, $p_taxonomy[0]);
2083
+									if ($ret && !is_wp_error($ret)) {
2084
+										if (get_term_by('name', $catid, $p_taxonomy[0])) {
2085
+											$cat = get_term_by('name', $catid, $p_taxonomy[0]);
2086
+											$catids_arr[] = $cat->slug;
2087
+										} elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {
2088
+											$cat = get_term_by('slug', $catid, $p_taxonomy[0]);
2089
+											$catids_arr[] = $cat->slug;
2090
+										}
2091
+									}
2092
+								}
2093
+							}
2094
+						}
2095
+					}
2096
+				}
2097
+
2098
+				if (!$catids_arr) {
2099
+					$catids_arr[] = 1;
2100
+				}
2101
+
2102
+				$post_tags = trim($buffer[4]); // comma seperated tags
2103
+
2104
+				$tag_arr = '';
2105
+				if ($post_tags) {
2106
+					$tag_arr = explode(',', $post_tags);
2107
+				}
2108
+
2109
+				$table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database
2110
+
2111
+				$error = '';
2112
+				if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {
2113
+					$invalid_post_type++;
2114
+					continue;
2115
+				}
2116
+
2117
+				if ($post_title != '') {
2118
+					$menu_order = 0;
2119
+					$image_folder_name = 'uplaod/';
2120
+
2121
+					$image_names = array();
2122
+
2123
+					for ($c = 5; $c < count($customKeyarray); $c++) {
2124
+						$gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);
2125
+
2126
+						if ($customKeyarray[$c] == 'IMAGE') {
2127
+							$buffer[$c] = trim($buffer[$c]);
2128
+
2129
+							if (!empty($buffer[$c])) {
2130
+								$image_names[] = $buffer[$c];
2131
+							}
2132
+						}
2133
+
2134
+						if ($customKeyarray[$c] == 'alive_days') {
2135
+							if ($buffer[$c] != '0' && $buffer[$c] != '') {
2136
+								$submitdata = date('Y-m-d');
2137
+
2138
+								$gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));
2139
+							} else {
2140
+								$gd_post_info['expire_date'] = 'Never';
2141
+							}
2142
+						}
2143
+
2144
+						if ($customKeyarray[$c] == 'post_city') {
2145
+							$post_city = addslashes($buffer[$c]);
2146
+						}
2147
+
2148
+						if ($customKeyarray[$c] == 'post_region') {
2149
+							$post_region = addslashes($buffer[$c]);
2150
+						}
2151
+
2152
+						if ($customKeyarray[$c] == 'post_country') {
2153
+							$post_country = addslashes($buffer[$c]);
2154
+						}
2155
+
2156
+						if ($customKeyarray[$c] == 'post_latitude') {
2157
+							$post_latitude = addslashes($buffer[$c]);
2158
+						}
2159
+
2160
+						if ($customKeyarray[$c] == 'post_longitude') {
2161
+							$post_longitude = addslashes($buffer[$c]);
2162
+						}
2163 2163
 						
2164 2164
 						// Post status
2165 2165
 						if ($customKeyarray[$c] == 'post_status') {
2166
-                            $post_status = sanitize_key( $buffer[$c] );
2167
-                        }
2168
-                    }
2169
-
2170
-                    /* ================ before array create ============== */
2171
-                    $location_result = geodir_get_default_location();
2172
-                    if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {
2173
-                        $blank_address++;
2174
-                        continue;
2175
-                    } else if ($location_result->location_id == 0) {
2176
-                        if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {
2177
-                            $address_invalid++;
2178
-                            continue;
2179
-                        }
2180
-                    }
2166
+							$post_status = sanitize_key( $buffer[$c] );
2167
+						}
2168
+					}
2169
+
2170
+					/* ================ before array create ============== */
2171
+					$location_result = geodir_get_default_location();
2172
+					if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {
2173
+						$blank_address++;
2174
+						continue;
2175
+					} else if ($location_result->location_id == 0) {
2176
+						if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {
2177
+							$address_invalid++;
2178
+							continue;
2179
+						}
2180
+					}
2181 2181
 					
2182 2182
 					// Default post status
2183 2183
 					$default_status = 'publish';
2184 2184
 					$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;
2185 2185
 					$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;
2186 2186
 
2187
-                    $my_post['post_title'] = $post_title;
2188
-                    $my_post['post_content'] = $post_desc;
2189
-                    $my_post['post_type'] = addslashes($buffer[5]);
2190
-                    $my_post['post_author'] = $current_post_author;
2191
-                    $my_post['post_status'] = $post_status;
2192
-                    $my_post['post_category'] = $catids_arr;
2193
-                    $my_post['post_tags'] = $tag_arr;
2194
-
2195
-                    $gd_post_info['post_tags'] = $tag_arr;
2196
-                    $gd_post_info['post_title'] = $post_title;
2197
-                    $gd_post_info['post_status'] = $post_status;
2198
-                    $gd_post_info['submit_time'] = time();
2199
-                    $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];
2200
-
2201
-                    $last_postid = wp_insert_post($my_post);
2202
-                    $countpost++;
2203
-
2204
-                    // Check if we need to save post location as new location
2205
-                    if ($location_result->location_id > 0) {
2206
-                        if (isset($post_city) && isset($post_region)) {
2207
-                            $request_info['post_location'] = array(
2208
-                                'city' => $post_city,
2209
-                                'region' => $post_region,
2210
-                                'country' => $post_country,
2211
-                                'geo_lat' => $post_latitude,
2212
-                                'geo_lng' => $post_longitude
2213
-                            );
2214
-
2215
-                            $post_location_info = $request_info['post_location'];
2216
-                            if ($location_id = geodir_add_new_location($post_location_info))
2217
-                                $post_location_id = $location_id;
2218
-                        } else {
2219
-                            $post_location_id = 0;
2220
-                        }
2221
-                    } else {
2222
-                        $post_location_id = 0;
2223
-                    }
2224
-
2225
-                    /* ------- get default package info ----- */
2226
-                    $payment_info = array();
2227
-                    $package_info = array();
2228
-
2229
-                    $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);
2230
-                    $package_id = '';
2231
-                    if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
2232
-                        $package_id = $gd_post_info['package_id'];
2233
-                    }
2234
-
2235
-                    if (!empty($package_info)) {
2236
-                        $payment_info['package_id'] = $package_info['pid'];
2237
-
2238
-                        if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
2239
-                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
2240
-                        } else {
2241
-                            $payment_info['expire_date'] = 'Never';
2242
-                        }
2243
-
2244
-                        $gd_post_info = array_merge($gd_post_info, $payment_info);
2245
-                    }
2246
-
2247
-                    $gd_post_info['post_location_id'] = $post_location_id;
2248
-
2249
-                    $post_type = get_post_type($last_postid);
2250
-
2251
-                    $table = $plugin_prefix . $post_type . '_detail';
2252
-
2253
-                    geodir_save_post_info($last_postid, $gd_post_info);
2254
-
2255
-                    if (!empty($image_names)) {
2256
-                        $upload_files++;
2257
-                        $menu_order = 1;
2258
-
2259
-                        foreach ($image_names as $image_name) {
2260
-                            $img_name_arr = explode('.', $image_name);
2261
-
2262
-                            $uploads = wp_upload_dir();
2263
-                            $sub_dir = $uploads['subdir'];
2264
-
2265
-                            $arr_file_type = wp_check_filetype($image_name);
2266
-                            $uploaded_file_type = $arr_file_type['type'];
2267
-
2268
-                            $attachment = array();
2269
-                            $attachment['post_id'] = $last_postid;
2270
-                            $attachment['title'] = $img_name_arr[0];
2271
-                            $attachment['content'] = '';
2272
-                            $attachment['file'] = $sub_dir . '/' . $image_name;
2273
-                            $attachment['mime_type'] = $uploaded_file_type;
2274
-                            $attachment['menu_order'] = $menu_order;
2275
-                            $attachment['is_featured'] = 0;
2276
-
2277
-                            $attachment_set = '';
2278
-
2279
-                            foreach ($attachment as $key => $val) {
2280
-                                if ($val != '')
2281
-                                    $attachment_set .= $key . " = '" . $val . "', ";
2282
-                            }
2283
-                            $attachment_set = trim($attachment_set, ", ");
2284
-
2285
-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
2286
-
2287
-                            if ($menu_order == 1) {
2288
-                                $post_type = get_post_type($last_postid);
2289
-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
2290
-                            }
2291
-                            $menu_order++;
2292
-                        }
2293
-                    }
2294
-
2295
-                    $gd_post_info['package_id'] = $package_id;
2296
-
2297
-                    /** This action is documented in geodirectory-functions/post-functions.php */
2298
-                    do_action('geodir_after_save_listing', $last_postid, $gd_post_info);
2299
-
2300
-                    if (!empty($buffer[5])) {
2301
-                        if (in_array($buffer[5], geodir_get_posttypes())) {
2302
-                            $taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));
2303
-                            wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);
2304
-                            wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);
2305
-
2306
-                            $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';
2307
-                            $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';
2308
-                            geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);
2309
-                        }
2310
-                    }
2311
-                } else {
2312
-                    $invalid_title++;
2313
-                }
2314
-            }
2315
-        }
2316
-    }
2317
-    $return['rowcount'] = $countpost;
2318
-    $return['invalidcount'] = $address_invalid;
2319
-    $return['blank_address'] = $blank_address;
2320
-    $return['upload_files'] = $upload_files;
2321
-    $return['invalid_post_type'] = $invalid_post_type;
2322
-    $return['invalid_title'] = $invalid_title;
2323
-    $return['total_records'] = $total_records;
2324
-
2325
-    echo json_encode($return);
2326
-    exit;
2187
+					$my_post['post_title'] = $post_title;
2188
+					$my_post['post_content'] = $post_desc;
2189
+					$my_post['post_type'] = addslashes($buffer[5]);
2190
+					$my_post['post_author'] = $current_post_author;
2191
+					$my_post['post_status'] = $post_status;
2192
+					$my_post['post_category'] = $catids_arr;
2193
+					$my_post['post_tags'] = $tag_arr;
2194
+
2195
+					$gd_post_info['post_tags'] = $tag_arr;
2196
+					$gd_post_info['post_title'] = $post_title;
2197
+					$gd_post_info['post_status'] = $post_status;
2198
+					$gd_post_info['submit_time'] = time();
2199
+					$gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];
2200
+
2201
+					$last_postid = wp_insert_post($my_post);
2202
+					$countpost++;
2203
+
2204
+					// Check if we need to save post location as new location
2205
+					if ($location_result->location_id > 0) {
2206
+						if (isset($post_city) && isset($post_region)) {
2207
+							$request_info['post_location'] = array(
2208
+								'city' => $post_city,
2209
+								'region' => $post_region,
2210
+								'country' => $post_country,
2211
+								'geo_lat' => $post_latitude,
2212
+								'geo_lng' => $post_longitude
2213
+							);
2214
+
2215
+							$post_location_info = $request_info['post_location'];
2216
+							if ($location_id = geodir_add_new_location($post_location_info))
2217
+								$post_location_id = $location_id;
2218
+						} else {
2219
+							$post_location_id = 0;
2220
+						}
2221
+					} else {
2222
+						$post_location_id = 0;
2223
+					}
2224
+
2225
+					/* ------- get default package info ----- */
2226
+					$payment_info = array();
2227
+					$package_info = array();
2228
+
2229
+					$package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);
2230
+					$package_id = '';
2231
+					if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {
2232
+						$package_id = $gd_post_info['package_id'];
2233
+					}
2234
+
2235
+					if (!empty($package_info)) {
2236
+						$payment_info['package_id'] = $package_info['pid'];
2237
+
2238
+						if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {
2239
+							$payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));
2240
+						} else {
2241
+							$payment_info['expire_date'] = 'Never';
2242
+						}
2243
+
2244
+						$gd_post_info = array_merge($gd_post_info, $payment_info);
2245
+					}
2246
+
2247
+					$gd_post_info['post_location_id'] = $post_location_id;
2248
+
2249
+					$post_type = get_post_type($last_postid);
2250
+
2251
+					$table = $plugin_prefix . $post_type . '_detail';
2252
+
2253
+					geodir_save_post_info($last_postid, $gd_post_info);
2254
+
2255
+					if (!empty($image_names)) {
2256
+						$upload_files++;
2257
+						$menu_order = 1;
2258
+
2259
+						foreach ($image_names as $image_name) {
2260
+							$img_name_arr = explode('.', $image_name);
2261
+
2262
+							$uploads = wp_upload_dir();
2263
+							$sub_dir = $uploads['subdir'];
2264
+
2265
+							$arr_file_type = wp_check_filetype($image_name);
2266
+							$uploaded_file_type = $arr_file_type['type'];
2267
+
2268
+							$attachment = array();
2269
+							$attachment['post_id'] = $last_postid;
2270
+							$attachment['title'] = $img_name_arr[0];
2271
+							$attachment['content'] = '';
2272
+							$attachment['file'] = $sub_dir . '/' . $image_name;
2273
+							$attachment['mime_type'] = $uploaded_file_type;
2274
+							$attachment['menu_order'] = $menu_order;
2275
+							$attachment['is_featured'] = 0;
2276
+
2277
+							$attachment_set = '';
2278
+
2279
+							foreach ($attachment as $key => $val) {
2280
+								if ($val != '')
2281
+									$attachment_set .= $key . " = '" . $val . "', ";
2282
+							}
2283
+							$attachment_set = trim($attachment_set, ", ");
2284
+
2285
+							$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);
2286
+
2287
+							if ($menu_order == 1) {
2288
+								$post_type = get_post_type($last_postid);
2289
+								$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));
2290
+							}
2291
+							$menu_order++;
2292
+						}
2293
+					}
2294
+
2295
+					$gd_post_info['package_id'] = $package_id;
2296
+
2297
+					/** This action is documented in geodirectory-functions/post-functions.php */
2298
+					do_action('geodir_after_save_listing', $last_postid, $gd_post_info);
2299
+
2300
+					if (!empty($buffer[5])) {
2301
+						if (in_array($buffer[5], geodir_get_posttypes())) {
2302
+							$taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));
2303
+							wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);
2304
+							wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);
2305
+
2306
+							$post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';
2307
+							$post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';
2308
+							geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);
2309
+						}
2310
+					}
2311
+				} else {
2312
+					$invalid_title++;
2313
+				}
2314
+			}
2315
+		}
2316
+	}
2317
+	$return['rowcount'] = $countpost;
2318
+	$return['invalidcount'] = $address_invalid;
2319
+	$return['blank_address'] = $blank_address;
2320
+	$return['upload_files'] = $upload_files;
2321
+	$return['invalid_post_type'] = $invalid_post_type;
2322
+	$return['invalid_title'] = $invalid_title;
2323
+	$return['total_records'] = $total_records;
2324
+
2325
+	echo json_encode($return);
2326
+	exit;
2327 2327
 }
2328 2328
 
2329 2329
 // Add the tab in left sidebar menu fro import & export page.
@@ -2343,9 +2343,9 @@  discard block
 block discarded – undo
2343 2343
  * @param $post object $post The post object of the post being saved.
2344 2344
  */
2345 2345
 function geodir_update_location_prefix($post_id,$post){
2346
-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
2347
-        update_option('geodir_location_prefix',$post->post_name);
2348
-    }
2346
+	if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){
2347
+		update_option('geodir_location_prefix',$post->post_name);
2348
+	}
2349 2349
 
2350 2350
 }
2351 2351
 
@@ -2356,50 +2356,50 @@  discard block
 block discarded – undo
2356 2356
 function geodir_ga_callback(){
2357 2357
 
2358 2358
 if(isset($_REQUEST['code']) && $_REQUEST['code']) {
2359
-    $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";
2360
-    $code = "code=".$_REQUEST['code'];
2361
-    $grant_type = "&grant_type=authorization_code";
2362
-    $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
2363
-    $client_id = "&client_id=".get_option('geodir_ga_client_id');
2364
-    $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
2359
+	$oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";
2360
+	$code = "code=".$_REQUEST['code'];
2361
+	$grant_type = "&grant_type=authorization_code";
2362
+	$redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";
2363
+	$client_id = "&client_id=".get_option('geodir_ga_client_id');
2364
+	$client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
2365 2365
 
2366
-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;
2366
+	$auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;
2367 2367
 
2368
-    $response = wp_remote_post($auth_url, array('timeout' => 15));
2368
+	$response = wp_remote_post($auth_url, array('timeout' => 15));
2369 2369
 
2370
-    //print_r($response);
2370
+	//print_r($response);
2371 2371
 
2372
-    $error_msg =  __('Something went wrong','geodirectory');
2373
-    if(!empty($response['response']['code']) && $response['response']['code']==200){
2372
+	$error_msg =  __('Something went wrong','geodirectory');
2373
+	if(!empty($response['response']['code']) && $response['response']['code']==200){
2374 2374
 
2375
-        $parts = json_decode($response['body']);
2376
-        //print_r($parts);
2377
-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
2378
-        else{
2375
+		$parts = json_decode($response['body']);
2376
+		//print_r($parts);
2377
+		if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}
2378
+		else{
2379 2379
 
2380
-            update_option('gd_ga_access_token', $parts->access_token);
2381
-            update_option('gd_ga_refresh_token', $parts->refresh_token);
2382
-            ?><script>window.close();</script><?php
2383
-        }
2380
+			update_option('gd_ga_access_token', $parts->access_token);
2381
+			update_option('gd_ga_refresh_token', $parts->refresh_token);
2382
+			?><script>window.close();</script><?php
2383
+		}
2384 2384
 
2385 2385
 
2386
-    }
2387
-    elseif(!empty($response['response']['code'])) {
2388
-        $parts = json_decode($response['body']);
2386
+	}
2387
+	elseif(!empty($response['response']['code'])) {
2388
+		$parts = json_decode($response['body']);
2389 2389
 
2390
-        if(isset($parts->error)){
2391
-            echo $parts->error.": ".$parts->error_description;exit;
2392
-        }else{
2393
-            echo $error_msg." - #2";exit;
2394
-        }
2390
+		if(isset($parts->error)){
2391
+			echo $parts->error.": ".$parts->error_description;exit;
2392
+		}else{
2393
+			echo $error_msg." - #2";exit;
2394
+		}
2395 2395
 
2396
-    }else{
2396
+	}else{
2397 2397
 
2398
-        echo $error_msg." - #3";exit;
2398
+		echo $error_msg." - #3";exit;
2399 2399
 
2400
-    }
2400
+	}
2401 2401
 }
2402
-    exit;
2402
+	exit;
2403 2403
 }
2404 2404
 
2405 2405
 if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {
@@ -2415,45 +2415,45 @@  discard block
 block discarded – undo
2415 2415
  * @return array Array of settings.
2416 2416
  */
2417 2417
 function geodir_uninstall_settings($general_settings) {
2418
-    $settings   = array();
2419
-    $settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
2420
-    $settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
2418
+	$settings   = array();
2419
+	$settings[] = array('type' => 'title', 'id' => 'uninstall_settings', 'name' => __('Uninstall Settings', 'geodirectory'));
2420
+	$settings[] = array('type' => 'sectionstart', 'id' => 'uninstall_settings_main', 'name' => __('Remove Data on Uninstall?', 'geodirectory' ));
2421 2421
     
2422
-    $plugins    = get_plugins();
2423
-    $un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
2422
+	$plugins    = get_plugins();
2423
+	$un_plugins = apply_filters('geodir_plugins_uninstall_settings', array());
2424 2424
     
2425
-    if (!empty($plugins) && !empty($un_plugins)) {
2426
-        foreach ($plugins as $plugin => $data) {
2427
-            $plugin_name = plugin_basename(dirname($plugin));
2425
+	if (!empty($plugins) && !empty($un_plugins)) {
2426
+		foreach ($plugins as $plugin => $data) {
2427
+			$plugin_name = plugin_basename(dirname($plugin));
2428 2428
             
2429
-            if (in_array($plugin_name, $un_plugins)) {
2430
-                $settings[] = array(
2431
-                    'type' => 'checkbox',
2432
-                    'id' => 'geodir_un_' . $plugin_name,
2433
-                    'name' => $data['Name'],
2434
-                    'desc' => __('Remove all data when deleted?', 'geodirectory'),
2435
-                    'std' => '0'
2436
-                );
2437
-            }
2438
-        }
2439
-    }
2429
+			if (in_array($plugin_name, $un_plugins)) {
2430
+				$settings[] = array(
2431
+					'type' => 'checkbox',
2432
+					'id' => 'geodir_un_' . $plugin_name,
2433
+					'name' => $data['Name'],
2434
+					'desc' => __('Remove all data when deleted?', 'geodirectory'),
2435
+					'std' => '0'
2436
+				);
2437
+			}
2438
+		}
2439
+	}
2440 2440
         
2441
-    $settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');
2441
+	$settings[] = array('type' => 'sectionend', 'id' => 'uninstall_settings_main');
2442 2442
     
2443
-    /**
2444
-     * Filter the uninstall settings array.
2445
-     *
2446
-     * @since 1.6.9
2447
-     *
2448
-     * @param array $settings The settings array.
2449
-     */
2450
-    $settings = apply_filters('geodir_uninstall_settings', $settings);
2443
+	/**
2444
+	 * Filter the uninstall settings array.
2445
+	 *
2446
+	 * @since 1.6.9
2447
+	 *
2448
+	 * @param array $settings The settings array.
2449
+	 */
2450
+	$settings = apply_filters('geodir_uninstall_settings', $settings);
2451 2451
     
2452
-    if (!empty($settings) && count($settings) > 3) {
2453
-        return array_merge($general_settings, $settings);
2454
-    }
2452
+	if (!empty($settings) && count($settings) > 3) {
2453
+		return array_merge($general_settings, $settings);
2454
+	}
2455 2455
     
2456
-    return $general_settings;
2456
+	return $general_settings;
2457 2457
 }
2458 2458
 add_filter('geodir_general_settings', 'geodir_uninstall_settings', 100, 1);
2459 2459
 
@@ -2463,7 +2463,7 @@  discard block
 block discarded – undo
2463 2463
  * @since 1.6.9
2464 2464
  */
2465 2465
 function geodir_uninstall_settings_desc() {
2466
-    echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';
2466
+	echo '<p class="gd-un-settings-desc">' . __('Select the plugin(s) for which all data should be completely removed when the plugin is deleted.', 'geodirectory') . '</p>';
2467 2467
 }
2468 2468
 add_action('geodir_settings_uninstall_settings_main_start', 'geodir_uninstall_settings_desc');
2469 2469
 
@@ -2479,18 +2479,18 @@  discard block
 block discarded – undo
2479 2479
  * @return array The settings array.
2480 2480
  */
2481 2481
 function geodir_resave_settings($settings = array()) {
2482
-    if (!empty($settings) && is_array($settings)) {
2483
-        $c = 0;
2482
+	if (!empty($settings) && is_array($settings)) {
2483
+		$c = 0;
2484 2484
         
2485
-        foreach ($settings as $setting) {
2486
-            if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {
2487
-                $settings[$c]['std'] = $value;
2488
-            }
2489
-            $c++;
2490
-        }
2491
-    }
2492
-
2493
-    return $settings;
2485
+		foreach ($settings as $setting) {
2486
+			if (!empty($setting['id']) && false !== ($value = get_option($setting['id']))) {
2487
+				$settings[$c]['std'] = $value;
2488
+			}
2489
+			$c++;
2490
+		}
2491
+	}
2492
+
2493
+	return $settings;
2494 2494
 }
2495 2495
 
2496 2496
 /**
@@ -2502,9 +2502,9 @@  discard block
 block discarded – undo
2502 2502
  * @return array The modified settings.
2503 2503
  */
2504 2504
 function geodir_core_uninstall_settings($settings) {
2505
-    $settings[] = plugin_basename(dirname(dirname(__FILE__)));
2505
+	$settings[] = plugin_basename(dirname(dirname(__FILE__)));
2506 2506
     
2507
-    return $settings;
2507
+	return $settings;
2508 2508
 }
2509 2509
 add_filter('geodir_plugins_uninstall_settings', 'geodir_core_uninstall_settings', 10, 1);
2510 2510
 
@@ -2518,34 +2518,34 @@  discard block
 block discarded – undo
2518 2518
  */
2519 2519
 function geodir_diagnose_reload_db_countries()
2520 2520
 {
2521
-    global $wpdb, $plugin_prefix;
2522
-
2523
-    $is_error_during_diagnose = false;
2524
-    $output_str = '';
2525
-
2526
-    $delete = $wpdb->query("TRUNCATE TABLE ".GEODIR_COUNTRIES_TABLE);
2527
-
2528
-
2529
-    if ($delete) {
2530
-            $output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";
2531
-        ob_start();
2532
-        geodir_diagnose_version_clear();
2533
-        ob_end_clean();
2534
-    }else{
2535
-        $output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
2536
-    }
2537
-
2538
-    if ($is_error_during_diagnose) {
2539
-        $info_div_class = "geodir_problem_info";
2540
-        $fix_button_txt = "";
2541
-    } else {
2542
-        $info_div_class = "geodir_noproblem_info";
2543
-        $fix_button_txt = '';
2544
-    }
2545
-    echo "<ul class='$info_div_class'>";
2546
-    echo $output_str;
2547
-    echo $fix_button_txt;
2548
-    echo "</ul>";
2521
+	global $wpdb, $plugin_prefix;
2522
+
2523
+	$is_error_during_diagnose = false;
2524
+	$output_str = '';
2525
+
2526
+	$delete = $wpdb->query("TRUNCATE TABLE ".GEODIR_COUNTRIES_TABLE);
2527
+
2528
+
2529
+	if ($delete) {
2530
+			$output_str .= "<li><strong>" . __('Table dropped, refresh page to reinstall.', 'geodirectory') . "</strong></li>";
2531
+		ob_start();
2532
+		geodir_diagnose_version_clear();
2533
+		ob_end_clean();
2534
+	}else{
2535
+		$output_str .= "<li><strong>" . __('Something went wrong.', 'geodirectory') . "</strong></li>";
2536
+	}
2537
+
2538
+	if ($is_error_during_diagnose) {
2539
+		$info_div_class = "geodir_problem_info";
2540
+		$fix_button_txt = "";
2541
+	} else {
2542
+		$info_div_class = "geodir_noproblem_info";
2543
+		$fix_button_txt = '';
2544
+	}
2545
+	echo "<ul class='$info_div_class'>";
2546
+	echo $output_str;
2547
+	echo $fix_button_txt;
2548
+	echo "</ul>";
2549 2549
 }
2550 2550
 
2551 2551
 /**
@@ -2558,11 +2558,11 @@  discard block
 block discarded – undo
2558 2558
  * @return array Filtered actions.
2559 2559
  */
2560 2560
 function geodir_disable_quick_edit( $actions = array(), $row = null ) {
2561
-    if ( isset( $actions['inline hide-if-no-js'] ) ) {
2562
-        unset( $actions['inline hide-if-no-js'] );
2563
-    }
2561
+	if ( isset( $actions['inline hide-if-no-js'] ) ) {
2562
+		unset( $actions['inline hide-if-no-js'] );
2563
+	}
2564 2564
 
2565
-    return $actions;
2565
+	return $actions;
2566 2566
 }
2567 2567
 
2568 2568
 /**
@@ -2576,26 +2576,26 @@  discard block
 block discarded – undo
2576 2576
  * @global bool $gd_cpt_screen True if current scrrrn has GD post type.
2577 2577
  */
2578 2578
 function geodir_check_quick_edit() {
2579
-    global $pagenow, $current_screen, $gd_cpt_screen;
2580
-
2581
-    if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {
2582
-        if ( empty( $gd_cpt_screen ) ) {
2583
-            if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {
2584
-                $gd_cpt_screen = 'y';
2585
-            } else {
2586
-                $gd_cpt_screen = 'n';
2587
-            }
2588
-        }
2589
-
2590
-        if ( $gd_cpt_screen == 'y' ) {
2591
-            if ( $pagenow == 'edit.php' ) {
2592
-                add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 );
2593
-                add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 );
2594
-            } elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {
2595
-                add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 );
2596
-            }
2597
-        }
2598
-    }
2579
+	global $pagenow, $current_screen, $gd_cpt_screen;
2580
+
2581
+	if ( ( $pagenow == 'edit.php' || $pagenow == 'edit-tags.php' ) && !empty( $current_screen->post_type ) ) {
2582
+		if ( empty( $gd_cpt_screen ) ) {
2583
+			if ( in_array( $current_screen->post_type, geodir_get_posttypes() ) ) {
2584
+				$gd_cpt_screen = 'y';
2585
+			} else {
2586
+				$gd_cpt_screen = 'n';
2587
+			}
2588
+		}
2589
+
2590
+		if ( $gd_cpt_screen == 'y' ) {
2591
+			if ( $pagenow == 'edit.php' ) {
2592
+				add_filter( 'post_row_actions', 'geodir_disable_quick_edit', 10, 2 );
2593
+				add_filter( 'page_row_actions', 'geodir_disable_quick_edit', 10, 2 );
2594
+			} elseif ( $pagenow == 'edit-tags.php' && !empty( $current_screen->taxonomy ) ) {
2595
+				add_filter( $current_screen->taxonomy . '_row_actions', 'geodir_disable_quick_edit', 10, 2 );
2596
+			}
2597
+		}
2598
+	}
2599 2599
 }
2600 2600
 add_action( 'admin_head', 'geodir_check_quick_edit', 10 );
2601 2601
 
@@ -2609,11 +2609,11 @@  discard block
 block discarded – undo
2609 2609
  * @return array Filtered bulk actions.
2610 2610
  */
2611 2611
 function geodir_filter_bulk_actions( $actions ) {
2612
-    if ( isset( $actions['edit'] ) ) {
2613
-        unset( $actions['edit'] );
2614
-    }
2612
+	if ( isset( $actions['edit'] ) ) {
2613
+		unset( $actions['edit'] );
2614
+	}
2615 2615
     
2616
-    return $actions;
2616
+	return $actions;
2617 2617
 }
2618 2618
 
2619 2619
 /**
Please login to merge, or discard this patch.
uninstall.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -10,21 +10,21 @@
 block discarded – undo
10 10
 
11 11
 // Exit if accessed directly.
12 12
 if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
13
-    exit;
13
+	exit;
14 14
 }
15 15
 
16 16
 global $wpdb;
17 17
 
18 18
 if (get_option('geodir_un_geodirectory')) {
19
-    $wpdb->hide_errors();
19
+	$wpdb->hide_errors();
20 20
     
21
-    /*
21
+	/*
22 22
     if (!defined('GEODIRECTORY_VERSION')) {
23 23
         // Load plugin file.
24 24
         include_once('geodirectory.php');
25 25
     }
26 26
     */
27 27
 
28
-    // Delete default data.
29
-    delete_option('geodir_default_data_installed');
28
+	// Delete default data.
29
+	delete_option('geodir_default_data_installed');
30 30
 }
31 31
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
  */
10 10
 
11 11
 // Exit if accessed directly.
12
-if ( ! defined( 'WP_UNINSTALL_PLUGIN' ) ) {
12
+if (!defined('WP_UNINSTALL_PLUGIN')) {
13 13
     exit;
14 14
 }
15 15
 
Please login to merge, or discard this patch.
geodirectory_widgets.php 3 patches
Indentation   +898 added lines, -898 removed lines patch added patch discarded remove patch
@@ -15,296 +15,296 @@  discard block
 block discarded – undo
15 15
  */
16 16
 function geodir_register_sidebar()
17 17
 {
18
-    global $geodir_sidebars;
19
-
20
-    if (function_exists('register_sidebar')) {
21
-        /*===========================*/
22
-        /* Home page sidebars start*/
23
-        /*===========================*/
24
-
25
-        /**
26
-         * Filter the `$before_widget` widget opening HTML tag.
27
-         *
28
-         * @since 1.0.0
29
-         * @param string $var The HTML string to filter. Default = '<section id="%1$s" class="widget geodir-widget %2$s">'.
30
-         * @see 'geodir_after_widget'
31
-         */
32
-        $before_widget = apply_filters('geodir_before_widget', '<section id="%1$s" class="widget geodir-widget %2$s">');
33
-        /**
34
-         * Filter the `$after_widget` widget closing HTML tag.
35
-         *
36
-         * @since 1.0.0
37
-         * @param string $var The HTML string to filter. Default = '</section>'.
38
-         * @see 'geodir_before_widget'
39
-         */
40
-        $after_widget = apply_filters('geodir_after_widget', '</section>');
41
-        /**
42
-         * Filter the `$before_title` widget title opening HTML tag.
43
-         *
44
-         * @since 1.0.0
45
-         * @param string $var The HTML string to filter. Default = '<h3 class="widget-title">'.
46
-         * @see 'geodir_after_title'
47
-         */
48
-        $before_title = apply_filters('geodir_before_title', '<h3 class="widget-title">');
49
-        /**
50
-         * Filter the `$after_title` widget title closing HTML tag.
51
-         *
52
-         * @since 1.0.0
53
-         * @param string $var The HTML string to filter. Default = '</h3>'.
54
-         * @see 'geodir_before_title'
55
-         */
56
-        $after_title = apply_filters('geodir_after_title', '</h3>');
57
-
58
-        if (get_option('geodir_show_home_top_section')) {
59
-            register_sidebars(1, array('id' => 'geodir_home_top', 'name' => __('GD Home Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
60
-
61
-            $geodir_sidebars[] = 'geodir_home_top';
62
-        }
63
-
64
-        if (get_option('geodir_show_home_contant_section')) {
65
-            register_sidebars(1, array('id' => 'geodir_home_content', 'name' => __('GD Home Content Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
18
+	global $geodir_sidebars;
66 19
 
67
-            $geodir_sidebars[] = 'geodir_home_content';
68
-        }
20
+	if (function_exists('register_sidebar')) {
21
+		/*===========================*/
22
+		/* Home page sidebars start*/
23
+		/*===========================*/
69 24
 
70
-        if (get_option('geodir_show_home_right_section')) {
71
-            register_sidebars(1, array('id' => 'geodir_home_right', 'name' => __('GD Home Right Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
25
+		/**
26
+		 * Filter the `$before_widget` widget opening HTML tag.
27
+		 *
28
+		 * @since 1.0.0
29
+		 * @param string $var The HTML string to filter. Default = '<section id="%1$s" class="widget geodir-widget %2$s">'.
30
+		 * @see 'geodir_after_widget'
31
+		 */
32
+		$before_widget = apply_filters('geodir_before_widget', '<section id="%1$s" class="widget geodir-widget %2$s">');
33
+		/**
34
+		 * Filter the `$after_widget` widget closing HTML tag.
35
+		 *
36
+		 * @since 1.0.0
37
+		 * @param string $var The HTML string to filter. Default = '</section>'.
38
+		 * @see 'geodir_before_widget'
39
+		 */
40
+		$after_widget = apply_filters('geodir_after_widget', '</section>');
41
+		/**
42
+		 * Filter the `$before_title` widget title opening HTML tag.
43
+		 *
44
+		 * @since 1.0.0
45
+		 * @param string $var The HTML string to filter. Default = '<h3 class="widget-title">'.
46
+		 * @see 'geodir_after_title'
47
+		 */
48
+		$before_title = apply_filters('geodir_before_title', '<h3 class="widget-title">');
49
+		/**
50
+		 * Filter the `$after_title` widget title closing HTML tag.
51
+		 *
52
+		 * @since 1.0.0
53
+		 * @param string $var The HTML string to filter. Default = '</h3>'.
54
+		 * @see 'geodir_before_title'
55
+		 */
56
+		$after_title = apply_filters('geodir_after_title', '</h3>');
57
+
58
+		if (get_option('geodir_show_home_top_section')) {
59
+			register_sidebars(1, array('id' => 'geodir_home_top', 'name' => __('GD Home Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
72 60
 
73
-            $geodir_sidebars[] = 'geodir_home_right';
74
-        }
61
+			$geodir_sidebars[] = 'geodir_home_top';
62
+		}
75 63
 
76
-        if (get_option('geodir_show_home_left_section')) {
77
-            register_sidebars(1, array('id' => 'geodir_home_left', 'name' => __('GD Home Left Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
64
+		if (get_option('geodir_show_home_contant_section')) {
65
+			register_sidebars(1, array('id' => 'geodir_home_content', 'name' => __('GD Home Content Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
78 66
 
79
-            $geodir_sidebars[] = 'geodir_home_left';
80
-        }
67
+			$geodir_sidebars[] = 'geodir_home_content';
68
+		}
81 69
 
82
-        if (get_option('geodir_show_home_bottom_section')) {
83
-            register_sidebars(1, array('id' => 'geodir_home_bottom', 'name' => __('GD Home Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
70
+		if (get_option('geodir_show_home_right_section')) {
71
+			register_sidebars(1, array('id' => 'geodir_home_right', 'name' => __('GD Home Right Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
84 72
 
85
-            $geodir_sidebars[] = 'geodir_home_bottom';
86
-        }
73
+			$geodir_sidebars[] = 'geodir_home_right';
74
+		}
87 75
 
88
-        /*===========================*/
89
-        /* Home page sidebars end*/
90
-        /*===========================*/
76
+		if (get_option('geodir_show_home_left_section')) {
77
+			register_sidebars(1, array('id' => 'geodir_home_left', 'name' => __('GD Home Left Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
91 78
 
92
-        /*===========================*/
93
-        /* Listing page sidebars start*/
94
-        /*===========================*/
79
+			$geodir_sidebars[] = 'geodir_home_left';
80
+		}
95 81
 
96
-        if (get_option('geodir_show_listing_top_section')) {
97
-            register_sidebars(1, array('id' => 'geodir_listing_top', 'name' => __('GD Listing Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
82
+		if (get_option('geodir_show_home_bottom_section')) {
83
+			register_sidebars(1, array('id' => 'geodir_home_bottom', 'name' => __('GD Home Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
98 84
 
99
-            $geodir_sidebars[] = 'geodir_listing_top';
100
-        }
85
+			$geodir_sidebars[] = 'geodir_home_bottom';
86
+		}
101 87
 
102
-        if (get_option('geodir_show_listing_left_section')) {
103
-            register_sidebars(1, array('id' => 'geodir_listing_left_sidebar', 'name' => __('GD Listing Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
88
+		/*===========================*/
89
+		/* Home page sidebars end*/
90
+		/*===========================*/
104 91
 
105
-            $geodir_sidebars[] = 'geodir_listing_left_sidebar';
106
-        }
92
+		/*===========================*/
93
+		/* Listing page sidebars start*/
94
+		/*===========================*/
107 95
 
108
-        if (get_option('geodir_show_listing_right_section')) {
109
-            register_sidebars(1, array('id' => 'geodir_listing_right_sidebar', 'name' => __('GD Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
96
+		if (get_option('geodir_show_listing_top_section')) {
97
+			register_sidebars(1, array('id' => 'geodir_listing_top', 'name' => __('GD Listing Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
110 98
 
111
-            $geodir_sidebars[] = 'geodir_listing_right_sidebar';
112
-        }
99
+			$geodir_sidebars[] = 'geodir_listing_top';
100
+		}
113 101
 
114
-        if (get_option('geodir_show_listing_bottom_section')) {
115
-            register_sidebars(1, array('id' => 'geodir_listing_bottom', 'name' => __('GD Listing Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
102
+		if (get_option('geodir_show_listing_left_section')) {
103
+			register_sidebars(1, array('id' => 'geodir_listing_left_sidebar', 'name' => __('GD Listing Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
116 104
 
117
-            $geodir_sidebars[] = 'geodir_listing_bottom';
118
-        }
105
+			$geodir_sidebars[] = 'geodir_listing_left_sidebar';
106
+		}
119 107
 
120
-        /*===========================*/
121
-        /* Listing page sidebars start*/
122
-        /*===========================*/
108
+		if (get_option('geodir_show_listing_right_section')) {
109
+			register_sidebars(1, array('id' => 'geodir_listing_right_sidebar', 'name' => __('GD Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
123 110
 
124
-        /*===========================*/
125
-        /* Search page sidebars start*/
126
-        /*===========================*/
111
+			$geodir_sidebars[] = 'geodir_listing_right_sidebar';
112
+		}
127 113
 
128
-        if (get_option('geodir_show_search_top_section')) {
129
-            register_sidebars(1, array('id' => 'geodir_search_top', 'name' => __('GD Search Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
114
+		if (get_option('geodir_show_listing_bottom_section')) {
115
+			register_sidebars(1, array('id' => 'geodir_listing_bottom', 'name' => __('GD Listing Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
130 116
 
131
-            $geodir_sidebars[] = 'geodir_search_top';
132
-        }
117
+			$geodir_sidebars[] = 'geodir_listing_bottom';
118
+		}
133 119
 
134
-        if (get_option('geodir_show_search_left_section')) {
135
-            register_sidebars(1, array('id' => 'geodir_search_left_sidebar', 'name' => __('GD Search Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
120
+		/*===========================*/
121
+		/* Listing page sidebars start*/
122
+		/*===========================*/
136 123
 
137
-            $geodir_sidebars[] = 'geodir_search_left_sidebar';
138
-        }
124
+		/*===========================*/
125
+		/* Search page sidebars start*/
126
+		/*===========================*/
139 127
 
140
-        if (get_option('geodir_show_search_right_section')) {
141
-            register_sidebars(1, array('id' => 'geodir_search_right_sidebar', 'name' => __('GD Search Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
128
+		if (get_option('geodir_show_search_top_section')) {
129
+			register_sidebars(1, array('id' => 'geodir_search_top', 'name' => __('GD Search Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
142 130
 
143
-            $geodir_sidebars[] = 'geodir_search_right_sidebar';
144
-        }
131
+			$geodir_sidebars[] = 'geodir_search_top';
132
+		}
145 133
 
146
-        if (get_option('geodir_show_search_bottom_section')) {
147
-            register_sidebars(1, array('id' => 'geodir_search_bottom', 'name' => __('GD Search Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
134
+		if (get_option('geodir_show_search_left_section')) {
135
+			register_sidebars(1, array('id' => 'geodir_search_left_sidebar', 'name' => __('GD Search Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
148 136
 
149
-            $geodir_sidebars[] = 'geodir_search_bottom';
150
-        }
137
+			$geodir_sidebars[] = 'geodir_search_left_sidebar';
138
+		}
151 139
 
152
-        /*===========================*/
153
-        /* Search page sidebars end*/
154
-        /*===========================*/
140
+		if (get_option('geodir_show_search_right_section')) {
141
+			register_sidebars(1, array('id' => 'geodir_search_right_sidebar', 'name' => __('GD Search Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
155 142
 
156
-        /*==================================*/
157
-        /* Detail/Single page sidebars start*/
158
-        /*==================================*/
159
-        if (get_option('geodir_show_detail_top_section')) {
160
-            register_sidebars(1, array('id' => 'geodir_detail_top', 'name' => __('GD Detail Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
143
+			$geodir_sidebars[] = 'geodir_search_right_sidebar';
144
+		}
161 145
 
162
-            $geodir_sidebars[] = 'geodir_detail_top';
163
-        }
146
+		if (get_option('geodir_show_search_bottom_section')) {
147
+			register_sidebars(1, array('id' => 'geodir_search_bottom', 'name' => __('GD Search Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
164 148
 
165
-        register_sidebars(1, array('id' => 'geodir_detail_sidebar', 'name' => __('GD Detail Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
149
+			$geodir_sidebars[] = 'geodir_search_bottom';
150
+		}
166 151
 
167
-        $geodir_sidebars[] = 'geodir_detail_sidebar';
152
+		/*===========================*/
153
+		/* Search page sidebars end*/
154
+		/*===========================*/
168 155
 
169
-        if (get_option('geodir_show_detail_bottom_section')) {
170
-            register_sidebars(1, array('id' => 'geodir_detail_bottom', 'name' => __('GD Detail Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
156
+		/*==================================*/
157
+		/* Detail/Single page sidebars start*/
158
+		/*==================================*/
159
+		if (get_option('geodir_show_detail_top_section')) {
160
+			register_sidebars(1, array('id' => 'geodir_detail_top', 'name' => __('GD Detail Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
171 161
 
172
-            $geodir_sidebars[] = 'geodir_detail_bottom';
173
-        }
162
+			$geodir_sidebars[] = 'geodir_detail_top';
163
+		}
174 164
 
175
-        /*==================================*/
176
-        /* Detail/Single page sidebars end*/
177
-        /*==================================*/
165
+		register_sidebars(1, array('id' => 'geodir_detail_sidebar', 'name' => __('GD Detail Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
178 166
 
179
-        /*==================================*/
180
-        /* Author page sidebars start       */
181
-        /*==================================*/
167
+		$geodir_sidebars[] = 'geodir_detail_sidebar';
182 168
 
183
-        if (get_option('geodir_show_author_top_section')) {
184
-            register_sidebars(1, array('id' => 'geodir_author_top', 'name' => __('GD Author Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
169
+		if (get_option('geodir_show_detail_bottom_section')) {
170
+			register_sidebars(1, array('id' => 'geodir_detail_bottom', 'name' => __('GD Detail Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
185 171
 
186
-            $geodir_sidebars[] = 'geodir_author_top';
187
-        }
172
+			$geodir_sidebars[] = 'geodir_detail_bottom';
173
+		}
188 174
 
189
-        if (get_option('geodir_show_author_left_section')) {
190
-            register_sidebars(1, array('id' => 'geodir_author_left_sidebar', 'name' => __('GD Author Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
175
+		/*==================================*/
176
+		/* Detail/Single page sidebars end*/
177
+		/*==================================*/
191 178
 
192
-            $geodir_sidebars[] = 'geodir_author_left_sidebar';
193
-        }
179
+		/*==================================*/
180
+		/* Author page sidebars start       */
181
+		/*==================================*/
194 182
 
195
-        if (get_option('geodir_show_author_right_section')) {
196
-            register_sidebars(1, array('id' => 'geodir_author_right_sidebar', 'name' => __('GD Author Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
183
+		if (get_option('geodir_show_author_top_section')) {
184
+			register_sidebars(1, array('id' => 'geodir_author_top', 'name' => __('GD Author Top Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
197 185
 
198
-            $geodir_sidebars[] = 'geodir_author_right_sidebar';
199
-        }
186
+			$geodir_sidebars[] = 'geodir_author_top';
187
+		}
200 188
 
201
-        if (get_option('geodir_show_author_bottom_section')) {
202
-            register_sidebars(1, array('id' => 'geodir_author_bottom', 'name' => __('GD Author Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
189
+		if (get_option('geodir_show_author_left_section')) {
190
+			register_sidebars(1, array('id' => 'geodir_author_left_sidebar', 'name' => __('GD Author Left Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
203 191
 
204
-            $geodir_sidebars[] = 'geodir_author_bottom';
205
-        }
192
+			$geodir_sidebars[] = 'geodir_author_left_sidebar';
193
+		}
206 194
 
207
-        /*==================================*/
208
-        /* Author page sidebars end         */
209
-        /*==================================*/
195
+		if (get_option('geodir_show_author_right_section')) {
196
+			register_sidebars(1, array('id' => 'geodir_author_right_sidebar', 'name' => __('GD Author Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
210 197
 
211
-        /*==================================*/
212
-        /* Add listing page sidebars start       */
213
-        /*==================================*/
198
+			$geodir_sidebars[] = 'geodir_author_right_sidebar';
199
+		}
214 200
 
215
-        register_sidebars(1, array('id' => 'geodir_add_listing_sidebar', 'name' => __('GD Add Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
201
+		if (get_option('geodir_show_author_bottom_section')) {
202
+			register_sidebars(1, array('id' => 'geodir_author_bottom', 'name' => __('GD Author Bottom Section', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
216 203
 
217
-        $geodir_sidebars[] = 'geodir_add_listing_sidebar';
204
+			$geodir_sidebars[] = 'geodir_author_bottom';
205
+		}
218 206
 
219
-        /*==================================*/
220
-        /* Add listing page sidebars end         */
221
-        /*==================================*/
207
+		/*==================================*/
208
+		/* Author page sidebars end         */
209
+		/*==================================*/
222 210
 
223
-    }
211
+		/*==================================*/
212
+		/* Add listing page sidebars start       */
213
+		/*==================================*/
214
+
215
+		register_sidebars(1, array('id' => 'geodir_add_listing_sidebar', 'name' => __('GD Add Listing Right Sidebar', 'geodirectory'), 'before_widget' => $before_widget, 'after_widget' => $after_widget, 'before_title' => $before_title, 'after_title' => $after_title));
216
+
217
+		$geodir_sidebars[] = 'geodir_add_listing_sidebar';
218
+
219
+		/*==================================*/
220
+		/* Add listing page sidebars end         */
221
+		/*==================================*/
222
+
223
+	}
224 224
 }
225 225
 
226 226
 
227 227
 if (!function_exists('register_geodir_widgets')) {
228
-    /**
229
-     * Registers all Widgets.
230
-     *
231
-     * @since 1.0.0
232
-     * @package GeoDirectory
233
-     */
234
-    function register_geodir_widgets()
235
-    {
236
-        /**
237
-         * Login Widget.
238
-         *
239
-         * @since 1.0.0
240
-         */
241
-        class geodir_loginwidget extends WP_Widget
242
-        {
243
-            /**
244
-             * Register the login widget with WordPress.
245
-             *
246
-             * @since 1.0.0
247
-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
248
-             */
249
-            public function __construct() {
250
-                $widget_ops = array('classname' => 'geodir_loginbox', 'description' => __('Geodirectory Loginbox Widget', 'geodirectory'));
251
-                parent::__construct(
252
-                    'geodir_loginbox', // Base ID
253
-                    __('GD > Loginbox', 'geodirectory'), // Name
254
-                    $widget_ops// Args
255
-                );
256
-            }
257
-
258
-            /**
259
-             * Front-end display content for login widget.
260
-             *
261
-             * @since 1.0.0
262
-             * @since 1.5.1 Declare function public.
263
-             *
264
-             * @param array $args     Widget arguments.
265
-             * @param array $instance Saved values from database.
266
-             */
267
-            public function widget($args, $instance)
268
-            {
269
-                geodir_loginwidget_output($args, $instance);
270
-            }
271
-
272
-            /**
273
-             * Sanitize login widget form values as they are saved.
274
-             *
275
-             * @since 1.0.0
276
-             * @since 1.5.1 Declare function public.
277
-             *
278
-             * @param array $new_instance Values just sent to be saved.
279
-             * @param array $old_instance Previously saved values from database.
280
-             *
281
-             * @return array Updated safe values to be saved.
282
-             */
283
-            public function update($new_instance, $old_instance)
284
-            {
285
-                //save the widget
286
-                $instance = $old_instance;
287
-                $instance['title'] = strip_tags($new_instance['title']);
288
-
289
-                return $instance;
290
-            }
291
-
292
-            /**
293
-             * Back-end login widget settings form.
294
-             *
295
-             * @since 1.0.0
296
-             * @since 1.5.1 Declare function public.
297
-             *
298
-             * @param array $instance Previously saved values from database.
299
-             * @return string|void
300
-             */
301
-            public function form($instance)
302
-            {
303
-                //widgetform in backend
304
-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
305
-                $title = strip_tags($instance['title']);
306
-
307
-                ?>
228
+	/**
229
+	 * Registers all Widgets.
230
+	 *
231
+	 * @since 1.0.0
232
+	 * @package GeoDirectory
233
+	 */
234
+	function register_geodir_widgets()
235
+	{
236
+		/**
237
+		 * Login Widget.
238
+		 *
239
+		 * @since 1.0.0
240
+		 */
241
+		class geodir_loginwidget extends WP_Widget
242
+		{
243
+			/**
244
+			 * Register the login widget with WordPress.
245
+			 *
246
+			 * @since 1.0.0
247
+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
248
+			 */
249
+			public function __construct() {
250
+				$widget_ops = array('classname' => 'geodir_loginbox', 'description' => __('Geodirectory Loginbox Widget', 'geodirectory'));
251
+				parent::__construct(
252
+					'geodir_loginbox', // Base ID
253
+					__('GD > Loginbox', 'geodirectory'), // Name
254
+					$widget_ops// Args
255
+				);
256
+			}
257
+
258
+			/**
259
+			 * Front-end display content for login widget.
260
+			 *
261
+			 * @since 1.0.0
262
+			 * @since 1.5.1 Declare function public.
263
+			 *
264
+			 * @param array $args     Widget arguments.
265
+			 * @param array $instance Saved values from database.
266
+			 */
267
+			public function widget($args, $instance)
268
+			{
269
+				geodir_loginwidget_output($args, $instance);
270
+			}
271
+
272
+			/**
273
+			 * Sanitize login widget form values as they are saved.
274
+			 *
275
+			 * @since 1.0.0
276
+			 * @since 1.5.1 Declare function public.
277
+			 *
278
+			 * @param array $new_instance Values just sent to be saved.
279
+			 * @param array $old_instance Previously saved values from database.
280
+			 *
281
+			 * @return array Updated safe values to be saved.
282
+			 */
283
+			public function update($new_instance, $old_instance)
284
+			{
285
+				//save the widget
286
+				$instance = $old_instance;
287
+				$instance['title'] = strip_tags($new_instance['title']);
288
+
289
+				return $instance;
290
+			}
291
+
292
+			/**
293
+			 * Back-end login widget settings form.
294
+			 *
295
+			 * @since 1.0.0
296
+			 * @since 1.5.1 Declare function public.
297
+			 *
298
+			 * @param array $instance Previously saved values from database.
299
+			 * @return string|void
300
+			 */
301
+			public function form($instance)
302
+			{
303
+				//widgetform in backend
304
+				$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
305
+				$title = strip_tags($instance['title']);
306
+
307
+				?>
308 308
                 <p><label
309 309
                         for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Widget Title', 'geodirectory'); ?>
310 310
                         : <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
@@ -313,64 +313,64 @@  discard block
 block discarded – undo
313 313
 
314 314
 
315 315
             <?php
316
-            }
317
-        }
318
-
319
-        register_widget('geodir_loginwidget');
320
-
321
-
322
-        /**
323
-         * GeoDirectory Social Like Widget.
324
-         *
325
-         * @since 1.0.0
326
-         */
327
-        class geodir_social_like_widget extends WP_Widget
328
-        {
329
-
330
-            /**
331
-             * Register the social like widget with WordPress.
332
-             *
333
-             * @since 1.0.0
334
-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
335
-             */
336
-            public function __construct() {
337
-                $widget_ops = array('classname' => 'geodir_social_like_widget', 'description' => __('GD > Twitter,Facebook and Google+ buttons', 'geodirectory'));
338
-                parent::__construct(
339
-                    'social_like_widget', // Base ID
340
-                    __('GD > Social Like', 'geodirectory'), // Name
341
-                    $widget_ops// Args
342
-                );
343
-            }
344
-
345
-            /**
346
-             * Front-end display content for social like widget.
347
-             *
348
-             * @since 1.0.0
349
-             * @since 1.5.1 Declare function public.
350
-             *
351
-             * @param array $args     Widget arguments.
352
-             * @param array $instance Saved values from database.
353
-             */
354
-            public function widget($args, $instance)
355
-            {
356
-                // prints the widget
357
-                extract($args, EXTR_SKIP);
358
-
359
-                /**
360
-                 * Filter the widget title text.
361
-                 *
362
-                 * @since 1.0.0
363
-                 * @global object $current_user Current user object.
364
-                 * @param string $title The widget title text.
365
-                 */
366
-                $title = empty($instance['title']) ? '&nbsp;' : apply_filters('widget_title', $instance['title']);
367
-
368
-                global $current_user, $post;
369
-                echo $before_widget;
370
-                ?>
316
+			}
317
+		}
318
+
319
+		register_widget('geodir_loginwidget');
320
+
321
+
322
+		/**
323
+		 * GeoDirectory Social Like Widget.
324
+		 *
325
+		 * @since 1.0.0
326
+		 */
327
+		class geodir_social_like_widget extends WP_Widget
328
+		{
329
+
330
+			/**
331
+			 * Register the social like widget with WordPress.
332
+			 *
333
+			 * @since 1.0.0
334
+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
335
+			 */
336
+			public function __construct() {
337
+				$widget_ops = array('classname' => 'geodir_social_like_widget', 'description' => __('GD > Twitter,Facebook and Google+ buttons', 'geodirectory'));
338
+				parent::__construct(
339
+					'social_like_widget', // Base ID
340
+					__('GD > Social Like', 'geodirectory'), // Name
341
+					$widget_ops// Args
342
+				);
343
+			}
344
+
345
+			/**
346
+			 * Front-end display content for social like widget.
347
+			 *
348
+			 * @since 1.0.0
349
+			 * @since 1.5.1 Declare function public.
350
+			 *
351
+			 * @param array $args     Widget arguments.
352
+			 * @param array $instance Saved values from database.
353
+			 */
354
+			public function widget($args, $instance)
355
+			{
356
+				// prints the widget
357
+				extract($args, EXTR_SKIP);
358
+
359
+				/**
360
+				 * Filter the widget title text.
361
+				 *
362
+				 * @since 1.0.0
363
+				 * @global object $current_user Current user object.
364
+				 * @param string $title The widget title text.
365
+				 */
366
+				$title = empty($instance['title']) ? '&nbsp;' : apply_filters('widget_title', $instance['title']);
367
+
368
+				global $current_user, $post;
369
+				echo $before_widget;
370
+				?>
371 371
 
372 372
                 <?php //if ( get_option('gd_tweet_button') ) {
373
-                ?>
373
+				?>
374 374
 
375 375
                 <a href="http://twitter.com/share"
376 376
                    class="twitter-share-button"><?php _e('Tweet', 'geodirectory');?></a>
@@ -378,23 +378,23 @@  discard block
 block discarded – undo
378 378
                 <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
379 379
 
380 380
                 <?php //}
381
-                ?>
381
+				?>
382 382
 
383 383
                 <?php // if ( get_option('gd_facebook_button') ) {
384
-                ?>
384
+				?>
385 385
 
386 386
                 <iframe <?php if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {
387
-                    echo 'allowtransparency="true"';
388
-                }?> class="facebook"
387
+					echo 'allowtransparency="true"';
388
+				}?> class="facebook"
389 389
                     src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode(geodir_curPageURL()); ?>&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light"
390 390
                     style="border:none; overflow:hidden; width:100px; height:20px"></iframe>
391 391
 
392 392
 
393 393
                 <?php //}
394
-                ?>
394
+				?>
395 395
 
396 396
                 <?php //if ( get_option('gd_google_button') ) {
397
-                ?>
397
+				?>
398 398
                 <script>
399 399
                     window.___gcfg = {
400 400
                         parsetags: 'explicit'
@@ -408,118 +408,118 @@  discard block
 block discarded – undo
408 408
                         "count": "true"
409 409
                     });</script>
410 410
                 <?php //}
411
-                echo $after_widget;
412
-
413
-            }
414
-
415
-            /**
416
-             * Sanitize social like widget form values as they are saved.
417
-             *
418
-             * @since 1.0.0
419
-             * @since 1.5.1 Declare function public.
420
-             *
421
-             * @param array $new_instance Values just sent to be saved.
422
-             * @param array $old_instance Previously saved values from database.
423
-             *
424
-             * @return array Updated safe values to be saved.
425
-             */
426
-            public function update($new_instance, $old_instance)
427
-            {
428
-                //save the widget
429
-                $instance = $old_instance;
430
-                $instance['title'] = strip_tags($new_instance['title']);
431
-                return $instance;
432
-            }
433
-
434
-            /**
435
-             * Back-end social like widget settings form.
436
-             *
437
-             * @since 1.0.0
438
-             * @since 1.5.1 Declare function public.
439
-             *
440
-             * @param array $instance Previously saved values from database.
441
-             * @return string|void
442
-             */
443
-            public function form($instance)
444
-            {
445
-                //widgetform in backend
446
-                $instance = wp_parse_args((array)$instance, array('title' => ''));
447
-                $title = strip_tags($instance['title']);
448
-                ?>
411
+				echo $after_widget;
412
+
413
+			}
414
+
415
+			/**
416
+			 * Sanitize social like widget form values as they are saved.
417
+			 *
418
+			 * @since 1.0.0
419
+			 * @since 1.5.1 Declare function public.
420
+			 *
421
+			 * @param array $new_instance Values just sent to be saved.
422
+			 * @param array $old_instance Previously saved values from database.
423
+			 *
424
+			 * @return array Updated safe values to be saved.
425
+			 */
426
+			public function update($new_instance, $old_instance)
427
+			{
428
+				//save the widget
429
+				$instance = $old_instance;
430
+				$instance['title'] = strip_tags($new_instance['title']);
431
+				return $instance;
432
+			}
433
+
434
+			/**
435
+			 * Back-end social like widget settings form.
436
+			 *
437
+			 * @since 1.0.0
438
+			 * @since 1.5.1 Declare function public.
439
+			 *
440
+			 * @param array $instance Previously saved values from database.
441
+			 * @return string|void
442
+			 */
443
+			public function form($instance)
444
+			{
445
+				//widgetform in backend
446
+				$instance = wp_parse_args((array)$instance, array('title' => ''));
447
+				$title = strip_tags($instance['title']);
448
+				?>
449 449
                 <p>No settings for this widget</p>
450 450
 
451 451
 
452 452
             <?php
453
-            }
454
-        }
455
-
456
-        register_widget('geodir_social_like_widget');
457
-
458
-
459
-        /**
460
-         * GeoDirectory Feedburner Subscribe widget.
461
-         *
462
-         * @since 1.0.0
463
-         */
464
-        class geodirsubscribeWidget extends WP_Widget
465
-        {
466
-
467
-            /**
468
-             * Register the feedburner subscribe widget with WordPress.
469
-             *
470
-             * @since 1.0.0
471
-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
472
-             */
473
-            public function __construct() {
474
-                $widget_ops = array('classname' => 'geodir-subscribe', 'description' => __('GD > Google Feedburner Subscribe', 'geodirectory'));
475
-                parent::__construct(
476
-                    'widget_subscribeWidget', // Base ID
477
-                    __('GD > Subscribe', 'geodirectory'), // Name
478
-                    $widget_ops// Args
479
-                );
480
-            }
481
-
482
-            /**
483
-             * Front-end display content for feedburner subscribe widget.
484
-             *
485
-             * @since 1.0.0
486
-             * @since 1.5.1 Declare function public.
487
-             *
488
-             * @param array $args     Widget arguments.
489
-             * @param array $instance Saved values from database.
490
-             */
491
-            public function widget($args, $instance)
492
-            {
493
-                // prints the widget
494
-                extract($args, EXTR_SKIP);
495
-
496
-                /**
497
-                 * Filter the widget instance id.
498
-                 *
499
-                 * @since 1.0.0
500
-                 * @param string $id The widget instance id.
501
-                 */
502
-                $id = empty($instance['id']) ? '' : apply_filters('widget_id', $instance['id']);
503
-
504
-                /** This filter is documented in geodirectory_widgets.php */
505
-                $title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
506
-
507
-                /**
508
-                 * Filter the widget text.
509
-                 *
510
-                 * @since 1.0.0
511
-                 * @param string $text The widget text.
512
-                 */
513
-                $text = empty($instance['text']) ? '' : apply_filters('widget_text', $instance['text']);
514
-
515
-                echo $before_widget;
516
-                ?>
453
+			}
454
+		}
455
+
456
+		register_widget('geodir_social_like_widget');
457
+
458
+
459
+		/**
460
+		 * GeoDirectory Feedburner Subscribe widget.
461
+		 *
462
+		 * @since 1.0.0
463
+		 */
464
+		class geodirsubscribeWidget extends WP_Widget
465
+		{
466
+
467
+			/**
468
+			 * Register the feedburner subscribe widget with WordPress.
469
+			 *
470
+			 * @since 1.0.0
471
+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
472
+			 */
473
+			public function __construct() {
474
+				$widget_ops = array('classname' => 'geodir-subscribe', 'description' => __('GD > Google Feedburner Subscribe', 'geodirectory'));
475
+				parent::__construct(
476
+					'widget_subscribeWidget', // Base ID
477
+					__('GD > Subscribe', 'geodirectory'), // Name
478
+					$widget_ops// Args
479
+				);
480
+			}
481
+
482
+			/**
483
+			 * Front-end display content for feedburner subscribe widget.
484
+			 *
485
+			 * @since 1.0.0
486
+			 * @since 1.5.1 Declare function public.
487
+			 *
488
+			 * @param array $args     Widget arguments.
489
+			 * @param array $instance Saved values from database.
490
+			 */
491
+			public function widget($args, $instance)
492
+			{
493
+				// prints the widget
494
+				extract($args, EXTR_SKIP);
495
+
496
+				/**
497
+				 * Filter the widget instance id.
498
+				 *
499
+				 * @since 1.0.0
500
+				 * @param string $id The widget instance id.
501
+				 */
502
+				$id = empty($instance['id']) ? '' : apply_filters('widget_id', $instance['id']);
503
+
504
+				/** This filter is documented in geodirectory_widgets.php */
505
+				$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
506
+
507
+				/**
508
+				 * Filter the widget text.
509
+				 *
510
+				 * @since 1.0.0
511
+				 * @param string $text The widget text.
512
+				 */
513
+				$text = empty($instance['text']) ? '' : apply_filters('widget_text', $instance['text']);
514
+
515
+				echo $before_widget;
516
+				?>
517 517
 
518 518
                 <?php echo $before_title . $title; ?>  <a href="<?php if ($id) {
519
-                echo 'http://feeds2.feedburner.com/' . $id;
520
-            } else {
521
-                bloginfo('rss_url');
522
-            } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?>
519
+				echo 'http://feeds2.feedburner.com/' . $id;
520
+			} else {
521
+				bloginfo('rss_url');
522
+			} ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?>
523 523
 
524 524
                 <?php if ($text <> "") { ?>
525 525
 
@@ -544,57 +544,57 @@  discard block
 block discarded – undo
544 544
                 </form>
545 545
 
546 546
                 <?php
547
-                echo $after_widget;
547
+				echo $after_widget;
548 548
 
549
-            }
549
+			}
550 550
 
551
-            /**
552
-             * Sanitize feedburner subscribe widget form values as they are saved.
553
-             *
554
-             * @since 1.0.0
555
-             * @since 1.5.1 Declare function public.
556
-             *
557
-             * @param array $new_instance Values just sent to be saved.
558
-             * @param array $old_instance Previously saved values from database.
559
-             *
560
-             * @return array Updated safe values to be saved.
561
-             */
562
-            public function update($new_instance, $old_instance)
563
-            {
551
+			/**
552
+			 * Sanitize feedburner subscribe widget form values as they are saved.
553
+			 *
554
+			 * @since 1.0.0
555
+			 * @since 1.5.1 Declare function public.
556
+			 *
557
+			 * @param array $new_instance Values just sent to be saved.
558
+			 * @param array $old_instance Previously saved values from database.
559
+			 *
560
+			 * @return array Updated safe values to be saved.
561
+			 */
562
+			public function update($new_instance, $old_instance)
563
+			{
564 564
 
565
-                //save the widget
566
-                $instance = $old_instance;
567
-                $instance['id'] = strip_tags($new_instance['id']);
568
-                $instance['title'] = ($new_instance['title']);
569
-                $instance['text'] = ($new_instance['text']);
565
+				//save the widget
566
+				$instance = $old_instance;
567
+				$instance['id'] = strip_tags($new_instance['id']);
568
+				$instance['title'] = ($new_instance['title']);
569
+				$instance['text'] = ($new_instance['text']);
570 570
 
571 571
 
572
-                return $instance;
573
-            }
572
+				return $instance;
573
+			}
574 574
 
575
-            /**
576
-             * Back-end feedburner subscribe widget settings form.
577
-             *
578
-             * @since 1.0.0
579
-             * @since 1.5.1 Declare function public.
580
-             *
581
-             * @param array $instance Previously saved values from database.
582
-             * @return string|void
583
-             */
584
-            public function form($instance)
585
-            {
586
-                //widgetform in backend
587
-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));
575
+			/**
576
+			 * Back-end feedburner subscribe widget settings form.
577
+			 *
578
+			 * @since 1.0.0
579
+			 * @since 1.5.1 Declare function public.
580
+			 *
581
+			 * @param array $instance Previously saved values from database.
582
+			 * @return string|void
583
+			 */
584
+			public function form($instance)
585
+			{
586
+				//widgetform in backend
587
+				$instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));
588 588
 
589
-                $id = strip_tags($instance['id']);
589
+				$id = strip_tags($instance['id']);
590 590
 
591
-                $title = strip_tags($instance['title']);
591
+				$title = strip_tags($instance['title']);
592 592
 
593
-                $text = strip_tags($instance['text']);
593
+				$text = strip_tags($instance['text']);
594 594
 
595 595
 
596 596
 
597
-                ?>
597
+				?>
598 598
                 <p><label
599 599
                         for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'geodirectory');?>:
600 600
                         <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
@@ -613,101 +613,101 @@  discard block
 block discarded – undo
613 613
                                   name="<?php echo $this->get_field_name('text'); ?>"><?php echo esc_attr($text); ?></textarea></label>
614 614
                 </p>
615 615
             <?php
616
-            }
617
-        }
618
-
619
-        register_widget('geodirsubscribeWidget');
620
-
621
-        /**
622
-         * GeoDirectory advertise widget.
623
-         *
624
-         * @since 1.0.0
625
-         */
626
-        class geodiradvtwidget extends WP_Widget
627
-        {
628
-
629
-            /**
630
-             * Register the advertise widget with WordPress.
631
-             *
632
-             * @since 1.0.0
633
-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
634
-             */
635
-            public function __construct() {
636
-                $widget_ops = array('classname' => 'GeoDirectory Advertise', 'description' => __('GD > common advertise widget in sidebar, bottom section', 'geodirectory'));
637
-                parent::__construct(
638
-                    'advtwidget', // Base ID
639
-                    __('GD > Advertise', 'geodirectory'), // Name
640
-                    $widget_ops// Args
641
-                );
642
-            }
643
-
644
-
645
-            /**
646
-             * Front-end display content for advertise widget.
647
-             *
648
-             * @since 1.0.0
649
-             * @since 1.5.1 Declare function public.
650
-             *
651
-             * @param array $args     Widget arguments.
652
-             * @param array $instance Saved values from database.
653
-             */
654
-            public function widget($args, $instance)
655
-            {
656
-
657
-                // prints the widget
658
-
659
-                extract($args, EXTR_SKIP);
660
-
661
-                /**
662
-                 * Filter the description text.
663
-                 *
664
-                 * @since 1.0.0
665
-                 * @param string $desc1 The widget description text.
666
-                 */
667
-                $desc1 = empty($instance['desc1']) ? '&nbsp;' : apply_filters('widget_desc1', $instance['desc1']);
668
-                echo $before_widget;
669
-                ?>
616
+			}
617
+		}
618
+
619
+		register_widget('geodirsubscribeWidget');
620
+
621
+		/**
622
+		 * GeoDirectory advertise widget.
623
+		 *
624
+		 * @since 1.0.0
625
+		 */
626
+		class geodiradvtwidget extends WP_Widget
627
+		{
628
+
629
+			/**
630
+			 * Register the advertise widget with WordPress.
631
+			 *
632
+			 * @since 1.0.0
633
+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
634
+			 */
635
+			public function __construct() {
636
+				$widget_ops = array('classname' => 'GeoDirectory Advertise', 'description' => __('GD > common advertise widget in sidebar, bottom section', 'geodirectory'));
637
+				parent::__construct(
638
+					'advtwidget', // Base ID
639
+					__('GD > Advertise', 'geodirectory'), // Name
640
+					$widget_ops// Args
641
+				);
642
+			}
643
+
644
+
645
+			/**
646
+			 * Front-end display content for advertise widget.
647
+			 *
648
+			 * @since 1.0.0
649
+			 * @since 1.5.1 Declare function public.
650
+			 *
651
+			 * @param array $args     Widget arguments.
652
+			 * @param array $instance Saved values from database.
653
+			 */
654
+			public function widget($args, $instance)
655
+			{
656
+
657
+				// prints the widget
658
+
659
+				extract($args, EXTR_SKIP);
660
+
661
+				/**
662
+				 * Filter the description text.
663
+				 *
664
+				 * @since 1.0.0
665
+				 * @param string $desc1 The widget description text.
666
+				 */
667
+				$desc1 = empty($instance['desc1']) ? '&nbsp;' : apply_filters('widget_desc1', $instance['desc1']);
668
+				echo $before_widget;
669
+				?>
670 670
                 <?php if ($desc1 <> "") { ?>
671 671
                 <?php echo $desc1; ?>
672 672
             <?php }
673
-                echo $after_widget;
674
-            }
675
-
676
-            /**
677
-             * Sanitize advertise widget form values as they are saved.
678
-             *
679
-             * @since 1.0.0
680
-             * @since 1.5.1 Declare function public.
681
-             *
682
-             * @param array $new_instance Values just sent to be saved.
683
-             * @param array $old_instance Previously saved values from database.
684
-             *
685
-             * @return array Updated safe values to be saved.
686
-             */
687
-            public function update($new_instance, $old_instance)
688
-            {
689
-                //save the widget
690
-                $instance = $old_instance;
691
-                $instance['desc1'] = ($new_instance['desc1']);
692
-                return $instance;
693
-            }
694
-
695
-            /**
696
-             * Back-end advertise widget settings form.
697
-             *
698
-             * @since 1.0.0
699
-             * @since 1.5.1 Declare function public.
700
-             *
701
-             * @param array $instance Previously saved values from database.
702
-             * @return string|void
703
-             */
704
-            public function form($instance)
705
-            {
706
-                //widgetform in backend
707
-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
708
-
709
-                $desc1 = ($instance['desc1']);
710
-                ?>
673
+				echo $after_widget;
674
+			}
675
+
676
+			/**
677
+			 * Sanitize advertise widget form values as they are saved.
678
+			 *
679
+			 * @since 1.0.0
680
+			 * @since 1.5.1 Declare function public.
681
+			 *
682
+			 * @param array $new_instance Values just sent to be saved.
683
+			 * @param array $old_instance Previously saved values from database.
684
+			 *
685
+			 * @return array Updated safe values to be saved.
686
+			 */
687
+			public function update($new_instance, $old_instance)
688
+			{
689
+				//save the widget
690
+				$instance = $old_instance;
691
+				$instance['desc1'] = ($new_instance['desc1']);
692
+				return $instance;
693
+			}
694
+
695
+			/**
696
+			 * Back-end advertise widget settings form.
697
+			 *
698
+			 * @since 1.0.0
699
+			 * @since 1.5.1 Declare function public.
700
+			 *
701
+			 * @param array $instance Previously saved values from database.
702
+			 * @return string|void
703
+			 */
704
+			public function form($instance)
705
+			{
706
+				//widgetform in backend
707
+				$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
708
+
709
+				$desc1 = ($instance['desc1']);
710
+				?>
711 711
                 <p><label
712 712
                         for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory');?>
713 713
                         <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('desc1'); ?>"
@@ -715,65 +715,65 @@  discard block
 block discarded – undo
715 715
                 </p>
716 716
 
717 717
             <?php
718
-            }
719
-        }
720
-
721
-        register_widget('geodiradvtwidget');
722
-
723
-        /**
724
-         * GeoDirectory Flickr widget.
725
-         *
726
-         * @since 1.0.0
727
-         */
728
-        class GeodirFlickrWidget extends WP_Widget
729
-        {
730
-
731
-            /**
732
-             * Register the flickr widget with WordPress.
733
-             *
734
-             * @since 1.0.0
735
-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
736
-             */
737
-            public function __construct() {
738
-                $widget_ops = array('classname' => 'Geo Dir Flickr Photos ', 'description' => __('GD > Flickr Photos', 'geodirectory'));
739
-                parent::__construct(
740
-                    'widget_flickrwidget', // Base ID
741
-                    __('GD > Flickr Photos', 'geodirectory'), // Name
742
-                    $widget_ops// Args
743
-                );
744
-            }
745
-
746
-            /**
747
-             * Front-end display content for flickr widget.
748
-             *
749
-             * @since 1.0.0
750
-             * @since 1.5.1 Declare function public.
751
-             *
752
-             * @param array $args     Widget arguments.
753
-             * @param array $instance Saved values from database.
754
-             */
755
-            public function widget($args, $instance)
756
-            {
757
-
758
-                // prints the widget
759
-                extract($args, EXTR_SKIP);
760
-
761
-                echo $before_widget;
762
-
763
-                /** This filter is documented in geodirectory_widgets.php */
764
-                $id = empty($instance['id']) ? '&nbsp;' : apply_filters('widget_id', $instance['id']);
765
-
766
-                /**
767
-                 * Filter the widget number.
768
-                 *
769
-                 * This is used in the flicker widget to show how many images to show.
770
-                 *
771
-                 * @since 1.0.0
772
-                 * @param string $number The image count.
773
-                 */
774
-                $number = empty($instance['number']) ? '&nbsp;' : apply_filters('widget_number', $instance['number']);
775
-                echo $before_title . __('Photo Gallery', 'geodirectory') . $after_title;
776
-                ?>
718
+			}
719
+		}
720
+
721
+		register_widget('geodiradvtwidget');
722
+
723
+		/**
724
+		 * GeoDirectory Flickr widget.
725
+		 *
726
+		 * @since 1.0.0
727
+		 */
728
+		class GeodirFlickrWidget extends WP_Widget
729
+		{
730
+
731
+			/**
732
+			 * Register the flickr widget with WordPress.
733
+			 *
734
+			 * @since 1.0.0
735
+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
736
+			 */
737
+			public function __construct() {
738
+				$widget_ops = array('classname' => 'Geo Dir Flickr Photos ', 'description' => __('GD > Flickr Photos', 'geodirectory'));
739
+				parent::__construct(
740
+					'widget_flickrwidget', // Base ID
741
+					__('GD > Flickr Photos', 'geodirectory'), // Name
742
+					$widget_ops// Args
743
+				);
744
+			}
745
+
746
+			/**
747
+			 * Front-end display content for flickr widget.
748
+			 *
749
+			 * @since 1.0.0
750
+			 * @since 1.5.1 Declare function public.
751
+			 *
752
+			 * @param array $args     Widget arguments.
753
+			 * @param array $instance Saved values from database.
754
+			 */
755
+			public function widget($args, $instance)
756
+			{
757
+
758
+				// prints the widget
759
+				extract($args, EXTR_SKIP);
760
+
761
+				echo $before_widget;
762
+
763
+				/** This filter is documented in geodirectory_widgets.php */
764
+				$id = empty($instance['id']) ? '&nbsp;' : apply_filters('widget_id', $instance['id']);
765
+
766
+				/**
767
+				 * Filter the widget number.
768
+				 *
769
+				 * This is used in the flicker widget to show how many images to show.
770
+				 *
771
+				 * @since 1.0.0
772
+				 * @param string $number The image count.
773
+				 */
774
+				$number = empty($instance['number']) ? '&nbsp;' : apply_filters('widget_number', $instance['number']);
775
+				echo $before_title . __('Photo Gallery', 'geodirectory') . $after_title;
776
+				?>
777 777
 
778 778
                 <div class="geodir-flickr clearfix">
779 779
 
@@ -784,45 +784,45 @@  discard block
 block discarded – undo
784 784
 
785 785
 
786 786
                 <?php echo $after_widget;
787
-            }
788
-
789
-            /**
790
-             * Sanitize flickr widget form values as they are saved.
791
-             *
792
-             * @since 1.0.0
793
-             * @since 1.5.1 Declare function public.
794
-             *
795
-             * @param array $new_instance Values just sent to be saved.
796
-             * @param array $old_instance Previously saved values from database.
797
-             *
798
-             * @return array Updated safe values to be saved.
799
-             */
800
-            public function update($new_instance, $old_instance)
801
-            {
802
-                //save the widget
803
-                $instance = $old_instance;
804
-                $instance['id'] = strip_tags($new_instance['id']);
805
-                $instance['number'] = strip_tags($new_instance['number']);
806
-                return $instance;
807
-            }
808
-
809
-            /**
810
-             * Back-end flickr widget settings form.
811
-             *
812
-             * @since 1.0.0
813
-             * @since 1.5.1 Declare function public.
814
-             *
815
-             * @param array $instance Previously saved values from database.
816
-             * @return string|void
817
-             */
818
-            public function form($instance)
819
-            {
820
-
821
-                //widgetform in backend
822
-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));
823
-                $id = strip_tags($instance['id']);
824
-                $number = strip_tags($instance['number']);
825
-                ?>
787
+			}
788
+
789
+			/**
790
+			 * Sanitize flickr widget form values as they are saved.
791
+			 *
792
+			 * @since 1.0.0
793
+			 * @since 1.5.1 Declare function public.
794
+			 *
795
+			 * @param array $new_instance Values just sent to be saved.
796
+			 * @param array $old_instance Previously saved values from database.
797
+			 *
798
+			 * @return array Updated safe values to be saved.
799
+			 */
800
+			public function update($new_instance, $old_instance)
801
+			{
802
+				//save the widget
803
+				$instance = $old_instance;
804
+				$instance['id'] = strip_tags($new_instance['id']);
805
+				$instance['number'] = strip_tags($new_instance['number']);
806
+				return $instance;
807
+			}
808
+
809
+			/**
810
+			 * Back-end flickr widget settings form.
811
+			 *
812
+			 * @since 1.0.0
813
+			 * @since 1.5.1 Declare function public.
814
+			 *
815
+			 * @param array $instance Previously saved values from database.
816
+			 * @return string|void
817
+			 */
818
+			public function form($instance)
819
+			{
820
+
821
+				//widgetform in backend
822
+				$instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));
823
+				$id = strip_tags($instance['id']);
824
+				$number = strip_tags($instance['number']);
825
+				?>
826 826
 
827 827
                 <p>
828 828
                     <label
@@ -843,99 +843,99 @@  discard block
 block discarded – undo
843 843
                     </label>
844 844
                 </p>
845 845
             <?php
846
-            }
847
-        }
848
-
849
-        register_widget('GeodirFlickrWidget');
850
-
851
-        /**
852
-         * GeoDirectory Twitter widget.
853
-         *
854
-         * @since 1.0.0
855
-         */
856
-        class geodir_twitter extends WP_Widget
857
-        {
858
-            /**
859
-             * Register the Twitter widget with WordPress.
860
-             *
861
-             * @since 1.0.0
862
-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
863
-             */
864
-            public function __construct() {
865
-                $widget_ops = array('classname' => 'Twitter', 'description' => __('GD > Twitter Feed', 'geodirectory'));
866
-                parent::__construct(
867
-                    'widget_Twidget', // Base ID
868
-                    __('GD > Twitter', 'geodirectory'), // Name
869
-                    $widget_ops// Args
870
-                );
871
-            }
872
-
873
-
874
-            /**
875
-             * Front-end display content for Twitter widget.
876
-             *
877
-             * @since 1.0.0
878
-             * @since 1.5.1 Declare function public.
879
-             *
880
-             * @param array $args     Widget arguments.
881
-             * @param array $instance Saved values from database.
882
-             */
883
-            public function widget($args, $instance)
884
-            {
885
-
886
-                // prints the widget
887
-
888
-                extract($args, EXTR_SKIP);
889
-
890
-                /**
891
-                 * Filter the twitter widget description text.
892
-                 *
893
-                 * @since 1.0.0
894
-                 * @param string $desc1 The widget description text.
895
-                 */
896
-                $desc1 = empty($instance['gd_tw_desc1']) ? '&nbsp;' : apply_filters('gd_tw_widget_desc1', $instance['gd_tw_desc1']);
897
-                echo $before_widget;
898
-                if ($desc1 <> "") {
899
-                    echo $desc1;
900
-                }
901
-                echo $after_widget;
902
-            }
903
-
904
-            /**
905
-             * Sanitize twitter widget form values as they are saved.
906
-             *
907
-             * @since 1.0.0
908
-             * @since 1.5.1 Declare function public.
909
-             *
910
-             * @param array $new_instance Values just sent to be saved.
911
-             * @param array $old_instance Previously saved values from database.
912
-             *
913
-             * @return array Updated safe values to be saved.
914
-             */
915
-            public function update($new_instance, $old_instance)
916
-            {
917
-                //save the widget
918
-                $instance = $old_instance;
919
-                $instance['gd_tw_desc1'] = ($new_instance['gd_tw_desc1']);
920
-                return $instance;
921
-            }
922
-
923
-            /**
924
-             * Back-end twitter widget settings form.
925
-             *
926
-             * @since 1.0.0
927
-             * @since 1.5.1 Declare function public.
928
-             *
929
-             * @param array $instance Previously saved values from database.
930
-             * @return string|void
931
-             */
932
-            public function form($instance)
933
-            {
934
-                //widgetform in backend
935
-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));
936
-
937
-                $desc1 = ($instance['gd_tw_desc1']);
938
-                ?>
846
+			}
847
+		}
848
+
849
+		register_widget('GeodirFlickrWidget');
850
+
851
+		/**
852
+		 * GeoDirectory Twitter widget.
853
+		 *
854
+		 * @since 1.0.0
855
+		 */
856
+		class geodir_twitter extends WP_Widget
857
+		{
858
+			/**
859
+			 * Register the Twitter widget with WordPress.
860
+			 *
861
+			 * @since 1.0.0
862
+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
863
+			 */
864
+			public function __construct() {
865
+				$widget_ops = array('classname' => 'Twitter', 'description' => __('GD > Twitter Feed', 'geodirectory'));
866
+				parent::__construct(
867
+					'widget_Twidget', // Base ID
868
+					__('GD > Twitter', 'geodirectory'), // Name
869
+					$widget_ops// Args
870
+				);
871
+			}
872
+
873
+
874
+			/**
875
+			 * Front-end display content for Twitter widget.
876
+			 *
877
+			 * @since 1.0.0
878
+			 * @since 1.5.1 Declare function public.
879
+			 *
880
+			 * @param array $args     Widget arguments.
881
+			 * @param array $instance Saved values from database.
882
+			 */
883
+			public function widget($args, $instance)
884
+			{
885
+
886
+				// prints the widget
887
+
888
+				extract($args, EXTR_SKIP);
889
+
890
+				/**
891
+				 * Filter the twitter widget description text.
892
+				 *
893
+				 * @since 1.0.0
894
+				 * @param string $desc1 The widget description text.
895
+				 */
896
+				$desc1 = empty($instance['gd_tw_desc1']) ? '&nbsp;' : apply_filters('gd_tw_widget_desc1', $instance['gd_tw_desc1']);
897
+				echo $before_widget;
898
+				if ($desc1 <> "") {
899
+					echo $desc1;
900
+				}
901
+				echo $after_widget;
902
+			}
903
+
904
+			/**
905
+			 * Sanitize twitter widget form values as they are saved.
906
+			 *
907
+			 * @since 1.0.0
908
+			 * @since 1.5.1 Declare function public.
909
+			 *
910
+			 * @param array $new_instance Values just sent to be saved.
911
+			 * @param array $old_instance Previously saved values from database.
912
+			 *
913
+			 * @return array Updated safe values to be saved.
914
+			 */
915
+			public function update($new_instance, $old_instance)
916
+			{
917
+				//save the widget
918
+				$instance = $old_instance;
919
+				$instance['gd_tw_desc1'] = ($new_instance['gd_tw_desc1']);
920
+				return $instance;
921
+			}
922
+
923
+			/**
924
+			 * Back-end twitter widget settings form.
925
+			 *
926
+			 * @since 1.0.0
927
+			 * @since 1.5.1 Declare function public.
928
+			 *
929
+			 * @param array $instance Previously saved values from database.
930
+			 * @return string|void
931
+			 */
932
+			public function form($instance)
933
+			{
934
+				//widgetform in backend
935
+				$instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));
936
+
937
+				$desc1 = ($instance['gd_tw_desc1']);
938
+				?>
939 939
                 <p><label
940 940
                         for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory');?>
941 941
                         <textarea class="widefat" rows="6" cols="20"
@@ -944,179 +944,179 @@  discard block
 block discarded – undo
944 944
                 </p>
945 945
 
946 946
             <?php
947
-            }
948
-        }
949
-
950
-        register_widget('geodir_twitter');
951
-
952
-        /**
953
-         * GeoDirectory Advanced Search widget.
954
-         *
955
-         * @since 1.0.0
956
-         */
957
-        class geodir_advance_search_widget extends WP_Widget
958
-        {
959
-            /**
960
-             * Register the advanced search widget with WordPress.
961
-             *
962
-             * @since 1.0.0
963
-             * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
964
-             */
965
-            public function __construct() {
966
-                $widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'),'post_type'=>'');
967
-                parent::__construct(
968
-                    'geodir_advance_search', // Base ID
969
-                    __('GD > Search', 'geodirectory'), // Name
970
-                    $widget_ops// Args
971
-                );
972
-            }
973
-
974
-
975
-            /**
976
-             * Front-end display content for advanced search widget.
977
-             *
978
-             * @since 1.0.0
979
-             * @since 1.5.1 Declare function public.
980
-             *
981
-             * @param array $args     Widget arguments.
982
-             * @param array $instance Saved values from database.
983
-             */
984
-            public function widget($args, $instance)
985
-            {
986
-                /**
987
-                 * Filter the search widget arguments.
988
-                 *
989
-                 * @since 1.5.7
990
-                 * @param array $args The widget arguments.
991
-                 * @param array $instance The widget instance.
992
-                 */
993
-                $args = apply_filters('widget_geodir_advance_search_args',$args,$instance);
994
-
995
-                // prints the widget
996
-                extract($args, EXTR_SKIP);
997
-
998
-                if(isset($post_type) && $post_type){
999
-                    geodir_get_search_post_type($post_type);// set the post type
1000
-                }else{
1001
-                    geodir_get_search_post_type();// set the post type
1002
-                }
1003
-
1004
-                echo $before_widget;
1005
-
1006
-                /** This filter is documented in geodirectory_widgets.php */
1007
-                $title = empty($instance['title']) ? __('Search', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
1008
-
1009
-                geodir_get_template_part('listing', 'filter-form');
1010
-
1011
-                echo $after_widget;
1012
-
1013
-                // after outputing the search reset the CPT
1014
-                global $geodir_search_post_type;
1015
-                $geodir_search_post_type = '';
1016
-            }
1017
-
1018
-            /**
1019
-             * Sanitize advanced search widget form values as they are saved.
1020
-             *
1021
-             * @since 1.0.0
1022
-             * @since 1.5.1 Declare function public.
1023
-             *
1024
-             * @param array $new_instance Values just sent to be saved.
1025
-             * @param array $old_instance Previously saved values from database.
1026
-             *
1027
-             * @return array Updated safe values to be saved.
1028
-             */
1029
-            public function update($new_instance, $old_instance)
1030
-            {
1031
-                //save the widget
1032
-                //Nothing to save
1033
-                return isset($instance) ? $instance : array();
1034
-            }
1035
-
1036
-            /**
1037
-             * Back-end advanced search widget settings form.
1038
-             *
1039
-             * @since 1.0.0
1040
-             * @since 1.5.1 Declare function public.
1041
-             *
1042
-             * @param array $instance Previously saved values from database.
1043
-             * @return string|void
1044
-             */
1045
-            public function form($instance)
1046
-            {
1047
-                //widgetform in backend
1048
-                echo __("This is a search widget to show advance search for gedodirectory listings.", 'geodirectory');
1049
-            }
1050
-        }
1051
-
1052
-        register_widget('geodir_advance_search_widget');
1053
-
1054
-
1055
-        /**
1056
-         * Contains all functions for popular widget.
1057
-         *
1058
-         * @since 1.0.0
1059
-         * @package GeoDirectory
1060
-         */
1061
-        include_once('geodirectory-widgets/geodirectory_popular_widget.php');
1062
-        /**
1063
-         * Contains all functions for listing slider widget.
1064
-         *
1065
-         * @since 1.0.0
1066
-         * @package GeoDirectory
1067
-         */
1068
-        include_once('geodirectory-widgets/geodirectory_listing_slider_widget.php');
1069
-        /**
1070
-         * Contains all functions for home map widget.
1071
-         *
1072
-         * @since 1.0.0
1073
-         * @package GeoDirectory
1074
-         */
1075
-        include_once('geodirectory-widgets/home_map_widget.php');
1076
-        /**
1077
-         * Contains all functions for listing map widget.
1078
-         *
1079
-         * @since 1.0.0
1080
-         * @package GeoDirectory
1081
-         */
1082
-        include_once('geodirectory-widgets/listing_map_widget.php');
1083
-        /**
1084
-         * Contains all functions for reviews widget.
1085
-         *
1086
-         * @since 1.0.0
1087
-         * @package GeoDirectory
1088
-         */
1089
-        include_once('geodirectory-widgets/geodirectory_reviews_widget.php');
1090
-        /**
1091
-         * Contains all functions for related listing widget.
1092
-         *
1093
-         * @since 1.0.0
1094
-         * @package GeoDirectory
1095
-         */
1096
-        include_once('geodirectory-widgets/geodirectory_related_listing_widget.php');
1097
-        /**
1098
-         * Contains all functions for bestof widget.
1099
-         *
1100
-         * @since 1.0.0
1101
-         * @package GeoDirectory
1102
-         */
1103
-        include_once('geodirectory-widgets/geodirectory_bestof_widget.php');
947
+			}
948
+		}
949
+
950
+		register_widget('geodir_twitter');
951
+
952
+		/**
953
+		 * GeoDirectory Advanced Search widget.
954
+		 *
955
+		 * @since 1.0.0
956
+		 */
957
+		class geodir_advance_search_widget extends WP_Widget
958
+		{
959
+			/**
960
+			 * Register the advanced search widget with WordPress.
961
+			 *
962
+			 * @since 1.0.0
963
+			 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
964
+			 */
965
+			public function __construct() {
966
+				$widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'),'post_type'=>'');
967
+				parent::__construct(
968
+					'geodir_advance_search', // Base ID
969
+					__('GD > Search', 'geodirectory'), // Name
970
+					$widget_ops// Args
971
+				);
972
+			}
973
+
974
+
975
+			/**
976
+			 * Front-end display content for advanced search widget.
977
+			 *
978
+			 * @since 1.0.0
979
+			 * @since 1.5.1 Declare function public.
980
+			 *
981
+			 * @param array $args     Widget arguments.
982
+			 * @param array $instance Saved values from database.
983
+			 */
984
+			public function widget($args, $instance)
985
+			{
986
+				/**
987
+				 * Filter the search widget arguments.
988
+				 *
989
+				 * @since 1.5.7
990
+				 * @param array $args The widget arguments.
991
+				 * @param array $instance The widget instance.
992
+				 */
993
+				$args = apply_filters('widget_geodir_advance_search_args',$args,$instance);
994
+
995
+				// prints the widget
996
+				extract($args, EXTR_SKIP);
997
+
998
+				if(isset($post_type) && $post_type){
999
+					geodir_get_search_post_type($post_type);// set the post type
1000
+				}else{
1001
+					geodir_get_search_post_type();// set the post type
1002
+				}
1003
+
1004
+				echo $before_widget;
1005
+
1006
+				/** This filter is documented in geodirectory_widgets.php */
1007
+				$title = empty($instance['title']) ? __('Search', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));
1008
+
1009
+				geodir_get_template_part('listing', 'filter-form');
1010
+
1011
+				echo $after_widget;
1012
+
1013
+				// after outputing the search reset the CPT
1014
+				global $geodir_search_post_type;
1015
+				$geodir_search_post_type = '';
1016
+			}
1017
+
1018
+			/**
1019
+			 * Sanitize advanced search widget form values as they are saved.
1020
+			 *
1021
+			 * @since 1.0.0
1022
+			 * @since 1.5.1 Declare function public.
1023
+			 *
1024
+			 * @param array $new_instance Values just sent to be saved.
1025
+			 * @param array $old_instance Previously saved values from database.
1026
+			 *
1027
+			 * @return array Updated safe values to be saved.
1028
+			 */
1029
+			public function update($new_instance, $old_instance)
1030
+			{
1031
+				//save the widget
1032
+				//Nothing to save
1033
+				return isset($instance) ? $instance : array();
1034
+			}
1035
+
1036
+			/**
1037
+			 * Back-end advanced search widget settings form.
1038
+			 *
1039
+			 * @since 1.0.0
1040
+			 * @since 1.5.1 Declare function public.
1041
+			 *
1042
+			 * @param array $instance Previously saved values from database.
1043
+			 * @return string|void
1044
+			 */
1045
+			public function form($instance)
1046
+			{
1047
+				//widgetform in backend
1048
+				echo __("This is a search widget to show advance search for gedodirectory listings.", 'geodirectory');
1049
+			}
1050
+		}
1051
+
1052
+		register_widget('geodir_advance_search_widget');
1053
+
1054
+
1055
+		/**
1056
+		 * Contains all functions for popular widget.
1057
+		 *
1058
+		 * @since 1.0.0
1059
+		 * @package GeoDirectory
1060
+		 */
1061
+		include_once('geodirectory-widgets/geodirectory_popular_widget.php');
1062
+		/**
1063
+		 * Contains all functions for listing slider widget.
1064
+		 *
1065
+		 * @since 1.0.0
1066
+		 * @package GeoDirectory
1067
+		 */
1068
+		include_once('geodirectory-widgets/geodirectory_listing_slider_widget.php');
1069
+		/**
1070
+		 * Contains all functions for home map widget.
1071
+		 *
1072
+		 * @since 1.0.0
1073
+		 * @package GeoDirectory
1074
+		 */
1075
+		include_once('geodirectory-widgets/home_map_widget.php');
1076
+		/**
1077
+		 * Contains all functions for listing map widget.
1078
+		 *
1079
+		 * @since 1.0.0
1080
+		 * @package GeoDirectory
1081
+		 */
1082
+		include_once('geodirectory-widgets/listing_map_widget.php');
1083
+		/**
1084
+		 * Contains all functions for reviews widget.
1085
+		 *
1086
+		 * @since 1.0.0
1087
+		 * @package GeoDirectory
1088
+		 */
1089
+		include_once('geodirectory-widgets/geodirectory_reviews_widget.php');
1090
+		/**
1091
+		 * Contains all functions for related listing widget.
1092
+		 *
1093
+		 * @since 1.0.0
1094
+		 * @package GeoDirectory
1095
+		 */
1096
+		include_once('geodirectory-widgets/geodirectory_related_listing_widget.php');
1097
+		/**
1098
+		 * Contains all functions for bestof widget.
1099
+		 *
1100
+		 * @since 1.0.0
1101
+		 * @package GeoDirectory
1102
+		 */
1103
+		include_once('geodirectory-widgets/geodirectory_bestof_widget.php');
1104
+		/**
1105
+		 * Contains all functions for cpt categories widget.
1106
+		 *
1107
+		 * @since 1.5.4
1108
+		 * @package GeoDirectory
1109
+		 */
1110
+		include_once('geodirectory-widgets/geodirectory_cpt_categories_widget.php');
1104 1111
 		/**
1105
-         * Contains all functions for cpt categories widget.
1106
-         *
1107
-         * @since 1.5.4
1108
-         * @package GeoDirectory
1109
-         */
1110
-        include_once('geodirectory-widgets/geodirectory_cpt_categories_widget.php');
1111
-        /**
1112
-         * Contains all functions for features widget.
1113
-         *
1114
-         * @since 1.5.6
1115
-         * @package GeoDirectory
1116
-         * @todo make the image field recurring
1117
-         */
1118
-        include_once('geodirectory-widgets/geodirectory_features_widget.php');
1119
-    }
1112
+		 * Contains all functions for features widget.
1113
+		 *
1114
+		 * @since 1.5.6
1115
+		 * @package GeoDirectory
1116
+		 * @todo make the image field recurring
1117
+		 */
1118
+		include_once('geodirectory-widgets/geodirectory_features_widget.php');
1119
+	}
1120 1120
 
1121 1121
 }
1122 1122
 
Please login to merge, or discard this patch.
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
             public function form($instance)
302 302
             {
303 303
                 //widgetform in backend
304
-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
304
+                $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
305 305
                 $title = strip_tags($instance['title']);
306 306
 
307 307
                 ?>
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
                 ?>
374 374
 
375 375
                 <a href="http://twitter.com/share"
376
-                   class="twitter-share-button"><?php _e('Tweet', 'geodirectory');?></a>
376
+                   class="twitter-share-button"><?php _e('Tweet', 'geodirectory'); ?></a>
377 377
 
378 378
                 <script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>
379 379
 
@@ -443,7 +443,7 @@  discard block
 block discarded – undo
443 443
             public function form($instance)
444 444
             {
445 445
                 //widgetform in backend
446
-                $instance = wp_parse_args((array)$instance, array('title' => ''));
446
+                $instance = wp_parse_args((array) $instance, array('title' => ''));
447 447
                 $title = strip_tags($instance['title']);
448 448
                 ?>
449 449
                 <p>No settings for this widget</p>
@@ -515,11 +515,11 @@  discard block
 block discarded – undo
515 515
                 echo $before_widget;
516 516
                 ?>
517 517
 
518
-                <?php echo $before_title . $title; ?>  <a href="<?php if ($id) {
519
-                echo 'http://feeds2.feedburner.com/' . $id;
518
+                <?php echo $before_title.$title; ?>  <a href="<?php if ($id) {
519
+                echo 'http://feeds2.feedburner.com/'.$id;
520 520
             } else {
521 521
                 bloginfo('rss_url');
522
-            } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title;?>
522
+            } ?>"><i class="fa fa-rss-square"></i> </a><?php echo $after_title; ?>
523 523
 
524 524
                 <?php if ($text <> "") { ?>
525 525
 
@@ -584,7 +584,7 @@  discard block
 block discarded – undo
584 584
             public function form($instance)
585 585
             {
586 586
                 //widgetform in backend
587
-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));
587
+                $instance = wp_parse_args((array) $instance, array('title' => '', 'id' => '', 'advt1' => '', 'text' => '', 'twitter' => '', 'facebook' => '', 'digg' => '', 'myspace' => ''));
588 588
 
589 589
                 $id = strip_tags($instance['id']);
590 590
 
@@ -596,19 +596,19 @@  discard block
 block discarded – undo
596 596
 
597 597
                 ?>
598 598
                 <p><label
599
-                        for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'geodirectory');?>:
599
+                        for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'geodirectory'); ?>:
600 600
                         <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"
601 601
                                name="<?php echo $this->get_field_name('title'); ?>" type="text"
602 602
                                value="<?php echo esc_attr($title); ?>"/></label></p>
603 603
 
604 604
                 <p><label
605
-                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Feedburner ID (ex :- geotheme)', 'geodirectory');?>
605
+                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Feedburner ID (ex :- geotheme)', 'geodirectory'); ?>
606 606
                         : <input class="widefat" id="<?php echo $this->get_field_id('id'); ?>"
607 607
                                  name="<?php echo $this->get_field_name('id'); ?>" type="text"
608 608
                                  value="<?php echo esc_attr($id); ?>"/></label></p>
609 609
 
610 610
                 <p><label
611
-                        for="<?php echo $this->get_field_id('text'); ?>"><?php _e('Short Description', 'geodirectory');?>
611
+                        for="<?php echo $this->get_field_id('text'); ?>"><?php _e('Short Description', 'geodirectory'); ?>
612 612
                         <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('text'); ?>"
613 613
                                   name="<?php echo $this->get_field_name('text'); ?>"><?php echo esc_attr($text); ?></textarea></label>
614 614
                 </p>
@@ -704,12 +704,12 @@  discard block
 block discarded – undo
704 704
             public function form($instance)
705 705
             {
706 706
                 //widgetform in backend
707
-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
707
+                $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'desc1' => ''));
708 708
 
709 709
                 $desc1 = ($instance['desc1']);
710 710
                 ?>
711 711
                 <p><label
712
-                        for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory');?>
712
+                        for="<?php echo $this->get_field_id('desc1'); ?>"><?php _e('Your Advt code (ex.google adsense, etc.)', 'geodirectory'); ?>
713 713
                         <textarea class="widefat" rows="6" cols="20" id="<?php echo $this->get_field_id('desc1'); ?>"
714 714
                                   name="<?php echo $this->get_field_name('desc1'); ?>"><?php echo esc_attr($desc1); ?></textarea></label>
715 715
                 </p>
@@ -772,7 +772,7 @@  discard block
 block discarded – undo
772 772
                  * @param string $number The image count.
773 773
                  */
774 774
                 $number = empty($instance['number']) ? '&nbsp;' : apply_filters('widget_number', $instance['number']);
775
-                echo $before_title . __('Photo Gallery', 'geodirectory') . $after_title;
775
+                echo $before_title.__('Photo Gallery', 'geodirectory').$after_title;
776 776
                 ?>
777 777
 
778 778
                 <div class="geodir-flickr clearfix">
@@ -819,14 +819,14 @@  discard block
 block discarded – undo
819 819
             {
820 820
 
821 821
                 //widgetform in backend
822
-                $instance = wp_parse_args((array)$instance, array('title' => '', 'id' => '', 'number' => ''));
822
+                $instance = wp_parse_args((array) $instance, array('title' => '', 'id' => '', 'number' => ''));
823 823
                 $id = strip_tags($instance['id']);
824 824
                 $number = strip_tags($instance['number']);
825 825
                 ?>
826 826
 
827 827
                 <p>
828 828
                     <label
829
-                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Flickr ID', 'geodirectory');?>
829
+                        for="<?php echo $this->get_field_id('id'); ?>"><?php _e('Flickr ID', 'geodirectory'); ?>
830 830
                         (<a href="http://www.idgettr.com">idGettr</a>):
831 831
                         <input class="widefat" id="<?php echo $this->get_field_id('id'); ?>"
832 832
                                name="<?php echo $this->get_field_name('id'); ?>" type="text"
@@ -836,7 +836,7 @@  discard block
 block discarded – undo
836 836
 
837 837
                 <p>
838 838
                     <label
839
-                        for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of photos:', 'geodirectory');?>
839
+                        for="<?php echo $this->get_field_id('number'); ?>"><?php _e('Number of photos:', 'geodirectory'); ?>
840 840
                         <input class="widefat" id="<?php echo $this->get_field_id('number'); ?>"
841 841
                                name="<?php echo $this->get_field_name('number'); ?>" type="text"
842 842
                                value="<?php echo esc_attr($number); ?>"/>
@@ -932,12 +932,12 @@  discard block
 block discarded – undo
932 932
             public function form($instance)
933 933
             {
934 934
                 //widgetform in backend
935
-                $instance = wp_parse_args((array)$instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));
935
+                $instance = wp_parse_args((array) $instance, array('title' => '', 't1' => '', 't2' => '', 't3' => '', 'img1' => '', 'gd_tw_desc1' => ''));
936 936
 
937 937
                 $desc1 = ($instance['gd_tw_desc1']);
938 938
                 ?>
939 939
                 <p><label
940
-                        for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory');?>
940
+                        for="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"><?php _e('Your twitter code', 'geodirectory'); ?>
941 941
                         <textarea class="widefat" rows="6" cols="20"
942 942
                                   id="<?php echo $this->get_field_id('gd_tw_desc1'); ?>"
943 943
                                   name="<?php echo $this->get_field_name('gd_tw_desc1'); ?>"><?php echo esc_attr($desc1); ?></textarea></label>
@@ -963,7 +963,7 @@  discard block
 block discarded – undo
963 963
              * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.
964 964
              */
965 965
             public function __construct() {
966
-                $widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'),'post_type'=>'');
966
+                $widget_ops = array('classname' => 'geodir_advance_search_widget', 'description' => __('GD > Search', 'geodirectory'), 'post_type'=>'');
967 967
                 parent::__construct(
968 968
                     'geodir_advance_search', // Base ID
969 969
                     __('GD > Search', 'geodirectory'), // Name
@@ -990,15 +990,15 @@  discard block
 block discarded – undo
990 990
                  * @param array $args The widget arguments.
991 991
                  * @param array $instance The widget instance.
992 992
                  */
993
-                $args = apply_filters('widget_geodir_advance_search_args',$args,$instance);
993
+                $args = apply_filters('widget_geodir_advance_search_args', $args, $instance);
994 994
 
995 995
                 // prints the widget
996 996
                 extract($args, EXTR_SKIP);
997 997
 
998
-                if(isset($post_type) && $post_type){
999
-                    geodir_get_search_post_type($post_type);// set the post type
1000
-                }else{
1001
-                    geodir_get_search_post_type();// set the post type
998
+                if (isset($post_type) && $post_type) {
999
+                    geodir_get_search_post_type($post_type); // set the post type
1000
+                } else {
1001
+                    geodir_get_search_post_type(); // set the post type
1002 1002
                 }
1003 1003
 
1004 1004
                 echo $before_widget;
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -997,7 +997,7 @@
 block discarded – undo
997 997
 
998 998
                 if(isset($post_type) && $post_type){
999 999
                     geodir_get_search_post_type($post_type);// set the post type
1000
-                }else{
1000
+                } else{
1001 1001
                     geodir_get_search_post_type();// set the post type
1002 1002
                 }
1003 1003
 
Please login to merge, or discard this patch.
geodirectory-templates/geodir-information.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -12,27 +12,27 @@
 block discarded – undo
12 12
         <div class="clearfix">
13 13
             <div id="geodir_content">
14 14
                 <?php
15
-                /** This action is documented in geodirectory-templates/geodir-home.php */
16
-                do_action('geodir_add_page_content', 'before', 'info-page');
17
-                global $information;
18
-                echo '<h5 class="geodir_information">';
19
-                echo $information;
20
-                echo '</h5>';
21
-                /** This action is documented in geodirectory-templates/geodir-home.php */
22
-                do_action('geodir_add_page_content', 'after', 'info-page');
23
-                ?>
15
+				/** This action is documented in geodirectory-templates/geodir-home.php */
16
+				do_action('geodir_add_page_content', 'before', 'info-page');
17
+				global $information;
18
+				echo '<h5 class="geodir_information">';
19
+				echo $information;
20
+				echo '</h5>';
21
+				/** This action is documented in geodirectory-templates/geodir-home.php */
22
+				do_action('geodir_add_page_content', 'after', 'info-page');
23
+				?>
24 24
             </div>
25 25
             <!-- geodir_content ends here-->
26 26
             <div id="gd-sidebar-wrapper">
27 27
                 <div class="geodir-sidebar-main">
28 28
                     <div class="geodir-gd-sidebar">
29 29
                         <?php
30
-                        /**
31
-                         * Calls the author sidebar.
32
-                         *
33
-                         * @since 1.6.11
34
-                         */
35
-                        dynamic_sidebar('geodir_author_right_sidebar'); ?>
30
+						/**
31
+						 * Calls the author sidebar.
32
+						 *
33
+						 * @since 1.6.11
34
+						 */
35
+						dynamic_sidebar('geodir_author_right_sidebar'); ?>
36 36
                     </div>
37 37
                 </div>
38 38
             </div>
Please login to merge, or discard this patch.
geodirectory-admin/class.analytics.stats.php 4 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -223,6 +223,9 @@
 block discarded – undo
223 223
 	 * @param filter - the property to filter on
224 224
 	 * @param limit - the number of items to get
225 225
 	 * @param realtime - if the realtime api should be used
226
+	 * @param string $metric
227
+	 * @param string $startDate
228
+	 * @param string $endDate
226 229
 	 * @return the specific metrics in array form
227 230
 	 **/
228 231
 	function getMetrics($metric, $startDate, $endDate, $dimensions = false, $sort = false, $filter = false, $limit = false, $realtime = false)
Please login to merge, or discard this patch.
Indentation   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -30,135 +30,135 @@  discard block
 block discarded – undo
30 30
 			// Include the Google Service API
31 31
 			include_once('google-api-php-client/src/Google/autoload.php');
32 32
 
33
-            $this->client = new Google_Client();
34
-            $this->client->setApprovalPrompt("force");
35
-            $this->client->setAccessType('offline');
36
-            $this->client->setClientId(GEODIR_GA_CLIENTID);
37
-            $this->client->setClientSecret(GEODIR_GA_CLIENTSECRET);
38
-            $this->client->setRedirectUri(GEODIR_GA_REDIRECT);
33
+			$this->client = new Google_Client();
34
+			$this->client->setApprovalPrompt("force");
35
+			$this->client->setAccessType('offline');
36
+			$this->client->setClientId(GEODIR_GA_CLIENTID);
37
+			$this->client->setClientSecret(GEODIR_GA_CLIENTSECRET);
38
+			$this->client->setRedirectUri(GEODIR_GA_REDIRECT);
39 39
 			
40
-            $this->client->setScopes(array("https://www.googleapis.com/auth/analytics"));
41
-
42
-            try {
43
-                    $this->analytics = new Google_Service_Analytics($this->client);
44
-                }
45
-            catch (Google_ServiceException $e)
46
-                {
47
-                    print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
40
+			$this->client->setScopes(array("https://www.googleapis.com/auth/analytics"));
41
+
42
+			try {
43
+					$this->analytics = new Google_Service_Analytics($this->client);
44
+				}
45
+			catch (Google_ServiceException $e)
46
+				{
47
+					print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
48 48
 					return false;
49
-                }
49
+				}
50 50
 	}
51 51
 
52 52
 	function checkLogin()
53 53
 	{
54
-            $ga_google_authtoken = get_option('geodir_ga_auth_token');
54
+			$ga_google_authtoken = get_option('geodir_ga_auth_token');
55 55
 
56
-            if (!empty($ga_google_authtoken))
57
-            {
56
+			if (!empty($ga_google_authtoken))
57
+			{
58 58
 				try
59
-                {
60
-                    $this->client->setAccessToken($ga_google_authtoken);
59
+				{
60
+					$this->client->setAccessToken($ga_google_authtoken);
61 61
 				}
62 62
 				catch( Google_AuthException $e )
63
-                {
64
-                    print '(cas:72) GeoDirectory was unable to authenticate you with
63
+				{
64
+					print '(cas:72) GeoDirectory was unable to authenticate you with
65 65
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
66 66
                             This could mean either you pasted the token wrong, or the time/date on your server is wrong,
67 67
                             or an SSL issue preventing Google from Authenticating. <br><br>
68 68
                             <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage();
69 69
 
70
-                    return false;
71
-                }
72
-            }
73
-            else
74
-            {
75
-                $authCode = get_option('geodir_ga_auth_code');
76
-
77
-                if (empty($authCode)) return false;
78
-
79
-                try
80
-                {
81
-                    $accessToken = $this->client->authenticate($authCode);
82
-                }
83
-                catch( Exception $e )
84
-                {
85
-                    print '(cas:72) GeoDirectory was unable to authenticate you with
70
+					return false;
71
+				}
72
+			}
73
+			else
74
+			{
75
+				$authCode = get_option('geodir_ga_auth_code');
76
+
77
+				if (empty($authCode)) return false;
78
+
79
+				try
80
+				{
81
+					$accessToken = $this->client->authenticate($authCode);
82
+				}
83
+				catch( Exception $e )
84
+				{
85
+					print '(cas:72) GeoDirectory was unable to authenticate you with
86 86
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
87 87
                             This could mean either you pasted the token wrong, or the time/date on your server is wrong,
88 88
                             or an SSL issue preventing Google from Authenticating. <br><br>
89 89
                             <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage();
90 90
 
91
-                    return false;
92
-                }
93
-
94
-                if($accessToken)
95
-                {
96
-                    $this->client->setAccessToken($accessToken);
97
-                    update_option('geodir_ga_auth_token', $accessToken);
98
-                }
99
-                else
100
-                {
101
-                    return false;
102
-                }
103
-            }
104
-
105
-            $this->token =  $this->client->getAccessToken();
106
-            return true;
91
+					return false;
92
+				}
93
+
94
+				if($accessToken)
95
+				{
96
+					$this->client->setAccessToken($accessToken);
97
+					update_option('geodir_ga_auth_token', $accessToken);
98
+				}
99
+				else
100
+				{
101
+					return false;
102
+				}
103
+			}
104
+
105
+			$this->token =  $this->client->getAccessToken();
106
+			return true;
107 107
 	}
108 108
 
109 109
 	function deauthorize()
110 110
 	{
111
-            update_option('geodir_ga_auth_code', '');
112
-            update_option('geodir_ga_auth_token', '');
111
+			update_option('geodir_ga_auth_code', '');
112
+			update_option('geodir_ga_auth_token', '');
113 113
 	}
114 114
 
115 115
 	function getSingleProfile()
116 116
 	{
117
-            $webproperty_id = get_option('geodir_ga_account_id');
118
-            list($pre, $account_id, $post) = explode('-',$webproperty_id);
119
-
120
-            if (empty($webproperty_id)) return false;
121
-
122
-            try {
123
-                $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id);
124
-            }
125
-            catch (Google_ServiceException $e)
126
-            {
127
-                print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
128
-                return false;
129
-            }
130
-
131
-            $profile_id = $profiles->items[0]->id;
132
-            if (empty($profile_id)) return false;
133
-
134
-            $account_array = array();
135
-            array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id));
136
-            return $account_array;
117
+			$webproperty_id = get_option('geodir_ga_account_id');
118
+			list($pre, $account_id, $post) = explode('-',$webproperty_id);
119
+
120
+			if (empty($webproperty_id)) return false;
121
+
122
+			try {
123
+				$profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id);
124
+			}
125
+			catch (Google_ServiceException $e)
126
+			{
127
+				print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
128
+				return false;
129
+			}
130
+
131
+			$profile_id = $profiles->items[0]->id;
132
+			if (empty($profile_id)) return false;
133
+
134
+			$account_array = array();
135
+			array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id));
136
+			return $account_array;
137 137
 	}
138 138
 
139
-        function getAllProfiles()
140
-        {
141
-            $profile_array = array();
139
+		function getAllProfiles()
140
+		{
141
+			$profile_array = array();
142 142
             
143
-            try {
144
-                    $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all');
145
-                }
146
-                catch (Google_ServiceException $e)
147
-                {
148
-                    print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
149
-                }
150
-
151
-
152
-            if( !empty( $profiles->items ) )
153
-            {
154
-                foreach( $profiles->items as $profile )
155
-                {
156
-                    $profile_array[ $profile->id ] = str_replace('http://','',$profile->name );
157
-                }
158
-            }
159
-
160
-            return $profile_array;
161
-        }
143
+			try {
144
+					$profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all');
145
+				}
146
+				catch (Google_ServiceException $e)
147
+				{
148
+					print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
149
+				}
150
+
151
+
152
+			if( !empty( $profiles->items ) )
153
+			{
154
+				foreach( $profiles->items as $profile )
155
+				{
156
+					$profile_array[ $profile->id ] = str_replace('http://','',$profile->name );
157
+				}
158
+			}
159
+
160
+			return $profile_array;
161
+		}
162 162
 
163 163
 	function getAnalyticsAccounts()
164 164
 	{
@@ -241,13 +241,13 @@  discard block
 block discarded – undo
241 241
 			$params['max-results'] = $limit;
242 242
 		}
243 243
            
244
-           // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking
245
-           $filtered_id = str_replace( 'ga:', '', $this->accountId );
244
+		   // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking
245
+		   $filtered_id = str_replace( 'ga:', '', $this->accountId );
246 246
            
247
-           if(!$filtered_id){
248
-                echo 'Error - Account ID is blank';
249
-                return false;
250
-           }
247
+		   if(!$filtered_id){
248
+				echo 'Error - Account ID is blank';
249
+				return false;
250
+		   }
251 251
 
252 252
 		if($realtime){
253 253
 			return $analytics->data_realtime->get(
Please login to merge, or discard this patch.
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
                 }
45 45
             catch (Google_ServiceException $e)
46 46
                 {
47
-                    print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
47
+                    print '(cas:48) There was an Analytics API service error '.$e->getCode().':'.$e->getMessage();
48 48
 					return false;
49 49
                 }
50 50
 	}
@@ -59,13 +59,13 @@  discard block
 block discarded – undo
59 59
                 {
60 60
                     $this->client->setAccessToken($ga_google_authtoken);
61 61
 				}
62
-				catch( Google_AuthException $e )
62
+				catch (Google_AuthException $e)
63 63
                 {
64 64
                     print '(cas:72) GeoDirectory was unable to authenticate you with
65 65
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
66 66
                             This could mean either you pasted the token wrong, or the time/date on your server is wrong,
67 67
                             or an SSL issue preventing Google from Authenticating. <br><br>
68
-                            <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage();
68
+                            <br><br><strong>Tech Info </strong> ' . $e->getCode().':'.$e->getMessage();
69 69
 
70 70
                     return false;
71 71
                 }
@@ -80,18 +80,18 @@  discard block
 block discarded – undo
80 80
                 {
81 81
                     $accessToken = $this->client->authenticate($authCode);
82 82
                 }
83
-                catch( Exception $e )
83
+                catch (Exception $e)
84 84
                 {
85 85
                     print '(cas:72) GeoDirectory was unable to authenticate you with
86 86
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
87 87
                             This could mean either you pasted the token wrong, or the time/date on your server is wrong,
88 88
                             or an SSL issue preventing Google from Authenticating. <br><br>
89
-                            <br><br><strong>Tech Info </strong> ' . $e->getCode() . ':' . $e->getMessage();
89
+                            <br><br><strong>Tech Info </strong> ' . $e->getCode().':'.$e->getMessage();
90 90
 
91 91
                     return false;
92 92
                 }
93 93
 
94
-                if($accessToken)
94
+                if ($accessToken)
95 95
                 {
96 96
                     $this->client->setAccessToken($accessToken);
97 97
                     update_option('geodir_ga_auth_token', $accessToken);
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
                 }
103 103
             }
104 104
 
105
-            $this->token =  $this->client->getAccessToken();
105
+            $this->token = $this->client->getAccessToken();
106 106
             return true;
107 107
 	}
108 108
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	function getSingleProfile()
116 116
 	{
117 117
             $webproperty_id = get_option('geodir_ga_account_id');
118
-            list($pre, $account_id, $post) = explode('-',$webproperty_id);
118
+            list($pre, $account_id, $post) = explode('-', $webproperty_id);
119 119
 
120 120
             if (empty($webproperty_id)) return false;
121 121
 
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
             }
125 125
             catch (Google_ServiceException $e)
126 126
             {
127
-                print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
127
+                print 'There was an Analytics API service error '.$e->getCode().': '.$e->getMessage();
128 128
                 return false;
129 129
             }
130 130
 
@@ -145,15 +145,15 @@  discard block
 block discarded – undo
145 145
                 }
146 146
                 catch (Google_ServiceException $e)
147 147
                 {
148
-                    print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
148
+                    print 'There was an Analytics API service error '.$e->getCode().': '.$e->getMessage();
149 149
                 }
150 150
 
151 151
 
152
-            if( !empty( $profiles->items ) )
152
+            if (!empty($profiles->items))
153 153
             {
154
-                foreach( $profiles->items as $profile )
154
+                foreach ($profiles->items as $profile)
155 155
                 {
156
-                    $profile_array[ $profile->id ] = str_replace('http://','',$profile->name );
156
+                    $profile_array[$profile->id] = str_replace('http://', '', $profile->name);
157 157
                 }
158 158
             }
159 159
 
@@ -242,20 +242,20 @@  discard block
 block discarded – undo
242 242
 		}
243 243
            
244 244
            // Just incase, the ga: is still used in the account id, strip it out to prevent it breaking
245
-           $filtered_id = str_replace( 'ga:', '', $this->accountId );
245
+           $filtered_id = str_replace('ga:', '', $this->accountId);
246 246
            
247
-           if(!$filtered_id){
247
+           if (!$filtered_id) {
248 248
                 echo 'Error - Account ID is blank';
249 249
                 return false;
250 250
            }
251 251
 
252
-		if($realtime){
252
+		if ($realtime) {
253 253
 			return $analytics->data_realtime->get(
254 254
 				'ga:'.$filtered_id,
255 255
 				$metric,
256 256
 				$params
257 257
 			);
258
-		}else{
258
+		} else {
259 259
 			return $analytics->data_ga->get(
260 260
 				'ga:'.$filtered_id,
261 261
 				$startDate,
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 	 **/
280 280
 	function verifyStartDate($date)
281 281
 	{
282
-		if ( strtotime($date) > strtotime('2005-01-01') )
282
+		if (strtotime($date) > strtotime('2005-01-01'))
283 283
 			return $date;
284 284
 		else
285 285
 			return '2005-01-01';
Please login to merge, or discard this patch.
Braces   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -41,8 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
             try {
43 43
                     $this->analytics = new Google_Service_Analytics($this->client);
44
-                }
45
-            catch (Google_ServiceException $e)
44
+                } catch (Google_ServiceException $e)
46 45
                 {
47 46
                     print '(cas:48) There was an Analytics API service error ' . $e->getCode() . ':' . $e->getMessage();
48 47
 					return false;
@@ -58,8 +57,7 @@  discard block
 block discarded – undo
58 57
 				try
59 58
                 {
60 59
                     $this->client->setAccessToken($ga_google_authtoken);
61
-				}
62
-				catch( Google_AuthException $e )
60
+				} catch( Google_AuthException $e )
63 61
                 {
64 62
                     print '(cas:72) GeoDirectory was unable to authenticate you with
65 63
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
@@ -69,18 +67,18 @@  discard block
 block discarded – undo
69 67
 
70 68
                     return false;
71 69
                 }
72
-            }
73
-            else
70
+            } else
74 71
             {
75 72
                 $authCode = get_option('geodir_ga_auth_code');
76 73
 
77
-                if (empty($authCode)) return false;
74
+                if (empty($authCode)) {
75
+                	return false;
76
+                }
78 77
 
79 78
                 try
80 79
                 {
81 80
                     $accessToken = $this->client->authenticate($authCode);
82
-                }
83
-                catch( Exception $e )
81
+                } catch( Exception $e )
84 82
                 {
85 83
                     print '(cas:72) GeoDirectory was unable to authenticate you with
86 84
                             Google using the Auth Token you pasted into the input box on the previous step. <br><br>
@@ -95,8 +93,7 @@  discard block
 block discarded – undo
95 93
                 {
96 94
                     $this->client->setAccessToken($accessToken);
97 95
                     update_option('geodir_ga_auth_token', $accessToken);
98
-                }
99
-                else
96
+                } else
100 97
                 {
101 98
                     return false;
102 99
                 }
@@ -117,19 +114,22 @@  discard block
 block discarded – undo
117 114
             $webproperty_id = get_option('geodir_ga_account_id');
118 115
             list($pre, $account_id, $post) = explode('-',$webproperty_id);
119 116
 
120
-            if (empty($webproperty_id)) return false;
117
+            if (empty($webproperty_id)) {
118
+            	return false;
119
+            }
121 120
 
122 121
             try {
123 122
                 $profiles = $this->analytics->management_profiles->listManagementProfiles($account_id, $webproperty_id);
124
-            }
125
-            catch (Google_ServiceException $e)
123
+            } catch (Google_ServiceException $e)
126 124
             {
127 125
                 print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
128 126
                 return false;
129 127
             }
130 128
 
131 129
             $profile_id = $profiles->items[0]->id;
132
-            if (empty($profile_id)) return false;
130
+            if (empty($profile_id)) {
131
+            	return false;
132
+            }
133 133
 
134 134
             $account_array = array();
135 135
             array_push($account_array, array('id'=>$profile_id, 'ga:webPropertyId'=>$webproperty_id));
@@ -142,8 +142,7 @@  discard block
 block discarded – undo
142 142
             
143 143
             try {
144 144
                     $profiles = $this->analytics->management_webproperties->listManagementWebproperties('~all');
145
-                }
146
-                catch (Google_ServiceException $e)
145
+                } catch (Google_ServiceException $e)
147 146
                 {
148 147
                     print 'There was an Analytics API service error ' . $e->getCode() . ': ' . $e->getMessage();
149 148
                 }
@@ -255,7 +254,7 @@  discard block
 block discarded – undo
255 254
 				$metric,
256 255
 				$params
257 256
 			);
258
-		}else{
257
+		} else{
259 258
 			return $analytics->data_ga->get(
260 259
 				'ga:'.$filtered_id,
261 260
 				$startDate,
@@ -279,10 +278,11 @@  discard block
 block discarded – undo
279 278
 	 **/
280 279
 	function verifyStartDate($date)
281 280
 	{
282
-		if ( strtotime($date) > strtotime('2005-01-01') )
283
-			return $date;
284
-		else
285
-			return '2005-01-01';
281
+		if ( strtotime($date) > strtotime('2005-01-01') ) {
282
+					return $date;
283
+		} else {
284
+					return '2005-01-01';
285
+		}
286 286
 	}
287 287
 
288 288
 } // END class	
289 289
\ No newline at end of file
Please login to merge, or discard this patch.
geodirectory-functions/google_analytics.php 4 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -55,7 +55,7 @@
 block discarded – undo
55 55
  * @param string $page Page url to use in analytics filters.
56 56
  * @param bool   $ga_start The start date of the data to include in YYYY-MM-DD format.
57 57
  * @param bool   $ga_end The end date of the data to include in YYYY-MM-DD format.
58
- * @return string Html text content.
58
+ * @return false|null Html text content.
59 59
  */
60 60
 function geodir_getGoogleAnalytics($page, $ga_start, $ga_end)
61 61
 {
Please login to merge, or discard this patch.
Indentation   +128 added lines, -128 removed lines patch added patch discarded remove patch
@@ -17,34 +17,34 @@  discard block
 block discarded – undo
17 17
  */
18 18
 function geodir_sec2hms($sec, $padHours = false)
19 19
 {
20
-    // holds formatted string
21
-    $hms = "";
22
-    // there are 3600 seconds in an hour, so if we
23
-    // divide total seconds by 3600 and throw away
24
-    // the remainder, we've got the number of hours
25
-    $hours = intval(intval($sec) / 3600);
26
-
27
-    // add to $hms, with a leading 0 if asked for
28
-    $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':';
29
-
30
-    // dividing the total seconds by 60 will give us
31
-    // the number of minutes, but we're interested in
32
-    // minutes past the hour: to get that, we need to
33
-    // divide by 60 again and keep the remainder
34
-    $minutes = intval(($sec / 60) % 60);
35
-
36
-    // then add to $hms (with a leading 0 if needed)
37
-    $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':';
38
-
39
-    // seconds are simple - just divide the total
40
-    // seconds by 60 and keep the remainder
41
-    $seconds = intval($sec % 60);
42
-
43
-    // add to $hms, again with a leading 0 if needed
44
-    $hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT);
45
-
46
-    // done!
47
-    return $hms;
20
+	// holds formatted string
21
+	$hms = "";
22
+	// there are 3600 seconds in an hour, so if we
23
+	// divide total seconds by 3600 and throw away
24
+	// the remainder, we've got the number of hours
25
+	$hours = intval(intval($sec) / 3600);
26
+
27
+	// add to $hms, with a leading 0 if asked for
28
+	$hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':';
29
+
30
+	// dividing the total seconds by 60 will give us
31
+	// the number of minutes, but we're interested in
32
+	// minutes past the hour: to get that, we need to
33
+	// divide by 60 again and keep the remainder
34
+	$minutes = intval(($sec / 60) % 60);
35
+
36
+	// then add to $hms (with a leading 0 if needed)
37
+	$hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':';
38
+
39
+	// seconds are simple - just divide the total
40
+	// seconds by 60 and keep the remainder
41
+	$seconds = intval($sec % 60);
42
+
43
+	// add to $hms, again with a leading 0 if needed
44
+	$hms .= str_pad($seconds, 2, "0", STR_PAD_LEFT);
45
+
46
+	// done!
47
+	return $hms;
48 48
 }
49 49
 
50 50
 /**
@@ -60,122 +60,122 @@  discard block
 block discarded – undo
60 60
 function geodir_getGoogleAnalytics($page, $ga_start, $ga_end)
61 61
 {
62 62
 
63
-    // NEW ANALYTICS
64
-
65
-    $start_date = '';
66
-    $end_date = '';
67
-    $dimensions = '';
68
-    $sort = '';
69
-    $filters = "ga:pagePath==".$page;
70
-    $metrics = "ga:pageviews";
71
-    $realtime = false;
72
-    $limit = false;
73
-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){
74
-        $start_date = date('Y-m-d', strtotime("-6 day"));
75
-        $end_date = date('Y-m-d');
76
-        $dimensions = "ga:date,ga:nthDay";
77
-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
78
-        $start_date = date('Y-m-d', strtotime("-13 day"));
79
-        $end_date = date('Y-m-d', strtotime("-7 day"));
80
-        $dimensions = "ga:date,ga:nthDay";
81
-    }
82
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
83
-        $start_date = date('Y')."-01-01";
84
-        $end_date = date('Y-m-d');
85
-        $dimensions = "ga:month,ga:nthMonth";
86
-    }
87
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
88
-        $start_date = date('Y', strtotime("-1 year"))."-01-01";
89
-        $end_date = date('Y', strtotime("-1 year"))."-12-31";
90
-        $dimensions = "ga:month,ga:nthMonth";
91
-    }
92
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
93
-        $start_date = "14daysAgo";
94
-        $end_date = "yesterday";
95
-        $dimensions = "ga:country";
96
-        $sort = "ga:pageviews";
97
-        $limit  = 5;
98
-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
99
-        $metrics = "rt:activeUsers";
100
-        $realtime = true;
101
-    }
102
-
103
-    # Create a new Gdata call
104
-    $gaApi = new GDGoogleAnalyticsStats();
105
-
106
-    # Check if Google sucessfully logged in
107
-    if (!$gaApi->checkLogin()){
108
-        echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
109
-        return false;
110
-    }
111
-
112
-    $account = $gaApi->getSingleProfile();
113
-
114
-    if(!isset($account[0]['id'])){
115
-        echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
116
-        return false;
117
-    }
118
-
119
-    $account = $account[0]['id'];
120
-
121
-    # Set the account to the one requested
122
-    $gaApi->setAccount($account);
123
-
124
-
125
-
126
-    # Get the metrics needed to build the visits graph;
127
-    try {
128
-        $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);
129
-    }
130
-    catch (Exception $e) {
131
-        print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();
132
-    }
133
-
134
-
135
-    //print_r($stats);
136
-    echo json_encode($stats);
137
-    exit;
63
+	// NEW ANALYTICS
64
+
65
+	$start_date = '';
66
+	$end_date = '';
67
+	$dimensions = '';
68
+	$sort = '';
69
+	$filters = "ga:pagePath==".$page;
70
+	$metrics = "ga:pageviews";
71
+	$realtime = false;
72
+	$limit = false;
73
+	if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){
74
+		$start_date = date('Y-m-d', strtotime("-6 day"));
75
+		$end_date = date('Y-m-d');
76
+		$dimensions = "ga:date,ga:nthDay";
77
+	}elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
78
+		$start_date = date('Y-m-d', strtotime("-13 day"));
79
+		$end_date = date('Y-m-d', strtotime("-7 day"));
80
+		$dimensions = "ga:date,ga:nthDay";
81
+	}
82
+	elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
83
+		$start_date = date('Y')."-01-01";
84
+		$end_date = date('Y-m-d');
85
+		$dimensions = "ga:month,ga:nthMonth";
86
+	}
87
+	elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
88
+		$start_date = date('Y', strtotime("-1 year"))."-01-01";
89
+		$end_date = date('Y', strtotime("-1 year"))."-12-31";
90
+		$dimensions = "ga:month,ga:nthMonth";
91
+	}
92
+	elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
93
+		$start_date = "14daysAgo";
94
+		$end_date = "yesterday";
95
+		$dimensions = "ga:country";
96
+		$sort = "ga:pageviews";
97
+		$limit  = 5;
98
+	}elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
99
+		$metrics = "rt:activeUsers";
100
+		$realtime = true;
101
+	}
102
+
103
+	# Create a new Gdata call
104
+	$gaApi = new GDGoogleAnalyticsStats();
105
+
106
+	# Check if Google sucessfully logged in
107
+	if (!$gaApi->checkLogin()){
108
+		echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
109
+		return false;
110
+	}
111
+
112
+	$account = $gaApi->getSingleProfile();
113
+
114
+	if(!isset($account[0]['id'])){
115
+		echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
116
+		return false;
117
+	}
118
+
119
+	$account = $account[0]['id'];
120
+
121
+	# Set the account to the one requested
122
+	$gaApi->setAccount($account);
123
+
124
+
125
+
126
+	# Get the metrics needed to build the visits graph;
127
+	try {
128
+		$stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);
129
+	}
130
+	catch (Exception $e) {
131
+		print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();
132
+	}
133
+
134
+
135
+	//print_r($stats);
136
+	echo json_encode($stats);
137
+	exit;
138 138
 
139 139
 
140 140
 }// end GA function
141 141
 
142 142
 
143 143
 function geodir_ga_get_token(){
144
-    $at = get_option('gd_ga_access_token');
145
-    $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;
146
-    $response =  wp_remote_get($use_url,array('timeout' => 15));
144
+	$at = get_option('gd_ga_access_token');
145
+	$use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;
146
+	$response =  wp_remote_get($use_url,array('timeout' => 15));
147 147
 
148
-    if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
148
+	if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
149 149
 
150
-    return $at;
151
-    }else{//else get new access token
150
+	return $at;
151
+	}else{//else get new access token
152 152
 
153
-        $refresh_at = get_option('gd_ga_refresh_token');
154
-        if(!$refresh_at){
155
-            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;
156
-        }
153
+		$refresh_at = get_option('gd_ga_refresh_token');
154
+		if(!$refresh_at){
155
+			echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;
156
+		}
157 157
 
158
-        $rat_url = "https://www.googleapis.com/oauth2/v3/token?";
159
-        $client_id = "client_id=".get_option('geodir_ga_client_id');
160
-        $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
161
-        $refresh_token = "&refresh_token=".$refresh_at;
162
-        $grant_type = "&grant_type=refresh_token";
158
+		$rat_url = "https://www.googleapis.com/oauth2/v3/token?";
159
+		$client_id = "client_id=".get_option('geodir_ga_client_id');
160
+		$client_secret = "&client_secret=".get_option('geodir_ga_client_secret');
161
+		$refresh_token = "&refresh_token=".$refresh_at;
162
+		$grant_type = "&grant_type=refresh_token";
163 163
 
164
-        $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;
164
+		$rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;
165 165
 
166
-        $rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));
167
-        if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {
168
-            $parts = json_decode($rat_response['body']);
166
+		$rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));
167
+		if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {
168
+			$parts = json_decode($rat_response['body']);
169 169
 
170 170
 
171
-            update_option('gd_ga_access_token', $parts->access_token);
172
-            return $parts->access_token;
171
+			update_option('gd_ga_access_token', $parts->access_token);
172
+			return $parts->access_token;
173 173
 
174
-        }else{
175
-            echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
176
-        }
174
+		}else{
175
+			echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
176
+		}
177 177
 
178 178
 
179
-    }
179
+	}
180 180
 
181 181
 }
182 182
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
     $hours = intval(intval($sec) / 3600);
26 26
 
27 27
     // add to $hms, with a leading 0 if asked for
28
-    $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT) . ':' : $hours . ':';
28
+    $hms .= ($padHours) ? str_pad($hours, 2, "0", STR_PAD_LEFT).':' : $hours.':';
29 29
 
30 30
     // dividing the total seconds by 60 will give us
31 31
     // the number of minutes, but we're interested in
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
     $minutes = intval(($sec / 60) % 60);
35 35
 
36 36
     // then add to $hms (with a leading 0 if needed)
37
-    $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT) . ':';
37
+    $hms .= str_pad($minutes, 2, "0", STR_PAD_LEFT).':';
38 38
 
39 39
     // seconds are simple - just divide the total
40 40
     // seconds by 60 and keep the remainder
@@ -70,32 +70,32 @@  discard block
 block discarded – undo
70 70
     $metrics = "ga:pageviews";
71 71
     $realtime = false;
72 72
     $limit = false;
73
-    if(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisweek'){
73
+    if (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisweek') {
74 74
         $start_date = date('Y-m-d', strtotime("-6 day"));
75 75
         $end_date = date('Y-m-d');
76 76
         $dimensions = "ga:date,ga:nthDay";
77
-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
77
+    }elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastweek') {
78 78
         $start_date = date('Y-m-d', strtotime("-13 day"));
79 79
         $end_date = date('Y-m-d', strtotime("-7 day"));
80 80
         $dimensions = "ga:date,ga:nthDay";
81 81
     }
82
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
82
+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'thisyear') {
83 83
         $start_date = date('Y')."-01-01";
84 84
         $end_date = date('Y-m-d');
85 85
         $dimensions = "ga:month,ga:nthMonth";
86 86
     }
87
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
87
+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'lastyear') {
88 88
         $start_date = date('Y', strtotime("-1 year"))."-01-01";
89 89
         $end_date = date('Y', strtotime("-1 year"))."-12-31";
90 90
         $dimensions = "ga:month,ga:nthMonth";
91 91
     }
92
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
92
+    elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'country') {
93 93
         $start_date = "14daysAgo";
94 94
         $end_date = "yesterday";
95 95
         $dimensions = "ga:country";
96 96
         $sort = "ga:pageviews";
97
-        $limit  = 5;
98
-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
97
+        $limit = 5;
98
+    }elseif (isset($_REQUEST['ga_type']) && $_REQUEST['ga_type'] == 'realtime') {
99 99
         $metrics = "rt:activeUsers";
100 100
         $realtime = true;
101 101
     }
@@ -104,15 +104,15 @@  discard block
 block discarded – undo
104 104
     $gaApi = new GDGoogleAnalyticsStats();
105 105
 
106 106
     # Check if Google sucessfully logged in
107
-    if (!$gaApi->checkLogin()){
108
-        echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
107
+    if (!$gaApi->checkLogin()) {
108
+        echo json_encode(array('error'=>__('Please check Google Analytics Settings', 'geodirectory')));
109 109
         return false;
110 110
     }
111 111
 
112 112
     $account = $gaApi->getSingleProfile();
113 113
 
114
-    if(!isset($account[0]['id'])){
115
-        echo json_encode(array('error'=>__('Please check Google Analytics Settings','geodirectory')));
114
+    if (!isset($account[0]['id'])) {
115
+        echo json_encode(array('error'=>__('Please check Google Analytics Settings', 'geodirectory')));
116 116
         return false;
117 117
     }
118 118
 
@@ -125,10 +125,10 @@  discard block
 block discarded – undo
125 125
 
126 126
     # Get the metrics needed to build the visits graph;
127 127
     try {
128
-        $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);
128
+        $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit, $realtime);
129 129
     }
130 130
     catch (Exception $e) {
131
-        print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();
131
+        print 'GA Summary Widget - there was a service error '.$e->getCode().':'.$e->getMessage();
132 132
     }
133 133
 
134 134
 
@@ -140,19 +140,19 @@  discard block
 block discarded – undo
140 140
 }// end GA function
141 141
 
142 142
 
143
-function geodir_ga_get_token(){
143
+function geodir_ga_get_token() {
144 144
     $at = get_option('gd_ga_access_token');
145 145
     $use_url = "https://www.googleapis.com/oauth2/v1/tokeninfo?access_token=".$at;
146
-    $response =  wp_remote_get($use_url,array('timeout' => 15));
146
+    $response = wp_remote_get($use_url, array('timeout' => 15));
147 147
 
148
-    if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
148
+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {//access token is valid
149 149
 
150 150
     return $at;
151
-    }else{//else get new access token
151
+    } else {//else get new access token
152 152
 
153 153
         $refresh_at = get_option('gd_ga_refresh_token');
154
-        if(!$refresh_at){
155
-            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory')));exit;
154
+        if (!$refresh_at) {
155
+            echo json_encode(array('error'=>__('Not authorized, please click authorized in GD > Google analytic settings.', 'geodirectory'))); exit;
156 156
         }
157 157
 
158 158
         $rat_url = "https://www.googleapis.com/oauth2/v3/token?";
@@ -163,16 +163,16 @@  discard block
 block discarded – undo
163 163
 
164 164
         $rat_url_use = $rat_url.$client_id.$client_secret.$refresh_token.$grant_type;
165 165
 
166
-        $rat_response =  wp_remote_post($rat_url_use,array('timeout' => 15));
167
-        if(!empty($rat_response['response']['code']) && $rat_response['response']['code']==200) {
166
+        $rat_response = wp_remote_post($rat_url_use, array('timeout' => 15));
167
+        if (!empty($rat_response['response']['code']) && $rat_response['response']['code'] == 200) {
168 168
             $parts = json_decode($rat_response['body']);
169 169
 
170 170
 
171 171
             update_option('gd_ga_access_token', $parts->access_token);
172 172
             return $parts->access_token;
173 173
 
174
-        }else{
175
-            echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
174
+        } else {
175
+            echo json_encode(array('error'=>__('Login failed', 'geodirectory'))); exit;
176 176
         }
177 177
 
178 178
 
Please login to merge, or discard this patch.
Braces   +8 added lines, -12 removed lines patch added patch discarded remove patch
@@ -74,28 +74,25 @@  discard block
 block discarded – undo
74 74
         $start_date = date('Y-m-d', strtotime("-6 day"));
75 75
         $end_date = date('Y-m-d');
76 76
         $dimensions = "ga:date,ga:nthDay";
77
-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
77
+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastweek'){
78 78
         $start_date = date('Y-m-d', strtotime("-13 day"));
79 79
         $end_date = date('Y-m-d', strtotime("-7 day"));
80 80
         $dimensions = "ga:date,ga:nthDay";
81
-    }
82
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
81
+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='thisyear'){
83 82
         $start_date = date('Y')."-01-01";
84 83
         $end_date = date('Y-m-d');
85 84
         $dimensions = "ga:month,ga:nthMonth";
86
-    }
87
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
85
+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='lastyear'){
88 86
         $start_date = date('Y', strtotime("-1 year"))."-01-01";
89 87
         $end_date = date('Y', strtotime("-1 year"))."-12-31";
90 88
         $dimensions = "ga:month,ga:nthMonth";
91
-    }
92
-    elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
89
+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='country'){
93 90
         $start_date = "14daysAgo";
94 91
         $end_date = "yesterday";
95 92
         $dimensions = "ga:country";
96 93
         $sort = "ga:pageviews";
97 94
         $limit  = 5;
98
-    }elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
95
+    } elseif(isset($_REQUEST['ga_type']) && $_REQUEST['ga_type']=='realtime'){
99 96
         $metrics = "rt:activeUsers";
100 97
         $realtime = true;
101 98
     }
@@ -126,8 +123,7 @@  discard block
 block discarded – undo
126 123
     # Get the metrics needed to build the visits graph;
127 124
     try {
128 125
         $stats = $gaApi->getMetrics($metrics, $start_date, $end_date, $dimensions, $sort, $filters, $limit , $realtime);
129
-    }
130
-    catch (Exception $e) {
126
+    } catch (Exception $e) {
131 127
         print 'GA Summary Widget - there was a service error ' . $e->getCode() . ':' . $e->getMessage();
132 128
     }
133 129
 
@@ -148,7 +144,7 @@  discard block
 block discarded – undo
148 144
     if(!empty($response['response']['code']) && $response['response']['code']==200) {//access token is valid
149 145
 
150 146
     return $at;
151
-    }else{//else get new access token
147
+    } else{//else get new access token
152 148
 
153 149
         $refresh_at = get_option('gd_ga_refresh_token');
154 150
         if(!$refresh_at){
@@ -171,7 +167,7 @@  discard block
 block discarded – undo
171 167
             update_option('gd_ga_access_token', $parts->access_token);
172 168
             return $parts->access_token;
173 169
 
174
-        }else{
170
+        } else{
175 171
             echo json_encode(array('error'=>__('Login failed', 'geodirectory')));exit;
176 172
         }
177 173
 
Please login to merge, or discard this patch.