GeoDirectory / geodirectory

geodirectory_hooks_actions.php

Spacing +198 added lines, -198 removed lines

@@ -136,7 +136,7 @@ 
 /* ON TEMPLATE INCLUDE */

 /////////////////////////

 

-add_filter('template_include', 'geodir_template_loader',9);

+add_filter('template_include', 'geodir_template_loader', 9);

 

 /////////////////////////

 /* CATEGORY / TAXONOMY / CUSTOM POST ACTIONS */

@@ -176,9 +176,9 @@ 
 /* WP REVIEW COUNT ACTIONS */

 ////////////////////////

 

-add_action('geodir_update_postrating', 'geodir_term_review_count_force_update_single_post', 100,1);

+add_action('geodir_update_postrating', 'geodir_term_review_count_force_update_single_post', 100, 1);

 //add_action('geodir_update_postrating', 'geodir_term_review_count_force_update', 100);

-add_action('transition_post_status', 'geodir_term_review_count_force_update', 100,3);

+add_action('transition_post_status', 'geodir_term_review_count_force_update', 100, 3);

 //add_action('created_term', 'geodir_term_review_count_force_update', 100);

 add_action('edited_term', 'geodir_term_review_count_force_update', 100);

 add_action('delete_term', 'geodir_term_review_count_force_update', 100);

