GeoDirectory /
geodirectory
@@ -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 ########### |
|
| 699 | 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 | + } |
|
| 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,92 +741,92 @@ 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 = ''; |
|
| 807 | + $content_where = $terms_where = ''; |
|
| 808 | 808 | if ($s != '') {
|
| 809 | - /** |
|
| 810 | - * Filter the search query content where values. |
|
| 811 | - * |
|
| 812 | - * @since 1.5.0 |
|
| 813 | - * @package GeoDirectory |
|
| 814 | - * @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%\") ") "`. |
|
| 815 | - */ |
|
| 809 | + /** |
|
| 810 | + * Filter the search query content where values. |
|
| 811 | + * |
|
| 812 | + * @since 1.5.0 |
|
| 813 | + * @package GeoDirectory |
|
| 814 | + * @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%\") ") "`. |
|
| 815 | + */ |
|
| 816 | 816 | $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%\") ");
|
| 817 | - /** |
|
| 818 | - * Filter the search query term values. |
|
| 819 | - * |
|
| 820 | - * @since 1.5.0 |
|
| 821 | - * @package GeoDirectory |
|
| 822 | - * @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)) "`. |
|
| 823 | - */ |
|
| 824 | - $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)) ");
|
|
| 817 | + /** |
|
| 818 | + * Filter the search query term values. |
|
| 819 | + * |
|
| 820 | + * @since 1.5.0 |
|
| 821 | + * @package GeoDirectory |
|
| 822 | + * @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)) "`. |
|
| 823 | + */ |
|
| 824 | + $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)) ");
|
|
| 825 | 825 | } |
| 826 | 826 | |
| 827 | 827 | |
| 828 | - // get term sql |
|
| 829 | - $term_sql = "SELECT $wpdb->term_taxonomy.term_id, $wpdb->terms.name, $wpdb->term_taxonomy.taxonomy |
|
| 828 | + // get term sql |
|
| 829 | + $term_sql = "SELECT $wpdb->term_taxonomy.term_id, $wpdb->terms.name, $wpdb->term_taxonomy.taxonomy |
|
| 830 | 830 | FROM $wpdb->term_taxonomy, $wpdb->terms, $wpdb->term_relationships |
| 831 | 831 | WHERE $wpdb->term_taxonomy.term_id = $wpdb->terms.term_id |
| 832 | 832 | AND $wpdb->term_relationships.term_taxonomy_id = $wpdb->term_taxonomy.term_taxonomy_id |
@@ -834,45 +834,45 @@ discard block |
||
| 834 | 834 | $terms_where |
| 835 | 835 | GROUP BY $wpdb->term_taxonomy.term_id"; |
| 836 | 836 | |
| 837 | - $term_results = $wpdb->get_results($term_sql); |
|
| 838 | - $term_ids = array(); |
|
| 839 | - $terms_sql = ''; |
|
| 840 | - |
|
| 841 | - if(!empty($term_results)){
|
|
| 842 | - foreach($term_results as $term_id){
|
|
| 843 | - $term_ids[] = $term_id; |
|
| 844 | - } |
|
| 845 | - if (!empty($term_ids)) {
|
|
| 846 | - foreach($term_ids as $term){
|
|
| 847 | - if ($term->taxonomy == $post_types.'_tags') {
|
|
| 848 | - $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , " . $table . ".post_tags) ", $term->name);
|
|
| 849 | - } else {
|
|
| 850 | - $terms_sql .= " OR FIND_IN_SET($term->term_id , " . $table . "." . $post_types . "category) "; |
|
| 851 | - } |
|
| 852 | - } |
|
| 853 | - } |
|
| 854 | - } |
|
| 837 | + $term_results = $wpdb->get_results($term_sql); |
|
| 838 | + $term_ids = array(); |
|
| 839 | + $terms_sql = ''; |
|
| 840 | + |
|
| 841 | + if(!empty($term_results)){
|
|
| 842 | + foreach($term_results as $term_id){
|
|
| 843 | + $term_ids[] = $term_id; |
|
| 844 | + } |
|
| 845 | + if (!empty($term_ids)) {
|
|
| 846 | + foreach($term_ids as $term){
|
|
| 847 | + if ($term->taxonomy == $post_types.'_tags') {
|
|
| 848 | + $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , " . $table . ".post_tags) ", $term->name);
|
|
| 849 | + } else {
|
|
| 850 | + $terms_sql .= " OR FIND_IN_SET($term->term_id , " . $table . "." . $post_types . "category) "; |
|
| 851 | + } |
|
| 852 | + } |
|
| 853 | + } |
|
| 854 | + } |
|
| 855 | 855 | |
| 856 | 856 | |
| 857 | - if ($snear != '') {
|
|
| 857 | + if ($snear != '') {
|
|
| 858 | 858 | |
| 859 | 859 | |
| 860 | - if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 861 | - $dist = $gd_session->get('near_me_range');
|
|
| 862 | - } |
|
| 863 | - $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 864 | - $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 865 | - $lat1 = $mylat - ($dist / 69); |
|
| 866 | - $lat2 = $mylat + ($dist / 69); |
|
| 860 | + if (is_numeric($gd_session->get('near_me_range')) && !isset($_REQUEST['sdist'])) {
|
|
| 861 | + $dist = $gd_session->get('near_me_range');
|
|
| 862 | + } |
|
| 863 | + $lon1 = $mylon - $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 864 | + $lon2 = $mylon + $dist / abs(cos(deg2rad($mylat)) * 69); |
|
| 865 | + $lat1 = $mylat - ($dist / 69); |
|
| 866 | + $lat2 = $mylat + ($dist / 69); |
|
| 867 | 867 | |
| 868 | - $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 869 | - $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 870 | - $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 871 | - $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 868 | + $rlon1 = is_numeric(min($lon1, $lon2)) ? min($lon1, $lon2) : ''; |
|
| 869 | + $rlon2 = is_numeric(max($lon1, $lon2)) ? max($lon1, $lon2) : ''; |
|
| 870 | + $rlat1 = is_numeric(min($lat1, $lat2)) ? min($lat1, $lat2) : ''; |
|
| 871 | + $rlat2 = is_numeric(max($lat1, $lat2)) ? max($lat1, $lat2) : ''; |
|
| 872 | 872 | |
| 873 | 873 | |
| 874 | 874 | |
| 875 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 875 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 876 | 876 | $content_where |
| 877 | 877 | $terms_sql |
| 878 | 878 | ) |
@@ -881,35 +881,35 @@ discard block |
||
| 881 | 881 | AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 ) |
| 882 | 882 | AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) "; |
| 883 | 883 | |
| 884 | - if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 885 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 886 | - $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;
|
|
| 887 | - } |
|
| 884 | + if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {
|
|
| 885 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 886 | + $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;
|
|
| 887 | + } |
|
| 888 | 888 | |
| 889 | - } else {
|
|
| 889 | + } else {
|
|
| 890 | 890 | |
| 891 | 891 | |
| 892 | 892 | |
| 893 | - $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 893 | + $where .= " AND ( ( $wpdb->posts.post_title LIKE \"$s\" $better_search_terms) |
|
| 894 | 894 | $content_where |
| 895 | 895 | $terms_sql |
| 896 | 896 | ) |
| 897 | 897 | |
| 898 | 898 | AND $wpdb->posts.post_type in ('$post_types')
|
| 899 | 899 | AND ($wpdb->posts.post_status = 'publish') "; |
| 900 | - } |
|
| 900 | + } |
|
| 901 | 901 | |
| 902 | 902 | ########### WPML ########### |
| 903 | - if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 903 | + if ( geodir_wpml_is_post_type_translated( $post_types ) ) {
|
|
| 904 | 904 | $lang_code = ICL_LANGUAGE_CODE; |
| 905 | 905 | |
| 906 | 906 | if ($lang_code && $post_types) {
|
| 907 | - $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 908 | - } |
|
| 909 | - } |
|
| 910 | - ########### WPML ########### |
|
| 907 | + $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";
|
|
| 908 | + } |
|
| 909 | + } |
|
| 910 | + ########### WPML ########### |
|
| 911 | 911 | |
| 912 | - return $where; |
|
| 912 | + return $where; |
|
| 913 | 913 | } |
| 914 | 914 | |
| 915 | 915 | |
@@ -924,45 +924,45 @@ discard block |
||
| 924 | 924 | * @return string Modified where query string. |
| 925 | 925 | */ |
| 926 | 926 | function author_filter_where($where) {
|
| 927 | - global $wpdb, $geodir_post_type, $table, $curr; |
|
| 927 | + global $wpdb, $geodir_post_type, $table, $curr; |
|
| 928 | 928 | |
| 929 | - $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 930 | - $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 929 | + $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));
|
|
| 930 | + $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0; |
|
| 931 | 931 | |
| 932 | - if (isset($_REQUEST['stype'])) {
|
|
| 933 | - $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 934 | - } else {
|
|
| 935 | - $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 936 | - } |
|
| 932 | + if (isset($_REQUEST['stype'])) {
|
|
| 933 | + $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);
|
|
| 934 | + } else {
|
|
| 935 | + $where = " AND $wpdb->posts.post_type IN ('gd_place') ";
|
|
| 936 | + } |
|
| 937 | 937 | |
| 938 | - if ($user_id > 0) {
|
|
| 939 | - if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 940 | - $user_fav_posts = geodir_get_user_favourites($user_id); |
|
| 941 | - $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 942 | - $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 943 | - } else |
|
| 944 | - $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 945 | - |
|
| 946 | - if ($user_id == (int)get_current_user_id()) {
|
|
| 947 | - $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 948 | - } else {
|
|
| 949 | - $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 950 | - } |
|
| 951 | - } else {
|
|
| 952 | - $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 953 | - } |
|
| 938 | + if ($user_id > 0) {
|
|
| 939 | + if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite') {
|
|
| 940 | + $user_fav_posts = geodir_get_user_favourites($user_id); |
|
| 941 | + $user_fav_posts = !empty($user_fav_posts) && is_array($user_fav_posts) ? implode("','", $user_fav_posts) : '-1';
|
|
| 942 | + $where .= " AND $wpdb->posts.ID IN ('$user_fav_posts')";
|
|
| 943 | + } else |
|
| 944 | + $where .= " AND $wpdb->posts.post_author = $user_id"; |
|
| 945 | + |
|
| 946 | + if ($user_id == (int)get_current_user_id()) {
|
|
| 947 | + $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";
|
|
| 948 | + } else {
|
|
| 949 | + $where .= " AND $wpdb->posts.post_status = 'publish' "; |
|
| 950 | + } |
|
| 951 | + } else {
|
|
| 952 | + $where .= " AND $wpdb->posts.post_author = '-1' AND $wpdb->posts.post_status = 'publish' "; |
|
| 953 | + } |
|
| 954 | 954 | |
| 955 | - ########### WPML ########### |
|
| 956 | - if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
|
| 957 | - $lang_code = ICL_LANGUAGE_CODE; |
|
| 958 | - if ($lang_code) {
|
|
| 959 | - $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 960 | - } |
|
| 955 | + ########### WPML ########### |
|
| 956 | + if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {
|
|
| 957 | + $lang_code = ICL_LANGUAGE_CODE; |
|
| 958 | + if ($lang_code) {
|
|
| 959 | + $where .= " AND icl_t.language_code='" . $lang_code . "' "; |
|
| 960 | + } |
|
| 961 | 961 | |
| 962 | - } |
|
| 963 | - ########### WPML ########### |
|
| 962 | + } |
|
| 963 | + ########### WPML ########### |
|
| 964 | 964 | |
| 965 | - return $where; |
|
| 965 | + return $where; |
|
| 966 | 966 | } |
| 967 | 967 | |
| 968 | 968 | /** |
@@ -977,11 +977,11 @@ discard block |
||
| 977 | 977 | */ |
| 978 | 978 | function geodir_filter_widget_join($join) |
| 979 | 979 | {
|
| 980 | - global $wp_query, $table; |
|
| 981 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 982 | - $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 983 | - } |
|
| 984 | - return $join; |
|
| 980 | + global $wp_query, $table; |
|
| 981 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 982 | + $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )"; |
|
| 983 | + } |
|
| 984 | + return $join; |
|
| 985 | 985 | } |
| 986 | 986 | |
| 987 | 987 | /** |
@@ -996,43 +996,43 @@ discard block |
||
| 996 | 996 | */ |
| 997 | 997 | function geodir_filter_widget_where($where) |
| 998 | 998 | {
|
| 999 | - global $wp_query, $table; |
|
| 1000 | - if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 1001 | - $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 1002 | - } |
|
| 1003 | - if (!empty($wp_query->query['show_special_only'])) {
|
|
| 1004 | - $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 1005 | - } |
|
| 1006 | - if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 1007 | - $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 1008 | - } |
|
| 1009 | - if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 1010 | - $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 1011 | - } |
|
| 1012 | - return $where; |
|
| 999 | + global $wp_query, $table; |
|
| 1000 | + if (!empty($wp_query->query['show_featured_only'])) {
|
|
| 1001 | + $where .= " AND " . $table . ".is_featured = '1'"; |
|
| 1002 | + } |
|
| 1003 | + if (!empty($wp_query->query['show_special_only'])) {
|
|
| 1004 | + $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )"; |
|
| 1005 | + } |
|
| 1006 | + if (!empty($wp_query->query['with_pics_only'])) {
|
|
| 1007 | + $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id"; |
|
| 1008 | + } |
|
| 1009 | + if (!empty($wp_query->query['with_videos_only'])) {
|
|
| 1010 | + $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )"; |
|
| 1011 | + } |
|
| 1012 | + return $where; |
|
| 1013 | 1013 | } |
| 1014 | 1014 | |
| 1015 | 1015 | |
| 1016 | 1016 | function geodir_related_posts_fields($fields) {
|
| 1017 | - global $wp_query, $wpdb, $table, $post; |
|
| 1017 | + global $wp_query, $wpdb, $table, $post; |
|
| 1018 | 1018 | |
| 1019 | - $fields .= ", " . $table . ".* "; |
|
| 1019 | + $fields .= ", " . $table . ".* "; |
|
| 1020 | 1020 | |
| 1021 | - $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 1021 | + $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));
|
|
| 1022 | 1022 | |
| 1023 | - $mylat = $post->post_latitude; |
|
| 1024 | - $mylon = $post->post_longitude; |
|
| 1023 | + $mylat = $post->post_latitude; |
|
| 1024 | + $mylon = $post->post_longitude; |
|
| 1025 | 1025 | |
| 1026 | - $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 ";
|
|
| 1027 | - return $fields; |
|
| 1026 | + $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 ";
|
|
| 1027 | + return $fields; |
|
| 1028 | 1028 | } |
| 1029 | 1029 | function geodir_related_posts_fields_filter($query) {
|
| 1030 | - if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1031 | - && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 1032 | - && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 1033 | - ) {
|
|
| 1034 | - add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 1035 | - } |
|
| 1030 | + if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop'] |
|
| 1031 | + && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest' |
|
| 1032 | + && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings'] |
|
| 1033 | + ) {
|
|
| 1034 | + add_filter('posts_fields', 'geodir_related_posts_fields', 1);
|
|
| 1035 | + } |
|
| 1036 | 1036 | } |
| 1037 | 1037 | add_action('pre_get_posts', 'geodir_related_posts_fields_filter', 1);
|
| 1038 | 1038 | |
@@ -1047,30 +1047,30 @@ discard block |
||
| 1047 | 1047 | * @return string|null If field exists in table returns order by clause else returns empty. |
| 1048 | 1048 | */ |
| 1049 | 1049 | function geodir_prepare_custom_sorting( $sorting, $table ) {
|
| 1050 | - $orderby = ''; |
|
| 1050 | + $orderby = ''; |
|
| 1051 | 1051 | |
| 1052 | - if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1053 | - return $orderby; |
|
| 1054 | - } |
|
| 1052 | + if ( empty( $sorting ) || empty( $table ) ) {
|
|
| 1053 | + return $orderby; |
|
| 1054 | + } |
|
| 1055 | 1055 | |
| 1056 | - if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1057 | - $sorting_array = explode( '_', $sorting ); |
|
| 1056 | + if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {
|
|
| 1057 | + $sorting_array = explode( '_', $sorting ); |
|
| 1058 | 1058 | |
| 1059 | - if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1060 | - $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1061 | - array_pop( $sorting_array ); |
|
| 1059 | + if ( ( $count = count( $sorting_array ) ) > 1 ) {
|
|
| 1060 | + $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : ''; |
|
| 1061 | + array_pop( $sorting_array ); |
|
| 1062 | 1062 | |
| 1063 | - if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1064 | - $sort_by = implode( '_', $sorting_array ); |
|
| 1063 | + if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {
|
|
| 1064 | + $sort_by = implode( '_', $sorting_array ); |
|
| 1065 | 1065 | |
| 1066 | - if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1067 | - $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1068 | - } |
|
| 1069 | - } |
|
| 1070 | - } |
|
| 1071 | - } |
|
| 1066 | + if ( geodir_column_exist( $table, $sort_by ) ) {
|
|
| 1067 | + $orderby = $table . "." . $sort_by . " " . $order; |
|
| 1068 | + } |
|
| 1069 | + } |
|
| 1070 | + } |
|
| 1071 | + } |
|
| 1072 | 1072 | |
| 1073 | - return $orderby; |
|
| 1073 | + return $orderby; |
|
| 1074 | 1074 | } |
| 1075 | 1075 | |
| 1076 | 1076 | /** |
@@ -1090,21 +1090,21 @@ discard block |
||
| 1090 | 1090 | * @return string Modified fields SQL. |
| 1091 | 1091 | */ |
| 1092 | 1092 | function geodir_search_widget_location_filter_fields( $fields, $table, $post_type ) {
|
| 1093 | - global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
|
| 1093 | + global $wpdb, $gd_query_args_widgets, $snear, $gd_session; |
|
| 1094 | 1094 | |
| 1095 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1096 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1095 | + if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1096 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1097 | 1097 | |
| 1098 | - if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1099 | - $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
| 1100 | - $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
| 1101 | - $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
| 1098 | + if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1099 | + $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] ); |
|
| 1100 | + $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] ); |
|
| 1101 | + $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) ); |
|
| 1102 | 1102 | |
| 1103 | - $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 );
|
|
| 1104 | - } |
|
| 1105 | - } |
|
| 1103 | + $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 );
|
|
| 1104 | + } |
|
| 1105 | + } |
|
| 1106 | 1106 | |
| 1107 | - return $fields; |
|
| 1107 | + return $fields; |
|
| 1108 | 1108 | } |
| 1109 | 1109 | |
| 1110 | 1110 | /** |
@@ -1123,17 +1123,17 @@ discard block |
||
| 1123 | 1123 | * @return string Modified fields SQL. |
| 1124 | 1124 | */ |
| 1125 | 1125 | function geodir_search_widget_location_filter_orderby( $orderby, $table, $post_type ) {
|
| 1126 | - global $gd_query_args_widgets, $snear, $gd_session; |
|
| 1126 | + global $gd_query_args_widgets, $snear, $gd_session; |
|
| 1127 | 1127 | |
| 1128 | - if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1129 | - $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1128 | + if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {
|
|
| 1129 | + $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true; |
|
| 1130 | 1130 | |
| 1131 | - if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1132 | - $orderby = "distance ASC, " . $orderby; |
|
| 1133 | - } |
|
| 1134 | - } |
|
| 1131 | + if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {
|
|
| 1132 | + $orderby = "distance ASC, " . $orderby; |
|
| 1133 | + } |
|
| 1134 | + } |
|
| 1135 | 1135 | |
| 1136 | - return $orderby; |
|
| 1136 | + return $orderby; |
|
| 1137 | 1137 | } |
| 1138 | 1138 | |
| 1139 | 1139 | /** |
@@ -1144,21 +1144,21 @@ discard block |
||
| 1144 | 1144 | * @return string Filtered url. |
| 1145 | 1145 | */ |
| 1146 | 1146 | function geodir_search_page_base_url() {
|
| 1147 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1148 | - remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 1149 | - } |
|
| 1147 | + if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1148 | + remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 ); |
|
| 1149 | + } |
|
| 1150 | 1150 | |
| 1151 | - if ( defined( 'DOING_AJAX' ) && DOING_AJAX && geodir_is_wpml() ) {
|
|
| 1152 | - $url = icl_get_home_url(); |
|
| 1153 | - } else {
|
|
| 1154 | - $url = get_home_url(); |
|
| 1155 | - } |
|
| 1151 | + if ( defined( 'DOING_AJAX' ) && DOING_AJAX && geodir_is_wpml() ) {
|
|
| 1152 | + $url = icl_get_home_url(); |
|
| 1153 | + } else {
|
|
| 1154 | + $url = get_home_url(); |
|
| 1155 | + } |
|
| 1156 | 1156 | |
| 1157 | - $url = trailingslashit( $url ); |
|
| 1157 | + $url = trailingslashit( $url ); |
|
| 1158 | 1158 | |
| 1159 | - if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1160 | - add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 1161 | - } |
|
| 1159 | + if ( function_exists( 'geodir_location_geo_home_link' ) ) {
|
|
| 1160 | + add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 ); |
|
| 1161 | + } |
|
| 1162 | 1162 | |
| 1163 | - return apply_filters( 'geodir_search_page_base_url', $url ); |
|
| 1163 | + return apply_filters( 'geodir_search_page_base_url', $url ); |
|
| 1164 | 1164 | } |
| 1165 | 1165 | \ No newline at end of file |
