GeoDirectory / geodirectory

geodirectory-functions/listing_filters.php

Spacing +131 added lines, -131 removed lines

@@ -65,7 +65,7 @@ 
  * @global string $s_A Extra parameters.

  * @global string $s_SA Extra parameters.

  */

-function set_listing_request($query )

+function set_listing_request($query)

 {

     global $wp_query, $wpdb, $geodir_post_type, $table, $dist, $mylat, $mylon, $s, $snear, $s, $s_A, $s_SA;

 

@@ -99,15 +99,15 @@ 
         } //  Distance

 

         if (isset($_REQUEST['sgeo_lat'])) {

-            $mylat = (float)esc_attr($_REQUEST['sgeo_lat']);

+            $mylat = (float) esc_attr($_REQUEST['sgeo_lat']);

         } else {

-            $mylat = (float)geodir_get_current_city_lat();

+            $mylat = (float) geodir_get_current_city_lat();

         } //  Latitude

 

         if (isset($_REQUEST['sgeo_lon'])) {

-            $mylon = (float)esc_attr($_REQUEST['sgeo_lon']);

+            $mylon = (float) esc_attr($_REQUEST['sgeo_lon']);

         } else {

-            $mylon = (float)geodir_get_current_city_lng();

+            $mylon = (float) geodir_get_current_city_lng();

         } //  Distance

 

         if (isset($_REQUEST['snear'])) {

@@ -116,12 +116,12 @@ 
 

         if (isset($_REQUEST['s'])) {

             $s = trim(esc_attr(wp_strip_all_tags($_REQUEST['s'])));

-            $s = str_replace(array("%E2%80%99","’"),array("%27","'"),$s);

+            $s = str_replace(array("%E2%80%99", "’"), array("%27", "'"), $s);

         }

 

         if ($snear == 'NEAR ME') {

             $ip = $_SERVER['REMOTE_ADDR'];

-            $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip=' . $ip));

+            $addr_details = unserialize(file_get_contents('http://www.geoplugin.net/php.gp?ip='.$ip));

             $mylat = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_latitude]));

             $mylon = stripslashes(geodir_utf8_ucfirst($addr_details[geoplugin_longitude]));

         }

@@ -131,9 +131,9 @@ 
             $s_AA = str_replace(" ", "", $s);

             $s_A = explode(",", $s_AA);

             $s_A = implode('","', $s_A);

-            $s_A = '"' . $s_A . '"';

+            $s_A = '"'.$s_A.'"';

         } else {

-            $s_A = '"' . $s . '"';

+            $s_A = '"'.$s.'"';

         }

 

         if (strstr($s, ' ')) {

@@ -194,7 +194,7 @@ 
     }

     if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {

 

-        $table = $plugin_prefix . $geodir_post_type . '_detail';

+        $table = $plugin_prefix.$geodir_post_type.'_detail';

 

         add_filter('posts_fields', 'geodir_posts_fields', 1);

         add_filter('posts_join', 'geodir_posts_join', 1);

@@ -234,7 +234,7 @@ 
     global $wp_query, $wpdb, $geodir_post_type, $table, $plugin_prefix, $dist, $mylat, $mylon, $snear, $gd_session;

 

     // Filter-Location-Manager to add location table.

-    $fields .= ", " . $table . ".* ";

+    $fields .= ", ".$table.".* ";

 

 	if ($snear != '' || $gd_session->get('all_near_me')) {

         $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

@@ -244,16 +244,16 @@ 
             $mylon = $gd_session->get('user_lon');

         }

 

-        $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 ";

+        $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 ";

     }

 

     global $s;

     if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

         $keywords = explode(" ", $s);

 

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(geodir_utf8_strlen($kword)<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (geodir_utf8_strlen($kword) <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -271,24 +271,24 @@ 
                 $count = 0;

                 foreach ($keywords as $keyword) {

                     $keyword = trim($keyword);

-                    $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+                    $keyword = wp_specialchars_decode($keyword, ENT_QUOTES);

 					$count++;

                     if ($count < count($keywords)) {

                        // $gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' " . $key . " ";

-						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) " . $key . " ";

+						$gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) ".$key." ";

                     } else {

                         //$gd_titlematch_part .= $wpdb->posts . ".post_title LIKE '%%" . $keyword . "%%' ";

-						$gd_titlematch_part .= "( " . $wpdb->posts . ".post_title LIKE '" . $keyword . "' OR " . $wpdb->posts . ".post_title LIKE '" . $keyword . "%%' OR " . $wpdb->posts . ".post_title LIKE '%% " . $keyword . "%%' ) ";

+						$gd_titlematch_part .= "( ".$wpdb->posts.".post_title LIKE '".$keyword."' OR ".$wpdb->posts.".post_title LIKE '".$keyword."%%' OR ".$wpdb->posts.".post_title LIKE '%% ".$keyword."%%' ) ";

                     }

                 }