@@ -223,7 +223,7 @@ 
  */

 function geodir_unset_prev_theme_nav_location($newname)

 {

-    $geodir_theme_location = get_option('geodir_theme_location_nav_' . $newname);

+    $geodir_theme_location = get_option('geodir_theme_location_nav_'.$newname);

     if ($geodir_theme_location) {

         update_option('geodir_theme_location_nav', $geodir_theme_location);

     } else {

@@ -258,13 +258,13 @@ 
     include_once('geodirectory-functions/listing_filters.php');

     

     // Theme My Login compatibility fix

-    if ( isset( $_REQUEST['geodir_search'] ) && class_exists( 'Theme_My_Login' ) ) {

-        remove_action( 'pre_get_posts', array( Theme_My_Login::get_object(), 'pre_get_posts' ) );

+    if (isset($_REQUEST['geodir_search']) && class_exists('Theme_My_Login')) {

+        remove_action('pre_get_posts', array(Theme_My_Login::get_object(), 'pre_get_posts'));

     }

     

-    if ( isset( $_REQUEST['geodir_search'] ) ) {

-        add_filter( 'geodir_filter_widget_listings_fields', 'geodir_search_widget_location_filter_fields', 100, 3 );

-        add_filter( 'geodir_filter_widget_listings_orderby', 'geodir_search_widget_location_filter_orderby', 100, 3 );

+    if (isset($_REQUEST['geodir_search'])) {

+        add_filter('geodir_filter_widget_listings_fields', 'geodir_search_widget_location_filter_fields', 100, 3);

+        add_filter('geodir_filter_widget_listings_orderby', 'geodir_search_widget_location_filter_orderby', 100, 3);

     }

 }

 

@@ -331,8 +331,8 @@ 
 

 /////// GEO DIRECOTORY CUSTOM HOOKS ///

 

-add_action('geodir_before_tab_content', 'geodir_before_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content 

-add_action('geodir_after_tab_content', 'geodir_after_tab_content');// this function is in custom_functions.php and it is used to wrap detail page tab content

+add_action('geodir_before_tab_content', 'geodir_before_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content 

+add_action('geodir_after_tab_content', 'geodir_after_tab_content'); // this function is in custom_functions.php and it is used to wrap detail page tab content

 

 // Detail page sidebar content 

 add_action('geodir_detail_page_sidebar', 'geodir_detail_page_sidebar_content_sorting', 1);

@@ -432,8 +432,8 @@ 
     do_action('geodir_after_social_sharing_buttons');

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_tfg_buttons_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-social-sharing">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_tfg_buttons_section') != 1) {

         /**

          * Filter the geodir_social_sharing_buttons() function content.

          *

@@ -473,12 +473,12 @@ 
             $post_id = $post->ID;

             

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

-                $post_id = (int)$_REQUEST['pid'];

+                $post_id = (int) $_REQUEST['pid'];

             }

 

             $postlink = get_permalink(geodir_add_listing_page_id());

             $editlink = geodir_getlink($postlink, array('pid' => $post_id), false);

-            echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="' . esc_url($editlink) . '">' . __('Edit this Post', 'geodirectory') . '</a></p>';

+            echo ' <p class="edit_link"><i class="fa fa-pencil"></i> <a href="'.esc_url($editlink).'">'.__('Edit this Post', 'geodirectory').'</a></p>';

         }

     }// end of if, if its a preview or not

     /**

@@ -489,8 +489,8 @@ 
     do_action('geodir_after_edit_post_link');

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_user_links_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-user-links">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_user_links_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

          *

@@ -511,8 +511,8 @@ 
  */

 function geodir_detail_page_google_analytics()

 {

-    global $post,$preview;

-    if($preview){return '';}

+    global $post, $preview;

+    if ($preview) {return ''; }

     $package_info = array();

     $package_info = geodir_post_package_info($package_info, $post);

 

@@ -544,14 +544,14 @@ 
     $hide_refresh = get_option('geodir_ga_auto_refresh');

     

     $auto_refresh = $hide_refresh && $refresh_time && $refresh_time > 0 ? 1 : 0;

-    if (get_option('geodir_ga_stats') && is_user_logged_in() &&  (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id()==$post->post_author || current_user_can( 'manage_options' )) ) {

+    if (get_option('geodir_ga_stats') && is_user_logged_in() && (isset($package_info->google_analytics) && $package_info->google_analytics == '1') && (get_current_user_id() == $post->post_author || current_user_can('manage_options'))) {

         $page_url = urlencode($_SERVER['REQUEST_URI']);

         ?>

         <script type="text/javascript">

             var gd_gaTimeOut;

-            var gd_gaTime = parseInt('<?php echo $refresh_time;?>');

-            var gd_gaHideRefresh = <?php echo (int)$hide_refresh;?>;

-            var gd_gaAutoRefresh = <?php echo $auto_refresh;?>;

+            var gd_gaTime = parseInt('<?php echo $refresh_time; ?>');

+            var gd_gaHideRefresh = <?php echo (int) $hide_refresh; ?>;

+            var gd_gaAutoRefresh = <?php echo $auto_refresh; ?>;

             ga_data1 = false;

             ga_data2 = false;

             ga_data3 = false;

@@ -692,7 +692,7 @@ 
             }

 

             function gdga_noResults() {

-                jQuery('#gdga-chart-container').html('<?php _e('No results available','geodirectory');?>');

+                jQuery('#gdga-chart-container').html('<?php _e('No results available', 'geodirectory'); ?>');

                 jQuery('#gdga-legend-container').html('');

             }

 

@@ -724,18 +724,18 @@ 
                     var data2 = results[1].rows.map(function(row) { return +row[2]; });

                     //var labelsN = results[0].rows.map(function(row) { return +row[1]; });

 

-                    var labels = ['<?php _e('Jan', 'geodirectory');?>',

-                        '<?php _e('Feb', 'geodirectory');?>',

-                        '<?php _e('Mar', 'geodirectory');?>',

-                        '<?php _e('Apr', 'geodirectory');?>',

-                        '<?php _e('May', 'geodirectory');?>',

-                        '<?php _e('Jun', 'geodirectory');?>',

-                        '<?php _e('Jul', 'geodirectory');?>',

-                        '<?php _e('Aug', 'geodirectory');?>',

-                        '<?php _e('Sep', 'geodirectory');?>',

-                        '<?php _e('Oct', 'geodirectory');?>',

-                        '<?php _e('Nov', 'geodirectory');?>',

-                        '<?php _e('Dec', 'geodirectory');?>'];

+                    var labels = ['<?php _e('Jan', 'geodirectory'); ?>',

+                        '<?php _e('Feb', 'geodirectory'); ?>',

+                        '<?php _e('Mar', 'geodirectory'); ?>',

+                        '<?php _e('Apr', 'geodirectory'); ?>',

+                        '<?php _e('May', 'geodirectory'); ?>',

+                        '<?php _e('Jun', 'geodirectory'); ?>',

+                        '<?php _e('Jul', 'geodirectory'); ?>',

+                        '<?php _e('Aug', 'geodirectory'); ?>',

+                        '<?php _e('Sep', 'geodirectory'); ?>',

+                        '<?php _e('Oct', 'geodirectory'); ?>',

+                        '<?php _e('Nov', 'geodirectory'); ?>',

+                        '<?php _e('Dec', 'geodirectory'); ?>'];

 

                     // Ensure the data arrays are at least as long as the labels array.

                     // Chart.js bar charts don't (yet) accept sparse datasets.

@@ -748,13 +748,13 @@ 
                         labels : labels,

                         datasets : [

                             {

-                                label: '<?php _e('Last Year', 'geodirectory');?>',

+                                label: '<?php _e('Last Year', 'geodirectory'); ?>',

                                 fillColor : "rgba(220,220,220,0.5)",

                                 strokeColor : "rgba(220,220,220,1)",

                                 data : data2

                             },

                             {

-                                label: '<?php _e('This Year', 'geodirectory');?>',

+                                label: '<?php _e('This Year', 'geodirectory'); ?>',

                                 fillColor : "rgba(151,187,205,0.5)",

                                 strokeColor : "rgba(151,187,205,1)",

                                 data : data1

@@ -799,30 +799,30 @@ 
 

                     <?php

                     // Here we list the shorthand days of the week so it can be used in translation.

-                    __("Mon",'geodirectory');

-                    __("Tue",'geodirectory');

-                    __("Wed",'geodirectory');

-                    __("Thu",'geodirectory');

-                    __("Fri",'geodirectory');

-                    __("Sat",'geodirectory');

-                    __("Sun",'geodirectory');

+                    __("Mon", 'geodirectory');

+                    __("Tue", 'geodirectory');

+                    __("Wed", 'geodirectory');

+                    __("Thu", 'geodirectory');

+                    __("Fri", 'geodirectory');

+                    __("Sat", 'geodirectory');

+                    __("Sun", 'geodirectory');

                     ?>

 

                     labels = [

-                        "<?php _e(date('D', strtotime("+1 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+2 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+3 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+4 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+5 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+6 day")),'geodirectory'); ?>",

-                        "<?php _e(date('D', strtotime("+7 day")),'geodirectory'); ?>"

+                        "<?php _e(date('D', strtotime("+1 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+2 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+3 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+4 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+5 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+6 day")), 'geodirectory'); ?>",

+                        "<?php _e(date('D', strtotime("+7 day")), 'geodirectory'); ?>"

                     ];

 

                     var data = {

                         labels : labels,

                         datasets : [

                             {

-                                label: '<?php _e('Last Week', 'geodirectory');?>',

+                                label: '<?php _e('Last Week', 'geodirectory'); ?>',

                                 fillColor : "rgba(220,220,220,0.5)",

                                 strokeColor : "rgba(220,220,220,1)",

                                 pointColor : "rgba(220,220,220,1)",

@@ -830,7 +830,7 @@ 
                                 data : data2

                             },

                             {

-                                label: '<?php _e('This Week', 'geodirectory');?>',

+                                label: '<?php _e('This Week', 'geodirectory'); ?>',

                                 fillColor : "rgba(151,187,205,0.5)",

                                 strokeColor : "rgba(151,187,205,1)",

                                 pointColor : "rgba(151,187,205,1)",

@@ -1037,18 +1037,18 @@ 
         </style>

         <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/1.0.2/Chart.min.js"></script>

         <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js"></script>

-        <button type="button" class="gdga-show-analytics"><?php _e('Show Google Analytics', 'geodirectory');?></button>

+        <button type="button" class="gdga-show-analytics"><?php _e('Show Google Analytics', 'geodirectory'); ?></button>

         <span id="ga_stats" class="gdga-analytics-box" style="display:none">

-            <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory');?></div>

+            <div id="ga-analytics-title"><?php _e("Analytics", 'geodirectory'); ?></div>

             <div id="gd-active-users-container">

-                <div class="gd-ActiveUsers"><i id="gdga-loader-icon" class="fa fa-refresh fa-spin" title="<?php esc_attr_e("Refresh", 'geodirectory');?>"></i><?php _e("Active Users:", 'geodirectory');?>

+                <div class="gd-ActiveUsers"><i id="gdga-loader-icon" class="fa fa-refresh fa-spin" title="<?php esc_attr_e("Refresh", 'geodirectory'); ?>"></i><?php _e("Active Users:", 'geodirectory'); ?>

                     <b class="gd-ActiveUsers-value">0</b>

                 </div>

             </div>

             <select id="gdga-select-analytic" onchange="gdga_select_option();" style="display: none;">

-                <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory');?></option>

-                <option value="years"><?php _e("This Year vs Last Year", 'geodirectory');?></option>

-                <option value="country"><?php _e("Top Countries", 'geodirectory');?></option>

+                <option value="weeks"><?php _e("Last Week vs This Week", 'geodirectory'); ?></option>

+                <option value="years"><?php _e("This Year vs Last Year", 'geodirectory'); ?></option>

+                <option value="country"><?php _e("Top Countries", 'geodirectory'); ?></option>

             </select>

             <div class="Chartjs-figure" id="gdga-chart-container"></div>

             <ol class="Chartjs-legend" id="gdga-legend-container"></ol>

@@ -1064,8 +1064,8 @@ 
     do_action('geodir_after_google_analytics');

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_google_analytics_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-google-analytics">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_google_analytics_section') != 1) {

         /**

          * Filter the geodir_edit_post_link() function content.

          *

@@ -1091,7 +1091,7 @@ 
 {

     global $post, $preview, $post_images;

     

-    if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int)$post->ID)) {

+    if (!empty($post->ID) && geodir_cpt_has_rating_disabled((int) $post->ID)) {

         return;

     }

     ob_start(); // Start  buffering;

@@ -1126,10 +1126,10 @@ 
        

 	   $reviews_text = $comment_count > 1 ? __("reviews", 'geodirectory') : __("review", 'geodirectory');

 	   

-	   $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="' . $post_avgratings . '">' . $post_avgratings . '</span> / <span itemprop="best" content="5">5</span> ' . __("based on", 'geodirectory') . ' </span><span class="count" itemprop="count" content="' . $comment_count . '">' . $comment_count . ' ' . $reviews_text . '</span><br />';

+	   $html .= '<span itemprop="rating" itemscope itemtype="http://data-vocabulary.org/Rating"><span class="rating" itemprop="average" content="'.$post_avgratings.'">'.$post_avgratings.'</span> / <span itemprop="best" content="5">5</span> '.__("based on", 'geodirectory').' </span><span class="count" itemprop="count" content="'.$comment_count.'">'.$comment_count.' '.$reviews_text.'</span><br />';

 

         $html .= '<span class="item">';

-        $html .= '<span class="fn" itemprop="itemreviewed">' . $post->post_title . '</span>';

+        $html .= '<span class="fn" itemprop="itemreviewed">'.$post->post_title.'</span>';

 

         if ($post_images) {

             foreach ($post_images as $img) {

@@ -1139,7 +1139,7 @@ 
         }

 

         if (isset($post_img) && $post_img) {

-            $html .= '<br /><img src="' . $post_img . '" class="photo" alt="' . esc_attr($post->post_title) . '" itemprop="photo" content="' . $post_img . '" class="photo" />';

+            $html .= '<br /><img src="'.$post_img.'" class="photo" alt="'.esc_attr($post->post_title).'" itemprop="photo" content="'.$post_img.'" class="photo" />';

         }

 

         $html .= '</span>';

@@ -1166,9 +1166,9 @@ 
     do_action('geodir_after_detail_page_review_rating');

     $content_html = ob_get_clean();

     if (trim($content_html) != '') {

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">' . $content_html . '</div>';

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-rating">'.$content_html.'</div>';

     }

-    if ((int)get_option('geodir_disable_rating_info_section') != 1) {

+    if ((int) get_option('geodir_disable_rating_info_section') != 1) {

         /**

          * Filter the geodir_detail_page_review_rating() function content.

          *

@@ -1207,8 +1207,8 @@ 
 

     $content_html = ob_get_clean();

     if (trim($content_html) != '')

-        $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">' . $content_html . '</div>';

-    if ((int)get_option('geodir_disable_listing_info_section') != 1) {

+        $content_html = '<div class="geodir-company_info geodir-details-sidebar-listing-info">'.$content_html.'</div>';

+    if ((int) get_option('geodir_disable_listing_info_section') != 1) {

         /**

          * Filter the output html for function geodir_detail_page_more_info().

          *

@@ -1307,7 +1307,7 @@ 
 		'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',

 		'geodir_txt_form_wait' => __('Wait...', 'geodirectory'),

 		'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),

-		'fa_rating' => (int)get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

+		'fa_rating' => (int) get_option('geodir_reviewrating_enable_font_awesome') == 1 ? 1 : '',

 		'reviewrating' => defined('GEODIRREVIEWRATING_VERSION') ? 1 : '',

         'multirating' => defined('GEODIRREVIEWRATING_VERSION') && get_option('geodir_reviewrating_enable_rating') ? true : false,

         'geodir_map_name' => geodir_map_name(),

@@ -1336,10 +1336,10 @@ 
     foreach ($arr_alert_msg as $key => $value) {

         if (!is_scalar($value))

             continue;

-        $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

+        $arr_alert_msg[$key] = html_entity_decode((string) $value, ENT_QUOTES, 'UTF-8');

     }

 

-    $script = "var geodir_all_js_msg = " . json_encode($arr_alert_msg) . ';';

+    $script = "var geodir_all_js_msg = ".json_encode($arr_alert_msg).';';

     echo '<script>';

     echo $script;

     echo '</script>';

@@ -1429,7 +1429,7 @@ 
         $geodir_old_sidebars = get_option('geodir_sidebars');

         if (is_array($geodir_old_sidebars)) {

             foreach ($geodir_old_sidebars as $key => $val) {

-                if(0 === strpos($key, 'geodir_'))// if gd widget

+                if (0 === strpos($key, 'geodir_'))// if gd widget

                 {

                     $sidebars_widgets[$key] = $geodir_old_sidebars[$key];

                 }

@@ -1508,7 +1508,7 @@ 
         global $post;

         $term_condition = '';

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

-            $post = (object)$gd_session->get('listing');

+            $post = (object) $gd_session->get('listing');

             $term_condition = isset($post->geodir_accept_term_condition) ? $post->geodir_accept_term_condition : '';

         }

 

@@ -1522,7 +1522,7 @@ 
                     echo 'checked="checked"';

                 } ?> field_type="checkbox" name="geodir_accept_term_condition" id="geodir_accept_term_condition"

                        class="geodir_textfield" value="1"

-                       style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if($terms_page){ echo get_permalink($terms_page);}?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

+                       style="display:inline-block"/><a href="<?php $terms_page = get_option('geodir_term_condition_page'); if ($terms_page) { echo get_permalink($terms_page); }?>" target="_blank"><?php _e('Please accept our terms and conditions', 'geodirectory'); ?></a>

 				</span>

             </div>

             <span class="geodir_message_error"><?php if (isset($required_msg)) {

@@ -1562,7 +1562,7 @@ 
         /** This action is documented in geodirectory_template_actions.php */

         $desc_limit = apply_filters('geodir_description_field_desc_limit', '');

         

-        if (!($desc_limit === '' || (int)$desc_limit > 0)) {

+        if (!($desc_limit === '' || (int) $desc_limit > 0)) {

             $is_display = false;

         }

     }

@@ -1610,16 +1610,16 @@ 
     global $wpdb, $plugin_prefix;

 	

 	// Remove unused virtual page

-	$listings_page_id = (int)get_option('geodir_listing_page');

+	$listings_page_id = (int) get_option('geodir_listing_page');

 	if ($listings_page_id) {

-		$wpdb->query($wpdb->prepare("DELETE FROM " . $wpdb->posts . " WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

+		$wpdb->query($wpdb->prepare("DELETE FROM ".$wpdb->posts." WHERE ID=%d AND post_name = %s AND post_type=%s", array($listings_page_id, 'listings', 'page')));

         delete_option('geodir_listing_page');

 	}

 

     if (!get_option('geodir_changes_in_custom_fields_table')) {

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . GEODIR_CUSTOM_FIELDS_TABLE . " SET is_default=%s, is_admin=%s WHERE is_default=%s",

+                "UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET is_default=%s, is_admin=%s WHERE is_default=%s",

                 array('1', '1', 'admin')

             )

         );

@@ -1627,9 +1627,9 @@ 
 

         /* --- terms meta value set --- */

 

-        update_option('geodir_default_marker_icon', geodir_plugin_url() . '/geodirectory-functions/map-functions/icons/pin.png');

+        update_option('geodir_default_marker_icon', geodir_plugin_url().'/geodirectory-functions/map-functions/icons/pin.png');

 

-        $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . $wpdb->prefix . "options WHERE option_name LIKE %s", array('%tax_meta_%')));

+        $options_data = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".$wpdb->prefix."options WHERE option_name LIKE %s", array('%tax_meta_%')));

 

         if (!empty($options_data)) {

 

@@ -1637,7 +1637,7 @@ 
 

                 $option_val = str_replace('tax_meta_', '', $optobj->option_name);

 

-                $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM " . $wpdb->prefix . "term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));

+                $taxonomies_data = $wpdb->get_results($wpdb->prepare("SELECT taxonomy FROM ".$wpdb->prefix."term_taxonomy WHERE taxonomy LIKE %s AND term_id=%d", array('%category%', $option_val)));

 

                 if (!empty($taxonomies_data)) {

 

@@ -1646,17 +1646,17 @@ 
                         $taxObject = get_taxonomy($taxobj->taxonomy);

                         $post_type = $taxObject->object_type[0];

 

-                        $opt_value = 'tax_meta_' . $post_type . '_' . $option_val;

+                        $opt_value = 'tax_meta_'.$post_type.'_'.$option_val;

 

-                        $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM " . $wpdb->prefix . "options WHERE option_name=%s", array('tax_meta_' . $option_val)));

+                        $duplicate_data = $wpdb->get_var($wpdb->prepare("SELECT option_id FROM ".$wpdb->prefix."options WHERE option_name=%s", array('tax_meta_'.$option_val)));

 

                         if ($duplicate_data) {

 

-                            $wpdb->query($wpdb->prepare("UPDATE " . $wpdb->prefix . "options SET	option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));

+                            $wpdb->query($wpdb->prepare("UPDATE ".$wpdb->prefix."options SET	option_name=%s WHERE option_id=%d", array($opt_value, $optobj->option_id)));

 

                         } else {

 

-                            $wpdb->query($wpdb->prepare("INSERT INTO " . $wpdb->prefix . "options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));

+                            $wpdb->query($wpdb->prepare("INSERT INTO ".$wpdb->prefix."options (option_name,option_value,autoload) VALUES (%s, %s, %s)", array($opt_value, $optobj->option_value, $optobj->autoload)));

 

                         }

 

@@ -1690,14 +1690,14 @@ 
 

     global $wpdb, $table_prefix;

 

-    $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($slug)));

+    $slug_exists = $wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s", array($slug)));

 

     if ($slug_exists) {

 

         $suffix = 1;

         do {

-            $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

-            $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s", array($alt_location_name)));

+            $alt_location_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";

+            $location_slug_check = $wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s", array($alt_location_name)));

             $suffix++;

         } while ($location_slug_check && $suffix < 100);

 

@@ -1751,7 +1751,7 @@ 
 

         $suffix = 1;

         do {

-            $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1)) . "-$suffix";

+            $new_slug = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";

 

             /** This action is documented in geodirectory_hooks_actions.php */

             $term_slug_check = apply_filters('geodir_term_slug_is_exists', false, $new_slug, $term_id);

@@ -1763,7 +1763,7 @@ 
 

         //wp_update_term( $term_id, $taxonomy, array('slug' => $slug) );

 

-        $wpdb->query($wpdb->prepare("UPDATE " . $table_prefix . "terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));

+        $wpdb->query($wpdb->prepare("UPDATE ".$table_prefix."terms SET slug=%s WHERE term_id=%d", array($slug, $term_id)));

 

     }

 	

@@ -1772,18 +1772,18 @@ 
 	$post_type = !empty($taxonomy_obj) ? $taxonomy_obj->object_type[0] : NULL;

 	

 	$post_types = geodir_get_posttypes();

-	if ($post_type && in_array($post_type, $post_types) && $post_type . '_tags' == $taxonomy) {		

-		$posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM " . $wpdb->term_relationships . " WHERE term_taxonomy_id = %d", array($tt_id)));

+	if ($post_type && in_array($post_type, $post_types) && $post_type.'_tags' == $taxonomy) {		

+		$posts_obj = $wpdb->get_results($wpdb->prepare("SELECT object_id FROM ".$wpdb->term_relationships." WHERE term_taxonomy_id = %d", array($tt_id)));

 		

 		if (!empty($posts_obj)) {

 			foreach ($posts_obj as $post_obj) {

 				$post_id = $post_obj->object_id;

 				

-				$raw_tags = wp_get_object_terms($post_id, $post_type . '_tags', array('fields' => 'names'));

+				$raw_tags = wp_get_object_terms($post_id, $post_type.'_tags', array('fields' => 'names'));

 				$post_tags = !empty($raw_tags) ? implode(',', $raw_tags) : '';

 				

-				$listing_table = $plugin_prefix . $post_type . '_detail';

-				$wpdb->query($wpdb->prepare("UPDATE " . $listing_table . " SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));

+				$listing_table = $plugin_prefix.$post_type.'_detail';

+				$wpdb->query($wpdb->prepare("UPDATE ".$listing_table." SET post_tags=%s WHERE post_id =%d", array($post_tags, $post_id)));

 			}

 		}

 	}

@@ -1817,7 +1817,7 @@ 
     if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

         return $slug_exists = true;

 

-    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM " . $table_prefix . "terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

+    if ($wpdb->get_var($wpdb->prepare("SELECT slug FROM ".$table_prefix."terms WHERE slug=%s AND term_id != %d", array($slug, $term_id))))

         return $slug_exists = true;

 

     return $slug_exists;

@@ -1858,43 +1858,43 @@ 
 

 

     $gd_page = '';

-    if(geodir_is_page('home')){

+    if (geodir_is_page('home')) {

         $gd_page = 'home';

         $title = (get_option('geodir_meta_title_homepage')) ? get_option('geodir_meta_title_homepage') : $title;

     }

-    elseif(geodir_is_page('detail')){

+    elseif (geodir_is_page('detail')) {

         $gd_page = 'detail';

         $title = (get_option('geodir_meta_title_detail')) ? get_option('geodir_meta_title_detail') : $title;

     }

-    elseif(geodir_is_page('pt')){

+    elseif (geodir_is_page('pt')) {

         $gd_page = 'pt';

         $title = (get_option('geodir_meta_title_pt')) ? get_option('geodir_meta_title_pt') : $title;

     }

-    elseif(geodir_is_page('listing')){

+    elseif (geodir_is_page('listing')) {

         $gd_page = 'listing';

         $title = (get_option('geodir_meta_title_listing')) ? get_option('geodir_meta_title_listing') : $title;

     }

-    elseif(geodir_is_page('location')){

+    elseif (geodir_is_page('location')) {

         $gd_page = 'location';

         $title = (get_option('geodir_meta_title_location')) ? get_option('geodir_meta_title_location') : $title;

     }

-    elseif(geodir_is_page('search')){

+    elseif (geodir_is_page('search')) {

         $gd_page = 'search';

         $title = (get_option('geodir_meta_title_search')) ? get_option('geodir_meta_title_search') : $title;

     }

-    elseif(geodir_is_page('add-listing')){

+    elseif (geodir_is_page('add-listing')) {

         $gd_page = 'add-listing';

         $title = (get_option('geodir_meta_title_add-listing')) ? get_option('geodir_meta_title_add-listing') : $title;

     }

-    elseif(geodir_is_page('author')){

+    elseif (geodir_is_page('author')) {

         $gd_page = 'author';

         $title = (get_option('geodir_meta_title_author')) ? get_option('geodir_meta_title_author') : $title;

     }

-    elseif(geodir_is_page('login')){

+    elseif (geodir_is_page('login')) {

         $gd_page = 'login';

         $title = (get_option('geodir_meta_title_login')) ? get_option('geodir_meta_title_login') : $title;

     }

-    elseif(geodir_is_page('listing-success')){

+    elseif (geodir_is_page('listing-success')) {

         $gd_page = 'listing-success';

         $title = (get_option('geodir_meta_title_listing-success')) ? get_option('geodir_meta_title_listing-success') : $title;

     }

@@ -1926,12 +1926,12 @@ 
 

     if (!get_option('geodir_set_post_attachments')) {

 

-        require_once(ABSPATH . 'wp-admin/includes/image.php');

-        require_once(ABSPATH . 'wp-admin/includes/file.php');

+        require_once(ABSPATH.'wp-admin/includes/image.php');

+        require_once(ABSPATH.'wp-admin/includes/file.php');

 

         $all_postypes = geodir_get_posttypes();

 

-        foreach($all_postypes as $post_type){

+        foreach ($all_postypes as $post_type) {

             $args = array(

                 'posts_per_page' => -1,

                 'post_type' => $post_type,

@@ -2025,7 +2025,7 @@ 
 {

     $user_id = get_current_user_id();

 

-    if(!$user_id){return $post;}

+    if (!$user_id) {return $post; }

 

     $gd_post_types = geodir_get_posttypes();

 

@@ -2134,7 +2134,7 @@ 
 

         if (array_key_exists('post_video', $tabs_arr)) {

 

-            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

+            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from ".GEODIR_CUSTOM_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s ", array('geodir_video', $post_type)));

 

             if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '')

                 $tabs_arr['post_video']['heading_text'] = $field_title;

@@ -2142,7 +2142,7 @@ 
 

         if (array_key_exists('special_offers', $tabs_arr)) {

 

-            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from " . GEODIR_CUSTOM_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

+            $field_title = $wpdb->get_var($wpdb->prepare("select site_title from ".GEODIR_CUSTOM_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s ", array('geodir_special_offers', $post_type)));

 

             if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '')

                 $tabs_arr['special_offers']['heading_text'] = $field_title;

@@ -2163,7 +2163,7 @@ 
  */

 function geodir_remove_template_redirect_actions()

 {

-    if (geodir_is_page('login')){

+    if (geodir_is_page('login')) {

         remove_all_actions('template_redirect');

         remove_action('init', 'avia_modify_front', 10);

     }

@@ -2210,25 +2210,25 @@ 
         $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

 

         $wpdb->query(

-            $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d AND file=%s ",

+            $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d AND file=%s ",

                 array($post_id, $split_img_file_path)

             )

         );

 

         $attachment_data = $wpdb->get_row(

-            $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=%d",

+            $wpdb->prepare("SELECT ID, MIN(`menu_order`) FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id=%d",

                 array($post_id)

             )

         );

 

         if (!empty($attachment_data)) {

-            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+            $wpdb->query("UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order=1 WHERE ID=".$attachment_data->ID);

         }

 

 

-        $table_name = $plugin_prefix . $post_type . '_detail';

+        $table_name = $plugin_prefix.$post_type.'_detail';

 

-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='' WHERE post_id =" . $post_id);

+        $wpdb->query("UPDATE ".$table_name." SET featured_image='' WHERE post_id =".$post_id);

 

         geodir_set_wp_featured_image($post_id);

 

@@ -2256,9 +2256,9 @@ 
 

     foreach ($all_postypes as $posttype) {

 

-        $tablename = $plugin_prefix . $posttype . '_detail';

+        $tablename = $plugin_prefix.$posttype.'_detail';

 

-        $get_post_data = $wpdb->get_results("SELECT post_id FROM " . $tablename);

+        $get_post_data = $wpdb->get_results("SELECT post_id FROM ".$tablename);

 

         if (!empty($get_post_data)) {

 

@@ -2266,7 +2266,7 @@ 
 

                 $post_id = $data->post_id;

 

-                $attachment_data = $wpdb->get_results("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =" . $post_id . " AND file!=''");

+                $attachment_data = $wpdb->get_results("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id =".$post_id." AND file!=''");

 

                 if (!empty($attachment_data)) {

 

@@ -2283,22 +2283,22 @@ 
 

                         $file_name = $file_info['basename'];

 

-                        $img_arr['path'] = $uploads_path . $sub_dir . '/' . $file_name;

+                        $img_arr['path'] = $uploads_path.$sub_dir.'/'.$file_name;

 

                         if (!file_exists($img_arr['path'])) {

 

-                            $wpdb->query("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE ID=" . $attach->ID);

+                            $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ID=".$attach->ID);

 

                         }

 

                     }

 

-                    $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id=" . $post_id . " GROUP BY post_id");

+                    $attachment_data = $wpdb->get_row("SELECT ID, MIN(`menu_order`) FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id=".$post_id." GROUP BY post_id");

 

                     if (!empty($attachment_data)) {

 

                         if ($attachment_data->ID)

-                            $wpdb->query("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order=1 WHERE ID=" . $attachment_data->ID);

+                            $wpdb->query("UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order=1 WHERE ID=".$attachment_data->ID);

 

                     } else {

 

@@ -2312,7 +2312,7 @@ 
 

                     }

 

-                    $wpdb->query("UPDATE " . $tablename . " SET featured_image='' WHERE post_id =" . $post_id);

+                    $wpdb->query("UPDATE ".$tablename." SET featured_image='' WHERE post_id =".$post_id);

 

                     geodir_set_wp_featured_image($post_id);

 

@@ -2341,7 +2341,7 @@ 
 {

 

     if (!get_option('geodir_default_rating_star_icon')) {

-        update_option('geodir_default_rating_star_icon', geodir_plugin_url() . '/geodirectory-assets/images/stars.png');

+        update_option('geodir_default_rating_star_icon', geodir_plugin_url().'/geodirectory-assets/images/stars.png');

     }

 

 }

@@ -2361,7 +2361,7 @@ 
 function geodir_user_post_listing_count($user_id = 0)

 {

     global $wpdb, $plugin_prefix, $current_user;

-    if(!$user_id){

+    if (!$user_id) {

         $user_id = $current_user->ID;

     }

 

@@ -2370,7 +2370,7 @@ 
     $user_listing = array();

     if ($user_id && is_array($all_posts) && !empty($all_posts)) {

         foreach ($all_posts as $ptype) {

-            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM " . $wpdb->prefix . "posts WHERE post_author=" . $user_id . " AND post_type='" . $ptype . "' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");

+            $total_posts = $wpdb->get_var("SELECT count( ID ) FROM ".$wpdb->prefix."posts WHERE post_author=".$user_id." AND post_type='".$ptype."' AND ( post_status = 'publish' OR post_status = 'draft' OR post_status = 'private' )");

 

             if ($total_posts > 0) {

                 $user_listing[$ptype] = $total_posts;

@@ -2411,19 +2411,19 @@ 
 

         $custom_fields = geodir_post_custom_fields($post_package_id, 'all', $post_type, $fields_location);

         //remove video and special offers if it is already set to show

-        if(isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']){

+        if (isset($tabs_arr['post_video']['is_display']) && $tabs_arr['post_video']['is_display']) {

             $unset_video = true;

         }

 

-        if(isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']){

+        if (isset($tabs_arr['special_offers']['is_display']) && $tabs_arr['special_offers']['is_display']) {

             $unset_special_offers = true;

         }

-        if(isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)){

-            foreach($custom_fields as $key => $custom_field){

-                if($custom_field['name']=='geodir_video' && isset($unset_video)){

+        if (isset($unset_video) || isset($unset_special_offers) && !empty($custom_fields)) {

+            foreach ($custom_fields as $key => $custom_field) {

+                if ($custom_field['name'] == 'geodir_video' && isset($unset_video)) {

                     unset($custom_fields[$key]);

                 }

-                if($custom_field['name']=='geodir_special_offers' && isset($unset_special_offers)){

+                if ($custom_field['name'] == 'geodir_special_offers' && isset($unset_special_offers)) {

                     unset($custom_fields[$key]);

                 }

             }

@@ -2440,7 +2440,7 @@ 
                     $post->{$field_name} = $_REQUEST[$field_name];

                 }

 

-                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false  && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

+                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file', 'address', 'taxonomy'))) {

                     if ($type['type'] == 'datepicker' && ($post->{$type['htmlvar_name']} == '' || $post->{$type['htmlvar_name']} == '0000-00-00')) {

                         continue;

                     }

@@ -2473,7 +2473,7 @@ 
                     $post->{$field_name} = $_REQUEST[$field_name];

                 }

 

-                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file','address','taxonomy'))) {

+                if (isset($field['show_in']) && strpos($field['show_in'], '[owntab]') !== false && ((isset($post->{$field_name}) && $post->{$field_name} != '') || $field['type'] == 'fieldset' || $field['type'] == 'address') && in_array($field['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file', 'address', 'taxonomy'))) {

                     $label = $field['site_title'] != '' ? $field['site_title'] : $field['admin_title'];

                     $site_title = trim($field['site_title']);

                     $type = $field;

@@ -2489,21 +2489,21 @@ 
                         $variables_array['label'] = __($type['site_title'], 'geodirectory');

                         $variables_array['value'] = isset($post->{$type['htmlvar_name']}) ? $post->{$type['htmlvar_name']} : '';

 

-                    }else{

+                    } else {

                         $i = 0;

                         $fieldset_count++;

                         $field_set_start = 1;

-                        $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_' . $fieldset_count;

+                        $fieldset_arr[$fieldset_count]['htmlvar_name'] = 'gd_tab_'.$fieldset_count;

                         $fieldset_arr[$fieldset_count]['label'] = $label;

                     }

 

 

-                    if(isset($type['extra_fields'])){$extra_fields= $type['extra_fields'];}

+                    if (isset($type['extra_fields'])) {$extra_fields = $type['extra_fields']; }

                     $type = stripslashes_deep($type); // strip slashes

-                    if(isset($type['extra_fields'])){$type['extra_fields'] = $extra_fields;}

+                    if (isset($type['extra_fields'])) {$type['extra_fields'] = $extra_fields; }

                     $html = '';

                     $html_var = isset($type['htmlvar_name']) ? $type['htmlvar_name'] : '';

-                    if($html_var=='post'){$html_var='post_address';}

+                    if ($html_var == 'post') {$html_var = 'post_address'; }

                     $field_icon = geodir_field_icon_proccess($type);

                     $filed_type = $type['type'];

 

@@ -2516,7 +2516,7 @@ 
                      * @param string $fields_location The location the field is to be show.

                      * @param array $type The array of field values.

                      */

-                    $html = apply_filters("geodir_custom_field_output_{$filed_type}",$html,$fields_location,$type);

+                    $html = apply_filters("geodir_custom_field_output_{$filed_type}", $html, $fields_location, $type);

 

 

                     /**

@@ -2562,7 +2562,7 @@ 
                                  * @param string $htmlvar_name The field HTML var name.

                                  */

                                 'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $htmlvar_name),

-                                'tab_content' => '<div class="geodir-company_info field-group xxx">' . $fieldset_html . '</div>'

+                                'tab_content' => '<div class="geodir-company_info field-group xxx">'.$fieldset_html.'</div>'

                             );

                         }

                     } else {

@@ -2624,7 +2624,7 @@ 
             }

             $status .= ")</strong>";

 

-            $html = '<span class="geodir-post-status">' . $status_icon . ' <font class="geodir-status-label">' . __('Status: ', 'geodirectory') . '</font>' . $status . '</span>';

+            $html = '<span class="geodir-post-status">'.$status_icon.' <font class="geodir-status-label">'.__('Status: ', 'geodirectory').'</font>'.$status.'</span>';

         }

     }

 

@@ -2693,7 +2693,7 @@ 
  * @return array Modified class array.

  */

 function geodir_body_class_active_map($classes = array()) {

-    $classes[] = 'gd-map-' . geodir_map_name();

+    $classes[] = 'gd-map-'.geodir_map_name();

 

     return $classes;

 }

@@ -2708,7 +2708,7 @@ 
  * @return string Modified class string.

  */

 function geodir_admin_body_class_active_map($class = '') {    

-    $class .= ' gd-map-' . geodir_map_name();

+    $class .= ' gd-map-'.geodir_map_name();

 

     return $class;

 }

@@ -2728,7 +2728,7 @@ 
  * @return array Translation texts.

  */

 function geodir_load_gd_options_text_translation($translation_texts = array()) {

-    $translation_texts = !empty( $translation_texts ) && is_array( $translation_texts ) ? $translation_texts : array();

+    $translation_texts = !empty($translation_texts) && is_array($translation_texts) ? $translation_texts : array();

 

     $gd_options = array('geodir_post_submited_success_email_subject_admin', 'geodir_post_submited_success_email_content_admin', 'geodir_post_submited_success_email_subject', 'geodir_post_submited_success_email_content', 'geodir_forgot_password_subject', 'geodir_forgot_password_content', 'geodir_registration_success_email_subject', 'geodir_registration_success_email_content', 'geodir_post_published_email_subject', 'geodir_post_published_email_content', 'geodir_email_friend_subject', 'geodir_email_friend_content', 'geodir_email_enquiry_subject', 'geodir_email_enquiry_content', 'geodir_post_added_success_msg_content', 'geodir_post_edited_email_subject_admin', 'geodir_post_edited_email_content_admin');

 

@@ -2794,17 +2794,17 @@ 
  * @param array $args The array of menu arguments.

  * @return array The modified arguments.

  */

-function geodir_add_nav_menu_class( $args )

+function geodir_add_nav_menu_class($args)

 {

 

-        if(isset($args['menu_class'])){

+        if (isset($args['menu_class'])) {

             $args['menu_class'] = $args['menu_class']." gd-menu-z";

         }

     

     return $args;

 }

 

-add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' );

+add_filter('wp_nav_menu_args', 'geodir_add_nav_menu_class');

 

 /**

  * Filters WordPress locale ID.

@@ -2844,9 +2844,9 @@ 
         }

         

         add_action('geodir_after_save_listing', 'geodir_wpml_duplicate_listing', 100, 2);

-        add_action( 'geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1 );

+        add_action('geodir_edit_post_link_html', 'geodir_wpml_frontend_duplicate_listing', 0, 1);

         if (is_admin()) {

-            add_filter( 'geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1 );

+            add_filter('geodir_design_settings', 'geodir_wpml_duplicate_settings', 10, 1);

         }

     }

 }

@@ -2875,7 +2875,7 @@ 
         }        

         

         if (!empty($keep_vars)) {

-            foreach ( $languages as $code => $url) {

+            foreach ($languages as $code => $url) {

                 $filter_url = $url['url'];

                 

                 foreach ($keep_vars as $var) {

@@ -2894,7 +2894,7 @@ 
 

     return $languages;

 }

-add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 );

+add_filter('icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1);

 

 /**

  * Remove Yoast SEO hook if disabled on GD pages.

@@ -2902,18 +2902,18 @@ 
  * @since 1.6.18

  *

  */

-function geodir_remove_yoast_seo_metas(){

-    if ( class_exists( 'WPSEO_Frontend' ) && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas() ) {

+function geodir_remove_yoast_seo_metas() {

+    if (class_exists('WPSEO_Frontend') && geodir_is_geodir_page() && geodir_disable_yoast_seo_metas()) {

         $wpseo = WPSEO_Frontend::get_instance();

         

-        remove_action( 'wp_head', array( $wpseo, 'metadesc' ), 6 );

-        remove_action( 'wp_head', array( $wpseo, 'metakeywords' ), 11 );

-        remove_filter( 'pre_get_document_title', array( $wpseo, 'title' ), 15 );

-        remove_filter( 'wp_title', array( $wpseo, 'title' ), 15, 3 );

-        remove_filter( 'thematic_doctitle', array( $wpseo, 'title' ), 15 );

-        remove_filter( 'woo_title', array( $wpseo, 'fix_woo_title' ), 99 );

+        remove_action('wp_head', array($wpseo, 'metadesc'), 6);

+        remove_action('wp_head', array($wpseo, 'metakeywords'), 11);

+        remove_filter('pre_get_document_title', array($wpseo, 'title'), 15);

+        remove_filter('wp_title', array($wpseo, 'title'), 15, 3);

+        remove_filter('thematic_doctitle', array($wpseo, 'title'), 15);

+        remove_filter('woo_title', array($wpseo, 'fix_woo_title'), 99);

         

-        remove_action( 'template_redirect', 'wpseo_frontend_head_init', 999 );

+        remove_action('template_redirect', 'wpseo_frontend_head_init', 999);

     }

 }

 

@@ -2928,22 +2928,22 @@ 
  *

  */

  function geodir_wpml_ajax_set_guest_lang() {    

-    if ( geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in() ) {

-        if ( empty( $_GET['lang'] ) && !( !empty( $_SERVER['REQUEST_URI'] ) && preg_match( '@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename( preg_replace( '@\?.*$@', '', $_SERVER['REQUEST_URI'] ) ) ) ) ) {

+    if (geodir_is_wpml() && wpml_is_ajax() && !is_user_logged_in()) {

+        if (empty($_GET['lang']) && !(!empty($_SERVER['REQUEST_URI']) && preg_match('@\.(css|js|png|jpg|gif|jpeg|bmp)@i', basename(preg_replace('@\?.*$@', '', $_SERVER['REQUEST_URI']))))) {

             global $sitepress;

             

             $referer = wp_get_referer();

             

             $current_lang = $sitepress->get_current_language();

-            $referrer_lang = $sitepress->get_language_from_url( $referer );

+            $referrer_lang = $sitepress->get_language_from_url($referer);

             

-            if ( $referrer_lang && $current_lang != $referrer_lang ) {

+            if ($referrer_lang && $current_lang != $referrer_lang) {

                 $_GET['lang'] = $referrer_lang;

             }

         }

     }

 }

-add_action( 'plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1 );

+add_action('plugins_loaded', 'geodir_wpml_ajax_set_guest_lang', -1);

 

 /**

  * Change country slug czech-republic to czechia and redirect.

@@ -2964,18 +2964,18 @@ 
         }

         

         $redirect = false;

-        if (strpos($current_url, '/' . $search . '/') !== false) {

+        if (strpos($current_url, '/'.$search.'/') !== false) {

             $redirect = true;

-            $current_url = preg_replace('/\/' . $search . '\//', '/' . $replace . '/', $current_url, 1);

+            $current_url = preg_replace('/\/'.$search.'\//', '/'.$replace.'/', $current_url, 1);

         }

         

         if ($has_slash != "/") {

             $current_url = trim($current_url, '/');

         }

         

-        if (strpos($current_url, 'gd_country=' . $search) !== false) {

+        if (strpos($current_url, 'gd_country='.$search) !== false) {

             $redirect = true;

-            $current_url = str_replace('gd_country=' . $search, 'gd_country=' . $replace, $current_url);

+            $current_url = str_replace('gd_country='.$search, 'gd_country='.$replace, $current_url);

         }

 

         if ($redirect) {

@@ -3001,10 +3001,10 @@ 
  * @param int    $post_parent   Post parent ID

  * @param string $original_slug The original post slug.

  */

-function geodir_check_post_to_term_slug( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {

+function geodir_check_post_to_term_slug($slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug) {

     global $wpdb, $sitepress;

     

-    if ( $post_type && strpos( $post_type, 'gd_' ) === 0 ) {

+    if ($post_type && strpos($post_type, 'gd_') === 0) {

         $wpml_post_join = "";

         $wpml_post_where = "";

         $wpml_term_join = "";

@@ -3018,28 +3018,28 @@ 
             }

             

             $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";

-            $wpml_post_where = " AND icl_t.language_code = '" . $post_language ."'";

+            $wpml_post_where = " AND icl_t.language_code = '".$post_language."'";

             

             $wpml_term_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON icl_t.element_id = tt.term_taxonomy_id AND icl_t.element_type = CONCAT('tax_', tt.taxonomy)";

-            $wpml_term_where = " AND icl_t.language_code = '" . $post_language ."'";

+            $wpml_term_where = " AND icl_t.language_code = '".$post_language."'";

         }

 

-        $term_slug_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $slug ) );

+        $term_slug_check = $wpdb->get_var($wpdb->prepare("SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '".$post_type."category' OR tt.taxonomy = '".$post_type."_tags' ) {$wpml_term_where} LIMIT 1", $slug));

 

-        if ( $term_slug_check ) {

+        if ($term_slug_check) {

             $suffix = 1;

             

             do {

-                $alt_slug = _truncate_post_slug( $original_slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";

+                $alt_slug = _truncate_post_slug($original_slug, 200 - (strlen($suffix) + 1))."-$suffix";

                 

-                $term_check = $wpdb->get_var( $wpdb->prepare( "SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '" . $post_type . "category' OR tt.taxonomy = '" . $post_type . "_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug ) );

+                $term_check = $wpdb->get_var($wpdb->prepare("SELECT t.slug FROM $wpdb->terms AS t LEFT JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id {$wpml_term_join} WHERE t.slug = '%s' AND ( tt.taxonomy = '".$post_type."category' OR tt.taxonomy = '".$post_type."_tags' ) {$wpml_term_where} LIMIT 1", $alt_slug));

                 

-                $post_check = !$term_check && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID ) );

+                $post_check = !$term_check && $wpdb->get_var($wpdb->prepare("SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s AND p.ID != %d {$wpml_term_where} LIMIT 1", $alt_slug, $post_type, $post_ID));

                 

                 $term_slug_check = $term_check || $post_check;

                 

                 $suffix++;

-            } while ( $term_slug_check );

+            } while ($term_slug_check);

             

             $slug = $alt_slug;

         }

@@ -3047,7 +3047,7 @@ 
     

     return $slug;

 }

-add_filter( 'wp_unique_post_slug', 'geodir_check_post_to_term_slug', 101, 6 );

+add_filter('wp_unique_post_slug', 'geodir_check_post_to_term_slug', 101, 6);

 

 /**

  * Check whether a post name with slug exists or not.

@@ -3064,48 +3064,48 @@ 
  * @param int $term_id The term ID.

  * @return bool true when exists. false when not exists.

  */

-function geodir_check_term_to_post_slug( $slug_exists, $slug, $term_id ) {

+function geodir_check_term_to_post_slug($slug_exists, $slug, $term_id) {

     global $wpdb, $gd_term_post_type, $gd_term_taxonomy, $sitepress;

     

-    if ( $slug_exists ) {

+    if ($slug_exists) {

         return $slug_exists;

     }

     

-    if ( !empty( $gd_term_taxonomy ) && isset($gd_term_taxonomy[$term_id]) ) {

+    if (!empty($gd_term_taxonomy) && isset($gd_term_taxonomy[$term_id])) {

         $taxonomy = $gd_term_taxonomy[$term_id];

     } else {

-        $taxonomy = $wpdb->get_var( $wpdb->prepare( "SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id ) );

+        $taxonomy = $wpdb->get_var($wpdb->prepare("SELECT taxonomy FROM $wpdb->term_taxonomy WHERE term_id = %d LIMIT 1", $term_id));

         $gd_term_taxonomy[$term_id] = $taxonomy;

     }

     

-    if ( empty($taxonomy) ) {

+    if (empty($taxonomy)) {

         return $slug_exists;

     }

     

-    if ( !empty( $gd_term_post_type ) && $gd_term_post_type[$term_id] ) {

+    if (!empty($gd_term_post_type) && $gd_term_post_type[$term_id]) {

         $post_type = $gd_term_post_type[$term_id];

     } else {

-        $taxonomy_obj = get_taxonomy( $taxonomy );

-        $post_type = !empty( $taxonomy_obj->object_type ) ? $taxonomy_obj->object_type[0] : NULL;

+        $taxonomy_obj = get_taxonomy($taxonomy);

+        $post_type = !empty($taxonomy_obj->object_type) ? $taxonomy_obj->object_type[0] : NULL;

     }

     

     $wpml_post_join = "";

     $wpml_post_where = "";

     

     if (geodir_wpml_is_taxonomy_translated($taxonomy) || geodir_wpml_is_post_type_translated($post_type)) {

-        $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_' . $taxonomy) : $sitepress->get_current_language();

+        $term_language = $term_id ? geodir_get_language_for_element($term_id, 'tax_'.$taxonomy) : $sitepress->get_current_language();

         if (!$term_language) {

             $term_language = $sitepress->get_current_language();

         }

         

         $wpml_post_join = " JOIN {$wpdb->prefix}icl_translations AS icl_t ON p.ID = icl_t.element_id AND icl_t.element_type = CONCAT('post_', p.post_type)";

-        $wpml_post_where = " AND icl_t.language_code = '" . $term_language ."'";

+        $wpml_post_where = " AND icl_t.language_code = '".$term_language."'";

     }

     

-    if ( $post_type && $wpdb->get_var( $wpdb->prepare( "SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s  {$wpml_post_where} LIMIT 1", $slug, $post_type ) ) ) {

+    if ($post_type && $wpdb->get_var($wpdb->prepare("SELECT p.post_name FROM $wpdb->posts p {$wpml_post_join} WHERE p.post_name = %s AND p.post_type = %s  {$wpml_post_where} LIMIT 1", $slug, $post_type))) {

         $slug_exists = true;

     }

 

     return $slug_exists;

 }

-add_filter( 'geodir_term_slug_is_exists', 'geodir_check_term_to_post_slug', 10, 3 );
\ No newline at end of file
+add_filter('geodir_term_slug_is_exists', 'geodir_check_term_to_post_slug', 10, 3);
\ No newline at end of file

geodirectory-templates/geodir-signup.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
         $_redirect = $_REQUEST['redirect_to'];
     }
 
-    wp_safe_redirect($_redirect , 302);
+    wp_safe_redirect($_redirect, 302);
     exit;
 }
 

geodirectory-functions/listing_filters.php

Spacing +105 added lines, -105 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'])) {

@@ -120,7 +120,7 @@ 
 

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

         }

@@ -130,9 +130,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, ' ')) {

@@ -193,7 +193,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);

@@ -233,7 +233,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'));

@@ -243,16 +243,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]);

                 }

             }

@@ -270,24 +270,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;

@@ -311,18 +311,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

 

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

         }

 

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

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

             $sort_by = 'nearest';

         }

     }

@@ -405,20 +405,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, ";

@@ -434,10 +434,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:

 

@@ -458,24 +458,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;

             }

         }

     }

@@ -490,7 +490,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;

 }

@@ -512,7 +512,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);

 

@@ -522,31 +522,31 @@ 
 

         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':

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

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

 

                     break;

 

 

                 default:

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

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

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

 					}

                     break;

 

@@ -594,7 +594,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

 

@@ -665,7 +665,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' ";

         }

 

@@ -732,8 +732,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 = '';

@@ -744,9 +744,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]);

                 }

             }

@@ -755,7 +755,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.

@@ -766,7 +766,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);

                 }

             }

         }

@@ -774,10 +774,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 != '') {

@@ -788,7 +788,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.

          *

@@ -796,7 +796,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)) ");

 	}

 

 

@@ -813,13 +813,13 @@ 
     $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)){

+        if (!empty($term_ids)) {

 

-            foreach($term_ids as $term){

+            foreach ($term_ids as $term) {

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

             }

         }

@@ -850,12 +850,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 {

@@ -872,11 +872,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 ###########

@@ -899,10 +899,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') ";

     }

@@ -915,7 +915,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' ";

@@ -928,7 +928,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."' ";

         }

 

     }

@@ -951,7 +951,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;

 }

@@ -970,16 +970,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;

 }

@@ -988,18 +988,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']

     ) {

@@ -1018,25 +1018,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;

                 }

             }

         }

@@ -1061,18 +1061,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);

         }

     }

 

@@ -1094,14 +1094,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;

         }

     }