← All changes | application/views/search_fields/LOCATION.php +37 -8 1.2.3 → 1.5.9 View file →

		@@ -20,8 +20,12 @@
20	20	if(isset($predefinedfields_query) && !empty($predefinedfields_query[$field_key])) {
21	21	$field_value = intval($predefinedfields_query[$field_key]);
22	22	}
23	23
	24	+if(isset($_GET['location_root'])) {
	25	+ $predefinedfields_query['custom_location_root'] = sanitize_text_field(wp_unslash($_GET['location_root']));
	26	+}
	27	+
24	28	if(isset($predefinedfields_query) && !empty($predefinedfields_query['custom_location_root'])) {
25	29	$custom_field_value = intval($predefinedfields_query['custom_location_root']);
26	30	global $Winter_MVC_WDK;
27	31	$Winter_MVC_WDK->load_helper('listing');
		@@ -28,16 +32,20 @@
28	32	$Winter_MVC_WDK->model('location_m');
29	33	$location = $Winter_MVC_WDK->location_m->get($custom_field_value, TRUE);
30	34
31	35	/* if root search childs */
32		- if(empty(wmvc_show_data('parent_id', $location, false, TRUE, TRUE))) {
	36	+ if($location) {
33	37	$filter_ids = wdk_location_get_all_childs($custom_field_value);
34	38	if(!empty($filter_ids)) {
35		- $filter_ids[] = $custom_field_value;
36	39	if(in_array($field_value, $filter_ids) === FALSE) {
37	40	$field_value = $custom_field_value;
38	41	}
	42	+ } else {
	43	+ $filter_ids[] = $custom_field_value;
39	44	}
	45	+ } else {
	46	+ /* location missing */
	47	+ $custom_field_value = null;
40	48	}
41	49	}
42	50
43	51	if(isset($_GET[$field_key])) {
		@@ -46,11 +54,22 @@
46	54	if(function_exists('run_wdk_geo') && (get_option('wdk_geo_autodetect_by_ip_enable') && !get_option('wdk_geo_autodetect_by_google_js_enable'))) {
47	55	$field_value = wdk_geo_get_location_id();
48	56	}
49	57	}
	58	+
50	59	wdk_search_fields_toggle();
	60	+
	61	+$hide_fields = '';
	62	+if(wmvc_show_data('search_type_tree_hide', $field_data)) {
	63	+ $hide_fields = wmvc_show_data('search_type_tree_hide', $field_data);
	64	+}
	65	+
51	66	?>
52	67
	68	+<?php if(isset($custom_field_value)):?>
	69	+ <input type="hidden" name="search_location[]" value="<?php echo esc_attr($custom_field_value);?>">
	70	+<?php endif;?>
	71	+
53	72	<?php if(wdk_get_option('wdk_multi_locations_search_field_type') == 'wdk_treefield_dropdown'):?>
54	73	<?php
55	74	global $Winter_MVC_WDK;
56	75	$Winter_MVC_WDK->load_helper('listing');
		@@ -87,9 +106,9 @@
87	106
88	107
89	108	?>
90	109
91		- <input name="<?php echo esc_attr($field_key); ?>" type="hidden" value="<?php echo esc_attr($field_value); ?> wdk_field_id_location">
	110	+ <input name="<?php echo esc_attr($field_key); ?>" type="hidden" value="<?php echo esc_attr($field_value); ?>" class="wdk_field_id_location">
92	111	<?php
93	112	$level = 0;
94	113	foreach ($locations as $location) {
95	114	$current = $Winter_MVC_WDK->location_m->get($location, TRUE);
		@@ -110,9 +129,11 @@
110	129
111	130	<div data-level="<?php echo esc_attr($level);?>" data-field="<?php echo esc_attr($field_key); ?>" class="wdk-field wdk-col wdk_treefield_dropdown <?php echo esc_attr(wmvc_show_data('field_type', $field_data)); ?> <?php echo esc_attr(wmvc_show_data('class', $field_data)); ?>">
112	131	<label class="wdk-field-label"><?php echo esc_html(wmvc_show_data('field_label', $field_data)); ?></label>
113	132	<div class="wdk-field-group">
114		- <?php echo wmvc_select_option('location_'.$level, $values_list, $location, 'class="wdk-control"');?>
	133	+ <?php
	134	+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped, WordPress.WP.I18n.NonSingularStringLiteralText
	135	+ echo wmvc_select_option('location_'.$level, $values_list, $location, 'class="wdk-control"');?>
115	136	</div>
116	137	</div>
117	138
118	139	<?php
		@@ -132,9 +153,11 @@
132	153
133	154	<div data-level="<?php echo esc_attr($level);?>" data-field="<?php echo esc_attr($field_key); ?>" class="wdk-field wdk-col wdk_treefield_dropdown <?php echo esc_attr(wmvc_show_data('field_type', $field_data)); ?> <?php echo esc_attr(wmvc_show_data('class', $field_data)); ?>">
134	155	<label class="wdk-field-label"><?php echo esc_html(wmvc_show_data('field_label', $field_data)); ?></label>
135	156	<div class="wdk-field-group">
136		- <?php echo wmvc_select_option('location_'.$level, $values_list, NULL, 'class="wdk-control"');?>
	157	+ <?php
	158	+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped, WordPress.WP.I18n.NonSingularStringLiteralText
	159	+ echo wmvc_select_option('location_'.$level, $values_list, NULL, 'class="wdk-control"');?>
137	160	</div>
138	161	</div>
139	162
140	163	<?php
		@@ -147,18 +170,24 @@
147	170	<div class="wdk-field wdk-col <?php echo esc_attr(wmvc_show_data('field_type', $field_data)); ?> <?php echo esc_attr(wmvc_show_data('class', $field_data)); ?>">
148	171	<label class="wdk-field-label"><?php echo esc_html(wmvc_show_data('field_label', $field_data)); ?></label>
149	172	<div class="wdk-field-group">
150	173	<?php if(wdk_get_option('wdk_multi_locations_search_field_type') == 'select2'):?>
151		- <?php echo wdk_treefield_select_ajax ($field_key.'[]', 'location_m', $field_value, 'location_title','idlocation', '', __('All Locations', 'wpdirectorykit'), $filter_ids);?>
	174	+ <?php
	175	+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped, WordPress.WP.I18n.NonSingularStringLiteralText
	176	+ echo wdk_treefield_select_ajax ($field_key.'[]', 'location_m', $field_value, 'location_title','idlocation', '', __('All Locations', 'wpdirectorykit'), $filter_ids);?>
152	177	<?php elseif(wdk_get_option('wdk_multi_locations_search_field_type') == 'wdk_treefield_checkboxes'):?>
153	178	<?php
154	179	wp_enqueue_style( 'wdk-treefield-checkboxes');
155	180	wp_enqueue_script( 'wdk-treefield-checkboxes');
156	181	?>
157		- <?php echo wdk_treefield_option_checkboxes ('search_location', 'location_m', $field_value, 'location_title', '', __('All Locations', 'wpdirectorykit'), $filter_ids);?>
	182	+ <?php
	183	+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped, WordPress.WP.I18n.NonSingularStringLiteralText
	184	+ echo wdk_treefield_option_checkboxes ('search_location', 'location_m', $field_value, 'location_title', '', __('All Locations', 'wpdirectorykit'), $filter_ids);?>
158	185	<?php else:?>
159		- <?php echo wdk_treefield_option ('search_location', 'location_m', $field_value, 'location_title', '', __('All Locations', 'wpdirectorykit'), $filter_ids);?>
	186	+ <?php
	187	+ // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped, WordPress.WP.I18n.NonSingularStringLiteralText
	188	+ echo wdk_treefield_option ('search_location', 'location_m', $field_value, 'location_title', '', __('All Locations', 'wpdirectorykit'), $filter_ids, FALSE, '', $hide_fields);?>
160	189	<?php endif;?>
161	190	</div>
162	191	</div>
163	192
164	193	<?php endif;?>