@@ -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 |
@@ -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 |