@@ -39,21 +39,21 @@ discard block |
||
39 | 39 | $is_detail_page = false; |
40 | 40 | $geodir_map_name = geodir_map_name(); |
41 | 41 | |
42 | - if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) { |
|
42 | + if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) { |
|
43 | 43 | $is_detail_page = true; |
44 | 44 | } |
45 | 45 | |
46 | 46 | wp_enqueue_script('jquery'); |
47 | 47 | |
48 | - wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION); |
|
48 | + wp_register_script('geodirectory-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory.min.js', array(), GEODIRECTORY_VERSION); |
|
49 | 49 | wp_enqueue_script('geodirectory-script'); |
50 | 50 | |
51 | 51 | $geodir_vars_data = array( |
52 | 52 | 'siteurl' => get_option('siteurl'), |
53 | 53 | 'geodir_plugin_url' => geodir_plugin_url(), |
54 | - 'geodir_lazy_load' => get_option('geodir_lazy_load',1), |
|
54 | + 'geodir_lazy_load' => get_option('geodir_lazy_load', 1), |
|
55 | 55 | 'geodir_ajax_url' => geodir_get_ajax_url(), |
56 | - 'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'), |
|
56 | + 'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'), |
|
57 | 57 | 'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue |
58 | 58 | ); |
59 | 59 | |
@@ -74,24 +74,24 @@ discard block |
||
74 | 74 | * |
75 | 75 | * } |
76 | 76 | */ |
77 | - $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data); |
|
77 | + $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data); |
|
78 | 78 | |
79 | 79 | wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data); |
80 | 80 | |
81 | - wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true); |
|
82 | - if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');} |
|
81 | + wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION, true); |
|
82 | + if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); } |
|
83 | 83 | |
84 | - wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true); |
|
84 | + wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url().'/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true); |
|
85 | 85 | wp_enqueue_script('geodirectory-lightbox-jquery'); |
86 | 86 | |
87 | - wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true); |
|
87 | + wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url().'/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION, true); |
|
88 | 88 | if ($is_detail_page) { |
89 | 89 | wp_enqueue_script('geodirectory-jquery-simplemodal'); |
90 | 90 | } |
91 | 91 | |
92 | 92 | if (in_array($geodir_map_name, array('auto', 'google'))) { |
93 | - $map_lang = "&language=" . geodir_get_map_default_language(); |
|
94 | - $map_key = "&key=" . geodir_get_map_api_key(); |
|
93 | + $map_lang = "&language=".geodir_get_map_default_language(); |
|
94 | + $map_key = "&key=".geodir_get_map_api_key(); |
|
95 | 95 | /** |
96 | 96 | * Filter the variables that are added to the end of the google maps script call. |
97 | 97 | * |
@@ -101,55 +101,55 @@ discard block |
||
101 | 101 | * @param string $var The string to filter, default is empty string. |
102 | 102 | */ |
103 | 103 | $map_extra = apply_filters('geodir_googlemap_script_extra', ''); |
104 | - wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL); |
|
104 | + wp_enqueue_script('google-maps-api', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL); |
|
105 | 105 | |
106 | 106 | // Overlapping Marker Spiderfier |
107 | - wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION); |
|
107 | + wp_register_script('geodirectory-g-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms.min.js', array(), GEODIRECTORY_VERSION); |
|
108 | 108 | wp_enqueue_script('geodirectory-g-overlappingmarker-script'); |
109 | 109 | } |
110 | 110 | |
111 | 111 | if ($geodir_map_name == 'osm') { |
112 | 112 | // Leaflet OpenStreetMap |
113 | - wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION); |
|
113 | + wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION); |
|
114 | 114 | wp_enqueue_style('geodirectory-leaflet-style'); |
115 | 115 | |
116 | - wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION); |
|
116 | + wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION); |
|
117 | 117 | wp_enqueue_script('geodirectory-leaflet-script'); |
118 | 118 | |
119 | - wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION); |
|
119 | + wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.min.js', array(), GEODIRECTORY_VERSION); |
|
120 | 120 | wp_enqueue_script('geodirectory-leaflet-geo-script'); |
121 | 121 | |
122 | 122 | if ($is_detail_page) { |
123 | - wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION); |
|
123 | + wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION); |
|
124 | 124 | wp_enqueue_style('geodirectory-leaflet-routing-style'); |
125 | 125 | |
126 | - wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION); |
|
126 | + wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.min.js', array(), GEODIRECTORY_VERSION); |
|
127 | 127 | wp_enqueue_script('geodirectory-leaflet-routing-script'); |
128 | 128 | } |
129 | 129 | |
130 | 130 | // Overlapping Marker Spiderfier Leaflet |
131 | - wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url() . '/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION); |
|
131 | + wp_register_script('geodirectory-o-overlappingmarker-script', geodir_plugin_url().'/geodirectory-assets/jawj/oms-leaflet.min.js', array(), GEODIRECTORY_VERSION); |
|
132 | 132 | wp_enqueue_script('geodirectory-o-overlappingmarker-script'); |
133 | 133 | } |
134 | - wp_enqueue_script( 'jquery-ui-autocomplete' ); |
|
134 | + wp_enqueue_script('jquery-ui-autocomplete'); |
|
135 | 135 | |
136 | - wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true); |
|
136 | + wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true); |
|
137 | 137 | wp_enqueue_script('geodirectory-goMap-script'); |
138 | 138 | |
139 | - wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION); |
|
139 | + wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION); |
|
140 | 140 | wp_enqueue_script('chosen'); |
141 | 141 | |
142 | - wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION); |
|
142 | + wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION); |
|
143 | 143 | wp_enqueue_script('geodirectory-choose-ajax'); |
144 | 144 | |
145 | - wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true); |
|
145 | + wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true); |
|
146 | 146 | |
147 | 147 | if (is_page() && geodir_is_page('add-listing')) { |
148 | 148 | // SCRIPT FOR UPLOAD |
149 | 149 | wp_enqueue_script('plupload-all'); |
150 | 150 | wp_enqueue_script('jquery-ui-sortable'); |
151 | 151 | |
152 | - wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true); |
|
152 | + wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION, true); |
|
153 | 153 | wp_enqueue_script('geodirectory-plupload-script'); |
154 | 154 | // SCRIPT FOR UPLOAD END |
155 | 155 | |
@@ -196,27 +196,27 @@ discard block |
||
196 | 196 | |
197 | 197 | wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init); |
198 | 198 | |
199 | - wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload'); |
|
199 | + wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation.min.js#asyncload'); |
|
200 | 200 | } // End if for add place page |
201 | 201 | |
202 | - wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true); |
|
202 | + wp_register_script('geodirectory-post-custom-js', geodir_plugin_url().'/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true); |
|
203 | 203 | if ($is_detail_page) { |
204 | 204 | wp_enqueue_script('geodirectory-post-custom-js'); |
205 | 205 | } |
206 | 206 | |
207 | 207 | // font awesome rating script |
208 | 208 | if (get_option('geodir_reviewrating_enable_font_awesome')) { |
209 | - wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true); |
|
209 | + wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true); |
|
210 | 210 | wp_enqueue_script('geodir-barrating-js'); |
211 | 211 | } else { // default rating script |
212 | - wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true); |
|
212 | + wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true); |
|
213 | 213 | wp_enqueue_script('geodir-jRating-js'); |
214 | 214 | } |
215 | 215 | |
216 | - wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true); |
|
216 | + wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.min.js#asyncload', array(), GEODIRECTORY_VERSION, true); |
|
217 | 217 | wp_enqueue_script('geodir-on-document-load'); |
218 | 218 | |
219 | - wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true); |
|
219 | + wp_register_script('google-geometa', geodir_plugin_url().'/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true); |
|
220 | 220 | wp_enqueue_script('google-geometa'); |
221 | 221 | } |
222 | 222 | |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | */ |
232 | 232 | function geodir_header_scripts() |
233 | 233 | { |
234 | - echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>'; |
|
234 | + echo '<style>'.stripslashes(get_option('geodir_coustem_css')).'</style>'; |
|
235 | 235 | echo stripslashes(get_option('geodir_header_scripts')); |
236 | 236 | } |
237 | 237 | |
@@ -245,7 +245,7 @@ discard block |
||
245 | 245 | */ |
246 | 246 | function geodir_google_analytics_tracking_code() |
247 | 247 | { |
248 | - if(get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')){?> |
|
248 | + if (get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_account_id')) {?> |
|
249 | 249 | |
250 | 250 | <script> |
251 | 251 | (function(i,s,o,g,r,a,m){ i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |
@@ -253,14 +253,14 @@ discard block |
||
253 | 253 | m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) |
254 | 254 | })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); |
255 | 255 | |
256 | - ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id'));?>', 'auto'); |
|
257 | - <?php if(get_option('geodir_ga_anonymize_ip')){echo "ga('set', 'anonymizeIP', true);";}?> |
|
256 | + ga('create', '<?php echo esc_attr(get_option('geodir_ga_account_id')); ?>', 'auto'); |
|
257 | + <?php if (get_option('geodir_ga_anonymize_ip')) {echo "ga('set', 'anonymizeIP', true);"; }?> |
|
258 | 258 | ga('send', 'pageview'); |
259 | 259 | |
260 | 260 | </script> |
261 | 261 | |
262 | 262 | <?php |
263 | - }elseif( get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')){ |
|
263 | + }elseif (get_option('geodir_ga_add_tracking_code') && get_option('geodir_ga_tracking_code') && !get_option('geodir_ga_account_id')) { |
|
264 | 264 | echo stripslashes(get_option('geodir_ga_tracking_code')); |
265 | 265 | } |
266 | 266 | } |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | * |
284 | 284 | * Flexbox wont wrap on ios for search form items |
285 | 285 | */ |
286 | - if ( !empty( $_SERVER['HTTP_USER_AGENT'] ) && preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) { |
|
286 | + if (!empty($_SERVER['HTTP_USER_AGENT']) && preg_match('/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'])) { |
|
287 | 287 | echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}.geodir-filter-container .geodir-filter-cat{width:auto !important;}</style>"; |
288 | 288 | } |
289 | 289 | } |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | */ |
300 | 300 | function geodir_add_async_forscript($url) |
301 | 301 | { |
302 | - if (strpos($url, '#asyncload')===false) |
|
302 | + if (strpos($url, '#asyncload') === false) |
|
303 | 303 | return $url; |
304 | 304 | else if (is_admin()) |
305 | 305 | return str_replace('#asyncload', '', $url); |
@@ -317,12 +317,12 @@ discard block |
||
317 | 317 | function geodir_templates_styles() |
318 | 318 | { |
319 | 319 | |
320 | - wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION); |
|
320 | + wp_register_style('geodir-core-scss', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION); |
|
321 | 321 | wp_enqueue_style('geodir-core-scss'); |
322 | - wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION); |
|
322 | + wp_register_style('geodir-core-scss-footer', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION); |
|
323 | 323 | |
324 | - if(is_rtl()){ |
|
325 | - wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION); |
|
324 | + if (is_rtl()) { |
|
325 | + wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION); |
|
326 | 326 | wp_enqueue_style('geodirectory-frontend-rtl-style'); |
327 | 327 | } |
328 | 328 | |
@@ -396,18 +396,18 @@ discard block |
||
396 | 396 | $term_id = get_queried_object_id(); |
397 | 397 | $taxonomy = get_query_var('taxonomy'); |
398 | 398 | |
399 | - if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) { |
|
400 | - $term = get_term($term_id, $post_type . 'category'); |
|
399 | + if ($term_id && $post_type && get_query_var('taxonomy') == $post_type.'category') { |
|
400 | + $term = get_term($term_id, $post_type.'category'); |
|
401 | 401 | } |
402 | 402 | } |
403 | 403 | |
404 | - if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) { |
|
405 | - $taxonomy_search = $_REQUEST['s' . $post_type . 'category']; |
|
404 | + if (geodir_is_page('search') && !empty($_REQUEST['s'.$post_type.'category'])) { |
|
405 | + $taxonomy_search = $_REQUEST['s'.$post_type.'category']; |
|
406 | 406 | |
407 | 407 | if (!is_array($taxonomy_search)) { |
408 | - $term = get_term((int)$taxonomy_search, $post_type . 'category'); |
|
409 | - } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search |
|
410 | - $term = get_term((int)$taxonomy_search[0], $post_type . 'category'); |
|
408 | + $term = get_term((int) $taxonomy_search, $post_type.'category'); |
|
409 | + } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search |
|
410 | + $term = get_term((int) $taxonomy_search[0], $post_type.'category'); |
|
411 | 411 | } |
412 | 412 | } |
413 | 413 | |
@@ -419,7 +419,7 @@ discard block |
||
419 | 419 | if ($max_page > 1 || $always_show) { |
420 | 420 | // Extra pagination info |
421 | 421 | $geodir_pagination_more_info = get_option('geodir_pagination_advance_info'); |
422 | - $start_no = ( $paged - 1 ) * $posts_per_page + 1; |
|
422 | + $start_no = ($paged - 1) * $posts_per_page + 1; |
|
423 | 423 | $end_no = min($paged * $posts_per_page, $numposts); |
424 | 424 | |
425 | 425 | if ($geodir_pagination_more_info != '') { |
@@ -429,7 +429,7 @@ discard block |
||
429 | 429 | } else { |
430 | 430 | $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts); |
431 | 431 | } |
432 | - $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>'; |
|
432 | + $pagination_info = '<div class="gd-pagination-details">'.$pegination_desc.'</div>'; |
|
433 | 433 | /** |
434 | 434 | * Adds an extra pagination info above/under pagination. |
435 | 435 | * |
@@ -445,15 +445,15 @@ discard block |
||
445 | 445 | $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type); |
446 | 446 | |
447 | 447 | if ($geodir_pagination_more_info == 'before') { |
448 | - $before = $before . $pagination_info; |
|
448 | + $before = $before.$pagination_info; |
|
449 | 449 | } else if ($geodir_pagination_more_info == 'after') { |
450 | - $after = $pagination_info . $after; |
|
450 | + $after = $pagination_info.$after; |
|
451 | 451 | } |
452 | 452 | } |
453 | 453 | |
454 | 454 | echo "$before <div class='Navi gd-navi'>"; |
455 | 455 | if ($paged >= ($pages_to_show - 1)) { |
456 | - echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link()) . '">«</a>'; |
|
456 | + echo '<a href="'.str_replace('&paged', '&paged', get_pagenum_link()).'">«</a>'; |
|
457 | 457 | } |
458 | 458 | previous_posts_link($prelabel); |
459 | 459 | for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) { |
@@ -461,13 +461,13 @@ discard block |
||
461 | 461 | if ($i == $paged) { |
462 | 462 | echo "<strong class='on'>$i</strong>"; |
463 | 463 | } else { |
464 | - echo ' <a href="' . str_replace('&paged', '&paged', get_pagenum_link($i)) . '">' . $i . '</a> '; |
|
464 | + echo ' <a href="'.str_replace('&paged', '&paged', get_pagenum_link($i)).'">'.$i.'</a> '; |
|
465 | 465 | } |
466 | 466 | } |
467 | 467 | } |
468 | 468 | next_posts_link($nxtlabel, $max_page); |
469 | 469 | if (($paged + $half_pages_to_show) < ($max_page)) { |
470 | - echo '<a href="' . str_replace('&paged', '&paged', get_pagenum_link($max_page)) . '">»</a>'; |
|
470 | + echo '<a href="'.str_replace('&paged', '&paged', get_pagenum_link($max_page)).'">»</a>'; |
|
471 | 471 | } |
472 | 472 | echo "</div> $after"; |
473 | 473 | } |
@@ -505,7 +505,7 @@ discard block |
||
505 | 505 | jQuery(function ($) { |
506 | 506 | $("#distance_slider").slider({ |
507 | 507 | range: true, |
508 | - values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>], |
|
508 | + values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>], |
|
509 | 509 | min: 0, |
510 | 510 | max: <?php echo $dist; ?>, |
511 | 511 | step: <?php echo $dist_dif; ?>, |
@@ -572,7 +572,7 @@ discard block |
||
572 | 572 | $city = !empty($search_location) ? addslashes(stripslashes($search_location->city)) : ''; |
573 | 573 | ?> |
574 | 574 | <script type="text/javascript"> |
575 | - var default_location = '<?php echo $city ;?>'; |
|
575 | + var default_location = '<?php echo $city; ?>'; |
|
576 | 576 | var latlng; |
577 | 577 | var address; |
578 | 578 | var dist = 0; |
@@ -588,7 +588,7 @@ discard block |
||
588 | 588 | var $form = jQuery(this).closest('form'); |
589 | 589 | |
590 | 590 | if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val(); |
591 | - if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s); |
|
591 | + if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s); |
|
592 | 592 | |
593 | 593 | // Disable location based search for disabled location post type. |
594 | 594 | if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') { |
@@ -602,7 +602,7 @@ discard block |
||
602 | 602 | } |
603 | 603 | } |
604 | 604 | |
605 | - if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) { |
|
605 | + if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) { |
|
606 | 606 | |
607 | 607 | // OSM can't handel post code with no space so we test for it and add one if needed |
608 | 608 | if(window.gdMaps === 'osm'){ |
@@ -631,7 +631,7 @@ discard block |
||
631 | 631 | }); |
632 | 632 | |
633 | 633 | function geodir_setsearch($form) { |
634 | - if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location); |
|
634 | + if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location); |
|
635 | 635 | geocodeAddress($form); |
636 | 636 | } |
637 | 637 | |
@@ -650,15 +650,15 @@ discard block |
||
650 | 650 | // Call the geocode function |
651 | 651 | Sgeocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null; |
652 | 652 | |
653 | - if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != '' ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) { |
|
654 | - if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) { |
|
653 | + if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != '' ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) { |
|
654 | + if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) { |
|
655 | 655 | jQuery(".snear", $form).val(''); |
656 | 656 | } |
657 | 657 | jQuery($form).submit(); |
658 | 658 | } else { |
659 | 659 | var address = jQuery(".snear", $form).val(); |
660 | 660 | |
661 | - if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') { |
|
661 | + if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') { |
|
662 | 662 | initialise2(); |
663 | 663 | } else { |
664 | 664 | <?php |
@@ -671,12 +671,12 @@ discard block |
||
671 | 671 | $near_add2 = apply_filters('geodir_search_near_addition', ''); |
672 | 672 | ?> |
673 | 673 | if (window.gdMaps === 'google') { |
674 | - Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>}, |
|
674 | + Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", '.$near_add.'"' : '').$near_add2; ?>}, |
|
675 | 675 | function (results, status) { |
676 | 676 | if (status == google.maps.GeocoderStatus.OK) { |
677 | 677 | updateSearchPosition(results[0].geometry.location, $form); |
678 | 678 | } else { |
679 | - alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory');?>" + status); |
|
679 | + alert("<?php esc_attr_e('Search was not successful for the following reason :', 'geodirectory'); ?>" + status); |
|
680 | 680 | } |
681 | 681 | }); |
682 | 682 | } else if (window.gdMaps === 'osm') { |
@@ -685,7 +685,7 @@ discard block |
||
685 | 685 | if (typeof geo !== 'undefined' && geo.lat && geo.lon) { |
686 | 686 | updateSearchPosition(geo, $form); |
687 | 687 | } else { |
688 | - alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory');?>"); |
|
688 | + alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory'); ?>"); |
|
689 | 689 | } |
690 | 690 | }); |
691 | 691 | } else { |
@@ -731,19 +731,19 @@ discard block |
||
731 | 731 | var msg; |
732 | 732 | switch (err.code) { |
733 | 733 | case err.UNKNOWN_ERROR: |
734 | - msg = "<?php _e('Unable to find your location','geodirectory');?>"; |
|
734 | + msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>"; |
|
735 | 735 | break; |
736 | 736 | case err.PERMISSION_DENINED: |
737 | - msg = "<?php _e('Permission denied in finding your location','geodirectory');?>"; |
|
737 | + msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>"; |
|
738 | 738 | break; |
739 | 739 | case err.POSITION_UNAVAILABLE: |
740 | - msg = "<?php _e('Your location is currently unknown','geodirectory');?>"; |
|
740 | + msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>"; |
|
741 | 741 | break; |
742 | 742 | case err.BREAK: |
743 | - msg = "<?php _e('Attempt to find location took too long','geodirectory');?>"; |
|
743 | + msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>"; |
|
744 | 744 | break; |
745 | 745 | default: |
746 | - msg = "<?php _e('Location detection not supported in browser','geodirectory');?>"; |
|
746 | + msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>"; |
|
747 | 747 | } |
748 | 748 | jQuery('#info').html(msg); |
749 | 749 | } |
@@ -793,7 +793,7 @@ discard block |
||
793 | 793 | * @param object $post The post object. |
794 | 794 | * @param string $link The link to the post. |
795 | 795 | */ |
796 | - $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img"> </span></a>',$post,$link); |
|
796 | + $return = apply_filters('geodir_featured_badge_on_image', '<a href="'.$link.'"><span class="geodir_featured_img"> </span></a>', $post, $link); |
|
797 | 797 | break; |
798 | 798 | case 'new' : |
799 | 799 | /** |
@@ -803,7 +803,7 @@ discard block |
||
803 | 803 | * @param object $post The post object. |
804 | 804 | * @param string $link The link to the post. |
805 | 805 | */ |
806 | - $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing"> </span></a>',$post,$link); |
|
806 | + $return = apply_filters('geodir_new_badge_on_image', '<a href="'.$link.'"><span class="geodir_new_listing"> </span></a>', $post, $link); |
|
807 | 807 | break; |
808 | 808 | |
809 | 809 | } |
@@ -817,8 +817,8 @@ discard block |
||
817 | 817 | * @since 1.6.22 |
818 | 818 | */ |
819 | 819 | function geodir_fix_script_conflict() { |
820 | - if ( wp_script_is( 'flexslider', 'enqueued' ) && wp_script_is( 'geodirectory-jquery-flexslider-js', 'enqueued' ) ) { |
|
821 | - wp_dequeue_script( 'flexslider' ); |
|
820 | + if (wp_script_is('flexslider', 'enqueued') && wp_script_is('geodirectory-jquery-flexslider-js', 'enqueued')) { |
|
821 | + wp_dequeue_script('flexslider'); |
|
822 | 822 | } |
823 | 823 | } |
824 | -add_action( 'wp_enqueue_scripts', 'geodir_fix_script_conflict', 100 ); |
|
825 | 824 | \ No newline at end of file |
825 | +add_action('wp_enqueue_scripts', 'geodir_fix_script_conflict', 100); |
|
826 | 826 | \ No newline at end of file |
@@ -16,10 +16,10 @@ discard block |
||
16 | 16 | */ |
17 | 17 | function geodir_session_start() |
18 | 18 | { |
19 | - if (!session_id()) session_start(); |
|
20 | - global $geodir_add_location_url; |
|
19 | + if (!session_id()) session_start(); |
|
20 | + global $geodir_add_location_url; |
|
21 | 21 | |
22 | - $geodir_add_location_url = NULL; |
|
22 | + $geodir_add_location_url = NULL; |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | /** |
@@ -33,18 +33,18 @@ discard block |
||
33 | 33 | */ |
34 | 34 | function geodir_modified_query($query) |
35 | 35 | { |
36 | - if ($query->is_main_query() && ( |
|
37 | - (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
38 | - || geodir_is_page('listing') |
|
39 | - || geodir_is_page('author') |
|
40 | - || geodir_is_page('search') |
|
41 | - || geodir_is_page('detail')) |
|
42 | - ) { |
|
43 | - |
|
44 | - $query->set('is_geodir_loop', true); |
|
45 | - } |
|
36 | + if ($query->is_main_query() && ( |
|
37 | + (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') |
|
38 | + || geodir_is_page('listing') |
|
39 | + || geodir_is_page('author') |
|
40 | + || geodir_is_page('search') |
|
41 | + || geodir_is_page('detail')) |
|
42 | + ) { |
|
43 | + |
|
44 | + $query->set('is_geodir_loop', true); |
|
45 | + } |
|
46 | 46 | |
47 | - return $query; |
|
47 | + return $query; |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
@@ -67,81 +67,81 @@ discard block |
||
67 | 67 | */ |
68 | 68 | function set_listing_request($query ) |
69 | 69 | { |
70 | - global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
|
70 | + global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
|
71 | 71 | |
72 | 72 | |
73 | - // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce |
|
74 | - if (!geodir_is_geodir_page()) { |
|
75 | - return; |
|
76 | - } |
|
73 | + // fix woocommerce shop products filtered by language for GD + WPML + Woocommerce |
|
74 | + if (!geodir_is_geodir_page()) { |
|
75 | + return; |
|
76 | + } |
|
77 | 77 | |
78 | - /* remove all pre filters */ |
|
79 | - remove_all_filters('query'); |
|
80 | - remove_all_filters('posts_search'); |
|
81 | - remove_all_filters('posts_fields'); |
|
82 | - remove_all_filters('posts_join'); |
|
83 | - remove_all_filters('posts_orderby'); |
|
84 | - remove_all_filters('posts_where'); |
|
78 | + /* remove all pre filters */ |
|
79 | + remove_all_filters('query'); |
|
80 | + remove_all_filters('posts_search'); |
|
81 | + remove_all_filters('posts_fields'); |
|
82 | + remove_all_filters('posts_join'); |
|
83 | + remove_all_filters('posts_orderby'); |
|
84 | + remove_all_filters('posts_where'); |
|
85 | 85 | |
86 | 86 | |
87 | - if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')): |
|
87 | + if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')): |
|
88 | 88 | |
89 | - if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = ''; |
|
90 | - //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = ''; |
|
89 | + if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = ''; |
|
90 | + //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = ''; |
|
91 | 91 | |
92 | - if (isset($_REQUEST['sdist'])) { |
|
93 | - ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000; |
|
94 | - } elseif (get_option('geodir_search_dist') != '') { |
|
95 | - $dist = get_option('geodir_search_dist'); |
|
92 | + if (isset($_REQUEST['sdist'])) { |
|
93 | + ($_REQUEST['sdist'] != '0' && $_REQUEST['sdist'] != '') ? $dist = esc_attr($_REQUEST['sdist']) : $dist = 25000; |
|
94 | + } elseif (get_option('geodir_search_dist') != '') { |
|
95 | + $dist = get_option('geodir_search_dist'); |
|
96 | 96 | |
97 | - } else { |
|
98 | - $dist = 25000; |
|
99 | - } // Distance |
|
97 | + } else { |
|
98 | + $dist = 25000; |
|
99 | + } // Distance |
|
100 | 100 | |
101 | - if (isset($_REQUEST['sgeo_lat'])) { |
|
102 | - $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
103 | - } else { |
|
104 | - $mylat = (float)geodir_get_current_city_lat(); |
|
105 | - } // Latitude |
|
101 | + if (isset($_REQUEST['sgeo_lat'])) { |
|
102 | + $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
103 | + } else { |
|
104 | + $mylat = (float)geodir_get_current_city_lat(); |
|
105 | + } // Latitude |
|
106 | 106 | |
107 | - if (isset($_REQUEST['sgeo_lon'])) { |
|
108 | - $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
109 | - } else { |
|
110 | - $mylon = (float)geodir_get_current_city_lng(); |
|
111 | - } // Distance |
|
107 | + if (isset($_REQUEST['sgeo_lon'])) { |
|
108 | + $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
109 | + } else { |
|
110 | + $mylon = (float)geodir_get_current_city_lng(); |
|
111 | + } // Distance |
|
112 | 112 | |
113 | - if (isset($_REQUEST['snear'])) { |
|
114 | - $snear = trim(esc_attr($_REQUEST['snear'])); |
|
115 | - } |
|
113 | + if (isset($_REQUEST['snear'])) { |
|
114 | + $snear = trim(esc_attr($_REQUEST['snear'])); |
|
115 | + } |
|
116 | 116 | |
117 | - if (isset($_REQUEST['s'])) { |
|
118 | - $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s']))); |
|
119 | - } |
|
117 | + if (isset($_REQUEST['s'])) { |
|
118 | + $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s']))); |
|
119 | + } |
|
120 | 120 | |
121 | - if ($snear == 'NEAR ME') { |
|
122 | - $ip = $_SERVER['REMOTE_ADDR']; |
|
123 | - $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip)); |
|
124 | - $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
|
125 | - $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude])); |
|
126 | - } |
|
121 | + if ($snear == 'NEAR ME') { |
|
122 | + $ip = $_SERVER['REMOTE_ADDR']; |
|
123 | + $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip)); |
|
124 | + $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
|
125 | + $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude])); |
|
126 | + } |
|
127 | 127 | |
128 | 128 | |
129 | - if (strstr($s, ',')) { |
|
130 | - $s_AA = str_replace(" ", "", $s); |
|
131 | - $s_A = explode(",", $s_AA); |
|
132 | - $s_A = implode('","', $s_A); |
|
133 | - $s_A = '"' . $s_A . '"'; |
|
134 | - } else { |
|
135 | - $s_A = '"' . $s . '"'; |
|
136 | - } |
|
129 | + if (strstr($s, ',')) { |
|
130 | + $s_AA = str_replace(" ", "", $s); |
|
131 | + $s_A = explode(",", $s_AA); |
|
132 | + $s_A = implode('","', $s_A); |
|
133 | + $s_A = '"' . $s_A . '"'; |
|
134 | + } else { |
|
135 | + $s_A = '"' . $s . '"'; |
|
136 | + } |
|
137 | 137 | |
138 | - if (strstr($s, ' ')) { |
|
139 | - $s_SA = explode(" ", $s); |
|
140 | - } else { |
|
141 | - $s_SA = ''; |
|
142 | - } |
|
138 | + if (strstr($s, ' ')) { |
|
139 | + $s_SA = explode(" ", $s); |
|
140 | + } else { |
|
141 | + $s_SA = ''; |
|
142 | + } |
|
143 | 143 | |
144 | - endif; |
|
144 | + endif; |
|
145 | 145 | |
146 | 146 | |
147 | 147 | |
@@ -162,56 +162,56 @@ discard block |
||
162 | 162 | */ |
163 | 163 | function geodir_listing_loop_filter($query) |
164 | 164 | { |
165 | - global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term; |
|
165 | + global $wp_query, $geodir_post_type, $table, $plugin_prefix, $table, $term; |
|
166 | 166 | |
167 | - // fix wp_reset_query for popular post view widget |
|
168 | - if (!geodir_is_geodir_page()) { |
|
169 | - return; |
|
170 | - } |
|
167 | + // fix wp_reset_query for popular post view widget |
|
168 | + if (!geodir_is_geodir_page()) { |
|
169 | + return; |
|
170 | + } |
|
171 | 171 | |
172 | - $geodir_post_type = geodir_get_current_posttype(); |
|
173 | - |
|
174 | - if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) { |
|
175 | - $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy'); |
|
176 | - |
|
177 | - if (isset($wp_query->query[$taxonomies[0]])) { |
|
178 | - $request_term = explode("/", $wp_query->query[$taxonomies[0]]); |
|
179 | - $request_term = end($request_term); |
|
180 | - if (!term_exists($request_term)) { |
|
181 | - $args = array('number' => '1',); |
|
182 | - $terms_arr = get_terms($taxonomies[0], $args); |
|
183 | - foreach ($terms_arr as $location_term) { |
|
184 | - $term_arr = $location_term; |
|
185 | - $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term)); |
|
186 | - } |
|
187 | - $wp_query->queried_object_id = 1; |
|
188 | - $wp_query->queried_object = $term_arr; |
|
189 | - //print_r($wp_query) ; |
|
190 | - } |
|
191 | - } |
|
172 | + $geodir_post_type = geodir_get_current_posttype(); |
|
173 | + |
|
174 | + if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) { |
|
175 | + $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy'); |
|
176 | + |
|
177 | + if (isset($wp_query->query[$taxonomies[0]])) { |
|
178 | + $request_term = explode("/", $wp_query->query[$taxonomies[0]]); |
|
179 | + $request_term = end($request_term); |
|
180 | + if (!term_exists($request_term)) { |
|
181 | + $args = array('number' => '1',); |
|
182 | + $terms_arr = get_terms($taxonomies[0], $args); |
|
183 | + foreach ($terms_arr as $location_term) { |
|
184 | + $term_arr = $location_term; |
|
185 | + $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term)); |
|
186 | + } |
|
187 | + $wp_query->queried_object_id = 1; |
|
188 | + $wp_query->queried_object = $term_arr; |
|
189 | + //print_r($wp_query) ; |
|
190 | + } |
|
191 | + } |
|
192 | 192 | |
193 | - } |
|
194 | - if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) { |
|
195 | - |
|
196 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
197 | - |
|
198 | - add_filter('posts_fields', 'geodir_posts_fields', 1); |
|
199 | - add_filter('posts_join', 'geodir_posts_join', 1); |
|
200 | - geodir_post_where(); |
|
201 | - if (!is_admin()) |
|
202 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1); |
|
203 | - |
|
204 | - // advanced filter for popular post view widget |
|
205 | - global $wp_query; |
|
206 | - if (!is_admin()) { |
|
207 | - if (!empty($wp_query->query['with_pics_only'])) { |
|
208 | - add_filter('posts_join', 'geodir_filter_widget_join', 1000); |
|
209 | - } |
|
210 | - add_filter('posts_where', 'geodir_filter_widget_where', 1000); |
|
211 | - } |
|
193 | + } |
|
194 | + if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) { |
|
212 | 195 | |
213 | - } |
|
214 | - return $query; |
|
196 | + $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
197 | + |
|
198 | + add_filter('posts_fields', 'geodir_posts_fields', 1); |
|
199 | + add_filter('posts_join', 'geodir_posts_join', 1); |
|
200 | + geodir_post_where(); |
|
201 | + if (!is_admin()) |
|
202 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1); |
|
203 | + |
|
204 | + // advanced filter for popular post view widget |
|
205 | + global $wp_query; |
|
206 | + if (!is_admin()) { |
|
207 | + if (!empty($wp_query->query['with_pics_only'])) { |
|
208 | + add_filter('posts_join', 'geodir_filter_widget_join', 1000); |
|
209 | + } |
|
210 | + add_filter('posts_where', 'geodir_filter_widget_where', 1000); |
|
211 | + } |
|
212 | + |
|
213 | + } |
|
214 | + return $query; |
|
215 | 215 | } |
216 | 216 | |
217 | 217 | |
@@ -230,67 +230,67 @@ discard block |
||
230 | 230 | * @return string Modified fields query string. |
231 | 231 | */ |
232 | 232 | function geodir_posts_fields($fields) { |
233 | - global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
|
233 | + global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
|
234 | 234 | |
235 | - // Filter-Location-Manager to add location table. |
|
236 | - $fields .= ", " . $table . ".* "; |
|
235 | + // Filter-Location-Manager to add location table. |
|
236 | + $fields .= ", " . $table . ".* "; |
|
237 | 237 | |
238 | 238 | if ($snear != '' || $gd_session->get('all_near_me')) { |
239 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1')); |
|
239 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1')); |
|
240 | 240 | |
241 | 241 | if ($gd_session->get('all_near_me')) { |
242 | - $mylat = $gd_session->get('user_lat'); |
|
243 | - $mylon = $gd_session->get('user_lon'); |
|
244 | - } |
|
245 | - |
|
246 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance "; |
|
247 | - } |
|
248 | - |
|
249 | - global $s; |
|
250 | - if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') { |
|
251 | - $keywords = explode(" ", $s); |
|
252 | - |
|
253 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){ |
|
254 | - foreach($keywords as $kkey=>$kword){ |
|
255 | - if(geodir_utf8_strlen($kword)<=$klimit){ |
|
256 | - unset($keywords[$kkey]); |
|
257 | - } |
|
258 | - } |
|
259 | - } |
|
242 | + $mylat = $gd_session->get('user_lat'); |
|
243 | + $mylon = $gd_session->get('user_lon'); |
|
244 | + } |
|
260 | 245 | |
246 | + $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance "; |
|
247 | + } |
|
261 | 248 | |
262 | - if (count($keywords) > 1) { |
|
263 | - $parts = array( |
|
264 | - 'AND' => 'gd_alltitlematch_part', |
|
265 | - 'OR' => 'gd_titlematch_part' |
|
266 | - ); |
|
267 | - $gd_titlematch_part = ""; |
|
268 | - foreach ($parts as $key => $part) { |
|
269 | - $gd_titlematch_part .= " CASE WHEN "; |
|
270 | - $count = 0; |
|
271 | - foreach ($keywords as $keyword) { |
|
272 | - $keyword = trim($keyword); |
|
273 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
249 | + global $s; |
|
250 | + if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') { |
|
251 | + $keywords = explode(" ", $s); |
|
252 | + |
|
253 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){ |
|
254 | + foreach($keywords as $kkey=>$kword){ |
|
255 | + if(geodir_utf8_strlen($kword)<=$klimit){ |
|
256 | + unset($keywords[$kkey]); |
|
257 | + } |
|
258 | + } |
|
259 | + } |
|
260 | + |
|
261 | + |
|
262 | + if (count($keywords) > 1) { |
|
263 | + $parts = array( |
|
264 | + 'AND' => 'gd_alltitlematch_part', |
|
265 | + 'OR' => 'gd_titlematch_part' |
|
266 | + ); |
|
267 | + $gd_titlematch_part = ""; |
|
268 | + foreach ($parts as $key => $part) { |
|
269 | + $gd_titlematch_part .= " CASE WHEN "; |
|
270 | + $count = 0; |
|
271 | + foreach ($keywords as $keyword) { |
|
272 | + $keyword = trim($keyword); |
|
273 | + $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
274 | 274 | $count++; |
275 | - if ($count < count($keywords)) { |
|
276 | - // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
|
275 | + if ($count < count($keywords)) { |
|
276 | + // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
|
277 | 277 | $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " "; |
278 | - } else { |
|
279 | - //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
|
278 | + } else { |
|
279 | + //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
|
280 | 280 | $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) "; |
281 | - } |
|
282 | - } |
|
283 | - $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
284 | - } |
|
285 | - } else { |
|
286 | - $gd_titlematch_part = ""; |
|
287 | - } |
|
288 | - $s = stripslashes_deep( $s ); |
|
289 | - $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
281 | + } |
|
282 | + } |
|
283 | + $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
284 | + } |
|
285 | + } else { |
|
286 | + $gd_titlematch_part = ""; |
|
287 | + } |
|
288 | + $s = stripslashes_deep( $s ); |
|
289 | + $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
290 | 290 | $fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s)); |
291 | - } |
|
291 | + } |
|
292 | 292 | |
293 | - return $fields; |
|
293 | + return $fields; |
|
294 | 294 | } |
295 | 295 | |
296 | 296 | |
@@ -307,26 +307,26 @@ discard block |
||
307 | 307 | */ |
308 | 308 | function geodir_posts_join($join) |
309 | 309 | { |
310 | - global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix; |
|
310 | + global $wpdb, $geodir_post_type, $table, $table_prefix, $plugin_prefix; |
|
311 | 311 | |
312 | - ########### WPML ########### |
|
312 | + ########### WPML ########### |
|
313 | 313 | |
314 | - if ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) { |
|
315 | - global $sitepress; |
|
316 | - $lang_code = ICL_LANGUAGE_CODE; |
|
317 | - $default_lang_code = $sitepress->get_default_language(); |
|
318 | - if ($lang_code) { |
|
319 | - $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
320 | - } |
|
314 | + if ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) { |
|
315 | + global $sitepress; |
|
316 | + $lang_code = ICL_LANGUAGE_CODE; |
|
317 | + $default_lang_code = $sitepress->get_default_language(); |
|
318 | + if ($lang_code) { |
|
319 | + $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
320 | + } |
|
321 | 321 | |
322 | - } |
|
323 | - ########### WPML ########### |
|
322 | + } |
|
323 | + ########### WPML ########### |
|
324 | 324 | |
325 | - $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) "; |
|
326 | - //===old code start |
|
327 | - //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end |
|
325 | + $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) "; |
|
326 | + //===old code start |
|
327 | + //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end |
|
328 | 328 | |
329 | - return $join; |
|
329 | + return $join; |
|
330 | 330 | } |
331 | 331 | |
332 | 332 | |
@@ -344,15 +344,15 @@ discard block |
||
344 | 344 | */ |
345 | 345 | function geodir_posts_orderby($orderby) |
346 | 346 | { |
347 | - global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort; |
|
347 | + global $wpdb, $wp_query, $geodir_post_type, $table, $plugin_prefix, $snear, $default_sort; |
|
348 | 348 | |
349 | - $sort_by = ''; |
|
350 | - $orderby = ' '; |
|
349 | + $sort_by = ''; |
|
350 | + $orderby = ' '; |
|
351 | 351 | |
352 | - if (get_query_var('order_by')) |
|
353 | - $sort_by = get_query_var('order_by'); |
|
352 | + if (get_query_var('order_by')) |
|
353 | + $sort_by = get_query_var('order_by'); |
|
354 | 354 | |
355 | - /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){ |
|
355 | + /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){ |
|
356 | 356 | $current_term = $wp_query->get_queried_object(); |
357 | 357 | } |
358 | 358 | |
@@ -366,133 +366,133 @@ discard block |
||
366 | 366 | }*/ |
367 | 367 | |
368 | 368 | |
369 | - if ($snear != '') { |
|
370 | - $orderby .= " distance,"; |
|
371 | - } |
|
369 | + if ($snear != '') { |
|
370 | + $orderby .= " distance,"; |
|
371 | + } |
|
372 | 372 | |
373 | - if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) |
|
374 | - $sort_by = esc_attr($_REQUEST['sort_by']); |
|
373 | + if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) |
|
374 | + $sort_by = esc_attr($_REQUEST['sort_by']); |
|
375 | 375 | |
376 | 376 | |
377 | - if ($sort_by == '') { |
|
378 | - $default_sort = geodir_get_posts_default_sort($geodir_post_type); |
|
379 | - if (!empty($default_sort)) |
|
380 | - $sort_by = $default_sort; |
|
381 | - } |
|
377 | + if ($sort_by == '') { |
|
378 | + $default_sort = geodir_get_posts_default_sort($geodir_post_type); |
|
379 | + if (!empty($default_sort)) |
|
380 | + $sort_by = $default_sort; |
|
381 | + } |
|
382 | 382 | |
383 | - /* |
|
383 | + /* |
|
384 | 384 | if search by term & no location then order always "relevance" |
385 | 385 | if search by location then order always "nearest" |
386 | 386 | */ |
387 | - if (is_main_query() && geodir_is_page('search')) { |
|
388 | - $search_term = get_query_var('s'); |
|
387 | + if (is_main_query() && geodir_is_page('search')) { |
|
388 | + $search_term = get_query_var('s'); |
|
389 | 389 | |
390 | - if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) { |
|
391 | - $sort_by = 'az'; |
|
392 | - } |
|
390 | + if (trim($search_term) != '' && !isset($_REQUEST['sort_by'])) { |
|
391 | + $sort_by = 'az'; |
|
392 | + } |
|
393 | 393 | |
394 | - if ($snear != '' && $sort_by!='farthest') { |
|
395 | - $sort_by = 'nearest'; |
|
396 | - } |
|
397 | - } |
|
398 | - |
|
399 | - switch ($sort_by): |
|
400 | - case 'newest': |
|
401 | - $orderby = "$wpdb->posts.post_date desc, "; |
|
402 | - break; |
|
403 | - case 'oldest': |
|
404 | - $orderby = "$wpdb->posts.post_date asc, "; |
|
405 | - break; |
|
406 | - case 'low_review': |
|
407 | - case 'rating_count_asc': |
|
408 | - $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
409 | - break; |
|
410 | - case 'high_review': |
|
411 | - case 'rating_count_desc': |
|
412 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
413 | - break; |
|
414 | - case 'low_rating': |
|
415 | - $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
416 | - break; |
|
417 | - case 'high_rating': |
|
418 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
419 | - break; |
|
420 | - case 'featured': |
|
421 | - $orderby = $table . ".is_featured asc, "; |
|
422 | - break; |
|
423 | - case 'nearest': |
|
424 | - $orderby = " distance asc, "; |
|
425 | - break; |
|
426 | - case 'farthest': |
|
427 | - $orderby = " distance desc, "; |
|
428 | - break; |
|
429 | - case 'random': |
|
430 | - $orderby = " rand(), "; |
|
431 | - break; |
|
432 | - case 'az': |
|
433 | - $orderby = "$wpdb->posts.post_title asc, "; |
|
434 | - break; |
|
435 | - // sort by rating |
|
436 | - case 'overall_rating_desc': |
|
437 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
438 | - break; |
|
439 | - case 'overall_rating_asc': |
|
440 | - $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
441 | - break; |
|
442 | - default: |
|
443 | - |
|
444 | - break; |
|
445 | - endswitch; |
|
446 | - |
|
447 | - if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) { |
|
448 | - if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) { |
|
449 | - $orderby = "$wpdb->posts.comment_count DESC, "; |
|
450 | - $sort_by = 'comment_count_desc'; |
|
451 | - } else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) { |
|
452 | - $orderby = "$wpdb->posts.comment_count ASC, "; |
|
453 | - $sort_by = 'comment_count_asc'; |
|
454 | - } |
|
455 | - } |
|
394 | + if ($snear != '' && $sort_by!='farthest') { |
|
395 | + $sort_by = 'nearest'; |
|
396 | + } |
|
397 | + } |
|
456 | 398 | |
457 | - global $s; |
|
399 | + switch ($sort_by): |
|
400 | + case 'newest': |
|
401 | + $orderby = "$wpdb->posts.post_date desc, "; |
|
402 | + break; |
|
403 | + case 'oldest': |
|
404 | + $orderby = "$wpdb->posts.post_date asc, "; |
|
405 | + break; |
|
406 | + case 'low_review': |
|
407 | + case 'rating_count_asc': |
|
408 | + $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
409 | + break; |
|
410 | + case 'high_review': |
|
411 | + case 'rating_count_desc': |
|
412 | + $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
413 | + break; |
|
414 | + case 'low_rating': |
|
415 | + $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
416 | + break; |
|
417 | + case 'high_rating': |
|
418 | + $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
419 | + break; |
|
420 | + case 'featured': |
|
421 | + $orderby = $table . ".is_featured asc, "; |
|
422 | + break; |
|
423 | + case 'nearest': |
|
424 | + $orderby = " distance asc, "; |
|
425 | + break; |
|
426 | + case 'farthest': |
|
427 | + $orderby = " distance desc, "; |
|
428 | + break; |
|
429 | + case 'random': |
|
430 | + $orderby = " rand(), "; |
|
431 | + break; |
|
432 | + case 'az': |
|
433 | + $orderby = "$wpdb->posts.post_title asc, "; |
|
434 | + break; |
|
435 | + // sort by rating |
|
436 | + case 'overall_rating_desc': |
|
437 | + $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
438 | + break; |
|
439 | + case 'overall_rating_asc': |
|
440 | + $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
441 | + break; |
|
442 | + default: |
|
443 | + |
|
444 | + break; |
|
445 | + endswitch; |
|
446 | + |
|
447 | + if ($sort_by != '' && geodir_cpt_has_rating_disabled($geodir_post_type)) { |
|
448 | + if (in_array($sort_by, array('high_review', 'rating_count_desc', 'high_rating', 'overall_rating_desc'))) { |
|
449 | + $orderby = "$wpdb->posts.comment_count DESC, "; |
|
450 | + $sort_by = 'comment_count_desc'; |
|
451 | + } else if (in_array($sort_by, array('low_review', 'rating_count_asc', 'low_rating', 'overall_rating_asc'))) { |
|
452 | + $orderby = "$wpdb->posts.comment_count ASC, "; |
|
453 | + $sort_by = 'comment_count_asc'; |
|
454 | + } |
|
455 | + } |
|
458 | 456 | |
459 | - if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') { |
|
460 | - $keywords = explode(" ", $s); |
|
461 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){ |
|
462 | - foreach($keywords as $kkey=>$kword){ |
|
463 | - if(geodir_utf8_strlen($kword)<=$klimit){ |
|
464 | - unset($keywords[$kkey]); |
|
465 | - } |
|
466 | - } |
|
467 | - } |
|
468 | - if ($sort_by == 'nearest' || $sort_by == 'farthest') { |
|
469 | - if (count($keywords) > 1) { |
|
470 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
471 | - } else { |
|
472 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
473 | - } |
|
474 | - } else { |
|
475 | - if (count($keywords) > 1) { |
|
476 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
477 | - } else { |
|
478 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
479 | - } |
|
480 | - } |
|
481 | - } |
|
457 | + global $s; |
|
458 | + |
|
459 | + if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') { |
|
460 | + $keywords = explode(" ", $s); |
|
461 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){ |
|
462 | + foreach($keywords as $kkey=>$kword){ |
|
463 | + if(geodir_utf8_strlen($kword)<=$klimit){ |
|
464 | + unset($keywords[$kkey]); |
|
465 | + } |
|
466 | + } |
|
467 | + } |
|
468 | + if ($sort_by == 'nearest' || $sort_by == 'farthest') { |
|
469 | + if (count($keywords) > 1) { |
|
470 | + $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
471 | + } else { |
|
472 | + $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
473 | + } |
|
474 | + } else { |
|
475 | + if (count($keywords) > 1) { |
|
476 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
477 | + } else { |
|
478 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
479 | + } |
|
480 | + } |
|
481 | + } |
|
482 | 482 | |
483 | - /** |
|
484 | - * Filter order by SQL. |
|
485 | - * |
|
486 | - * @since 1.0.0 |
|
487 | - * @param string $orderby The orderby query string. |
|
488 | - * @param string $sort_by Sortby query string. |
|
489 | - * @param string $table Listing table name. |
|
490 | - */ |
|
491 | - $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table); |
|
483 | + /** |
|
484 | + * Filter order by SQL. |
|
485 | + * |
|
486 | + * @since 1.0.0 |
|
487 | + * @param string $orderby The orderby query string. |
|
488 | + * @param string $sort_by Sortby query string. |
|
489 | + * @param string $table Listing table name. |
|
490 | + */ |
|
491 | + $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table); |
|
492 | 492 | |
493 | - $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
493 | + $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
494 | 494 | |
495 | - return $orderby; |
|
495 | + return $orderby; |
|
496 | 496 | } |
497 | 497 | |
498 | 498 | |
@@ -510,78 +510,78 @@ discard block |
||
510 | 510 | function geodir_posts_order_by_custom_sort($orderby, $sort_by, $table) |
511 | 511 | { |
512 | 512 | |
513 | - global $wpdb; |
|
513 | + global $wpdb; |
|
514 | 514 | |
515 | - if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) { |
|
515 | + if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) { |
|
516 | 516 | |
517 | - $sort_array = explode('_', $sort_by); |
|
517 | + $sort_array = explode('_', $sort_by); |
|
518 | 518 | |
519 | - $sort_by_count = count($sort_array); |
|
519 | + $sort_by_count = count($sort_array); |
|
520 | 520 | |
521 | - $order = $sort_array[$sort_by_count - 1]; |
|
521 | + $order = $sort_array[$sort_by_count - 1]; |
|
522 | 522 | |
523 | - if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) { |
|
523 | + if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) { |
|
524 | 524 | |
525 | - $sort_by = str_replace('_' . $order, '', $sort_by); |
|
525 | + $sort_by = str_replace('_' . $order, '', $sort_by); |
|
526 | 526 | |
527 | - switch ($sort_by): |
|
527 | + switch ($sort_by): |
|
528 | 528 | |
529 | - case 'post_date': |
|
530 | - case 'comment_count': |
|
529 | + case 'post_date': |
|
530 | + case 'comment_count': |
|
531 | 531 | |
532 | - $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
533 | - break; |
|
532 | + $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
533 | + break; |
|
534 | 534 | |
535 | - case 'distance': |
|
536 | - $orderby = $sort_by . " " . $order . ", "; |
|
537 | - break; |
|
535 | + case 'distance': |
|
536 | + $orderby = $sort_by . " " . $order . ", "; |
|
537 | + break; |
|
538 | 538 | |
539 | 539 | |
540 | - // sort by rating |
|
541 | - case 'overall_rating': |
|
540 | + // sort by rating |
|
541 | + case 'overall_rating': |
|
542 | 542 | |
543 | - $use_bayesian = apply_filters('gd_use_bayesian',true,$table); |
|
544 | - $avg_rating = 0; |
|
545 | - if($use_bayesian){ |
|
546 | - $avg_num_votes = get_transient( 'gd_avg_num_votes_'.$table ); |
|
547 | - if(!$avg_num_votes){ |
|
548 | - $avg_num_votes = $wpdb->get_var("SELECT SUM(rating_count) FROM $table"); |
|
549 | - if($avg_num_votes){ |
|
543 | + $use_bayesian = apply_filters('gd_use_bayesian',true,$table); |
|
544 | + $avg_rating = 0; |
|
545 | + if($use_bayesian){ |
|
546 | + $avg_num_votes = get_transient( 'gd_avg_num_votes_'.$table ); |
|
547 | + if(!$avg_num_votes){ |
|
548 | + $avg_num_votes = $wpdb->get_var("SELECT SUM(rating_count) FROM $table"); |
|
549 | + if($avg_num_votes){ |
|
550 | 550 | |
551 | - $avg_rating = get_transient( 'gd_avg_rating_'.$table ); |
|
552 | - if(!$avg_rating){ |
|
553 | - $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table")/$avg_num_votes; |
|
554 | - } |
|
555 | - set_transient( 'gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS ); |
|
556 | - set_transient( 'gd_avg_rating_'.$table, $avg_rating , 12 * HOUR_IN_SECONDS ); |
|
557 | - } |
|
558 | - } |
|
551 | + $avg_rating = get_transient( 'gd_avg_rating_'.$table ); |
|
552 | + if(!$avg_rating){ |
|
553 | + $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table")/$avg_num_votes; |
|
554 | + } |
|
555 | + set_transient( 'gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS ); |
|
556 | + set_transient( 'gd_avg_rating_'.$table, $avg_rating , 12 * HOUR_IN_SECONDS ); |
|
557 | + } |
|
558 | + } |
|
559 | 559 | |
560 | - if(!$avg_num_votes){ $avg_num_votes = 0;} |
|
560 | + if(!$avg_num_votes){ $avg_num_votes = 0;} |
|
561 | 561 | |
562 | - $orderby = " (( $avg_num_votes * $avg_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating )) / ( $avg_num_votes + " . $table . ".rating_count ) $order , "; |
|
562 | + $orderby = " (( $avg_num_votes * $avg_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating )) / ( $avg_num_votes + " . $table . ".rating_count ) $order , "; |
|
563 | 563 | |
564 | - //$orderby = " ( " . $table . ".rating_count * " . $table . ".overall_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating ) / ( " . $table . ".rating_count + " . $table . ".rating_count ) $order , "; // seems to work mostly with no extra overheads |
|
565 | - }else{ |
|
566 | - $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
567 | - } |
|
564 | + //$orderby = " ( " . $table . ".rating_count * " . $table . ".overall_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating ) / ( " . $table . ".rating_count + " . $table . ".rating_count ) $order , "; // seems to work mostly with no extra overheads |
|
565 | + }else{ |
|
566 | + $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
567 | + } |
|
568 | 568 | |
569 | - break; |
|
569 | + break; |
|
570 | 570 | |
571 | 571 | |
572 | - default: |
|
573 | - if (geodir_column_exist($table, $sort_by)) { |
|
572 | + default: |
|
573 | + if (geodir_column_exist($table, $sort_by)) { |
|
574 | 574 | $orderby = $table . "." . $sort_by . " " . $order . ", "; |
575 | 575 | } |
576 | - break; |
|
576 | + break; |
|
577 | 577 | |
578 | - endswitch; |
|
578 | + endswitch; |
|
579 | 579 | |
580 | - } |
|
580 | + } |
|
581 | 581 | |
582 | - } |
|
582 | + } |
|
583 | 583 | |
584 | - return $orderby; |
|
584 | + return $orderby; |
|
585 | 585 | } |
586 | 586 | |
587 | 587 | /** |
@@ -596,34 +596,34 @@ discard block |
||
596 | 596 | { |
597 | 597 | |
598 | 598 | |
599 | - global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
599 | + global $wpdb, $geodir_post_type, $table, $s, $snear; |
|
600 | 600 | |
601 | - if (!is_admin()) { |
|
601 | + if (!is_admin()) { |
|
602 | 602 | |
603 | - if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { |
|
604 | - add_filter('posts_where', 'geodir_edit_listing_where', 1); |
|
603 | + if (geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') { |
|
604 | + add_filter('posts_where', 'geodir_edit_listing_where', 1); |
|
605 | 605 | |
606 | - } elseif ((is_search() && $_REQUEST['geodir_search'])) { |
|
606 | + } elseif ((is_search() && $_REQUEST['geodir_search'])) { |
|
607 | 607 | |
608 | - add_filter('posts_where', 'searching_filter_where', 1); |
|
608 | + add_filter('posts_where', 'searching_filter_where', 1); |
|
609 | 609 | |
610 | - if ($snear != '') |
|
611 | - add_filter('posts_where', 'searching_filter_where', 1); |
|
610 | + if ($snear != '') |
|
611 | + add_filter('posts_where', 'searching_filter_where', 1); |
|
612 | 612 | |
613 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1); |
|
613 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1); |
|
614 | 614 | |
615 | - } elseif (geodir_is_page('author')) { |
|
615 | + } elseif (geodir_is_page('author')) { |
|
616 | 616 | |
617 | - add_filter('posts_where', 'author_filter_where', 1); |
|
617 | + add_filter('posts_where', 'author_filter_where', 1); |
|
618 | 618 | |
619 | - } |
|
619 | + } |
|
620 | 620 | |
621 | - //if (!geodir_is_page('detail')) |
|
622 | - add_filter('posts_where', 'geodir_default_where', 1);/**/ |
|
621 | + //if (!geodir_is_page('detail')) |
|
622 | + add_filter('posts_where', 'geodir_default_where', 1);/**/ |
|
623 | 623 | |
624 | - //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
624 | + //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
|
625 | 625 | |
626 | - } |
|
626 | + } |
|
627 | 627 | } |
628 | 628 | |
629 | 629 | /** |
@@ -638,13 +638,13 @@ discard block |
||
638 | 638 | */ |
639 | 639 | function geodir_preview_post_cap($allcaps, $caps, $args) |
640 | 640 | { |
641 | - $user_id = get_current_user_id(); |
|
642 | - if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) { |
|
641 | + $user_id = get_current_user_id(); |
|
642 | + if ($user_id && isset($_REQUEST['post_type']) && $_REQUEST['post_type'] != '' && isset($_REQUEST['p']) && $_REQUEST['p'] != '' && $args[0] == 'edit_post' && $_REQUEST['p'] == $args[2]) { |
|
643 | 643 | |
644 | - $allcaps['edit_posts'] = true; |
|
645 | - } |
|
646 | - //print_r($allcaps); |
|
647 | - return $allcaps; |
|
644 | + $allcaps['edit_posts'] = true; |
|
645 | + } |
|
646 | + //print_r($allcaps); |
|
647 | + return $allcaps; |
|
648 | 648 | } |
649 | 649 | |
650 | 650 | |
@@ -659,9 +659,9 @@ discard block |
||
659 | 659 | */ |
660 | 660 | function geodir_edit_listing_where($where) |
661 | 661 | { |
662 | - global $wpdb; |
|
663 | - $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']); |
|
664 | - return $where; |
|
662 | + global $wpdb; |
|
663 | + $where = $wpdb->prepare(" AND $wpdb->posts.ID = %d ", $_REQUEST['pid']); |
|
664 | + return $where; |
|
665 | 665 | } |
666 | 666 | |
667 | 667 | |
@@ -678,29 +678,29 @@ discard block |
||
678 | 678 | */ |
679 | 679 | function geodir_default_where($where) |
680 | 680 | { |
681 | - global $wp_query, $wpdb; |
|
682 | - |
|
683 | - //print_r($wp_query); |
|
684 | - ########### WPML ########### |
|
685 | - |
|
686 | - if (geodir_is_wpml()) { |
|
687 | - global $sitepress, $table_prefix; |
|
688 | - $lang_code = ICL_LANGUAGE_CODE; |
|
689 | - $default_lang_code = $sitepress->get_default_language(); |
|
690 | - $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
691 | - //echo '##########'.$q_post_type; |
|
692 | - if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) { |
|
693 | - $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') "; |
|
694 | - //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
695 | - } |
|
681 | + global $wp_query, $wpdb; |
|
696 | 682 | |
697 | - } |
|
698 | - ########### WPML ########### |
|
683 | + //print_r($wp_query); |
|
684 | + ########### WPML ########### |
|
685 | + |
|
686 | + if (geodir_is_wpml()) { |
|
687 | + global $sitepress, $table_prefix; |
|
688 | + $lang_code = ICL_LANGUAGE_CODE; |
|
689 | + $default_lang_code = $sitepress->get_default_language(); |
|
690 | + $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
|
691 | + //echo '##########'.$q_post_type; |
|
692 | + if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) { |
|
693 | + $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') "; |
|
694 | + //$where .= " AND icl_t.language_code = '$lang_code' "; |
|
695 | + } |
|
699 | 696 | |
697 | + } |
|
698 | + ########### WPML ########### |
|
700 | 699 | |
701 | - return $where = str_replace("0 = 1", "1=1", $where); |
|
702 | 700 | |
703 | - /* ====== old code start === |
|
701 | + return $where = str_replace("0 = 1", "1=1", $where); |
|
702 | + |
|
703 | + /* ====== old code start === |
|
704 | 704 | $where = str_replace("0 = 1", "1=1", $where); |
705 | 705 | $country = get_query_var('gd_country'); |
706 | 706 | $region = get_query_var('gd_region'); |
@@ -741,94 +741,94 @@ discard block |
||
741 | 741 | * @return string Modified where query string. |
742 | 742 | */ |
743 | 743 | function searching_filter_where($where) { |
744 | - global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
744 | + global $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $s, $snear, $s_A, $s_SA, $search_term, $gd_session; |
|
745 | 745 | |
746 | - $search_term = 'OR'; |
|
747 | - $search_term = 'AND'; |
|
748 | - $geodir_custom_search = ''; |
|
749 | - $category_search_range = ''; |
|
746 | + $search_term = 'OR'; |
|
747 | + $search_term = 'AND'; |
|
748 | + $geodir_custom_search = ''; |
|
749 | + $category_search_range = ''; |
|
750 | 750 | |
751 | - if (is_single() && get_query_var('post_type')) { |
|
751 | + if (is_single() && get_query_var('post_type')) { |
|
752 | 752 | return $where; |
753 | 753 | } |
754 | 754 | |
755 | - if (is_tax()) { |
|
755 | + if (is_tax()) { |
|
756 | 756 | return $where; |
757 | 757 | } |
758 | 758 | |
759 | 759 | $s = trim($s); |
760 | - $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
761 | - $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
762 | - |
|
763 | - $where = ''; |
|
764 | - $better_search_terms = ''; |
|
765 | - if (isset($_REQUEST['stype'])) |
|
766 | - $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
767 | - else |
|
768 | - $post_types = 'gd_place'; |
|
769 | - |
|
770 | - if ($s != '') { |
|
771 | - $keywords = explode(" ", $s); |
|
772 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){ |
|
773 | - foreach($keywords as $kkey=>$kword){ |
|
774 | - if(geodir_utf8_strlen($kword)<=$klimit){ |
|
775 | - unset($keywords[$kkey]); |
|
776 | - } |
|
777 | - } |
|
778 | - } |
|
760 | + $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
761 | + $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
779 | 762 | |
780 | - if (!empty($keywords)) { |
|
781 | - foreach ($keywords as $keyword) { |
|
782 | - $keyword = trim($keyword); |
|
783 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
784 | - if ($keyword != '') { |
|
785 | - /** |
|
786 | - * Filter the search query keywords SQL. |
|
787 | - * |
|
788 | - * @since 1.5.9 |
|
789 | - * @package GeoDirectory |
|
790 | - * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`. |
|
791 | - * @param array $keywords The array of keywords for the query. |
|
792 | - * @param string $keyword The single keyword being searched. |
|
793 | - */ |
|
763 | + $where = ''; |
|
764 | + $better_search_terms = ''; |
|
765 | + if (isset($_REQUEST['stype'])) |
|
766 | + $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
767 | + else |
|
768 | + $post_types = 'gd_place'; |
|
769 | + |
|
770 | + if ($s != '') { |
|
771 | + $keywords = explode(" ", $s); |
|
772 | + if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){ |
|
773 | + foreach($keywords as $kkey=>$kword){ |
|
774 | + if(geodir_utf8_strlen($kword)<=$klimit){ |
|
775 | + unset($keywords[$kkey]); |
|
776 | + } |
|
777 | + } |
|
778 | + } |
|
779 | + |
|
780 | + if (!empty($keywords)) { |
|
781 | + foreach ($keywords as $keyword) { |
|
782 | + $keyword = trim($keyword); |
|
783 | + $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
784 | + if ($keyword != '') { |
|
785 | + /** |
|
786 | + * Filter the search query keywords SQL. |
|
787 | + * |
|
788 | + * @since 1.5.9 |
|
789 | + * @package GeoDirectory |
|
790 | + * @param string $better_search_terms The query values, default: `' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )'`. |
|
791 | + * @param array $keywords The array of keywords for the query. |
|
792 | + * @param string $keyword The single keyword being searched. |
|
793 | + */ |
|
794 | 794 | $better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword); |
795 | - } |
|
796 | - } |
|
797 | - } |
|
798 | - } |
|
795 | + } |
|
796 | + } |
|
797 | + } |
|
798 | + } |
|
799 | 799 | |
800 | - /* get taxonomy */ |
|
801 | - $taxonomies = geodir_get_taxonomies($post_types, true); |
|
802 | - if($taxonomies) { |
|
803 | - $taxonomies = implode("','", $taxonomies); |
|
804 | - $taxonomies = "'" . $taxonomies . "'"; |
|
805 | - }else{$taxonomies='';} |
|
800 | + /* get taxonomy */ |
|
801 | + $taxonomies = geodir_get_taxonomies($post_types, true); |
|
802 | + if($taxonomies) { |
|
803 | + $taxonomies = implode("','", $taxonomies); |
|
804 | + $taxonomies = "'" . $taxonomies . "'"; |
|
805 | + }else{$taxonomies='';} |
|
806 | 806 | |
807 | - $content_where = $terms_where = ''; |
|
808 | - $terms_sql = ''; |
|
807 | + $content_where = $terms_where = ''; |
|
808 | + $terms_sql = ''; |
|
809 | 809 | if ($s != '') { |
810 | - /** |
|
811 | - * Filter the search query content where values. |
|
812 | - * |
|
813 | - * @since 1.5.0 |
|
814 | - * @package GeoDirectory |
|
815 | - * |
|
816 | - * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
|
817 | - */ |
|
818 | - $content_where = apply_filters( "geodir_search_content_where", " OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") " ); |
|
819 | - /** |
|
820 | - * Filter the search query term values. |
|
821 | - * |
|
822 | - * @since 1.5.0 |
|
823 | - * @package GeoDirectory |
|
824 | - * |
|
825 | - * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
|
826 | - */ |
|
827 | - $terms_where = apply_filters( "geodir_search_terms_where", " AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) " ); |
|
828 | - |
|
829 | - |
|
830 | - // get term sql |
|
831 | - $term_sql = "SELECT $wpdb->term_taxonomy.term_id, $wpdb->terms.name, $wpdb->term_taxonomy.taxonomy |
|
810 | + /** |
|
811 | + * Filter the search query content where values. |
|
812 | + * |
|
813 | + * @since 1.5.0 |
|
814 | + * @package GeoDirectory |
|
815 | + * |
|
816 | + * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
|
817 | + */ |
|
818 | + $content_where = apply_filters( "geodir_search_content_where", " OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") " ); |
|
819 | + /** |
|
820 | + * Filter the search query term values. |
|
821 | + * |
|
822 | + * @since 1.5.0 |
|
823 | + * @package GeoDirectory |
|
824 | + * |
|
825 | + * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
|
826 | + */ |
|
827 | + $terms_where = apply_filters( "geodir_search_terms_where", " AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) " ); |
|
828 | + |
|
829 | + |
|
830 | + // get term sql |
|
831 | + $term_sql = "SELECT $wpdb->term_taxonomy.term_id, $wpdb->terms.name, $wpdb->term_taxonomy.taxonomy |
|
832 | 832 | FROM $wpdb->term_taxonomy, $wpdb->terms, $wpdb->term_relationships |
833 | 833 | WHERE $wpdb->term_taxonomy.term_id = $wpdb->terms.term_id |
834 | 834 | AND $wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id |
@@ -836,46 +836,46 @@ discard block |
||
836 | 836 | $terms_where |
837 | 837 | GROUP BY $wpdb->term_taxonomy.term_id"; |
838 | 838 | |
839 | - $term_results = $wpdb->get_results( $term_sql ); |
|
840 | - $term_ids = array(); |
|
841 | - $terms_sql = ''; |
|
842 | - |
|
843 | - if ( ! empty( $term_results ) ) { |
|
844 | - foreach ( $term_results as $term_id ) { |
|
845 | - $term_ids[] = $term_id; |
|
846 | - } |
|
847 | - if ( ! empty( $term_ids ) ) { |
|
848 | - foreach ( $term_ids as $term ) { |
|
849 | - if ( $term->taxonomy == $post_types . '_tags' ) { |
|
850 | - $terms_sql .= $wpdb->prepare( " OR FIND_IN_SET(%s , " . $table . ".post_tags) ", $term->name ); |
|
851 | - } else { |
|
852 | - $terms_sql .= " OR FIND_IN_SET($term->term_id , " . $table . "." . $post_types . "category) "; |
|
853 | - } |
|
854 | - } |
|
855 | - } |
|
856 | - } |
|
839 | + $term_results = $wpdb->get_results( $term_sql ); |
|
840 | + $term_ids = array(); |
|
841 | + $terms_sql = ''; |
|
842 | + |
|
843 | + if ( ! empty( $term_results ) ) { |
|
844 | + foreach ( $term_results as $term_id ) { |
|
845 | + $term_ids[] = $term_id; |
|
846 | + } |
|
847 | + if ( ! empty( $term_ids ) ) { |
|
848 | + foreach ( $term_ids as $term ) { |
|
849 | + if ( $term->taxonomy == $post_types . '_tags' ) { |
|
850 | + $terms_sql .= $wpdb->prepare( " OR FIND_IN_SET(%s , " . $table . ".post_tags) ", $term->name ); |
|
851 | + } else { |
|
852 | + $terms_sql .= " OR FIND_IN_SET($term->term_id , " . $table . "." . $post_types . "category) "; |
|
853 | + } |
|
854 | + } |
|
855 | + } |
|
856 | + } |
|
857 | 857 | |
858 | - } |
|
858 | + } |
|
859 | 859 | |
860 | - if ($snear != '') { |
|
860 | + if ($snear != '') { |
|
861 | 861 | |
862 | 862 | |
863 | - if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) { |
|
864 | - $dist = $gd_session->get('near_me_range'); |
|
865 | - } |
|
866 | - $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
867 | - $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
868 | - $lat1 = $mylat - ($dist / 69); |
|
869 | - $lat2 = $mylat + ($dist / 69); |
|
863 | + if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) { |
|
864 | + $dist = $gd_session->get('near_me_range'); |
|
865 | + } |
|
866 | + $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
867 | + $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
868 | + $lat1 = $mylat - ($dist / 69); |
|
869 | + $lat2 = $mylat + ($dist / 69); |
|
870 | 870 | |
871 | - $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
872 | - $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
873 | - $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
874 | - $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
871 | + $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
872 | + $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
873 | + $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
874 | + $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
875 | 875 | |
876 | 876 | |
877 | 877 | |
878 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
878 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
879 | 879 | $content_where |
880 | 880 | $terms_sql |
881 | 881 | ) |
@@ -884,35 +884,35 @@ discard block |
||
884 | 884 | AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
885 | 885 | AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
886 | 886 | |
887 | - if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') { |
|
888 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1')); |
|
889 | - $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist; |
|
890 | - } |
|
887 | + if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') { |
|
888 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1')); |
|
889 | + $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist; |
|
890 | + } |
|
891 | 891 | |
892 | - } else { |
|
892 | + } else { |
|
893 | 893 | |
894 | 894 | |
895 | - $post_title_where = $s != "" ? "{$wpdb->posts}.post_title LIKE \"$s\"" : "1=1"; |
|
896 | - $where .= " AND ( ( $post_title_where $better_search_terms) |
|
895 | + $post_title_where = $s != "" ? "{$wpdb->posts}.post_title LIKE \"$s\"" : "1=1"; |
|
896 | + $where .= " AND ( ( $post_title_where $better_search_terms) |
|
897 | 897 | $content_where |
898 | 898 | $terms_sql |
899 | 899 | ) |
900 | 900 | |
901 | 901 | AND $wpdb->posts.post_type in ('$post_types') |
902 | 902 | AND ($wpdb->posts.post_status = 'publish') "; |
903 | - } |
|
903 | + } |
|
904 | 904 | |
905 | 905 | ########### WPML ########### |
906 | - if ( geodir_wpml_is_post_type_translated( $post_types ) ) { |
|
906 | + if ( geodir_wpml_is_post_type_translated( $post_types ) ) { |
|
907 | 907 | $lang_code = ICL_LANGUAGE_CODE; |
908 | 908 | |
909 | 909 | if ($lang_code && $post_types) { |
910 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') "; |
|
911 | - } |
|
912 | - } |
|
913 | - ########### WPML ########### |
|
910 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') "; |
|
911 | + } |
|
912 | + } |
|
913 | + ########### WPML ########### |
|
914 | 914 | |
915 | - return $where; |
|
915 | + return $where; |
|
916 | 916 | } |
917 | 917 | |
918 | 918 | |
@@ -927,45 +927,45 @@ discard block |
||
927 | 927 | * @return string Modified where query string. |
928 | 928 | */ |
929 | 929 | function author_filter_where($where) { |
930 | - global $wpdb, $geodir_post_type, $table, $curr; |
|
930 | + global $wpdb, $geodir_post_type, $table, $curr; |
|
931 | 931 | |
932 | - $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author')); |
|
933 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
932 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author')); |
|
933 | + $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
934 | 934 | |
935 | - if (isset($_REQUEST['stype'])) { |
|
936 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']); |
|
937 | - } else { |
|
938 | - $where = " AND $wpdb->posts.post_type IN ('gd_place') "; |
|
939 | - } |
|
935 | + if (isset($_REQUEST['stype'])) { |
|
936 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']); |
|
937 | + } else { |
|
938 | + $where = " AND $wpdb->posts.post_type IN ('gd_place') "; |
|
939 | + } |
|
940 | 940 | |
941 | - if ($user_id > 0) { |
|
942 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') { |
|
943 | - $user_fav_posts = geodir_get_user_favourites($user_id); |
|
944 | - $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1'; |
|
945 | - $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')"; |
|
946 | - } else |
|
947 | - $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
948 | - |
|
949 | - if ($user_id == (int)get_current_user_id()) { |
|
950 | - $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') "; |
|
951 | - } else { |
|
952 | - $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
953 | - } |
|
954 | - } else { |
|
955 | - $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
956 | - } |
|
941 | + if ($user_id > 0) { |
|
942 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') { |
|
943 | + $user_fav_posts = geodir_get_user_favourites($user_id); |
|
944 | + $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1'; |
|
945 | + $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')"; |
|
946 | + } else |
|
947 | + $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
948 | + |
|
949 | + if ($user_id == (int)get_current_user_id()) { |
|
950 | + $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') "; |
|
951 | + } else { |
|
952 | + $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
953 | + } |
|
954 | + } else { |
|
955 | + $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
956 | + } |
|
957 | 957 | |
958 | - ########### WPML ########### |
|
959 | - if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) { |
|
960 | - $lang_code = ICL_LANGUAGE_CODE; |
|
961 | - if ($lang_code) { |
|
962 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
963 | - } |
|
958 | + ########### WPML ########### |
|
959 | + if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) { |
|
960 | + $lang_code = ICL_LANGUAGE_CODE; |
|
961 | + if ($lang_code) { |
|
962 | + $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
963 | + } |
|
964 | 964 | |
965 | - } |
|
966 | - ########### WPML ########### |
|
965 | + } |
|
966 | + ########### WPML ########### |
|
967 | 967 | |
968 | - return $where; |
|
968 | + return $where; |
|
969 | 969 | } |
970 | 970 | |
971 | 971 | /** |
@@ -980,11 +980,11 @@ discard block |
||
980 | 980 | */ |
981 | 981 | function geodir_filter_widget_join($join) |
982 | 982 | { |
983 | - global $wp_query, $table; |
|
984 | - if (!empty($wp_query->query['with_pics_only'])) { |
|
985 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
986 | - } |
|
987 | - return $join; |
|
983 | + global $wp_query, $table; |
|
984 | + if (!empty($wp_query->query['with_pics_only'])) { |
|
985 | + $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
986 | + } |
|
987 | + return $join; |
|
988 | 988 | } |
989 | 989 | |
990 | 990 | /** |
@@ -999,43 +999,43 @@ discard block |
||
999 | 999 | */ |
1000 | 1000 | function geodir_filter_widget_where($where) |
1001 | 1001 | { |
1002 | - global $wp_query, $table; |
|
1003 | - if (!empty($wp_query->query['show_featured_only'])) { |
|
1004 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
1005 | - } |
|
1006 | - if (!empty($wp_query->query['show_special_only'])) { |
|
1007 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
1008 | - } |
|
1009 | - if (!empty($wp_query->query['with_pics_only'])) { |
|
1010 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
1011 | - } |
|
1012 | - if (!empty($wp_query->query['with_videos_only'])) { |
|
1013 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
1014 | - } |
|
1015 | - return $where; |
|
1002 | + global $wp_query, $table; |
|
1003 | + if (!empty($wp_query->query['show_featured_only'])) { |
|
1004 | + $where .= " AND " . $table . ".is_featured = '1'"; |
|
1005 | + } |
|
1006 | + if (!empty($wp_query->query['show_special_only'])) { |
|
1007 | + $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
1008 | + } |
|
1009 | + if (!empty($wp_query->query['with_pics_only'])) { |
|
1010 | + $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
1011 | + } |
|
1012 | + if (!empty($wp_query->query['with_videos_only'])) { |
|
1013 | + $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
1014 | + } |
|
1015 | + return $where; |
|
1016 | 1016 | } |
1017 | 1017 | |
1018 | 1018 | |
1019 | 1019 | function geodir_related_posts_fields($fields) { |
1020 | - global $wp_query, $wpdb, $table, $post; |
|
1020 | + global $wp_query, $wpdb, $table, $post; |
|
1021 | 1021 | |
1022 | - $fields .= ", " . $table . ".* "; |
|
1022 | + $fields .= ", " . $table . ".* "; |
|
1023 | 1023 | |
1024 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1')); |
|
1024 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1')); |
|
1025 | 1025 | |
1026 | - $mylat = $post->post_latitude; |
|
1027 | - $mylon = $post->post_longitude; |
|
1026 | + $mylat = $post->post_latitude; |
|
1027 | + $mylon = $post->post_longitude; |
|
1028 | 1028 | |
1029 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance "; |
|
1030 | - return $fields; |
|
1029 | + $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance "; |
|
1030 | + return $fields; |
|
1031 | 1031 | } |
1032 | 1032 | function geodir_related_posts_fields_filter($query) { |
1033 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
1034 | - && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
1035 | - && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
1036 | - ) { |
|
1037 | - add_filter('posts_fields', 'geodir_related_posts_fields', 1); |
|
1038 | - } |
|
1033 | + if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
1034 | + && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
1035 | + && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
1036 | + ) { |
|
1037 | + add_filter('posts_fields', 'geodir_related_posts_fields', 1); |
|
1038 | + } |
|
1039 | 1039 | } |
1040 | 1040 | add_action('pre_get_posts', 'geodir_related_posts_fields_filter', 1); |
1041 | 1041 | |
@@ -1050,30 +1050,30 @@ discard block |
||
1050 | 1050 | * @return string|null If field exists in table returns order by clause else returns empty. |
1051 | 1051 | */ |
1052 | 1052 | function geodir_prepare_custom_sorting( $sorting, $table ) { |
1053 | - $orderby = ''; |
|
1053 | + $orderby = ''; |
|
1054 | 1054 | |
1055 | - if ( empty( $sorting ) || empty( $table ) ) { |
|
1056 | - return $orderby; |
|
1057 | - } |
|
1055 | + if ( empty( $sorting ) || empty( $table ) ) { |
|
1056 | + return $orderby; |
|
1057 | + } |
|
1058 | 1058 | |
1059 | - if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) { |
|
1060 | - $sorting_array = explode( '_', $sorting ); |
|
1059 | + if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) { |
|
1060 | + $sorting_array = explode( '_', $sorting ); |
|
1061 | 1061 | |
1062 | - if ( ( $count = count( $sorting_array ) ) > 1 ) { |
|
1063 | - $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
1064 | - array_pop( $sorting_array ); |
|
1062 | + if ( ( $count = count( $sorting_array ) ) > 1 ) { |
|
1063 | + $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
1064 | + array_pop( $sorting_array ); |
|
1065 | 1065 | |
1066 | - if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) { |
|
1067 | - $sort_by = implode( '_', $sorting_array ); |
|
1066 | + if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) { |
|
1067 | + $sort_by = implode( '_', $sorting_array ); |
|
1068 | 1068 | |
1069 | - if ( geodir_column_exist( $table, $sort_by ) ) { |
|
1070 | - $orderby = $table . "." . $sort_by . " " . $order; |
|
1071 | - } |
|
1072 | - } |
|
1073 | - } |
|
1074 | - } |
|
1069 | + if ( geodir_column_exist( $table, $sort_by ) ) { |
|
1070 | + $orderby = $table . "." . $sort_by . " " . $order; |
|
1071 | + } |
|
1072 | + } |
|
1073 | + } |
|
1074 | + } |
|
1075 | 1075 | |
1076 | - return $orderby; |
|
1076 | + return $orderby; |
|
1077 | 1077 | } |
1078 | 1078 | |
1079 | 1079 | /** |
@@ -1093,21 +1093,21 @@ discard block |
||
1093 | 1093 | * @return string Modified fields SQL. |
1094 | 1094 | */ |
1095 | 1095 | function geodir_search_widget_location_filter_fields( $fields, $table, $post_type ) { |
1096 | - global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
|
1096 | + global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
|
1097 | 1097 | |
1098 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) { |
|
1099 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
1098 | + if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) { |
|
1099 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
1100 | 1100 | |
1101 | - if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) { |
|
1102 | - $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
1103 | - $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
1104 | - $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
1101 | + if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) { |
|
1102 | + $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
1103 | + $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
1104 | + $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
1105 | 1105 | |
1106 | - $fields .= $wpdb->prepare( ", (" . $radius . " * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(" . $table . ".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(" . $table . ".post_latitude) * PI() / 180) * POWER(SIN((%s - " . $table . ".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude ); |
|
1107 | - } |
|
1108 | - } |
|
1106 | + $fields .= $wpdb->prepare( ", (" . $radius . " * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(" . $table . ".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(" . $table . ".post_latitude) * PI() / 180) * POWER(SIN((%s - " . $table . ".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude ); |
|
1107 | + } |
|
1108 | + } |
|
1109 | 1109 | |
1110 | - return $fields; |
|
1110 | + return $fields; |
|
1111 | 1111 | } |
1112 | 1112 | |
1113 | 1113 | /** |
@@ -1126,17 +1126,17 @@ discard block |
||
1126 | 1126 | * @return string Modified fields SQL. |
1127 | 1127 | */ |
1128 | 1128 | function geodir_search_widget_location_filter_orderby( $orderby, $table, $post_type ) { |
1129 | - global $gd_query_args_widgets, $snear, $gd_session; |
|
1129 | + global $gd_query_args_widgets, $snear, $gd_session; |
|
1130 | 1130 | |
1131 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) { |
|
1132 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
1131 | + if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) { |
|
1132 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
1133 | 1133 | |
1134 | - if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) { |
|
1135 | - $orderby = "distance ASC, " . $orderby; |
|
1136 | - } |
|
1137 | - } |
|
1134 | + if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) { |
|
1135 | + $orderby = "distance ASC, " . $orderby; |
|
1136 | + } |
|
1137 | + } |
|
1138 | 1138 | |
1139 | - return $orderby; |
|
1139 | + return $orderby; |
|
1140 | 1140 | } |
1141 | 1141 | |
1142 | 1142 | /** |
@@ -1147,23 +1147,23 @@ discard block |
||
1147 | 1147 | * @return string Filtered url. |
1148 | 1148 | */ |
1149 | 1149 | function geodir_search_page_base_url() { |
1150 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) { |
|
1151 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
1152 | - } |
|
1150 | + if ( function_exists( 'geodir_location_geo_home_link' ) ) { |
|
1151 | + remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
1152 | + } |
|
1153 | 1153 | |
1154 | - if ( defined( 'DOING_AJAX' ) && DOING_AJAX && geodir_is_wpml() ) { |
|
1155 | - $url = icl_get_home_url(); |
|
1156 | - } else { |
|
1157 | - $url = get_home_url(); |
|
1158 | - } |
|
1154 | + if ( defined( 'DOING_AJAX' ) && DOING_AJAX && geodir_is_wpml() ) { |
|
1155 | + $url = icl_get_home_url(); |
|
1156 | + } else { |
|
1157 | + $url = get_home_url(); |
|
1158 | + } |
|
1159 | 1159 | |
1160 | - $url = trailingslashit( $url ); |
|
1160 | + $url = trailingslashit( $url ); |
|
1161 | 1161 | |
1162 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) { |
|
1163 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
1164 | - } |
|
1162 | + if ( function_exists( 'geodir_location_geo_home_link' ) ) { |
|
1163 | + add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
1164 | + } |
|
1165 | 1165 | |
1166 | - return apply_filters( 'geodir_search_page_base_url', $url ); |
|
1166 | + return apply_filters( 'geodir_search_page_base_url', $url ); |
|
1167 | 1167 | } |
1168 | 1168 | |
1169 | 1169 | /** |
@@ -1174,6 +1174,6 @@ discard block |
||
1174 | 1174 | function geodir_jetpack_fix_post_types_search(){ |
1175 | 1175 | if ( defined( 'JETPACK__VERSION' ) && ! empty( $_REQUEST['geodir_search'] ) ) { |
1176 | 1176 | add_filter( 'jetpack_search_should_handle_query', '__return_false', 999, 1 ); |
1177 | - } |
|
1177 | + } |
|
1178 | 1178 | } |
1179 | 1179 | add_action( 'plugins_loaded','geodir_jetpack_fix_post_types_search', 10 ); |
1180 | 1180 | \ No newline at end of file |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | * @global string $s_A Extra parameters. |
66 | 66 | * @global string $s_SA Extra parameters. |
67 | 67 | */ |
68 | -function set_listing_request($query ) |
|
68 | +function set_listing_request($query) |
|
69 | 69 | { |
70 | 70 | global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA; |
71 | 71 | |
@@ -99,15 +99,15 @@ discard block |
||
99 | 99 | } // Distance |
100 | 100 | |
101 | 101 | if (isset($_REQUEST['sgeo_lat'])) { |
102 | - $mylat = (float)esc_attr($_REQUEST['sgeo_lat']); |
|
102 | + $mylat = (float) esc_attr($_REQUEST['sgeo_lat']); |
|
103 | 103 | } else { |
104 | - $mylat = (float)geodir_get_current_city_lat(); |
|
104 | + $mylat = (float) geodir_get_current_city_lat(); |
|
105 | 105 | } // Latitude |
106 | 106 | |
107 | 107 | if (isset($_REQUEST['sgeo_lon'])) { |
108 | - $mylon = (float)esc_attr($_REQUEST['sgeo_lon']); |
|
108 | + $mylon = (float) esc_attr($_REQUEST['sgeo_lon']); |
|
109 | 109 | } else { |
110 | - $mylon = (float)geodir_get_current_city_lng(); |
|
110 | + $mylon = (float) geodir_get_current_city_lng(); |
|
111 | 111 | } // Distance |
112 | 112 | |
113 | 113 | if (isset($_REQUEST['snear'])) { |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | |
121 | 121 | if ($snear == 'NEAR ME') { |
122 | 122 | $ip = $_SERVER['REMOTE_ADDR']; |
123 | - $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip)); |
|
123 | + $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip='.$ip)); |
|
124 | 124 | $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude])); |
125 | 125 | $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude])); |
126 | 126 | } |
@@ -130,9 +130,9 @@ discard block |
||
130 | 130 | $s_AA = str_replace(" ", "", $s); |
131 | 131 | $s_A = explode(",", $s_AA); |
132 | 132 | $s_A = implode('","', $s_A); |
133 | - $s_A = '"' . $s_A . '"'; |
|
133 | + $s_A = '"'.$s_A.'"'; |
|
134 | 134 | } else { |
135 | - $s_A = '"' . $s . '"'; |
|
135 | + $s_A = '"'.$s.'"'; |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | if (strstr($s, ' ')) { |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | } |
194 | 194 | if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) { |
195 | 195 | |
196 | - $table = $plugin_prefix . $geodir_post_type . '_detail'; |
|
196 | + $table = $plugin_prefix.$geodir_post_type.'_detail'; |
|
197 | 197 | |
198 | 198 | add_filter('posts_fields', 'geodir_posts_fields', 1); |
199 | 199 | add_filter('posts_join', 'geodir_posts_join', 1); |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session; |
234 | 234 | |
235 | 235 | // Filter-Location-Manager to add location table. |
236 | - $fields .= ", " . $table . ".* "; |
|
236 | + $fields .= ", ".$table.".* "; |
|
237 | 237 | |
238 | 238 | if ($snear != '' || $gd_session->get('all_near_me')) { |
239 | 239 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1')); |
@@ -243,16 +243,16 @@ discard block |
||
243 | 243 | $mylon = $gd_session->get('user_lon'); |
244 | 244 | } |
245 | 245 | |
246 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance "; |
|
246 | + $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance "; |
|
247 | 247 | } |
248 | 248 | |
249 | 249 | global $s; |
250 | 250 | if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') { |
251 | 251 | $keywords = explode(" ", $s); |
252 | 252 | |
253 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){ |
|
254 | - foreach($keywords as $kkey=>$kword){ |
|
255 | - if(geodir_utf8_strlen($kword)<=$klimit){ |
|
253 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) { |
|
254 | + foreach ($keywords as $kkey=>$kword) { |
|
255 | + if (geodir_utf8_strlen($kword) <= $klimit) { |
|
256 | 256 | unset($keywords[$kkey]); |
257 | 257 | } |
258 | 258 | } |
@@ -270,24 +270,24 @@ discard block |
||
270 | 270 | $count = 0; |
271 | 271 | foreach ($keywords as $keyword) { |
272 | 272 | $keyword = trim($keyword); |
273 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
273 | + $keyword = wp_specialchars_decode($keyword, ENT_QUOTES); |
|
274 | 274 | $count++; |
275 | 275 | if ($count < count($keywords)) { |
276 | 276 | // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " "; |
277 | - $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " "; |
|
277 | + $gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) ".$key." "; |
|
278 | 278 | } else { |
279 | 279 | //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' "; |
280 | - $gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) "; |
|
280 | + $gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) "; |
|
281 | 281 | } |
282 | 282 | } |
283 | - $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ","; |
|
283 | + $gd_titlematch_part .= "THEN 1 ELSE 0 END AS ".$part.","; |
|
284 | 284 | } |
285 | 285 | } else { |
286 | 286 | $gd_titlematch_part = ""; |
287 | 287 | } |
288 | - $s = stripslashes_deep( $s ); |
|
289 | - $s = wp_specialchars_decode($s,ENT_QUOTES); |
|
290 | - $fields .= $wpdb->prepare(", CASE WHEN " . $table . ".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN " . $wpdb->posts . ".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle," . $gd_titlematch_part . " CASE WHEN ( " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s OR " . $wpdb->posts . ".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s OR " . $wpdb->posts . ".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s . '%', '% ' . $s . '%', $s, $s . ' %', '% ' . $s . ' %', '% ' . $s)); |
|
288 | + $s = stripslashes_deep($s); |
|
289 | + $s = wp_specialchars_decode($s, ENT_QUOTES); |
|
290 | + $fields .= $wpdb->prepare(", CASE WHEN ".$table.".is_featured='1' THEN 1 ELSE 0 END AS gd_featured, CASE WHEN ".$wpdb->posts.".post_title LIKE %s THEN 1 ELSE 0 END AS gd_exacttitle,".$gd_titlematch_part." CASE WHEN ( ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s OR ".$wpdb->posts.".post_title LIKE %s ) THEN 1 ELSE 0 END AS gd_titlematch, CASE WHEN ( ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s OR ".$wpdb->posts.".post_content LIKE %s ) THEN 1 ELSE 0 END AS gd_content", array($s, $s, $s.'%', '% '.$s.'%', $s, $s.' %', '% '.$s.' %', '% '.$s)); |
|
291 | 291 | } |
292 | 292 | |
293 | 293 | return $fields; |
@@ -311,18 +311,18 @@ discard block |
||
311 | 311 | |
312 | 312 | ########### WPML ########### |
313 | 313 | |
314 | - if ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) { |
|
314 | + if (geodir_wpml_is_post_type_translated($geodir_post_type)) { |
|
315 | 315 | global $sitepress; |
316 | 316 | $lang_code = ICL_LANGUAGE_CODE; |
317 | 317 | $default_lang_code = $sitepress->get_default_language(); |
318 | 318 | if ($lang_code) { |
319 | - $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID"; |
|
319 | + $join .= "JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID"; |
|
320 | 320 | } |
321 | 321 | |
322 | 322 | } |
323 | 323 | ########### WPML ########### |
324 | 324 | |
325 | - $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID) "; |
|
325 | + $join .= " INNER JOIN ".$table." ON (".$table.".post_id = $wpdb->posts.ID) "; |
|
326 | 326 | //===old code start |
327 | 327 | //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id) " ;//===old code end |
328 | 328 | |
@@ -391,7 +391,7 @@ discard block |
||
391 | 391 | $sort_by = 'az'; |
392 | 392 | } |
393 | 393 | |
394 | - if ($snear != '' && $sort_by!='farthest') { |
|
394 | + if ($snear != '' && $sort_by != 'farthest') { |
|
395 | 395 | $sort_by = 'nearest'; |
396 | 396 | } |
397 | 397 | } |
@@ -405,20 +405,20 @@ discard block |
||
405 | 405 | break; |
406 | 406 | case 'low_review': |
407 | 407 | case 'rating_count_asc': |
408 | - $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, "; |
|
408 | + $orderby = $table.".rating_count ASC, ".$table.".overall_rating ASC, "; |
|
409 | 409 | break; |
410 | 410 | case 'high_review': |
411 | 411 | case 'rating_count_desc': |
412 | - $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, "; |
|
412 | + $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, "; |
|
413 | 413 | break; |
414 | 414 | case 'low_rating': |
415 | - $orderby = "( " . $table . ".overall_rating ) ASC, " . $table . ".rating_count ASC, "; |
|
415 | + $orderby = "( ".$table.".overall_rating ) ASC, ".$table.".rating_count ASC, "; |
|
416 | 416 | break; |
417 | 417 | case 'high_rating': |
418 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
418 | + $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, "; |
|
419 | 419 | break; |
420 | 420 | case 'featured': |
421 | - $orderby = $table . ".is_featured asc, "; |
|
421 | + $orderby = $table.".is_featured asc, "; |
|
422 | 422 | break; |
423 | 423 | case 'nearest': |
424 | 424 | $orderby = " distance asc, "; |
@@ -434,10 +434,10 @@ discard block |
||
434 | 434 | break; |
435 | 435 | // sort by rating |
436 | 436 | case 'overall_rating_desc': |
437 | - $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, "; |
|
437 | + $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, "; |
|
438 | 438 | break; |
439 | 439 | case 'overall_rating_asc': |
440 | - $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, "; |
|
440 | + $orderby = " ".$table.".overall_rating ASC, ".$table.".rating_count ASC, "; |
|
441 | 441 | break; |
442 | 442 | default: |
443 | 443 | |
@@ -458,24 +458,24 @@ discard block |
||
458 | 458 | |
459 | 459 | if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') { |
460 | 460 | $keywords = explode(" ", $s); |
461 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){ |
|
462 | - foreach($keywords as $kkey=>$kword){ |
|
463 | - if(geodir_utf8_strlen($kword)<=$klimit){ |
|
461 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) { |
|
462 | + foreach ($keywords as $kkey=>$kword) { |
|
463 | + if (geodir_utf8_strlen($kword) <= $klimit) { |
|
464 | 464 | unset($keywords[$kkey]); |
465 | 465 | } |
466 | 466 | } |
467 | 467 | } |
468 | 468 | if ($sort_by == 'nearest' || $sort_by == 'farthest') { |
469 | 469 | if (count($keywords) > 1) { |
470 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
470 | + $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, "; |
|
471 | 471 | } else { |
472 | - $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
472 | + $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, "; |
|
473 | 473 | } |
474 | 474 | } else { |
475 | 475 | if (count($keywords) > 1) { |
476 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby; |
|
476 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ".$orderby; |
|
477 | 477 | } else { |
478 | - $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby; |
|
478 | + $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ".$orderby; |
|
479 | 479 | } |
480 | 480 | } |
481 | 481 | } |
@@ -490,7 +490,7 @@ discard block |
||
490 | 490 | */ |
491 | 491 | $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table); |
492 | 492 | |
493 | - $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
493 | + $orderby .= $table.".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title "; |
|
494 | 494 | |
495 | 495 | return $orderby; |
496 | 496 | } |
@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | |
513 | 513 | global $wpdb; |
514 | 514 | |
515 | - if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' || $_REQUEST['s']==' ') ) )) { |
|
515 | + if ($sort_by != '' && (!is_search() || (isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear'] == '' && ($_REQUEST['s'] == '' || $_REQUEST['s'] == ' ')))) { |
|
516 | 516 | |
517 | 517 | $sort_array = explode('_', $sort_by); |
518 | 518 | |
@@ -522,48 +522,48 @@ discard block |
||
522 | 522 | |
523 | 523 | if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) { |
524 | 524 | |
525 | - $sort_by = str_replace('_' . $order, '', $sort_by); |
|
525 | + $sort_by = str_replace('_'.$order, '', $sort_by); |
|
526 | 526 | |
527 | 527 | switch ($sort_by): |
528 | 528 | |
529 | 529 | case 'post_date': |
530 | 530 | case 'comment_count': |
531 | 531 | |
532 | - $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", "; |
|
532 | + $orderby = "$wpdb->posts.".$sort_by." ".$order.", ".$table.".overall_rating ".$order.", "; |
|
533 | 533 | break; |
534 | 534 | |
535 | 535 | case 'distance': |
536 | - $orderby = $sort_by . " " . $order . ", "; |
|
536 | + $orderby = $sort_by." ".$order.", "; |
|
537 | 537 | break; |
538 | 538 | |
539 | 539 | |
540 | 540 | // sort by rating |
541 | 541 | case 'overall_rating': |
542 | 542 | |
543 | - $use_bayesian = apply_filters('gd_use_bayesian',true,$table); |
|
543 | + $use_bayesian = apply_filters('gd_use_bayesian', true, $table); |
|
544 | 544 | $avg_rating = 0; |
545 | - if($use_bayesian){ |
|
546 | - $avg_num_votes = get_transient( 'gd_avg_num_votes_'.$table ); |
|
547 | - if(!$avg_num_votes){ |
|
545 | + if ($use_bayesian) { |
|
546 | + $avg_num_votes = get_transient('gd_avg_num_votes_'.$table); |
|
547 | + if (!$avg_num_votes) { |
|
548 | 548 | $avg_num_votes = $wpdb->get_var("SELECT SUM(rating_count) FROM $table"); |
549 | - if($avg_num_votes){ |
|
549 | + if ($avg_num_votes) { |
|
550 | 550 | |
551 | - $avg_rating = get_transient( 'gd_avg_rating_'.$table ); |
|
552 | - if(!$avg_rating){ |
|
553 | - $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table")/$avg_num_votes; |
|
551 | + $avg_rating = get_transient('gd_avg_rating_'.$table); |
|
552 | + if (!$avg_rating) { |
|
553 | + $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table") / $avg_num_votes; |
|
554 | 554 | } |
555 | - set_transient( 'gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS ); |
|
556 | - set_transient( 'gd_avg_rating_'.$table, $avg_rating , 12 * HOUR_IN_SECONDS ); |
|
555 | + set_transient('gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS); |
|
556 | + set_transient('gd_avg_rating_'.$table, $avg_rating, 12 * HOUR_IN_SECONDS); |
|
557 | 557 | } |
558 | 558 | } |
559 | 559 | |
560 | - if(!$avg_num_votes){ $avg_num_votes = 0;} |
|
560 | + if (!$avg_num_votes) { $avg_num_votes = 0; } |
|
561 | 561 | |
562 | - $orderby = " (( $avg_num_votes * $avg_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating )) / ( $avg_num_votes + " . $table . ".rating_count ) $order , "; |
|
562 | + $orderby = " (( $avg_num_votes * $avg_rating ) + (".$table.".rating_count * ".$table.".overall_rating )) / ( $avg_num_votes + ".$table.".rating_count ) $order , "; |
|
563 | 563 | |
564 | 564 | //$orderby = " ( " . $table . ".rating_count * " . $table . ".overall_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating ) / ( " . $table . ".rating_count + " . $table . ".rating_count ) $order , "; // seems to work mostly with no extra overheads |
565 | - }else{ |
|
566 | - $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
|
565 | + } else { |
|
566 | + $orderby = " ".$table.".".$sort_by." ".$order.", ".$table.".rating_count ".$order.", "; |
|
567 | 567 | } |
568 | 568 | |
569 | 569 | break; |
@@ -571,7 +571,7 @@ discard block |
||
571 | 571 | |
572 | 572 | default: |
573 | 573 | if (geodir_column_exist($table, $sort_by)) { |
574 | - $orderby = $table . "." . $sort_by . " " . $order . ", "; |
|
574 | + $orderby = $table.".".$sort_by." ".$order.", "; |
|
575 | 575 | } |
576 | 576 | break; |
577 | 577 | |
@@ -619,7 +619,7 @@ discard block |
||
619 | 619 | } |
620 | 620 | |
621 | 621 | //if (!geodir_is_page('detail')) |
622 | - add_filter('posts_where', 'geodir_default_where', 1);/**/ |
|
622 | + add_filter('posts_where', 'geodir_default_where', 1); /**/ |
|
623 | 623 | |
624 | 624 | //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts |
625 | 625 | |
@@ -690,7 +690,7 @@ discard block |
||
690 | 690 | $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : ''; |
691 | 691 | //echo '##########'.$q_post_type; |
692 | 692 | if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) { |
693 | - $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') "; |
|
693 | + $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_".$q_post_type."') "; |
|
694 | 694 | //$where .= " AND icl_t.language_code = '$lang_code' "; |
695 | 695 | } |
696 | 696 | |
@@ -757,8 +757,8 @@ discard block |
||
757 | 757 | } |
758 | 758 | |
759 | 759 | $s = trim($s); |
760 | - $s = wp_specialchars_decode($s ,ENT_QUOTES); |
|
761 | - $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES); |
|
760 | + $s = wp_specialchars_decode($s, ENT_QUOTES); |
|
761 | + $s_A = wp_specialchars_decode($s_A, ENT_QUOTES); |
|
762 | 762 | |
763 | 763 | $where = ''; |
764 | 764 | $better_search_terms = ''; |
@@ -769,9 +769,9 @@ discard block |
||
769 | 769 | |
770 | 770 | if ($s != '') { |
771 | 771 | $keywords = explode(" ", $s); |
772 | - if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){ |
|
773 | - foreach($keywords as $kkey=>$kword){ |
|
774 | - if(geodir_utf8_strlen($kword)<=$klimit){ |
|
772 | + if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) { |
|
773 | + foreach ($keywords as $kkey=>$kword) { |
|
774 | + if (geodir_utf8_strlen($kword) <= $klimit) { |
|
775 | 775 | unset($keywords[$kkey]); |
776 | 776 | } |
777 | 777 | } |
@@ -780,7 +780,7 @@ discard block |
||
780 | 780 | if (!empty($keywords)) { |
781 | 781 | foreach ($keywords as $keyword) { |
782 | 782 | $keyword = trim($keyword); |
783 | - $keyword = wp_specialchars_decode($keyword ,ENT_QUOTES); |
|
783 | + $keyword = wp_specialchars_decode($keyword, ENT_QUOTES); |
|
784 | 784 | if ($keyword != '') { |
785 | 785 | /** |
786 | 786 | * Filter the search query keywords SQL. |
@@ -791,7 +791,7 @@ discard block |
||
791 | 791 | * @param array $keywords The array of keywords for the query. |
792 | 792 | * @param string $keyword The single keyword being searched. |
793 | 793 | */ |
794 | - $better_search_terms .= apply_filters("geodir_search_better_search_terms",' OR ( ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '" OR ' . $wpdb->posts . '.post_title LIKE "' . $keyword . '%" OR ' . $wpdb->posts . '.post_title LIKE "% ' . $keyword . '%" )',$keywords,$keyword); |
|
794 | + $better_search_terms .= apply_filters("geodir_search_better_search_terms", ' OR ( '.$wpdb->posts.'.post_title LIKE "'.$keyword.'" OR '.$wpdb->posts.'.post_title LIKE "'.$keyword.'%" OR '.$wpdb->posts.'.post_title LIKE "% '.$keyword.'%" )', $keywords, $keyword); |
|
795 | 795 | } |
796 | 796 | } |
797 | 797 | } |
@@ -799,13 +799,13 @@ discard block |
||
799 | 799 | |
800 | 800 | /* get taxonomy */ |
801 | 801 | $taxonomies = geodir_get_taxonomies($post_types, true); |
802 | - if($taxonomies) { |
|
802 | + if ($taxonomies) { |
|
803 | 803 | $taxonomies = implode("','", $taxonomies); |
804 | - $taxonomies = "'" . $taxonomies . "'"; |
|
805 | - }else{$taxonomies='';} |
|
804 | + $taxonomies = "'".$taxonomies."'"; |
|
805 | + } else {$taxonomies = ''; } |
|
806 | 806 | |
807 | 807 | $content_where = $terms_where = ''; |
808 | - $terms_sql = ''; |
|
808 | + $terms_sql = ''; |
|
809 | 809 | if ($s != '') { |
810 | 810 | /** |
811 | 811 | * Filter the search query content where values. |
@@ -815,7 +815,7 @@ discard block |
||
815 | 815 | * |
816 | 816 | * @param string $content_where The query values, default: `" OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") ") "`. |
817 | 817 | */ |
818 | - $content_where = apply_filters( "geodir_search_content_where", " OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") " ); |
|
818 | + $content_where = apply_filters("geodir_search_content_where", " OR ($wpdb->posts.post_content LIKE \"$s\" OR $wpdb->posts.post_content LIKE \"$s%\" OR $wpdb->posts.post_content LIKE \"% $s%\" OR $wpdb->posts.post_content LIKE \"%>$s%\" OR $wpdb->posts.post_content LIKE \"%\n$s%\") "); |
|
819 | 819 | /** |
820 | 820 | * Filter the search query term values. |
821 | 821 | * |
@@ -824,7 +824,7 @@ discard block |
||
824 | 824 | * |
825 | 825 | * @param string $terms_where The separator, default: `" AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "`. |
826 | 826 | */ |
827 | - $terms_where = apply_filters( "geodir_search_terms_where", " AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) " ); |
|
827 | + $terms_where = apply_filters("geodir_search_terms_where", " AND ($wpdb->terms.name LIKE \"$s\" OR $wpdb->terms.name LIKE \"$s%\" OR $wpdb->terms.name LIKE \"% $s%\" OR $wpdb->terms.name IN ($s_A)) "); |
|
828 | 828 | |
829 | 829 | |
830 | 830 | // get term sql |
@@ -836,20 +836,20 @@ discard block |
||
836 | 836 | $terms_where |
837 | 837 | GROUP BY $wpdb->term_taxonomy.term_id"; |
838 | 838 | |
839 | - $term_results = $wpdb->get_results( $term_sql ); |
|
839 | + $term_results = $wpdb->get_results($term_sql); |
|
840 | 840 | $term_ids = array(); |
841 | 841 | $terms_sql = ''; |
842 | 842 | |
843 | - if ( ! empty( $term_results ) ) { |
|
844 | - foreach ( $term_results as $term_id ) { |
|
843 | + if (!empty($term_results)) { |
|
844 | + foreach ($term_results as $term_id) { |
|
845 | 845 | $term_ids[] = $term_id; |
846 | 846 | } |
847 | - if ( ! empty( $term_ids ) ) { |
|
848 | - foreach ( $term_ids as $term ) { |
|
849 | - if ( $term->taxonomy == $post_types . '_tags' ) { |
|
850 | - $terms_sql .= $wpdb->prepare( " OR FIND_IN_SET(%s , " . $table . ".post_tags) ", $term->name ); |
|
847 | + if (!empty($term_ids)) { |
|
848 | + foreach ($term_ids as $term) { |
|
849 | + if ($term->taxonomy == $post_types.'_tags') { |
|
850 | + $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , ".$table.".post_tags) ", $term->name); |
|
851 | 851 | } else { |
852 | - $terms_sql .= " OR FIND_IN_SET($term->term_id , " . $table . "." . $post_types . "category) "; |
|
852 | + $terms_sql .= " OR FIND_IN_SET($term->term_id , ".$table.".".$post_types."category) "; |
|
853 | 853 | } |
854 | 854 | } |
855 | 855 | } |
@@ -881,12 +881,12 @@ discard block |
||
881 | 881 | ) |
882 | 882 | AND $wpdb->posts.post_type in ('{$post_types}') |
883 | 883 | AND ($wpdb->posts.post_status = 'publish') |
884 | - AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
|
885 | - AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
|
884 | + AND ( ".$table.".post_latitude between $rlat1 and $rlat2 ) |
|
885 | + AND ( ".$table.".post_longitude between $rlon1 and $rlon2 ) "; |
|
886 | 886 | |
887 | 887 | if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') { |
888 | 888 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1')); |
889 | - $where .= " AND CONVERT((" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= " . $dist; |
|
889 | + $where .= " AND CONVERT((".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) ))),DECIMAL(64,4)) <= ".$dist; |
|
890 | 890 | } |
891 | 891 | |
892 | 892 | } else { |
@@ -903,11 +903,11 @@ discard block |
||
903 | 903 | } |
904 | 904 | |
905 | 905 | ########### WPML ########### |
906 | - if ( geodir_wpml_is_post_type_translated( $post_types ) ) { |
|
906 | + if (geodir_wpml_is_post_type_translated($post_types)) { |
|
907 | 907 | $lang_code = ICL_LANGUAGE_CODE; |
908 | 908 | |
909 | 909 | if ($lang_code && $post_types) { |
910 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') "; |
|
910 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_".$post_types."') "; |
|
911 | 911 | } |
912 | 912 | } |
913 | 913 | ########### WPML ########### |
@@ -930,10 +930,10 @@ discard block |
||
930 | 930 | global $wpdb, $geodir_post_type, $table, $curr; |
931 | 931 | |
932 | 932 | $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author')); |
933 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
933 | + $user_id = !empty($curauth->ID) ? (int) $curauth->ID : 0; |
|
934 | 934 | |
935 | 935 | if (isset($_REQUEST['stype'])) { |
936 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']); |
|
936 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ", $_REQUEST['stype']); |
|
937 | 937 | } else { |
938 | 938 | $where = " AND $wpdb->posts.post_type IN ('gd_place') "; |
939 | 939 | } |
@@ -946,7 +946,7 @@ discard block |
||
946 | 946 | } else |
947 | 947 | $where .= " AND $wpdb->posts.post_author = $user_id"; |
948 | 948 | |
949 | - if ($user_id == (int)get_current_user_id()) { |
|
949 | + if ($user_id == (int) get_current_user_id()) { |
|
950 | 950 | $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') "; |
951 | 951 | } else { |
952 | 952 | $where .= " AND $wpdb->posts.post_status = 'publish' "; |
@@ -959,7 +959,7 @@ discard block |
||
959 | 959 | if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) { |
960 | 960 | $lang_code = ICL_LANGUAGE_CODE; |
961 | 961 | if ($lang_code) { |
962 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
962 | + $where .= " AND icl_t.language_code='".$lang_code."' "; |
|
963 | 963 | } |
964 | 964 | |
965 | 965 | } |
@@ -982,7 +982,7 @@ discard block |
||
982 | 982 | { |
983 | 983 | global $wp_query, $table; |
984 | 984 | if (!empty($wp_query->query['with_pics_only'])) { |
985 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
985 | + $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )"; |
|
986 | 986 | } |
987 | 987 | return $join; |
988 | 988 | } |
@@ -1001,16 +1001,16 @@ discard block |
||
1001 | 1001 | { |
1002 | 1002 | global $wp_query, $table; |
1003 | 1003 | if (!empty($wp_query->query['show_featured_only'])) { |
1004 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
1004 | + $where .= " AND ".$table.".is_featured = '1'"; |
|
1005 | 1005 | } |
1006 | 1006 | if (!empty($wp_query->query['show_special_only'])) { |
1007 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
1007 | + $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )"; |
|
1008 | 1008 | } |
1009 | 1009 | if (!empty($wp_query->query['with_pics_only'])) { |
1010 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
1010 | + $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL GROUP BY ".$table.".post_id"; |
|
1011 | 1011 | } |
1012 | 1012 | if (!empty($wp_query->query['with_videos_only'])) { |
1013 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
1013 | + $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )"; |
|
1014 | 1014 | } |
1015 | 1015 | return $where; |
1016 | 1016 | } |
@@ -1019,18 +1019,18 @@ discard block |
||
1019 | 1019 | function geodir_related_posts_fields($fields) { |
1020 | 1020 | global $wp_query, $wpdb, $table, $post; |
1021 | 1021 | |
1022 | - $fields .= ", " . $table . ".* "; |
|
1022 | + $fields .= ", ".$table.".* "; |
|
1023 | 1023 | |
1024 | 1024 | $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1')); |
1025 | 1025 | |
1026 | 1026 | $mylat = $post->post_latitude; |
1027 | 1027 | $mylon = $post->post_longitude; |
1028 | 1028 | |
1029 | - $fields .= " , (" . $DistanceRadius . " * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(" . $table . ".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(" . $table . ".post_latitude) * pi()/180) *POWER(SIN(($mylon - " . $table . ".post_longitude) * pi()/180 / 2), 2) )))as distance "; |
|
1029 | + $fields .= " , (".$DistanceRadius." * 2 * ASIN(SQRT( POWER(SIN((ABS($mylat) - ABS(".$table.".post_latitude)) * pi()/180 / 2), 2) +COS(ABS($mylat) * pi()/180) * COS( ABS(".$table.".post_latitude) * pi()/180) *POWER(SIN(($mylon - ".$table.".post_longitude) * pi()/180 / 2), 2) )))as distance "; |
|
1030 | 1030 | return $fields; |
1031 | 1031 | } |
1032 | 1032 | function geodir_related_posts_fields_filter($query) { |
1033 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
1033 | + if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
1034 | 1034 | && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
1035 | 1035 | && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
1036 | 1036 | ) { |
@@ -1049,25 +1049,25 @@ discard block |
||
1049 | 1049 | * @param string $table Listing table name. |
1050 | 1050 | * @return string|null If field exists in table returns order by clause else returns empty. |
1051 | 1051 | */ |
1052 | -function geodir_prepare_custom_sorting( $sorting, $table ) { |
|
1052 | +function geodir_prepare_custom_sorting($sorting, $table) { |
|
1053 | 1053 | $orderby = ''; |
1054 | 1054 | |
1055 | - if ( empty( $sorting ) || empty( $table ) ) { |
|
1055 | + if (empty($sorting) || empty($table)) { |
|
1056 | 1056 | return $orderby; |
1057 | 1057 | } |
1058 | 1058 | |
1059 | - if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) { |
|
1060 | - $sorting_array = explode( '_', $sorting ); |
|
1059 | + if (strpos(strtoupper($sorting), '_ASC') !== false || strpos(strtoupper($sorting), '_DESC') !== false) { |
|
1060 | + $sorting_array = explode('_', $sorting); |
|
1061 | 1061 | |
1062 | - if ( ( $count = count( $sorting_array ) ) > 1 ) { |
|
1063 | - $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
1064 | - array_pop( $sorting_array ); |
|
1062 | + if (($count = count($sorting_array)) > 1) { |
|
1063 | + $order = !empty($sorting_array[$count - 1]) ? strtoupper($sorting_array[$count - 1]) : ''; |
|
1064 | + array_pop($sorting_array); |
|
1065 | 1065 | |
1066 | - if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) { |
|
1067 | - $sort_by = implode( '_', $sorting_array ); |
|
1066 | + if (!empty($sorting_array) && ($order == 'ASC' || $order == 'DESC')) { |
|
1067 | + $sort_by = implode('_', $sorting_array); |
|
1068 | 1068 | |
1069 | - if ( geodir_column_exist( $table, $sort_by ) ) { |
|
1070 | - $orderby = $table . "." . $sort_by . " " . $order; |
|
1069 | + if (geodir_column_exist($table, $sort_by)) { |
|
1070 | + $orderby = $table.".".$sort_by." ".$order; |
|
1071 | 1071 | } |
1072 | 1072 | } |
1073 | 1073 | } |
@@ -1092,18 +1092,18 @@ discard block |
||
1092 | 1092 | * |
1093 | 1093 | * @return string Modified fields SQL. |
1094 | 1094 | */ |
1095 | -function geodir_search_widget_location_filter_fields( $fields, $table, $post_type ) { |
|
1095 | +function geodir_search_widget_location_filter_fields($fields, $table, $post_type) { |
|
1096 | 1096 | global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
1097 | 1097 | |
1098 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) { |
|
1099 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
1098 | + if (!empty($gd_query_args_widgets['gd_location']) && geodir_is_page('search') && !empty($_REQUEST['sgeo_lat']) && !empty($_REQUEST['sgeo_lon'])) { |
|
1099 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true; |
|
1100 | 1100 | |
1101 | - if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) { |
|
1102 | - $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
1103 | - $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
1104 | - $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
1101 | + if ($location_allowed && strpos(strtolower($fields), ' as distance ') === false && ($snear != '' || $gd_session->get('all_near_me'))) { |
|
1102 | + $latitude = sanitize_text_field($_REQUEST['sgeo_lat']); |
|
1103 | + $longitude = sanitize_text_field($_REQUEST['sgeo_lon']); |
|
1104 | + $radius = geodir_getDistanceRadius(get_option('geodir_search_dist_1')); |
|
1105 | 1105 | |
1106 | - $fields .= $wpdb->prepare( ", (" . $radius . " * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(" . $table . ".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(" . $table . ".post_latitude) * PI() / 180) * POWER(SIN((%s - " . $table . ".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude ); |
|
1106 | + $fields .= $wpdb->prepare(", (".$radius." * 2 * ASIN(SQRT(POWER(SIN((ABS(%s) - ABS(".$table.".post_latitude)) * PI() / 180 / 2), 2) + COS(ABS(%s) * PI() / 180) * COS(ABS(".$table.".post_latitude) * PI() / 180) * POWER(SIN((%s - ".$table.".post_longitude) * PI() / 180 / 2), 2)))) AS distance ", $latitude, $latitude, $longitude); |
|
1107 | 1107 | } |
1108 | 1108 | } |
1109 | 1109 | |
@@ -1125,14 +1125,14 @@ discard block |
||
1125 | 1125 | * |
1126 | 1126 | * @return string Modified fields SQL. |
1127 | 1127 | */ |
1128 | -function geodir_search_widget_location_filter_orderby( $orderby, $table, $post_type ) { |
|
1128 | +function geodir_search_widget_location_filter_orderby($orderby, $table, $post_type) { |
|
1129 | 1129 | global $gd_query_args_widgets, $snear, $gd_session; |
1130 | 1130 | |
1131 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) { |
|
1132 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
1131 | + if (!empty($gd_query_args_widgets['gd_location']) && geodir_is_page('search') && !empty($_REQUEST['sgeo_lat']) && !empty($_REQUEST['sgeo_lon'])) { |
|
1132 | + $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true; |
|
1133 | 1133 | |
1134 | - if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) { |
|
1135 | - $orderby = "distance ASC, " . $orderby; |
|
1134 | + if ($location_allowed && ($snear != '' || $gd_session->get('all_near_me'))) { |
|
1135 | + $orderby = "distance ASC, ".$orderby; |
|
1136 | 1136 | } |
1137 | 1137 | } |
1138 | 1138 | |
@@ -1147,23 +1147,23 @@ discard block |
||
1147 | 1147 | * @return string Filtered url. |
1148 | 1148 | */ |
1149 | 1149 | function geodir_search_page_base_url() { |
1150 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) { |
|
1151 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
1150 | + if (function_exists('geodir_location_geo_home_link')) { |
|
1151 | + remove_filter('home_url', 'geodir_location_geo_home_link', 100000); |
|
1152 | 1152 | } |
1153 | 1153 | |
1154 | - if ( defined( 'DOING_AJAX' ) && DOING_AJAX && geodir_is_wpml() ) { |
|
1154 | + if (defined('DOING_AJAX') && DOING_AJAX && geodir_is_wpml()) { |
|
1155 | 1155 | $url = icl_get_home_url(); |
1156 | 1156 | } else { |
1157 | 1157 | $url = get_home_url(); |
1158 | 1158 | } |
1159 | 1159 | |
1160 | - $url = trailingslashit( $url ); |
|
1160 | + $url = trailingslashit($url); |
|
1161 | 1161 | |
1162 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) { |
|
1163 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
1162 | + if (function_exists('geodir_location_geo_home_link')) { |
|
1163 | + add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2); |
|
1164 | 1164 | } |
1165 | 1165 | |
1166 | - return apply_filters( 'geodir_search_page_base_url', $url ); |
|
1166 | + return apply_filters('geodir_search_page_base_url', $url); |
|
1167 | 1167 | } |
1168 | 1168 | |
1169 | 1169 | /** |
@@ -1171,9 +1171,9 @@ discard block |
||
1171 | 1171 | * |
1172 | 1172 | * @since 1.6.31 |
1173 | 1173 | */ |
1174 | -function geodir_jetpack_fix_post_types_search(){ |
|
1175 | - if ( defined( 'JETPACK__VERSION' ) && ! empty( $_REQUEST['geodir_search'] ) ) { |
|
1176 | - add_filter( 'jetpack_search_should_handle_query', '__return_false', 999, 1 ); |
|
1174 | +function geodir_jetpack_fix_post_types_search() { |
|
1175 | + if (defined('JETPACK__VERSION') && !empty($_REQUEST['geodir_search'])) { |
|
1176 | + add_filter('jetpack_search_should_handle_query', '__return_false', 999, 1); |
|
1177 | 1177 | } |
1178 | 1178 | } |
1179 | -add_action( 'plugins_loaded','geodir_jetpack_fix_post_types_search', 10 ); |
|
1180 | 1179 | \ No newline at end of file |
1180 | +add_action('plugins_loaded', 'geodir_jetpack_fix_post_types_search', 10); |
|
1181 | 1181 | \ No newline at end of file |
@@ -16,7 +16,9 @@ discard block |
||
16 | 16 | */ |
17 | 17 | function geodir_session_start() |
18 | 18 | { |
19 | - if (!session_id()) session_start(); |
|
19 | + if (!session_id()) { |
|
20 | + session_start(); |
|
21 | + } |
|
20 | 22 | global $geodir_add_location_url; |
21 | 23 | |
22 | 24 | $geodir_add_location_url = NULL; |
@@ -86,7 +88,9 @@ discard block |
||
86 | 88 | |
87 | 89 | if ((is_search() && isset($_REQUEST['geodir_search']) && $_REQUEST['geodir_search'] != '')): |
88 | 90 | |
89 | - if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') $_REQUEST['scat'] = ''; |
|
91 | + if (isset($_REQUEST['scat']) && $_REQUEST['scat'] == 'all') { |
|
92 | + $_REQUEST['scat'] = ''; |
|
93 | + } |
|
90 | 94 | //if(isset($_REQUEST['s']) && $_REQUEST['s'] == '+') $_REQUEST['s'] = ''; |
91 | 95 | |
92 | 96 | if (isset($_REQUEST['sdist'])) { |
@@ -198,8 +202,9 @@ discard block |
||
198 | 202 | add_filter('posts_fields', 'geodir_posts_fields', 1); |
199 | 203 | add_filter('posts_join', 'geodir_posts_join', 1); |
200 | 204 | geodir_post_where(); |
201 | - if (!is_admin()) |
|
202 | - add_filter('posts_orderby', 'geodir_posts_orderby', 1); |
|
205 | + if (!is_admin()) { |
|
206 | + add_filter('posts_orderby', 'geodir_posts_orderby', 1); |
|
207 | + } |
|
203 | 208 | |
204 | 209 | // advanced filter for popular post view widget |
205 | 210 | global $wp_query; |
@@ -349,8 +354,9 @@ discard block |
||
349 | 354 | $sort_by = ''; |
350 | 355 | $orderby = ' '; |
351 | 356 | |
352 | - if (get_query_var('order_by')) |
|
353 | - $sort_by = get_query_var('order_by'); |
|
357 | + if (get_query_var('order_by')) { |
|
358 | + $sort_by = get_query_var('order_by'); |
|
359 | + } |
|
354 | 360 | |
355 | 361 | /*if(isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries){ |
356 | 362 | $current_term = $wp_query->get_queried_object(); |
@@ -370,14 +376,16 @@ discard block |
||
370 | 376 | $orderby .= " distance,"; |
371 | 377 | } |
372 | 378 | |
373 | - if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) |
|
374 | - $sort_by = esc_attr($_REQUEST['sort_by']); |
|
379 | + if (isset($_REQUEST['sort_by']) && $_REQUEST['sort_by'] != '' && is_main_query()) { |
|
380 | + $sort_by = esc_attr($_REQUEST['sort_by']); |
|
381 | + } |
|
375 | 382 | |
376 | 383 | |
377 | 384 | if ($sort_by == '') { |
378 | 385 | $default_sort = geodir_get_posts_default_sort($geodir_post_type); |
379 | - if (!empty($default_sort)) |
|
380 | - $sort_by = $default_sort; |
|
386 | + if (!empty($default_sort)) { |
|
387 | + $sort_by = $default_sort; |
|
388 | + } |
|
381 | 389 | } |
382 | 390 | |
383 | 391 | /* |
@@ -562,7 +570,7 @@ discard block |
||
562 | 570 | $orderby = " (( $avg_num_votes * $avg_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating )) / ( $avg_num_votes + " . $table . ".rating_count ) $order , "; |
563 | 571 | |
564 | 572 | //$orderby = " ( " . $table . ".rating_count * " . $table . ".overall_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating ) / ( " . $table . ".rating_count + " . $table . ".rating_count ) $order , "; // seems to work mostly with no extra overheads |
565 | - }else{ |
|
573 | + } else{ |
|
566 | 574 | $orderby = " " . $table . "." . $sort_by . " " . $order . ", " . $table . ".rating_count " . $order . ", "; |
567 | 575 | } |
568 | 576 | |
@@ -607,8 +615,9 @@ discard block |
||
607 | 615 | |
608 | 616 | add_filter('posts_where', 'searching_filter_where', 1); |
609 | 617 | |
610 | - if ($snear != '') |
|
611 | - add_filter('posts_where', 'searching_filter_where', 1); |
|
618 | + if ($snear != '') { |
|
619 | + add_filter('posts_where', 'searching_filter_where', 1); |
|
620 | + } |
|
612 | 621 | |
613 | 622 | add_filter('posts_orderby', 'geodir_posts_orderby', 1); |
614 | 623 | |
@@ -762,10 +771,11 @@ discard block |
||
762 | 771 | |
763 | 772 | $where = ''; |
764 | 773 | $better_search_terms = ''; |
765 | - if (isset($_REQUEST['stype'])) |
|
766 | - $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
767 | - else |
|
768 | - $post_types = 'gd_place'; |
|
774 | + if (isset($_REQUEST['stype'])) { |
|
775 | + $post_types = esc_attr(wp_strip_all_tags($_REQUEST['stype'])); |
|
776 | + } else { |
|
777 | + $post_types = 'gd_place'; |
|
778 | + } |
|
769 | 779 | |
770 | 780 | if ($s != '') { |
771 | 781 | $keywords = explode(" ", $s); |
@@ -802,7 +812,7 @@ discard block |
||
802 | 812 | if($taxonomies) { |
803 | 813 | $taxonomies = implode("','", $taxonomies); |
804 | 814 | $taxonomies = "'" . $taxonomies . "'"; |
805 | - }else{$taxonomies='';} |
|
815 | + } else{$taxonomies='';} |
|
806 | 816 | |
807 | 817 | $content_where = $terms_where = ''; |
808 | 818 | $terms_sql = ''; |
@@ -943,8 +953,9 @@ discard block |
||
943 | 953 | $user_fav_posts = geodir_get_user_favourites($user_id); |
944 | 954 | $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1'; |
945 | 955 | $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')"; |
946 | - } else |
|
947 | - $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
956 | + } else { |
|
957 | + $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
958 | + } |
|
948 | 959 | |
949 | 960 | if ($user_id == (int)get_current_user_id()) { |
950 | 961 | $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') "; |