-                $gd_titlematch_part .= "THEN 1 ELSE 0 END AS " . $part . ",";

+                $gd_titlematch_part .= "THEN 1 ELSE 0 END AS ".$part.",";

             }

         } else {

             $gd_titlematch_part = "";

         }

-        $s = stripslashes_deep( $s );

-        $s = wp_specialchars_decode($s,ENT_QUOTES);

-		$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));

+        $s = stripslashes_deep($s);

+        $s = wp_specialchars_decode($s, ENT_QUOTES);

+		$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));

     }

 

     return $fields;

@@ -312,18 +312,18 @@ 
 

     ########### WPML ###########

 

-    if ( geodir_wpml_is_post_type_translated( $geodir_post_type ) ) {

+    if (geodir_wpml_is_post_type_translated($geodir_post_type)) {

         global $sitepress;

         $lang_code = ICL_LANGUAGE_CODE;

         $default_lang_code = $sitepress->get_default_language();

         if ($lang_code) {

-            $join .= "JOIN " . $table_prefix . "icl_translations icl_t ON icl_t.element_id = " . $table_prefix . "posts.ID";

+            $join .= "JOIN ".$table_prefix."icl_translations icl_t ON icl_t.element_id = ".$table_prefix."posts.ID";

         }

 

     }

     ########### WPML ###########

 

-    $join .= " INNER JOIN " . $table . " ON (" . $table . ".post_id = $wpdb->posts.ID)  ";

+    $join .= " INNER JOIN ".$table." ON (".$table.".post_id = $wpdb->posts.ID)  ";

     //===old code start

     //$join .= " INNER JOIN ".POST_LOCATION_TABLE." ON (".$table.".post_location_id = ".POST_LOCATION_TABLE.".location_id)  " ;//===old code end

 

@@ -392,7 +392,7 @@ 
             $sort_by = 'az';

         }

 

-        if ($snear != '' &&  $sort_by!='farthest') {

+        if ($snear != '' && $sort_by != 'farthest') {

             $sort_by = 'nearest';

         }

     }

@@ -406,20 +406,20 @@ 
             break;

         case 'low_review':

         case 'rating_count_asc':

-            $orderby = $table . ".rating_count ASC, " . $table . ".overall_rating ASC, ";

+            $orderby = $table.".rating_count ASC, ".$table.".overall_rating ASC, ";

             break;

         case 'high_review':

         case 'rating_count_desc':

-            $orderby = $table . ".rating_count DESC, " . $table . ".overall_rating DESC, ";

+            $orderby = $table.".rating_count DESC, ".$table.".overall_rating DESC, ";

             break;

         case 'low_rating':

-            $orderby = "( " . $table . ".overall_rating  ) ASC, " . $table . ".rating_count ASC,  ";

+            $orderby = "( ".$table.".overall_rating  ) ASC, ".$table.".rating_count ASC,  ";

             break;

         case 'high_rating':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+            $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, ";

             break;

         case 'featured':

-            $orderby = $table . ".is_featured asc, ";

+            $orderby = $table.".is_featured asc, ";

             break;

         case 'nearest':

             $orderby = " distance asc, ";

@@ -435,10 +435,10 @@ 
             break;

         // sort by rating

         case 'overall_rating_desc':

-            $orderby = " " . $table . ".overall_rating DESC, " . $table . ".rating_count DESC, ";

+            $orderby = " ".$table.".overall_rating DESC, ".$table.".rating_count DESC, ";

             break;

         case 'overall_rating_asc':

-            $orderby = " " . $table . ".overall_rating ASC, " . $table . ".rating_count ASC, ";

+            $orderby = " ".$table.".overall_rating ASC, ".$table.".rating_count ASC, ";

             break;

         default:

 

