← All changes | public/class-wpdirectorykit-public.php +61 -12 1.1.8 → 1.5.9 View file →

		@@ -103,11 +103,18 @@
103	103	wp_register_style( 'wdk-categories-grid-cover', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-categories-grid-cover.css', array(), $this->version, 'all' );
104	104	wp_register_style( 'wdk-locations-grid-cover', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-locations-grid-cover.css', array(), $this->version, 'all' );
105	105	wp_register_style( 'wdk-categories-grid', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-categories-grid.css', array(), $this->version, 'all' );
106	106	wp_register_style( 'wdk-categories-list', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-categories-list.css', array(), $this->version, 'all' );
	107	+ wp_register_style( 'wdk-locations-tree', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-locations-tree.css', array(), $this->version, 'all' );
	108	+ wp_register_style( 'wdk-categories-tree', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-categories-tree.css', array(), $this->version, 'all' );
	109	+ wp_register_style( 'wdk-categories-tree-top', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-categories-tree-top.css', array(), $this->version, 'all' );
107	110	wp_register_style( 'wdk-locations-list', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-locations-list.css', array(), $this->version, 'all' );
108	111	wp_register_style( 'wdk-listings-map', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-map.css', array(), $this->version, 'all' );
109	112	wp_register_style( 'wdk-listings-carousel', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-listings-carousel.css', array(), $this->version, 'all' );
	113	+ wp_register_style( 'wdk-listing-related-listings-table', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-listing-related-listings-table.css', array(), $this->version, 'all' );
	114	+ wp_register_style( 'wdk-search-popup', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-search-popup.css', array(), $this->version, 'all' );
	115	+ wp_register_style( 'wdk-tabs', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-tabs.css', array(), $this->version, 'all' );
	116	+ wp_register_style( 'wdk-language-switcher', WPDIRECTORYKIT_URL. 'elementor-elements/assets/css/widgets/wdk-language-switcher.css', array(), $this->version, 'all' );
110	117	wp_register_style( 'wdk-notify', plugin_dir_url( __FILE__ ) . 'css/wdk-notify.css', array(), $this->version, 'all' );
111	118	wp_register_style( 'wdk-modal', plugin_dir_url( __FILE__ ) . 'css/wdk-modal.css', array(), $this->version, 'all' );
112	119	wp_register_style( 'wdk-hover', plugin_dir_url( __FILE__ ) . 'css/wdk-hover.css', array(), $this->version, 'all' );
113	120	wp_register_style( 'leaflet', plugin_dir_url( __FILE__ ) . 'js/openstreetmap/leaflet.css', array(), '1.7.1', 'all' );
		@@ -115,10 +122,11 @@
115	122	wp_register_style( 'leaflet-cluster', plugin_dir_url( __FILE__ ) . 'js/openstreetmap/MarkerCluster.css', array(), '1.7.1', 'all' );
116	123	wp_register_style( 'leaflet-fullscreen', plugin_dir_url( __FILE__ ) . 'js/openstreetmap/leaflet.fullscreen.css', array(), '1.7.1', 'all' );
117	124	wp_register_style( 'ion.range-slider', plugin_dir_url( __FILE__ ) . 'js/ion.range-slider/css/ion.range-slider.min.css', array(), '2.3.1', 'all' );
118	125	wp_register_style( 'wdk-slider-range', plugin_dir_url( __FILE__ ) . 'css/wdk-slider-range.css', array(), '1.0', 'all' );
119		- wp_register_style( 'select2', plugin_dir_url( __FILE__ ) . 'js/select2/css/select2.min.css', array(), '4.0.13', 'all' );
	126	+ wp_register_style( 'select2-select2', plugin_dir_url( __FILE__ ) . 'js/select2/css/select2.min.css', array(), '4.0.13', 'all' );
120	127	wp_register_style( 'wdk-treefield-dropdown', plugin_dir_url( __FILE__ ) . 'js/wdk_treefield_dropdown/wdk_treefield_dropdown.css', array(), '1.0', 'all' );
	128	+ wp_register_style( 'leaflet-draw', plugin_dir_url( __FILE__ ) . 'js/leaflet-draw/leaflet.draw.css', array(), '1.0', 'all' );
121	129
122	130	wp_register_style('blueimp-gallery', plugin_dir_url( __FILE__ ).'js/blueimp-gallery/css/blueimp-gallery.min.css', array(), '1.8', 'all');
123	131
124	132	wp_register_style('slick', plugin_dir_url( __FILE__ ).'js/slick/slick.css', array(), '1.8', 'all');
		@@ -124,9 +132,9 @@
124	132	wp_register_style('slick', plugin_dir_url( __FILE__ ).'js/slick/slick.css', array(), '1.8', 'all');
125	133	wp_register_style('slick-theme', plugin_dir_url( __FILE__ ).'js/slick/slick-theme.css', array(), '1.8', 'all');
126	134
127	135	wp_register_style('jquery-confirm', plugin_dir_url( __FILE__ ).'js/jquery-confirm/css/jquery-confirm.css', array(), '3.3.4', 'all');
128		- wp_register_style('wdk-scroll-mobile-swipe', plugin_dir_url( __FILE__ ).'css/wdk-scroll-mobile-swipe.css', array(), '1.0', 'all');
	136	+ wp_register_style('wdk-scroll-mobile-swipe', plugin_dir_url( __FILE__ ).'css/wdk-scroll-mobile-swipe.css', array(), '1.0.2', 'all');
129	137	wp_enqueue_style('wdk-scroll-mobile-swipe');
130	138
131	139	wp_enqueue_style( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'css/wpdirectorykit-public.css', array(), $this->version, 'all' );
132	140	wp_enqueue_style( $this->plugin_name.'-responsive', plugin_dir_url( __FILE__ ) . 'css/wpdirectorykit-public-responsive.css', array(), $this->version, 'all' );
		@@ -146,8 +154,11 @@
146	154	$custom_css .= "
147	155	.wdk-element .wdk-map .wdk_marker-container.category_id_".esc_attr(wmvc_show_data('idcategory', $category),'',TRUE, TRUE)." .wdk_face.front i {
148	156	color: ".esc_attr(wmvc_show_data('category_color', $category),'',TRUE, TRUE).";
149	157	}
	158	+ .wdk-element .wdk-map .wdk_marker-container.category_id_".esc_attr(wmvc_show_data('idcategory', $category),'',TRUE, TRUE).":hover .wdk_face.front i {
	159	+ color:#fff;
	160	+ }
150	161	.wdk-element .wdk-map .wdk_marker-container.category_id_".esc_attr(wmvc_show_data('idcategory', $category),'',TRUE, TRUE)." .wdk_marker-container:hover .wdk_marker-card::after,
151	162	.wdk-element .wdk-map .wdk_marker-container.category_id_".esc_attr(wmvc_show_data('idcategory', $category),'',TRUE, TRUE)." .wdk_marker-card::before {
152	163	background: ".esc_attr(wmvc_show_data('category_color', $category),'',TRUE, TRUE).";
153	164	}
		@@ -201,17 +212,24 @@
201	212	wp_register_script('wdk-blueimp-slider', plugin_dir_url( __FILE__ ).'js/wdk-blueimp-slider.js', array( 'jquery' ), '1.0', false );
202	213	wp_register_script('slick', plugin_dir_url( __FILE__ ).'js/slick/slick.min.js', array( 'jquery' ), '1.8', false );
203	214	wp_register_script('ion.range-slider', plugin_dir_url( __FILE__ ).'js/ion.range-slider/js/ion.range-slider.min.js', array( 'jquery' ), '2.3.1', false );
204	215	wp_register_script('wdk-slider-range', plugin_dir_url( __FILE__ ).'js/wdk-slider-range.js', array( 'jquery' ), '1.0', false );
205		- wp_register_script('select2', plugin_dir_url( __FILE__ ).'js/select2/js/select2.min.js', array( 'jquery' ), '4.0.13', false );
	216	+ wp_register_script('select2-select2', plugin_dir_url( __FILE__ ).'js/select2/js/select2.min.js', array( 'jquery' ), '4.0.13', false );
206	217	wp_register_script('wdk-select2', plugin_dir_url( __FILE__ ).'js/wdk-select2.js', array( 'jquery' ), '4.0.13', false );
	218	+ wp_register_script('leaflet-googlemutant', plugin_dir_url( __FILE__ ).'js/leaflet-gridlayer-googlemutant/leaflet-googlemutant.js', array( 'jquery' ), '4.0.13', false );
	219	+ wp_register_script('wdk-ajax-loading-listings', plugin_dir_url( __FILE__ ).'js/wdk-ajax-loading-listings.js', array( 'jquery' ), '1.0', false );
	220	+ wp_register_script('leaflet-draw', plugin_dir_url( __FILE__ ).'js/leaflet-draw/leaflet.draw.js', array( 'jquery' ), '1.0', false );
	221	+ wp_register_script('wdk-map-rectangle', plugin_dir_url( __FILE__ ).'js/wdk-map-rectangle.js', array( 'jquery', 'leaflet-draw', 'wp-i18n' ), '1.0', false );
	222	+ wp_register_script('wdk-tabs', WPDIRECTORYKIT_URL. 'elementor-elements/assets/js/wdk-tabs.js', array( 'jquery', 'leaflet-draw' ), '1.0', false );
	223	+
207	224
208		-
209		- $params = array(
210		- 'ajax_url' => admin_url( 'admin-ajax.php' )
211		- );
	225	+ if( wdk_get_option('wdk_experimental_features') && wdk_get_option('wdk_experimental_listing_popup')) {
	226	+ wp_register_script('wdk-popup-listings', plugin_dir_url( __FILE__ ).'js/wdk-popup-listings.js', array( 'jquery', 'jquery-confirm' ), '1.6', false );
	227	+ wp_enqueue_script('wdk-popup-listings');
	228	+ wp_enqueue_style('jquery-confirm');
	229	+ }
	230	+
212	231	wp_register_script('wdk-treefield-dropdown', plugin_dir_url( __FILE__ ).'js/wdk_treefield_dropdown/wdk_treefield_dropdown.js', array( 'jquery' ), '1.0', false );
213		- wp_localize_script( 'wdk-treefield-dropdown', 'script_parameters', $params);
214	232
215	233	wp_register_script('jquery-confirm', plugin_dir_url( __FILE__ ).'js/jquery-confirm/js/jquery-confirm.js', array( 'jquery' ), '3.3.4', false );
216	234
217	235	$params = array(
		@@ -224,9 +242,10 @@
224	242	);
225	243	wp_register_script('wdk-booking-calculator-price', plugin_dir_url( __FILE__ ).'js/wdk-booking-calculator-price.js', array( 'jquery' ), '1.0', false );
226	244	wp_localize_script('wdk-booking-calculator-price', 'wdk_booking_script_parameters', $params);
227	245
228		- wp_register_script('wdk-scroll-mobile-swipe', plugin_dir_url( __FILE__ ).'js/wdk-scroll-mobile-swipe.js', array( 'jquery' ), '1.0', false );
	246	+ wp_deregister_script('wdk-scroll-mobile-swipe');
	247	+ wp_register_script('wdk-scroll-mobile-swipe', plugin_dir_url( __FILE__ ).'js/wdk-scroll-mobile-swipe.js', array( 'jquery' ), '1.1', false );
229	248	wp_enqueue_script('wdk-scroll-mobile-swipe');
230	249
231	250	$params = array(
232	251	'ajax_url' => admin_url( 'admin-ajax.php' ),
		@@ -233,16 +252,41 @@
233	252	'format_date' => wdk_convert_date_format_js(get_option('date_format')),
234	253	'format_datetime' => wdk_convert_date_format_js(get_option('date_format').' '.get_option('time_format')),
235	254	'format_date_js' => wdk_convert_date_format_jquery(get_option('date_format')),
236	255	'format_datetime_js' => wdk_convert_date_format_jquery(get_option('date_format').' '.get_option('time_format')),
	256	+ 'settings_wdk_field_search_suggestion_disable' => (wdk_get_option('wdk_field_search_suggestion_disable')) ? 1 : 0,
	257	+ 'text' => array(
	258	+ "read_more"=> esc_html__("Read More", 'wpdirectorykit'),
	259	+ "read_less"=> esc_html__("Read Less", 'wpdirectorykit'),
	260	+ ),
	261	+ 'wpApiSettings' => [
	262	+ 'root'=> esc_url_raw(rest_url()),
	263	+ 'nonce'=> wp_create_nonce('wp_rest'),
	264	+ 'wdk_secure_nonce'=> wp_create_nonce('wdk_secure_ajax'),
	265	+ ],
	266	+ 'fields_data' => wdk_cached_field_get(),
	267	+ 'wdk_ai_search_fields' => get_option( 'wdk_ai_search_fields', []),
237	268	);
238		-
239		- wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wpdirectorykit-public.js', array( 'jquery' ), $this->version, false );
	269	+ wp_enqueue_script( $this->plugin_name, plugin_dir_url( __FILE__ ) . 'js/wpdirectorykit-public.js', array( 'jquery' ,'wp-i18n'), $this->version, false );
240	270	wp_localize_script( $this->plugin_name, 'script_parameters', $params);
	271	+ wp_localize_script( $this->plugin_name, 'wdk_script_parameters', $params);
241	272
242	273	wp_register_style('jquery-ui', WPDIRECTORYKIT_URL. 'public/css/jquery-ui.css', array(), '1.12.1' );
243	274
244		- $custom_css = '.wdk-image:not(.media){background-image: url('.esc_url(wdk_placeholder_image_src()).');background-size: cover;background-position: center; }';
	275	+ $custom_css = '.wdk-image:not(.media):not(.jsplaceholder){background-image: url('.esc_url(wdk_placeholder_image_src()).');background-size: cover;background-position: center; }';
	276	+
	277	+ $params = array(
	278	+ 'ajax_url' => admin_url( 'admin-ajax.php' ),
	279	+ 'text' =>array(
	280	+ 'errorLoading' => esc_html__('The results could not be loaded.', 'wpdirectorykit'),
	281	+ 'loadingMore' => esc_html__('Loading more results…', 'wpdirectorykit'),
	282	+ 'noResults' => esc_html__('No results found', 'wpdirectorykit'),
	283	+ 'searching' => esc_html__('Searching…', 'wpdirectorykit'),
	284	+ 'removeAllItems' => esc_html__('Remove all items', 'wpdirectorykit'),
	285	+ ),
	286	+ );
	287	+ wp_localize_script('wdk-select2', 'wdk_select2_script_parameters', $params);
	288	+
245	289	wp_add_inline_style( $this->plugin_name, $custom_css);
246	290	}
247	291
248	292
		@@ -252,8 +296,13 @@
252	296	$function = '';
253	297
254	298	if(isset($_POST['page']))$page = sanitize_text_field($_POST['page']);
255	299	if(isset($_POST['function']))$function = sanitize_text_field($_POST['function']);
	300	+
	301	+ /* protect access only to ajax controller */
	302	+ if($page != 'wdk_frontendajax' && $page != 'wdk_backendajax') {
	303	+ exit(esc_html__('Access denied','wpdirectorykit'));
	304	+ }
256	305
257	306	$WMVC = &wdk_get_instance();
258	307	$WMVC->load_controller($page, $function, array());
259	308	}