@@ -459,24 +459,24 @@ 
 

     if (is_search() && isset($_REQUEST['geodir_search']) && $s && trim($s) != '') {

         $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(geodir_utf8_strlen($kword)<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (geodir_utf8_strlen($kword) <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

         }

         if ($sort_by == 'nearest' || $sort_by == 'farthest') {

             if (count($keywords) > 1) {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

+                $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ";

             } else {

-                $orderby = $orderby . " ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

+                $orderby = $orderby." ( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ";

             }

         } else {

             if (count($keywords) > 1) {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, " . $orderby;

+                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_alltitlematch_part * 100 + gd_titlematch_part * 50 + gd_content * 1.5) DESC, ".$orderby;

             } else {

-                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, " . $orderby;

+                $orderby = "( gd_titlematch * 2 + gd_featured * 5 + gd_exacttitle * 10 + gd_content * 1.5) DESC, ".$orderby;

             }

         }

     }

@@ -491,7 +491,7 @@ 
      */

     $orderby = apply_filters('geodir_posts_order_by_sort', $orderby, $sort_by, $table);

 

-    $orderby .= $table . ".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

+    $orderby .= $table.".is_featured asc, $wpdb->posts.post_date desc, $wpdb->posts.post_title ";

 

     return $orderby;

 }

@@ -513,7 +513,7 @@ 
 

     global $wpdb;

 

-    if ($sort_by != '' && (!is_search() || ( isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear']=='' && ( $_REQUEST['s']=='' ||  $_REQUEST['s']==' ') ) )) {

+    if ($sort_by != '' && (!is_search() || (isset($_REQUEST['s']) && isset($_REQUEST['snear']) && $_REQUEST['snear'] == '' && ($_REQUEST['s'] == '' || $_REQUEST['s'] == ' ')))) {

 

         $sort_array = explode('_', $sort_by);

 

@@ -523,48 +523,48 @@ 
 

         if ($sort_by_count > 1 && ($order == 'asc' || $order == 'desc')) {

 

-            $sort_by = str_replace('_' . $order, '', $sort_by);

+            $sort_by = str_replace('_'.$order, '', $sort_by);

 

             switch ($sort_by):

 

                 case 'post_date':

                 case 'comment_count':

 

-                    $orderby = "$wpdb->posts." . $sort_by . " " . $order . ", ".$table . ".overall_rating " . $order . ", ";

+                    $orderby = "$wpdb->posts.".$sort_by." ".$order.", ".$table.".overall_rating ".$order.", ";

                     break;

 

                 case 'distance':

-                    $orderby = $sort_by . " " . $order . ", ";

+                    $orderby = $sort_by." ".$order.", ";

                     break;

 

 

                 // sort by rating

                 case 'overall_rating':

 

-                    $use_bayesian = apply_filters('gd_use_bayesian',true,$table);

+                    $use_bayesian = apply_filters('gd_use_bayesian', true, $table);

                     $avg_rating = 0;

-                    if($use_bayesian){

-                        $avg_num_votes = get_transient( 'gd_avg_num_votes_'.$table );

-                        if(!$avg_num_votes){

+                    if ($use_bayesian) {

+                        $avg_num_votes = get_transient('gd_avg_num_votes_'.$table);

+                        if (!$avg_num_votes) {

                             $avg_num_votes = $wpdb->get_var("SELECT SUM(rating_count) FROM $table");

-                            if($avg_num_votes){

+                            if ($avg_num_votes) {

 

-                                $avg_rating = get_transient( 'gd_avg_rating_'.$table );

-                                if(!$avg_rating){

-                                    $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table")/$avg_num_votes;

+                                $avg_rating = get_transient('gd_avg_rating_'.$table);

+                                if (!$avg_rating) {

+                                    $avg_rating = $wpdb->get_var("SELECT SUM(overall_rating) FROM $table") / $avg_num_votes;

                                 }

-                                set_transient( 'gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS );

-                                set_transient( 'gd_avg_rating_'.$table, $avg_rating , 12 * HOUR_IN_SECONDS );

+                                set_transient('gd_avg_num_votes_'.$table, $avg_num_votes, 12 * HOUR_IN_SECONDS);

+                                set_transient('gd_avg_rating_'.$table, $avg_rating, 12 * HOUR_IN_SECONDS);

                             }

                         }

 

-                        if(!$avg_num_votes){ $avg_num_votes = 0;}

+                        if (!$avg_num_votes) { $avg_num_votes = 0; }

 

-                        $orderby = " (( $avg_num_votes * $avg_rating ) + (" . $table . ".rating_count * " . $table . ".overall_rating ))  / ( $avg_num_votes + " . $table . ".rating_count )  $order , ";

+                        $orderby = " (( $avg_num_votes * $avg_rating ) + (".$table.".rating_count * ".$table.".overall_rating ))  / ( $avg_num_votes + ".$table.".rating_count )  $order , ";

 

                         //$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

-                    }else{

-                        $orderby = " " . $table . "." . $sort_by . "  " . $order . ", " . $table . ".rating_count " . $order . ", ";

+                    } else {

+                        $orderby = " ".$table.".".$sort_by."  ".$order.", ".$table.".rating_count ".$order.", ";

                     }

 

                     break;

@@ -572,7 +572,7 @@ 
 

                 default:

                     if (geodir_column_exist($table, $sort_by)) {

-						$orderby = $table . "." . $sort_by . " " . $order . ", ";

+						$orderby = $table.".".$sort_by." ".$order.", ";

 					}

                     break;

 

@@ -620,7 +620,7 @@ 
         }

 

         //if (!geodir_is_page('detail'))

-            add_filter('posts_where', 'geodir_default_where', 1);/**/

+            add_filter('posts_where', 'geodir_default_where', 1); /**/

 

         //add_filter( 'user_has_cap', 'geodir_preview_post_cap', 10, 3 );// let subscribers edit their own posts

 

@@ -691,7 +691,7 @@ 
         $q_post_type = isset($wp_query->query['post_type']) ? $wp_query->query['post_type'] : '';

         //echo '##########'.$q_post_type;

         if ($lang_code && $q_post_type && geodir_wpml_is_post_type_translated($q_post_type)) {

-            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_" . $q_post_type . "') ";

+            $where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type IN('post_".$q_post_type."') ";

             //$where .= " AND icl_t.language_code = '$lang_code' ";

         }

 

@@ -758,8 +758,8 @@ 
 	}

 

 	$s = trim($s);

-    $s  = wp_specialchars_decode($s ,ENT_QUOTES);

-    $s_A = wp_specialchars_decode($s_A ,ENT_QUOTES);

+    $s = wp_specialchars_decode($s, ENT_QUOTES);

+    $s_A = wp_specialchars_decode($s_A, ENT_QUOTES);

 

     $where = '';

     $better_search_terms = '';

@@ -770,9 +770,9 @@ 
 

     if ($s != '') {

         $keywords = explode(" ", $s);

-        if(is_array($keywords) && $klimit = get_option('geodir_search_word_limit')){

-            foreach($keywords as $kkey=>$kword){

-                if(geodir_utf8_strlen($kword)<=$klimit){

+        if (is_array($keywords) && $klimit = get_option('geodir_search_word_limit')) {

+            foreach ($keywords as $kkey=>$kword) {

+                if (geodir_utf8_strlen($kword) <= $klimit) {

                     unset($keywords[$kkey]);

                 }

             }

@@ -781,7 +781,7 @@ 
         if (!empty($keywords)) {

             foreach ($keywords as $keyword) {

                 $keyword = trim($keyword);

-                $keyword  = wp_specialchars_decode($keyword ,ENT_QUOTES);

+                $keyword = wp_specialchars_decode($keyword, ENT_QUOTES);

                 if ($keyword != '') {

                     /**

                      * Filter the search query keywords SQL.

@@ -792,7 +792,7 @@ 
                      * @param array $keywords The array of keywords for the query.

                      * @param string $keyword The single keyword being searched.

                      */

-					$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);

+					$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);

                 }

             }

         }

@@ -800,10 +800,10 @@ 
 

     /* get taxonomy */

     $taxonomies = geodir_get_taxonomies($post_types, true);

-    if($taxonomies) {

+    if ($taxonomies) {

         $taxonomies = implode("','", $taxonomies);

-        $taxonomies = "'" . $taxonomies . "'";

-    }else{$taxonomies='';}

+        $taxonomies = "'".$taxonomies."'";

+    } else {$taxonomies = ''; }

 

     $content_where = $terms_where = '';

 	if ($s != '') {

@@ -814,7 +814,7 @@ 
          * @package GeoDirectory

          * @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%\") ") "`.

          */

-		$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%\") ");

+		$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%\") ");

         /**

          * Filter the search query term values.

          *

@@ -822,7 +822,7 @@ 
          * @package GeoDirectory

          * @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)) "`.

          */

-        $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)) ");

+        $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)) ");

 	}

 

 

@@ -839,16 +839,16 @@ 
     $term_ids = array();

     $terms_sql = '';

 

-    if(!empty($term_results)){

-        foreach($term_results as $term_id){

+    if (!empty($term_results)) {

+        foreach ($term_results as $term_id) {

             $term_ids[] = $term_id;

         }

         if (!empty($term_ids)) {

-            foreach($term_ids as $term){

+            foreach ($term_ids as $term) {

                 if ($term->taxonomy == $post_types.'_tags') {

-                    $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , " . $table . ".post_tags) ", $term->name);

+                    $terms_sql .= $wpdb->prepare(" OR FIND_IN_SET(%s , ".$table.".post_tags) ", $term->name);

                 } else {

-                    $terms_sql .= " OR FIND_IN_SET($term->term_id , " . $table . "." . $post_types . "category) ";

+                    $terms_sql .= " OR FIND_IN_SET($term->term_id , ".$table.".".$post_types."category) ";

                 }

             }

         }

@@ -879,12 +879,12 @@ 
 							)

 						AND $wpdb->posts.post_type in ('{$post_types}')

 						AND ($wpdb->posts.post_status = 'publish')

-						AND ( " . $table . ".post_latitude between $rlat1 and $rlat2 )

-						AND ( " . $table . ".post_longitude between $rlon1 and $rlon2 ) ";

+						AND ( ".$table.".post_latitude between $rlat1 and $rlat2 )

+						AND ( ".$table.".post_longitude between $rlon1 and $rlon2 ) ";

 

         if (isset($_REQUEST['sdist']) && $_REQUEST['sdist'] != 'all') {

             $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

-            $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;

+            $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;

         }

 

     } else {

@@ -901,11 +901,11 @@ 
     }

 

 	########### WPML ###########

-    if ( geodir_wpml_is_post_type_translated( $post_types ) ) {

+    if (geodir_wpml_is_post_type_translated($post_types)) {

 		$lang_code = ICL_LANGUAGE_CODE;

 

 		if ($lang_code && $post_types) {

-            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_" . $post_types . "') ";

+            $where .= " AND icl_t.language_code = '".$lang_code."' AND icl_t.element_type IN('post_".$post_types."') ";

         }

     }

     ########### WPML ###########

@@ -928,10 +928,10 @@ 
     global $wpdb, $geodir_post_type, $table, $curr;

 

     $curauth = (get_query_var('author_name')) ? get_user_by('slug', get_query_var('author_name')) : get_userdata(get_query_var('author'));

-    $user_id = !empty($curauth->ID) ? (int)$curauth->ID : 0;

+    $user_id = !empty($curauth->ID) ? (int) $curauth->ID : 0;

 

     if (isset($_REQUEST['stype'])) {

-        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ",$_REQUEST['stype']);

+        $where = $wpdb->prepare(" AND $wpdb->posts.post_type IN (%s) ", $_REQUEST['stype']);

     } else {

         $where = " AND $wpdb->posts.post_type IN ('gd_place') ";

     }

@@ -944,7 +944,7 @@ 
         } else

             $where .= " AND $wpdb->posts.post_author = $user_id";

 

-        if ($user_id == (int)get_current_user_id()) {

+        if ($user_id == (int) get_current_user_id()) {

             $where .= " AND $wpdb->posts.post_status IN ('publish','draft','pending') ";

         } else {

             $where .= " AND $wpdb->posts.post_status = 'publish' ";

@@ -957,7 +957,7 @@ 
     if (geodir_wpml_is_post_type_translated(sanitize_text_field($_REQUEST['stype']))) {

         $lang_code = ICL_LANGUAGE_CODE;

         if ($lang_code) {

-            $where .= " AND icl_t.language_code='" . $lang_code . "' ";

+            $where .= " AND icl_t.language_code='".$lang_code."' ";

         }

 

     }

@@ -980,7 +980,7 @@ 
 {

     global $wp_query, $table;

     if (!empty($wp_query->query['with_pics_only'])) {

-        $join .= " LEFT JOIN " . GEODIR_ATTACHMENT_TABLE . " ON ( " . GEODIR_ATTACHMENT_TABLE . ".post_id=" . $table . ".post_id AND " . GEODIR_ATTACHMENT_TABLE . ".mime_type LIKE '%image%' )";

+        $join .= " LEFT JOIN ".GEODIR_ATTACHMENT_TABLE." ON ( ".GEODIR_ATTACHMENT_TABLE.".post_id=".$table.".post_id AND ".GEODIR_ATTACHMENT_TABLE.".mime_type LIKE '%image%' )";

     }

     return $join;

 }

@@ -999,16 +999,16 @@ 
 {

     global $wp_query, $table;

     if (!empty($wp_query->query['show_featured_only'])) {

-        $where .= " AND " . $table . ".is_featured = '1'";

+        $where .= " AND ".$table.".is_featured = '1'";

     }

     if (!empty($wp_query->query['show_special_only'])) {

-        $where .= " AND ( " . $table . ".geodir_special_offers != '' AND " . $table . ".geodir_special_offers IS NOT NULL )";

+        $where .= " AND ( ".$table.".geodir_special_offers != '' AND ".$table.".geodir_special_offers IS NOT NULL )";

     }

     if (!empty($wp_query->query['with_pics_only'])) {

-        $where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL GROUP BY " . $table . ".post_id";

+        $where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL GROUP BY ".$table.".post_id";

     }

     if (!empty($wp_query->query['with_videos_only'])) {

-        $where .= " AND ( " . $table . ".geodir_video != '' AND " . $table . ".geodir_video IS NOT NULL )";

+        $where .= " AND ( ".$table.".geodir_video != '' AND ".$table.".geodir_video IS NOT NULL )";

     }

     return $where;

 }

@@ -1017,18 +1017,18 @@ 
 function geodir_related_posts_fields($fields) {

     global $wp_query, $wpdb, $table, $post;

 

-    $fields .= ", " . $table . ".* ";

+    $fields .= ", ".$table.".* ";

 

     $DistanceRadius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

 

     $mylat = $post->post_latitude;

     $mylon = $post->post_longitude;

 

-    $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 ";

+    $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 ";

     return $fields;

 }

 function geodir_related_posts_fields_filter($query) {

-    if ( isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

+    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']

         && isset($query->query_vars['order_by']) && $query->query_vars['order_by'] == 'nearest'

         && isset($query->query_vars['related_listings']) && $query->query_vars['related_listings']

     ) {

@@ -1047,25 +1047,25 @@ 
  * @param string $table Listing table name.

  * @return string|null If field exists in table returns order by clause else returns empty.

  */

-function geodir_prepare_custom_sorting( $sorting, $table ) {

+function geodir_prepare_custom_sorting($sorting, $table) {

     $orderby = '';

     

-    if ( empty( $sorting ) || empty( $table ) ) {

+    if (empty($sorting) || empty($table)) {

         return $orderby;

     }

     

-    if ( strpos( strtoupper( $sorting ), '_ASC' ) !== false || strpos( strtoupper( $sorting ), '_DESC') !== false ) {

-        $sorting_array = explode( '_', $sorting );

+    if (strpos(strtoupper($sorting), '_ASC') !== false || strpos(strtoupper($sorting), '_DESC') !== false) {

+        $sorting_array = explode('_', $sorting);

         

-        if ( ( $count = count( $sorting_array ) ) > 1 ) {

-            $order = !empty( $sorting_array[$count - 1] ) ? strtoupper( $sorting_array[$count - 1] ) : '';

-            array_pop( $sorting_array );

+        if (($count = count($sorting_array)) > 1) {

+            $order = !empty($sorting_array[$count - 1]) ? strtoupper($sorting_array[$count - 1]) : '';

+            array_pop($sorting_array);

             

-            if ( !empty( $sorting_array ) && ( $order == 'ASC' || $order == 'DESC' ) ) {

-                $sort_by = implode( '_', $sorting_array );

+            if (!empty($sorting_array) && ($order == 'ASC' || $order == 'DESC')) {

+                $sort_by = implode('_', $sorting_array);

                 

-                if ( geodir_column_exist( $table, $sort_by ) ) {

-                    $orderby = $table . "." . $sort_by . " " . $order;

+                if (geodir_column_exist($table, $sort_by)) {

+                    $orderby = $table.".".$sort_by." ".$order;

                 }

             }

         }

@@ -1090,18 +1090,18 @@ 
  *

  * @return string Modified fields SQL.

  */

-function geodir_search_widget_location_filter_fields( $fields, $table, $post_type ) {

+function geodir_search_widget_location_filter_fields($fields, $table, $post_type) {

     global $wpdb, $gd_query_args_widgets, $snear, $gd_session;

 

-    if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {

-        $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+    if (!empty($gd_query_args_widgets['gd_location']) && geodir_is_page('search') && !empty($_REQUEST['sgeo_lat']) && !empty($_REQUEST['sgeo_lon'])) {

+        $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

 

-        if ( $location_allowed && strpos( strtolower( $fields ), ' as distance ' ) === false && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {

-            $latitude = sanitize_text_field( $_REQUEST['sgeo_lat'] );

-            $longitude = sanitize_text_field( $_REQUEST['sgeo_lon'] );

-            $radius = geodir_getDistanceRadius( get_option( 'geodir_search_dist_1' ) );

+        if ($location_allowed && strpos(strtolower($fields), ' as distance ') === false && ($snear != '' || $gd_session->get('all_near_me'))) {

+            $latitude = sanitize_text_field($_REQUEST['sgeo_lat']);

+            $longitude = sanitize_text_field($_REQUEST['sgeo_lon']);

+            $radius = geodir_getDistanceRadius(get_option('geodir_search_dist_1'));

 

-            $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 );

+            $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);

         }

     }

 

@@ -1123,14 +1123,14 @@ 
  *

  * @return string Modified fields SQL.

  */

-function geodir_search_widget_location_filter_orderby( $orderby, $table, $post_type ) {

+function geodir_search_widget_location_filter_orderby($orderby, $table, $post_type) {

     global $gd_query_args_widgets, $snear, $gd_session;

 

-    if ( !empty( $gd_query_args_widgets['gd_location'] ) && geodir_is_page( 'search' ) && !empty( $_REQUEST['sgeo_lat'] ) && !empty( $_REQUEST['sgeo_lon'] ) ) {

-        $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+    if (!empty($gd_query_args_widgets['gd_location']) && geodir_is_page('search') && !empty($_REQUEST['sgeo_lat']) && !empty($_REQUEST['sgeo_lon'])) {

+        $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

 

-        if ( $location_allowed && ( $snear != '' || $gd_session->get( 'all_near_me' ) ) ) {

-            $orderby = "distance ASC, " . $orderby;

+        if ($location_allowed && ($snear != '' || $gd_session->get('all_near_me'))) {

+            $orderby = "distance ASC, ".$orderby;

         }

     }

 

@@ -1145,23 +1145,23 @@ 
  * @return string Filtered url.

  */

 function geodir_search_page_base_url() {

-    if ( function_exists( 'geodir_location_geo_home_link' ) ) {

-        remove_filter( 'home_url', 'geodir_location_geo_home_link', 100000 );

+    if (function_exists('geodir_location_geo_home_link')) {

+        remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

     }

 

-    if ( defined( 'DOING_AJAX' ) && DOING_AJAX && geodir_is_wpml() ) {

+    if (defined('DOING_AJAX') && DOING_AJAX && geodir_is_wpml()) {

         $url = icl_get_home_url();

     } else {

         $url = get_home_url();

     }

 

-    $url = trailingslashit( $url );

+    $url = trailingslashit($url);

 

-    if ( function_exists( 'geodir_location_geo_home_link' ) ) {

-        add_filter( 'home_url', 'geodir_location_geo_home_link', 100000, 2 );

+    if (function_exists('geodir_location_geo_home_link')) {

+        add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

     }

 

-    return apply_filters( 'geodir_search_page_base_url', $url );

+    return apply_filters('geodir_search_page_base_url', $url);

 }

 

 /**

@@ -1169,9 +1169,9 @@ 
  *

  * @since 1.6.31

  */

-function geodir_jetpack_fix_post_types_search(){

-	if ( defined( 'JETPACK__VERSION' ) && ! empty( $_REQUEST['geodir_search'] ) ) {

-		add_filter( 'jetpack_search_should_handle_query', '__return_false', 999, 1 );

+function geodir_jetpack_fix_post_types_search() {

+	if (defined('JETPACK__VERSION') && !empty($_REQUEST['geodir_search'])) {

+		add_filter('jetpack_search_should_handle_query', '__return_false', 999, 1);

     }

 }

-add_action( 'plugins_loaded','geodir_jetpack_fix_post_types_search', 10 );
\ No newline at end of file
+add_action('plugins_loaded', 'geodir_jetpack_fix_post_types_search', 10);
\ No newline at end of file