GeoDirectory / geodirectory

geodirectory_hooks_actions.php

Doc Comments +3 added lines, -2 removed lines

@@ -2195,7 +2195,7 @@ 
  * @global object $wpdb WordPress Database object.

  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @param int $attachment_id Attachment ID.

- * @return bool|void Returns false on failure.

+ * @return false|null Returns false on failure.

  */

 function geodirectory_before_featured_image_delete($attachment_id)

 {

@@ -2368,6 +2368,7 @@ 
  * @global object $wpdb WordPress Database object.

  * @global object $current_user Current user object.

  * @global string $plugin_prefix Geodirectory plugin table prefix.

+ * @param string $user_id
  * @return array User listing count for each post type.

  */

 function geodir_user_post_listing_count($user_id=null)

@@ -3176,7 +3177,7 @@ 
  * @since 1.0.0

  * @package GeoDirectory

  * @param array $classes The class array of the HTML element.

- * @return array Modified class array.

+ * @return string[] Modified class array.

  */

 function geodir_body_class_no_rating($classes = array())

 {

Braces +88 added lines, -71 removed lines

@@ -86,8 +86,9 @@ 
 add_filter('query_vars', 'geodir_add_location_var');

 add_filter('query_vars', 'geodir_add_geodir_page_var');

 add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8

-if (get_option('permalink_structure') != '')

-    add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');

+if (get_option('permalink_structure') != '') {
+    add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');
+}
 

 add_filter('parse_query', 'geodir_modified_query');

 

@@ -420,8 +421,9 @@ 
      */

     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 (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) {

         /**

          * Filter the geodir_social_sharing_buttons() function content.

@@ -477,8 +479,9 @@ 
      */

     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 (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) {

         /**

          * Filter the geodir_edit_post_link() function content.

@@ -1052,8 +1055,9 @@ 
      */

     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 (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) {

         /**

          * Filter the geodir_edit_post_link() function content.

@@ -1190,8 +1194,9 @@ 
     do_action('geodir_after_detail_page_more_info');

 

     $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 (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) {

         /**

          * Filter the output html for function geodir_detail_page_more_info().

@@ -1311,8 +1316,9 @@ 
     $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);

 

     foreach ($arr_alert_msg as $key => $value) {

-        if (!is_scalar($value))

-            continue;

+        if (!is_scalar($value)) {
+                    continue;
+        }
         $arr_alert_msg[$key] = html_entity_decode((string)$value, ENT_QUOTES, 'UTF-8');

     }

 

@@ -1368,17 +1374,19 @@ 
     global $geodir_sidebars;

     global $sidebars_widgets;

 

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

+    if (!is_array($sidebars_widgets)) {
+            $sidebars_widgets = wp_get_sidebars_widgets();
+    }
     $geodir_old_sidebars = array();

 

     if (is_array($geodir_sidebars)) {

         foreach ($geodir_sidebars as $val) {

             if (is_array($sidebars_widgets)) {

-                if (array_key_exists($val, $sidebars_widgets))

-                    $geodir_old_sidebars[$val] = $sidebars_widgets[$val];

-                else

-                    $geodir_old_sidebars[$val] = array();

+                if (array_key_exists($val, $sidebars_widgets)) {
+                                    $geodir_old_sidebars[$val] = $sidebars_widgets[$val];
+                } else {
+                                    $geodir_old_sidebars[$val] = array();
+                }
             }

         }

     }

@@ -1399,16 +1407,19 @@ 
 {

     global $sidebars_widgets;

 

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

+    if (!is_array($sidebars_widgets)) {
+            $sidebars_widgets = wp_get_sidebars_widgets();
+    }
 

     if (is_array($sidebars_widgets)) {

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

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

 

 

@@ -1544,20 +1555,25 @@ 
         }

     }

     

-    if ($tab == 'post_info')

-        $is_display = (!empty($geodir_post_detail_fields)) ? true : false;

+    if ($tab == 'post_info') {
+            $is_display = (!empty($geodir_post_detail_fields)) ? true : false;
+    }
     

-    if ($tab == 'post_images')

-        $is_display = (!empty($post_images)) ? true : false;

+    if ($tab == 'post_images') {
+            $is_display = (!empty($post_images)) ? true : false;
+    }
 

-    if ($tab == 'post_video')

-        $is_display = (!empty($video)) ? true : false;

+    if ($tab == 'post_video') {
+            $is_display = (!empty($video)) ? true : false;
+    }
 

-    if ($tab == 'special_offers')

-        $is_display = (!empty($special_offers)) ? true : false;

+    if ($tab == 'special_offers') {
+            $is_display = (!empty($special_offers)) ? true : false;
+    }
 

-    if ($tab == 'reviews')

-        $is_display = (geodir_is_page('detail')) ? true : false;

+    if ($tab == 'reviews') {
+            $is_display = (geodir_is_page('detail')) ? true : false;
+    }
 

     if ($tab == 'related_listing') {

        $message = __('No listings found which match your selection.', 'geodirectory');

@@ -1791,11 +1807,13 @@ 
     $region_slug = $default_location->region_slug;

     $city_slug = $default_location->city_slug;

 

-    if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

-        return $slug_exists = true;

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

-        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)))) {
+            return $slug_exists = true;
+    }
 

     return $slug_exists;

 }

@@ -1837,40 +1855,31 @@ 
     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;

     }

@@ -1948,11 +1957,13 @@ 
 

     if (!get_option('geodir_remove_url_seperator')) {

 

-        if (get_option('geodir_listingurl_separator'))

-            delete_option('geodir_listingurl_separator');

+        if (get_option('geodir_listingurl_separator')) {
+                    delete_option('geodir_listingurl_separator');
+        }
 

-        if (get_option('geodir_detailurl_separator'))

-            delete_option('geodir_detailurl_separator');

+        if (get_option('geodir_detailurl_separator')) {
+                    delete_option('geodir_detailurl_separator');
+        }
 

         flush_rewrite_rules(false);

 

@@ -1976,8 +1987,9 @@ 
 {

     foreach ($permalink_arr as $key => $value) {

 

-        if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator')

-            unset($permalink_arr[$key]);

+        if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator') {
+                    unset($permalink_arr[$key]);
+        }
 

     }

 

@@ -2112,16 +2124,18 @@ 
 

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

+            if (isset($tabs_arr['post_video']['heading_text']) && $field_title != '') {
+                            $tabs_arr['post_video']['heading_text'] = $field_title;
+            }
         }

 

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

 

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

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

+            if (isset($tabs_arr['special_offers']['heading_text']) && $field_title != '') {
+                            $tabs_arr['special_offers']['heading_text'] = $field_title;
+            }
         }

 

     }

@@ -2176,8 +2190,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

-        if (!in_array($post_type, $all_postypes) || !is_admin())

-            return false;

+        if (!in_array($post_type, $all_postypes) || !is_admin()) {
+                    return false;
+        }
 

         $uploads = wp_upload_dir();

 

@@ -2251,8 +2266,9 @@ 
                         $file_info = pathinfo($attach->file);

 

                         $sub_dir = '';

-                        if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                            $sub_dir = stripslashes_deep($file_info['dirname']);

+                        if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+                                                    $sub_dir = stripslashes_deep($file_info['dirname']);
+                        }
 

                         $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

                         $uploads_path = $uploads['basedir'];

@@ -2273,8 +2289,9 @@ 
 

                     if (!empty($attachment_data)) {

 

-                        if ($attachment_data->ID)

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

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

                     } else {

 

@@ -2470,7 +2487,7 @@ 
                         $variables_array['label'] = __($type['site_title'], 'geodirectory');

                         $variables_array['value'] = '';

                         $variables_array['value'] = $post->{$type['htmlvar_name']};

-                    }else{

+                    } else{

                         $i = 0;

                         $fieldset_count++;

                         $field_set_start = 1;

Spacing +151 added lines, -151 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);

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

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

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

          *

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

     /**

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

          *

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

 

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

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

             }

 

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

@@ -737,13 +737,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

@@ -788,30 +788,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)",

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

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

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

          *

@@ -1110,10 +1110,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) {

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

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

          *

@@ -1191,8 +1191,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().

          *

@@ -1291,7 +1291,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(),

@@ -1315,10 +1315,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>';

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

                 }

@@ -1487,7 +1487,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 : '';

         }

 

@@ -1501,7 +1501,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)) {

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

         }

     }

@@ -1589,16 +1589,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')

             )

         );

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

 

@@ -1616,7 +1616,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)) {

 

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

 

                         }

 

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

 

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

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

 

     }

 	

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

 			}

 		}

 	}

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

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

     }

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

@@ -2003,7 +2003,7 @@ 
 {

     $user_id = get_current_user_id();

 

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

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

 

     $gd_post_types = geodir_get_posttypes();

 

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

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

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

     }

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

 

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

 

@@ -2244,7 +2244,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)) {

 

@@ -2261,22 +2261,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 {

 

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

 

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

     }

 

 }

@@ -2336,10 +2336,10 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @return array User listing count for each post type.

  */

-function geodir_user_post_listing_count($user_id=null)

+function geodir_user_post_listing_count($user_id = null)

 {

     global $wpdb, $plugin_prefix, $current_user;

-    if(!$user_id){

+    if (!$user_id) {

         $user_id = $current_user->ID;

     }

 

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

     if (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;

@@ -2391,19 +2391,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]);

                 }

             }

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

                     }

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

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

                         $variables_array['value'] = '';

                         $variables_array['value'] = $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'];

 

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

 

 

                     /**

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

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

         }

     }

 

@@ -2688,7 +2688,7 @@ 
 function geodir_no_rating_comment_text($content, $comment = '')

 {

     if (!is_admin()) {

-        return '<div class="description">' . $content . '</div>';

+        return '<div class="description">'.$content.'</div>';

     } else {

         return $content;

     }

@@ -2766,7 +2766,7 @@ 
         $classes[] = 'gd-no-rating';

     }

     

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

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

 

     return $classes;

 }

@@ -2786,7 +2786,7 @@ 
         $class .= ' gd-no-rating';

     }

     

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

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

 

     return $class;

 }

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

 

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

@@ -2968,7 +2968,7 @@ 
         }        

         

         if (!empty($keep_vars)) {

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

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

                 $filter_url = $url['url'];

                 

                 foreach ($keep_vars as $var) {

@@ -2988,4 +2988,4 @@ 
 

     return $languages;

 }

-add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 );
\ No newline at end of file
+add_filter('icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1);
\ No newline at end of file

Indentation +1130 added lines, -1130 removed lines

@@ -19,7 +19,7 @@ 
  */

 function geodir_get_ajax_url()

 {

-    return admin_url('admin-ajax.php?action=geodir_ajax_action');

+	return admin_url('admin-ajax.php?action=geodir_ajax_action');

 }

 

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

@@ -87,7 +87,7 @@ 
 add_filter('query_vars', 'geodir_add_geodir_page_var');

 add_action('wp', 'geodir_add_page_id_in_query_var'); // problem fix in wordpress 3.8

 if (get_option('permalink_structure') != '')

-    add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');

+	add_filter('parse_request', 'geodir_set_location_var_in_session_in_core');

 

 add_filter('parse_query', 'geodir_modified_query');

 

@@ -154,14 +154,14 @@ 
 /* POST AND LOOP ACTIONS */

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

 if (!is_admin()) {

-    add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtural page from everywhere

-    add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);

-    /** Exclude Virtual Pages From Pages List **/

-    add_action('pre_get_posts', 'set_listing_request', 0);

-    add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);

-    add_filter('excerpt_more', 'geodir_excerpt_more', 1000);

-    add_filter('excerpt_length', 'geodir_excerpt_length', 1000);

-    add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter

+	add_action('pre_get_posts', 'geodir_exclude_page', 100); /// Will help to exclude virtural page from everywhere

+	add_filter('wp_list_pages_excludes', 'exclude_from_wp_list_pages', 100);

+	/** Exclude Virtual Pages From Pages List **/

+	add_action('pre_get_posts', 'set_listing_request', 0);

+	add_action('pre_get_posts', 'geodir_listing_loop_filter', 1);

+	add_filter('excerpt_more', 'geodir_excerpt_more', 1000);

+	add_filter('excerpt_length', 'geodir_excerpt_length', 1000);

+	add_action('the_post', 'create_marker_jason_of_posts'); // Add marker in json array, Map related filter

 }

 

 

@@ -222,12 +222,12 @@ 
  */

 function geodir_unset_prev_theme_nav_location($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 {

-        update_option('geodir_theme_location_nav', '');

-    }

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

+	if ($geodir_theme_location) {

+		update_option('geodir_theme_location_nav', $geodir_theme_location);

+	} else {

+		update_option('geodir_theme_location_nav', '');

+	}

 }

 

 /// add action for theme switch to blank previous theme navigation location setting

@@ -248,32 +248,32 @@ 
  */

 function geodir_add_post_filters()

 {

-    /**

-     * Contains all function for filtering listing.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once('geodirectory-functions/listing_filters.php');

+	/**

+	 * Contains all function for filtering listing.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once('geodirectory-functions/listing_filters.php');

 }

 

 

 if (!function_exists('geodir_init_defaults')) {

-    /**

-     * Calls the function to register the GeoDirectory default CPT and taxonomies.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_init_defaults()

-    {

-        if (function_exists('geodir_register_defaults')) {

+	/**

+	 * Calls the function to register the GeoDirectory default CPT and taxonomies.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_init_defaults()

+	{

+		if (function_exists('geodir_register_defaults')) {

 

-            geodir_register_defaults();

+			geodir_register_defaults();

 

-        }

+		}

 

-    }

+	}

 }

 

 

@@ -295,26 +295,26 @@ 
 // CALLED ON 'sidebars_widgets' FILTER

 

 if (!function_exists('geodir_restrict_widget')) {

-    /**

-     * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page.

-     *

-     * @global bool $is_listing Sets the global value to true if on a GD category page. False if not.

-     * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not.

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_restrict_widget()

-    {

-        global $is_listing, $is_single_place;

+	/**

+	 * Sets global values to be able to tell if the current page is a GeoDirectory listing page or a GeoDirectory details page.

+	 *

+	 * @global bool $is_listing Sets the global value to true if on a GD category page. False if not.

+	 * @global bool $is_single_place Sets the global value to true if on a GD details (post) page. False if not.

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_restrict_widget()

+	{

+		global $is_listing, $is_single_place;

 

-        // set is listing	

-        (geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;

+		// set is listing	

+		(geodir_is_page('listing')) ? $is_listing = true : $is_listing = false;

 

-        // set is single place

-        (geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;

+		// set is single place

+		(geodir_is_page('place')) ? $is_single_place = true : $is_single_place = false;

 

 

-    }

+	}

 }

 

 

@@ -335,31 +335,31 @@ 
  */

 function geodir_detail_page_sidebar_content_sorting()

 {

-    $arr_detail_page_sidebar_content =

-        /**

-         * An array of functions to be called to be displayed on the details (post) page sidebar.

-         *

-         * This filter can be used to remove sections of the details page sidebar,

-         * add new sections or rearrange the order of the sections.

-         *

-         * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.

-         * @since 1.0.0

-         */

-        apply_filters('geodir_detail_page_sidebar_content',

-            array('geodir_social_sharing_buttons',

-                'geodir_detail_page_google_analytics',

-                'geodir_edit_post_link',

-                'geodir_detail_page_review_rating',

-                'geodir_detail_page_more_info'

-            ) // end of array 

-        ); // end of apply filter

-    if (!empty($arr_detail_page_sidebar_content)) {

-        foreach ($arr_detail_page_sidebar_content as $content_function) {

-            if (function_exists($content_function)) {

-                add_action('geodir_detail_page_sidebar', $content_function);

-            }

-        }

-    }

+	$arr_detail_page_sidebar_content =

+		/**

+		 * An array of functions to be called to be displayed on the details (post) page sidebar.

+		 *

+		 * This filter can be used to remove sections of the details page sidebar,

+		 * add new sections or rearrange the order of the sections.

+		 *

+		 * @param array array('geodir_social_sharing_buttons','geodir_share_this_button','geodir_detail_page_google_analytics','geodir_edit_post_link','geodir_detail_page_review_rating','geodir_detail_page_more_info') The array of functions that will be called.

+		 * @since 1.0.0

+		 */

+		apply_filters('geodir_detail_page_sidebar_content',

+			array('geodir_social_sharing_buttons',

+				'geodir_detail_page_google_analytics',

+				'geodir_edit_post_link',

+				'geodir_detail_page_review_rating',

+				'geodir_detail_page_more_info'

+			) // end of array 

+		); // end of apply filter

+	if (!empty($arr_detail_page_sidebar_content)) {

+		foreach ($arr_detail_page_sidebar_content as $content_function) {

+			if (function_exists($content_function)) {

+				add_action('geodir_detail_page_sidebar', $content_function);

+			}

+		}

+	}

 }

 

 add_action('geodir_after_edit_post_link', 'geodir_add_to_favourite_link', 1);

@@ -374,14 +374,14 @@ 
  */

 function geodir_add_to_favourite_link()

 {

-    global $post, $preview;

-    if (!$preview && geodir_is_page('detail')) {

-        ?>

+	global $post, $preview;

+	if (!$preview && geodir_is_page('detail')) {

+		?>

         <p class="edit_link">

             <?php geodir_favourite_html($post->post_author, $post->ID); ?>

         </p>

     <?php

-    }

+	}

 }

 

 /**

@@ -395,41 +395,41 @@ 
  */

 function geodir_social_sharing_buttons()

 {

-    global $preview;

-    ob_start(); // Start  buffering;

-    /**

-     * This action is called before the social buttons twitter,facebook and google plus are output in a containing div.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_social_sharing_buttons');

-    if (!$preview) {

-        ?>

+	global $preview;

+	ob_start(); // Start  buffering;

+	/**

+	 * This action is called before the social buttons twitter,facebook and google plus are output in a containing div.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_social_sharing_buttons');

+	if (!$preview) {

+		?>

         <div class="likethis">

             <?php geodir_twitter_tweet_button(); ?>

             <?php geodir_fb_like_button(); ?>

             <?php geodir_google_plus_button(); ?>

         </div>

     <?php

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

-

-    /**

-     * This action is called after the social buttons twitter,facebook and google plus are output in a containing div.

-     *

-     * @since 1.0.0

-     */

-    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) {

-        /**

-         * Filter the geodir_social_sharing_buttons() function content.

-         *

-         * @param string $content_html The output html of the geodir_social_sharing_buttons() function.

-         */

-        echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);

-    }

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

+

+	/**

+	 * This action is called after the social buttons twitter,facebook and google plus are output in a containing div.

+	 *

+	 * @since 1.0.0

+	 */

+	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) {

+		/**

+		 * Filter the geodir_social_sharing_buttons() function content.

+		 *

+		 * @param string $content_html The output html of the geodir_social_sharing_buttons() function.

+		 */

+		echo $content_html = apply_filters('geodir_social_sharing_buttons_html', $content_html);

+	}

 

 

 }

@@ -447,46 +447,46 @@ 
  */

 function geodir_edit_post_link()

 {

-    global $post, $preview;

-    ob_start(); // Start buffering;

-    /**

-     * This is called before the edit post link html in the function geodir_edit_post_link()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_edit_post_link');

-    if (!$preview) {

-        $is_current_user_owner = geodir_listing_belong_to_current_user();

+	global $post, $preview;

+	ob_start(); // Start buffering;

+	/**

+	 * This is called before the edit post link html in the function geodir_edit_post_link()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_edit_post_link');

+	if (!$preview) {

+		$is_current_user_owner = geodir_listing_belong_to_current_user();

         

-        if ($is_current_user_owner) {

-            $post_id = $post->ID;

+		if ($is_current_user_owner) {

+			$post_id = $post->ID;

             

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

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

-            }

+			if (isset($_REQUEST['pid']) && $_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>';

-        }

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

-    /**

-     * This is called after the edit post link html in the function geodir_edit_post_link()

-     *

-     * @since 1.0.0

-     */

-    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) {

-        /**

-         * Filter the geodir_edit_post_link() function content.

-         *

-         * @param string $content_html The output html of the geodir_edit_post_link() function.

-         */

-        echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);

-    }

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

+		}

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

+	/**

+	 * This is called after the edit post link html in the function geodir_edit_post_link()

+	 *

+	 * @since 1.0.0

+	 */

+	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) {

+		/**

+		 * Filter the geodir_edit_post_link() function content.

+		 *

+		 * @param string $content_html The output html of the geodir_edit_post_link() function.

+		 */

+		echo $content_html = apply_filters('geodir_edit_post_link_html', $content_html);

+	}

 }

 

 /**

@@ -500,42 +500,42 @@ 
  */

 function geodir_detail_page_google_analytics()

 {

-    global $post,$preview;

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

-    $package_info = array();

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

+	global $post,$preview;

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

+	$package_info = array();

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

 

-    $id = trim(get_option('geodir_ga_account_id'));

+	$id = trim(get_option('geodir_ga_account_id'));

 

-    if (!$id) {

-        return; //if no Google Analytics ID then bail.

-    }

+	if (!$id) {

+		return; //if no Google Analytics ID then bail.

+	}

 

-    ob_start(); // Start buffering;

-    /**

-     * This is called before the edit post link html in the function geodir_detail_page_google_analytics()

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_google_analytics');

+	ob_start(); // Start buffering;

+	/**

+	 * This is called before the edit post link html in the function geodir_detail_page_google_analytics()

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_google_analytics');

     

-    $refresh_time = get_option('geodir_ga_refresh_time', 5);

-    /**

-     * Filter the time interval to check & refresh new users results.

-     *

-     * @since 1.5.9

-     *

-     * @param int $refresh_time Time interval to check & refresh new users results.

-     */

-    $refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);

-    $refresh_time = absint($refresh_time * 1000);

+	$refresh_time = get_option('geodir_ga_refresh_time', 5);

+	/**

+	 * Filter the time interval to check & refresh new users results.

+	 *

+	 * @since 1.5.9

+	 *

+	 * @param int $refresh_time Time interval to check & refresh new users results.

+	 */

+	$refresh_time = apply_filters('geodir_google_analytics_refresh_time', $refresh_time);

+	$refresh_time = absint($refresh_time * 1000);

     

-    $hide_refresh = get_option('geodir_ga_auto_refresh');

+	$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' )) ) {

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

-        ?>

+	$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' )) ) {

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

+		?>

         <script type="text/javascript">

             var gd_gaTimeOut;

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

@@ -787,15 +787,15 @@ 
                     var labels = results[1].rows.map(function(row) { return +row[0]; });

 

                     <?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');

-                    ?>

+					// 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');

+					?>

 

                     labels = [

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

@@ -1044,24 +1044,24 @@ 
         </span>

 

     <?php

-    }

-    /**

-     * This is called after the edit post link html in the function geodir_detail_page_google_analytics()

-     *

-     * @since 1.0.0

-     */

-    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) {

-        /**

-         * Filter the geodir_edit_post_link() function content.

-         *

-         * @param string $content_html The output html of the geodir_edit_post_link() function.

-         */

-        echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);

-    }

+	}

+	/**

+	 * This is called after the edit post link html in the function geodir_detail_page_google_analytics()

+	 *

+	 * @since 1.0.0

+	 */

+	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) {

+		/**

+		 * Filter the geodir_edit_post_link() function content.

+		 *

+		 * @param string $content_html The output html of the geodir_edit_post_link() function.

+		 */

+		echo $content_html = apply_filters('geodir_google_analytic_html', $content_html);

+	}

 }

 

 /**

@@ -1077,90 +1077,90 @@ 
  */

 function geodir_detail_page_review_rating()

 {

-    global $post, $preview, $post_images;

-    ob_start(); // Start  buffering;

-    /**

-     * This is called before the rating html in the function geodir_detail_page_review_rating().

-     *

-     * This is called outside the check for an actual rating and the check for preview page.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_detail_page_review_rating');

-

-    $comment_count = geodir_get_review_count_total($post->ID);

-    $post_avgratings = geodir_get_post_rating($post->ID);

-

-    if ($post_avgratings != 0 && !$preview) {

-        /**

-         * This is called before the rating html in the function geodir_detail_page_review_rating().

-         *

-         * This is called inside the check for an actual rating and the check for preview page.

-         *

-         * @since 1.0.0

-         * @param float $post_avgratings Average rating for the surrent post.

-         * @param int $post->ID Current post ID.

-         */

-        do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);

-

-        $html = '<p style=" float:left;">';

-        $html .= geodir_get_rating_stars($post_avgratings, $post->ID);

-        $html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">';

-        $post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings;

+	global $post, $preview, $post_images;

+	ob_start(); // Start  buffering;

+	/**

+	 * This is called before the rating html in the function geodir_detail_page_review_rating().

+	 *

+	 * This is called outside the check for an actual rating and the check for preview page.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_detail_page_review_rating');

+

+	$comment_count = geodir_get_review_count_total($post->ID);

+	$post_avgratings = geodir_get_post_rating($post->ID);

+

+	if ($post_avgratings != 0 && !$preview) {

+		/**

+		 * This is called before the rating html in the function geodir_detail_page_review_rating().

+		 *

+		 * This is called inside the check for an actual rating and the check for preview page.

+		 *

+		 * @since 1.0.0

+		 * @param float $post_avgratings Average rating for the surrent post.

+		 * @param int $post->ID Current post ID.

+		 */

+		do_action('geodir_before_review_rating_stars_on_detail', $post_avgratings, $post->ID);

+

+		$html = '<p style=" float:left;">';

+		$html .= geodir_get_rating_stars($post_avgratings, $post->ID);

+		$html .= '<div class="average-review" itemscope itemtype="http://data-vocabulary.org/Review-aggregate">';

+		$post_avgratings = (is_float($post_avgratings) || (strpos($post_avgratings, ".", 1) == 1 && strlen($post_avgratings) > 3)) ? number_format($post_avgratings, 1, '.', '') : $post_avgratings;

        

 	   $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 class="item">';

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

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

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

 

-        if ($post_images) {

-            foreach ($post_images as $img) {

-                $post_img = $img->src;

-                break;

-            }

-        }

-

-        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 .= '</span>';

-

-        echo $html .= '</div>';

-        /**

-         * This is called after the rating html in the function geodir_detail_page_review_rating().

-         *

-         * This is called inside the check for an actual rating and the check for preview page.

-         *

-         * @since 1.0.0

-         * @param float $post_avgratings Average rating for the surrent post.

-         * @param int $post->ID Current post ID.

-         */

-        do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);

-    }

-    /**

-     * This is called before the rating html in the function geodir_detail_page_review_rating().

-     *

-     * This is called outside the check for an actual rating and the check for preview page.

-     *

-     * @since 1.0.0

-     */

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

-    }

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

-        /**

-         * Filter the geodir_detail_page_review_rating() function content.

-         *

-         * @since 1.0.0

-         * @param string $content_html The output html of the geodir_detail_page_review_rating() function.

-         */

-        echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);

-    }

+		if ($post_images) {

+			foreach ($post_images as $img) {

+				$post_img = $img->src;

+				break;

+			}

+		}

+

+		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 .= '</span>';

+

+		echo $html .= '</div>';

+		/**

+		 * This is called after the rating html in the function geodir_detail_page_review_rating().

+		 *

+		 * This is called inside the check for an actual rating and the check for preview page.

+		 *

+		 * @since 1.0.0

+		 * @param float $post_avgratings Average rating for the surrent post.

+		 * @param int $post->ID Current post ID.

+		 */

+		do_action('geodir_after_review_rating_stars_on_detail', $post_avgratings, $post->ID);

+	}

+	/**

+	 * This is called before the rating html in the function geodir_detail_page_review_rating().

+	 *

+	 * This is called outside the check for an actual rating and the check for preview page.

+	 *

+	 * @since 1.0.0

+	 */

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

+	}

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

+		/**

+		 * Filter the geodir_detail_page_review_rating() function content.

+		 *

+		 * @since 1.0.0

+		 * @param string $content_html The output html of the geodir_detail_page_review_rating() function.

+		 */

+		echo $content_html = apply_filters('geodir_detail_page_review_rating_html', $content_html);

+	}

 }

 

 /**

@@ -1172,35 +1172,35 @@ 
  */

 function geodir_detail_page_more_info()

 {

-    ob_start(); // Start  buffering;

-    /**

-     * This is called before the info section html.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_before_detail_page_more_info');

-    if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {

-        echo $geodir_post_detail_fields;

-    }

-    /**

-     * This is called after the info section html.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_after_detail_page_more_info');

-

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

-        /**

-         * Filter the output html for function geodir_detail_page_more_info().

-         *

-         * @since 1.0.0

-         * @param string $content_html The output html of the geodir_detail_page_more_info() function.

-         */

-        echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);

-    }

+	ob_start(); // Start  buffering;

+	/**

+	 * This is called before the info section html.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_before_detail_page_more_info');

+	if ($geodir_post_detail_fields = geodir_show_listing_info('detail')) {

+		echo $geodir_post_detail_fields;

+	}

+	/**

+	 * This is called after the info section html.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_after_detail_page_more_info');

+

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

+		/**

+		 * Filter the output html for function geodir_detail_page_more_info().

+		 *

+		 * @since 1.0.0

+		 * @param string $content_html The output html of the geodir_detail_page_more_info() function.

+		 */

+		echo $content_html = apply_filters('geodir_detail_page_more_info_html', $content_html);

+	}

 }

 

 

@@ -1214,15 +1214,15 @@ 
  */

 function geodir_localize_all_js_msg()

 {// check_ajax_referer function is used to make sure no files are uplaoded remotly but it will fail if used between https and non https so we do the check below of the urls

-    if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-        $ajax_url = admin_url('admin-ajax.php');

-    } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-        $ajax_url = admin_url('admin-ajax.php');

-    } elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

-        $ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

-    } elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

-        $ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

-    }

+	if (str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+		$ajax_url = admin_url('admin-ajax.php');

+	} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+		$ajax_url = admin_url('admin-ajax.php');

+	} elseif (str_replace("https", "http", admin_url('admin-ajax.php')) && empty($_SERVER['HTTPS'])) {

+		$ajax_url = str_replace("https", "http", admin_url('admin-ajax.php'));

+	} elseif (!str_replace("https", "http", admin_url('admin-ajax.php')) && !empty($_SERVER['HTTPS'])) {

+		$ajax_url = str_replace("http", "https", admin_url('admin-ajax.php'));

+	}

 	

 	/**

 	 * Filter the allowed image type extensions for post images.

@@ -1232,60 +1232,60 @@ 
 	 */

 	$allowed_img_types = apply_filters('geodir_allowed_post_image_exts', array('jpg', 'jpeg', 'jpe', 'gif', 'png'));

 	

-    $default_marker_icon = get_option('geodir_default_marker_icon');

-    $default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));

-    $default_marker_width = $default_marker_size['w'];

-    $default_marker_height = $default_marker_size['h'];

+	$default_marker_icon = get_option('geodir_default_marker_icon');

+	$default_marker_size = geodir_get_marker_size($default_marker_icon, array('w' => 20, 'h' => 34));

+	$default_marker_width = $default_marker_size['w'];

+	$default_marker_height = $default_marker_size['h'];

     

-    $arr_alert_msg = array(

-        'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_admin_ajax_url' => $ajax_url,

-        'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),

-        'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),

-        'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),

-        'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),

-        //start not show alert msg

-        'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),

-        'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),

-        'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),

-        'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),

-        'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),

-        // end not show alert msg

-        'my_place_listing_del' => __('Are you wish to delete this listing?', 'geodirectory'),

-        'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),

-        //start not show alert msg

-        'rating_error_msg' => __('Error : please retry', 'geodirectory'),

-        'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),

-        'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),

-        'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),

-        'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),

-        'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),

-        'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),

-        'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),

-        'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),

-        'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),

-        'geodir_field_id_required' => __('This field is required.', 'geodirectory'),

-        'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),

-        'geodir_default_marker_icon' => $default_marker_icon,

-        'geodir_default_marker_w' => $default_marker_width,

-        'geodir_default_marker_h' => $default_marker_height,

-        'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG,

-        'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG,

-        'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),

-        'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),

-        'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),

-        'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),

-        'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),

-        'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),

-        /* on/off dragging for phone devices */

-        'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,

-        'geodir_is_mobile' => wp_is_mobile() ? true : false,

-        'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),

-        'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),

-        'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),

-        'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),

-        'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),

-        'geodir_action_remove' => __('Remove', 'geodirectory'),

+	$arr_alert_msg = array(

+		'geodir_plugin_url' => geodir_plugin_url(),

+		'geodir_admin_ajax_url' => $ajax_url,

+		'custom_field_not_blank_var' => __('HTML Variable Name must not be blank', 'geodirectory'),

+		'custom_field_not_special_char' => __('Please do not use special character and spaces in HTML Variable Name.', 'geodirectory'),

+		'custom_field_unique_name' => __('HTML Variable Name should be a unique name.', 'geodirectory'),

+		'custom_field_delete' => __('Are you wish to delete this field?', 'geodirectory'),

+		//start not show alert msg

+		'tax_meta_class_succ_del_msg' => __('File has been successfully deleted.', 'geodirectory'),

+		'tax_meta_class_not_permission_to_del_msg' => __('You do NOT have permission to delete this file.', 'geodirectory'),

+		'tax_meta_class_order_save_msg' => __('Order saved!', 'geodirectory'),

+		'tax_meta_class_not_permission_record_img_msg' => __('You do not have permission to reorder images.', 'geodirectory'),

+		'address_not_found_on_map_msg' => __('Address not found for:', 'geodirectory'),

+		// end not show alert msg

+		'my_place_listing_del' => __('Are you wish to delete this listing?', 'geodirectory'),

+		'my_main_listing_del' => __('Deleting the main listing of a franchise will turn all franchises in regular listings. Are you sure wish to delete this main listing?', 'geodirectory'),

+		//start not show alert msg

+		'rating_error_msg' => __('Error : please retry', 'geodirectory'),

+		'listing_url_prefix_msg' => __('Please enter listing url prefix', 'geodirectory'),

+		'invalid_listing_prefix_msg' => __('Invalid character in listing url prefix', 'geodirectory'),

+		'location_url_prefix_msg' => __('Please enter location url prefix', 'geodirectory'),

+		'invalid_location_prefix_msg' => __('Invalid character in location url prefix', 'geodirectory'),

+		'location_and_cat_url_separator_msg' => __('Please enter location and category url separator', 'geodirectory'),

+		'invalid_char_and_cat_url_separator_msg' => __('Invalid character in location and category url separator', 'geodirectory'),

+		'listing_det_url_separator_msg' => __('Please enter listing detail url separator', 'geodirectory'),

+		'invalid_char_listing_det_url_separator_msg' => __('Invalid character in listing detail url separator', 'geodirectory'),

+		'loading_listing_error_favorite' => __('Error loading listing.', 'geodirectory'),

+		'geodir_field_id_required' => __('This field is required.', 'geodirectory'),

+		'geodir_valid_email_address_msg' => __('Please enter valid email address.', 'geodirectory'),

+		'geodir_default_marker_icon' => $default_marker_icon,

+		'geodir_default_marker_w' => $default_marker_width,

+		'geodir_default_marker_h' => $default_marker_height,

+		'geodir_latitude_error_msg' => GEODIR_LATITUDE_ERROR_MSG,

+		'geodir_longgitude_error_msg' => GEODIR_LOGNGITUDE_ERROR_MSG,

+		'geodir_default_rating_star_icon' => get_option('geodir_default_rating_star_icon'),

+		'gd_cmt_btn_post_reply' => __('Post Reply', 'geodirectory'),

+		'gd_cmt_btn_reply_text' => __('Reply text', 'geodirectory'),

+		'gd_cmt_btn_post_review' => __('Post Review', 'geodirectory'),

+		'gd_cmt_btn_review_text' => __('Review text', 'geodirectory'),

+		'gd_cmt_err_no_rating' => __("Please select star rating, you can't leave a review without stars.", 'geodirectory'),

+		/* on/off dragging for phone devices */

+		'geodir_onoff_dragging' => get_option('geodir_map_onoff_dragging') ? true : false,

+		'geodir_is_mobile' => wp_is_mobile() ? true : false,

+		'geodir_on_dragging_text' => __('Enable Dragging', 'geodirectory'),

+		'geodir_off_dragging_text' => __('Disable Dragging', 'geodirectory'),

+		'geodir_err_max_file_size' => __('File size error : You tried to upload a file over %s', 'geodirectory'),

+		'geodir_err_file_upload_limit' => __('You have reached your upload limit of %s files.', 'geodirectory'),

+		'geodir_err_pkg_upload_limit' => __('You may only upload %s files with this package, please try again.', 'geodirectory'),

+		'geodir_action_remove' => __('Remove', 'geodirectory'),

 		'geodir_txt_all_files' => __('Allowed files', 'geodirectory'),

 		'geodir_err_file_type' => __('File type error. Allowed file types: %s', 'geodirectory'),

 		'gd_allowed_img_types' => !empty($allowed_img_types) ? implode(',', $allowed_img_types) : '',

@@ -1293,35 +1293,35 @@ 
 		'geodir_txt_form_searching' => __('Searching...', 'geodirectory'),

 		'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(),

-        'osmStart' => __('Start', 'geodirectory'),

-        'osmVia' => __('Via {viaNumber}', 'geodirectory'),

-        'osmEnd' => __('Enter Your Location', 'geodirectory'),

-        'ga_delete_check' => __('Are you wish to Deauthorize and break Analytics?', 'geodirectory'),

-

-    );

-

-    /**

-     * Filters the translated JS strings from function geodir_localize_all_js_msg().

-     *

-     * With this filter you can add, remove or change translated JS strings.

-     * You should add your own translations to this if you are building an addon rather than adding another script block.

-     *

-     * @since 1.0.0

-     */

-    $arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);

-

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

-    }

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

+		'geodir_map_name' => geodir_map_name(),

+		'osmStart' => __('Start', 'geodirectory'),

+		'osmVia' => __('Via {viaNumber}', 'geodirectory'),

+		'osmEnd' => __('Enter Your Location', 'geodirectory'),

+		'ga_delete_check' => __('Are you wish to Deauthorize and break Analytics?', 'geodirectory'),

+

+	);

+

+	/**

+	 * Filters the translated JS strings from function geodir_localize_all_js_msg().

+	 *

+	 * With this filter you can add, remove or change translated JS strings.

+	 * You should add your own translations to this if you are building an addon rather than adding another script block.

+	 *

+	 * @since 1.0.0

+	 */

+	$arr_alert_msg = apply_filters('geodir_all_js_msg', $arr_alert_msg);

 

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

-    echo '<script>';

-    echo $script;

-    echo '</script>';

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

+	}

+

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

+	echo '<script>';

+	echo $script;

+	echo '</script>';

 }

 

 add_action('admin_bar_menu', 'geodir_admin_bar_site_menu', 31);

@@ -1337,11 +1337,11 @@ 
  */

 function geodir_admin_bar_site_menu($wp_admin_bar)

 {

-    if (get_option("geodir_installed")) {

-        if (current_user_can('manage_options')) {

-            $wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));

-        }

-    }

+	if (get_option("geodir_installed")) {

+		if (current_user_can('manage_options')) {

+			$wp_admin_bar->add_menu(array('parent' => 'appearance', 'id' => 'geodirectory', 'title' => __('GeoDirectory', 'geodirectory'), 'href' => admin_url('?page=geodirectory')));

+		}

+	}

 }

 

 add_action('geodir_before_listing', 'geodir_display_sort_options'); /*function in custom_functions.php*/

@@ -1367,25 +1367,25 @@ 
  */

 function geodir_store_sidebars()

 {

-    global $geodir_sidebars;

-    global $sidebars_widgets;

-

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

-    $geodir_old_sidebars = array();

-

-    if (is_array($geodir_sidebars)) {

-        foreach ($geodir_sidebars as $val) {

-            if (is_array($sidebars_widgets)) {

-                if (array_key_exists($val, $sidebars_widgets))

-                    $geodir_old_sidebars[$val] = $sidebars_widgets[$val];

-                else

-                    $geodir_old_sidebars[$val] = array();

-            }

-        }

-    }

-    update_option('geodir_sidebars', $geodir_old_sidebars);

-    geodir_option_version_backup('geodir_sidebars');

+	global $geodir_sidebars;

+	global $sidebars_widgets;

+

+	if (!is_array($sidebars_widgets))

+		$sidebars_widgets = wp_get_sidebars_widgets();

+	$geodir_old_sidebars = array();

+

+	if (is_array($geodir_sidebars)) {

+		foreach ($geodir_sidebars as $val) {

+			if (is_array($sidebars_widgets)) {

+				if (array_key_exists($val, $sidebars_widgets))

+					$geodir_old_sidebars[$val] = $sidebars_widgets[$val];

+				else

+					$geodir_old_sidebars[$val] = array();

+			}

+		}

+	}

+	update_option('geodir_sidebars', $geodir_old_sidebars);

+	geodir_option_version_backup('geodir_sidebars');

 

 }

 

@@ -1399,28 +1399,28 @@ 
  */

 function geodir_restore_sidebars()

 {

-    global $sidebars_widgets;

-

-    if (!is_array($sidebars_widgets))

-        $sidebars_widgets = wp_get_sidebars_widgets();

-

-    if (is_array($sidebars_widgets)) {

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

-                {

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

-                }

+	global $sidebars_widgets;

 

+	if (!is_array($sidebars_widgets))

+		$sidebars_widgets = wp_get_sidebars_widgets();

 

-            }

-        }

+	if (is_array($sidebars_widgets)) {

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

+				{

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

+				}

 

-    }

 

-    update_option('sidebars_widgets', $sidebars_widgets);

-    update_option('geodir_sidebars', '');

+			}

+		}

+

+	}

+

+	update_option('sidebars_widgets', $sidebars_widgets);

+	update_option('geodir_sidebars', '');

 }

 

 add_action('geodir_after_listing_post_gridview', 'geodir_after_listing_post_gridview');

@@ -1433,9 +1433,9 @@ 
  */

 function geodir_after_listing_post_gridview()

 {

-    global $gridview_columns;

+	global $gridview_columns;

 

-    $gridview_columns = '';

+	$gridview_columns = '';

 

 }

 

@@ -1463,11 +1463,11 @@ 
  */

 function so_handle_038($url, $original_url, $_context)

 {

-    if (strstr($url, "maps.google.com/maps/api/js") !== false) {

-        $url = str_replace("&#038;", "&amp;", $url); // or $url = $original_url

-    }

+	if (strstr($url, "maps.google.com/maps/api/js") !== false) {

+		$url = str_replace("&#038;", "&amp;", $url); // or $url = $original_url

+	}

 

-    return $url;

+	return $url;

 }

 

 

@@ -1483,34 +1483,34 @@ 
 function geodir_after_main_form_fields() {

 	global $gd_session;

 	

-    if (get_option('geodir_accept_term_condition')) {

-        global $post;

-        $term_condition = '';

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

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

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

-        }

-

-        ?>

+	if (get_option('geodir_accept_term_condition')) {

+		global $post;

+		$term_condition = '';

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

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

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

+		}

+

+		?>

         <div id="geodir_accept_term_condition_row" class="required_field geodir_form_row clearfix">

             <label>&nbsp;</label>

 

             <div class="geodir_taxonomy_field" style="float:left; width:70%;">

 				<span style="display:block"> 

 				<input class="main_list_selecter" type="checkbox" <?php if ($term_condition == '1') {

-                    echo 'checked="checked"';

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

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

 				</span>

             </div>

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

-                    _e($required_msg, 'geodirectory');

-                } ?></span>

+					_e($required_msg, 'geodirectory');

+				} ?></span>

         </div>

     <?php

 

-    }

+	}

 }

 

 

@@ -1535,42 +1535,42 @@ 
  */

 function geodir_detail_page_tab_is_display($is_display, $tab)

 {

-    global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields;

+	global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields;

 

-    if ($tab == 'post_profile') {

-        /** This action is documented in geodirectory_template_actions.php */

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

+	if ($tab == 'post_profile') {

+		/** 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)) {

-            $is_display = false;

-        }

-    }

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

+			$is_display = false;

+		}

+	}

     

-    if ($tab == 'post_info')

-        $is_display = (!empty($geodir_post_detail_fields)) ? true : false;

+	if ($tab == 'post_info')

+		$is_display = (!empty($geodir_post_detail_fields)) ? true : false;

     

-    if ($tab == 'post_images')

-        $is_display = (!empty($post_images)) ? true : false;

+	if ($tab == 'post_images')

+		$is_display = (!empty($post_images)) ? true : false;

 

-    if ($tab == 'post_video')

-        $is_display = (!empty($video)) ? true : false;

+	if ($tab == 'post_video')

+		$is_display = (!empty($video)) ? true : false;

 

-    if ($tab == 'special_offers')

-        $is_display = (!empty($special_offers)) ? true : false;

+	if ($tab == 'special_offers')

+		$is_display = (!empty($special_offers)) ? true : false;

 

-    if ($tab == 'reviews')

-        $is_display = (geodir_is_page('detail')) ? true : false;

+	if ($tab == 'reviews')

+		$is_display = (geodir_is_page('detail')) ? true : false;

 

-    if ($tab == 'related_listing') {

-       $message = __('No listings found which match your selection.', 'geodirectory');

+	if ($tab == 'related_listing') {

+	   $message = __('No listings found which match your selection.', 'geodirectory');

        

-       /** This action is documented in geodirectory-functions/template_functions.php */

-       $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);

+	   /** This action is documented in geodirectory-functions/template_functions.php */

+	   $message = apply_filters('geodir_message_listing_not_found', $message, 'listing-listview', false);

        

-       $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;

-    }

+	   $is_display = ((strpos($related_listing, $message) !== false || $related_listing == '' || !geodir_is_page('detail'))) ? false : true;

+	}

 

-    return $is_display;

+	return $is_display;

 }

 

 

@@ -1586,69 +1586,69 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.

  */

 function geodir_changes_in_custom_fields_table() {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 	

 	// Remove unused virtual 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')));

-        delete_option('geodir_listing_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",

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

-            )

-        );

+	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",

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

+			)

+		);

 

 

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

+		/* --- 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)) {

+		if (!empty($options_data)) {

 

-            foreach ($options_data as $optobj) {

+			foreach ($options_data as $optobj) {

 

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

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

+				if (!empty($taxonomies_data)) {

 

-                    foreach ($taxonomies_data as $taxobj) {

+					foreach ($taxonomies_data as $taxobj) {

 

-                        $taxObject = get_taxonomy($taxobj->taxonomy);

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

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

+						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 {

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

 

-                        }

+						}

 

-                    }

+					}

 

-                }

+				}

 

-            }

-        }

+			}

+		}

 

-        update_option('geodir_changes_in_custom_fields_table', '1');

+		update_option('geodir_changes_in_custom_fields_table', '1');

 

-    }

+	}

 

 }

 

@@ -1667,24 +1667,24 @@ 
 function geodir_location_slug_check($slug)

 {

 

-    global $wpdb, $table_prefix;

+	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) {

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

-            $suffix++;

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

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

+			$suffix++;

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

 

-        $slug = $alt_location_name;

+		$slug = $alt_location_name;

 

-    }

+	}

 

-    return $slug;

+	return $slug;

 

 }

 

@@ -1709,42 +1709,42 @@ 
 function geodir_update_term_slug($term_id, $tt_id, $taxonomy)

 {

 

-    global $wpdb, $plugin_prefix, $table_prefix;

+	global $wpdb, $plugin_prefix, $table_prefix;

 

-    $tern_data = get_term_by('id', $term_id, $taxonomy);

+	$tern_data = get_term_by('id', $term_id, $taxonomy);

 

-    $slug = $tern_data->slug;

+	$slug = $tern_data->slug;

 

-    /**

-     * Filter if a term slug exists.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param bool $bool Default: false.

-     * @param string $slug The term slug.

-     * @param int $term_id The term ID.

-     */

-    $slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);

+	/**

+	 * Filter if a term slug exists.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param bool $bool Default: false.

+	 * @param string $slug The term slug.

+	 * @param int $term_id The term ID.

+	 */

+	$slug_exists = apply_filters('geodir_term_slug_is_exists', false, $slug, $term_id);

 

-    if ($slug_exists) {

+	if ($slug_exists) {

 

-        $suffix = 1;

-        do {

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

+		$suffix = 1;

+		do {

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

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

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

 

-            $suffix++;

-        } while ($term_slug_check && $suffix < 100);

+			$suffix++;

+		} while ($term_slug_check && $suffix < 100);

 

-        $slug = $new_slug;

+		$slug = $new_slug;

 

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

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

 

-    }

+	}

 	

 	// Update tag in detail table.

 	$taxonomy_obj = get_taxonomy($taxonomy);

@@ -1785,21 +1785,21 @@ 
 function geodir_term_slug_is_exists($slug_exists, $slug, $term_id)

 {

 

-    global $wpdb, $table_prefix;

+	global $wpdb, $table_prefix;

 

-    $default_location = geodir_get_default_location();

+	$default_location = geodir_get_default_location();

 

-    $country_slug = $default_location->country_slug;

-    $region_slug = $default_location->region_slug;

-    $city_slug = $default_location->city_slug;

+	$country_slug = $default_location->country_slug;

+	$region_slug = $default_location->region_slug;

+	$city_slug = $default_location->city_slug;

 

-    if ($country_slug == $slug || $region_slug == $slug || $city_slug == $slug)

-        return $slug_exists = true;

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

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

+		return $slug_exists = true;

 

-    return $slug_exists;

+	return $slug_exists;

 }

 

 

@@ -1818,75 +1818,75 @@ 
  */

 function geodir_custom_page_title($title = '', $sep = '')

 {

-    global $wp;

-    if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {

-        return $title;

-    }

+	global $wp;

+	if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {

+		return $title;

+	}

 

-    if ($sep == '') {

-        /**

-         * Filter the page title separator.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param string $sep The separator, default: `|`.

-         */

-        $sep = apply_filters('geodir_page_title_separator', '|');

-    }

+	if ($sep == '') {

+		/**

+		 * Filter the page title separator.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param string $sep The separator, default: `|`.

+		 */

+		$sep = apply_filters('geodir_page_title_separator', '|');

+	}

 

 

-    $gd_page = '';

-    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')){

-        $gd_page = 'detail';

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

-    }

-    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')){

-        $gd_page = 'listing';

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

-    }

-    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')){

-        $gd_page = 'search';

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

-    }

-    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')){

-        $gd_page = 'author';

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

-    }

-    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')){

-        $gd_page = 'listing-success';

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

-    }

+	$gd_page = '';

+	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')){

+		$gd_page = 'detail';

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

+	}

+	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')){

+		$gd_page = 'listing';

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

+	}

+	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')){

+		$gd_page = 'search';

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

+	}

+	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')){

+		$gd_page = 'author';

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

+	}

+	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')){

+		$gd_page = 'listing-success';

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

+	}

 

 

-    /**

-     * Filter page meta title to replace variables.

-     *

-     * @since 1.5.4

-     * @param string $title The page title including variables.

-     * @param string $gd_page The GeoDirectory page type if any.

-     * @param string $sep The title separator symbol.

-     */

-    return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);

+	/**

+	 * Filter page meta title to replace variables.

+	 *

+	 * @since 1.5.4

+	 * @param string $title The page title including variables.

+	 * @param string $gd_page The GeoDirectory page type if any.

+	 * @param string $sep The title separator symbol.

+	 */

+	return apply_filters('geodir_seo_meta_title', __($title, 'geodirectory'), $gd_page, $sep);

 

 }

 

@@ -1902,36 +1902,36 @@ 
 function geodir_set_post_attachment()

 {

 

-    if (!get_option('geodir_set_post_attachments')) {

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

+		$all_postypes = geodir_get_posttypes();

 

-        foreach($all_postypes as $post_type){

-            $args = array(

-                'posts_per_page' => -1,

-                'post_type' => $post_type,

-                'post_status' => 'publish');

+		foreach($all_postypes as $post_type){

+			$args = array(

+				'posts_per_page' => -1,

+				'post_type' => $post_type,

+				'post_status' => 'publish');

 

-            $posts_array = get_posts($args);

+			$posts_array = get_posts($args);

 

-            if (!empty($posts_array)) {

+			if (!empty($posts_array)) {

 

-                foreach ($posts_array as $post) {

+				foreach ($posts_array as $post) {

 

-                    geodir_set_wp_featured_image($post->ID);

+					geodir_set_wp_featured_image($post->ID);

 

-                }

+				}

 

-            }

-        }

+			}

+		}

 

 

-        update_option('geodir_set_post_attachments', '1');

+		update_option('geodir_set_post_attachments', '1');

 

-    }

+	}

 

 }

 

@@ -1948,19 +1948,19 @@ 
 function geodir_remove_url_seperator()

 {

 

-    if (!get_option('geodir_remove_url_seperator')) {

+	if (!get_option('geodir_remove_url_seperator')) {

 

-        if (get_option('geodir_listingurl_separator'))

-            delete_option('geodir_listingurl_separator');

+		if (get_option('geodir_listingurl_separator'))

+			delete_option('geodir_listingurl_separator');

 

-        if (get_option('geodir_detailurl_separator'))

-            delete_option('geodir_detailurl_separator');

+		if (get_option('geodir_detailurl_separator'))

+			delete_option('geodir_detailurl_separator');

 

-        flush_rewrite_rules(false);

+		flush_rewrite_rules(false);

 

-        update_option('geodir_remove_url_seperator', '1');

+		update_option('geodir_remove_url_seperator', '1');

 

-    }

+	}

 

 }

 

@@ -1976,19 +1976,19 @@ 
  */

 function geodir_remove_url_seperator_form_permalink_settings($permalink_arr)

 {

-    foreach ($permalink_arr as $key => $value) {

+	foreach ($permalink_arr as $key => $value) {

 

-        if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator')

-            unset($permalink_arr[$key]);

+		if ($value['id'] == 'geodir_listingurl_separator' || $value['id'] == 'geodir_detailurl_separator')

+			unset($permalink_arr[$key]);

 

-    }

+	}

 

-    return $permalink_arr;

+	return $permalink_arr;

 

 }

 

 if (!is_admin()) {

-    add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');

+	add_filter('posts_results', 'geodir_set_status_draft_to_publish_for_own_post');

 }

 /**

  * Set status from draft to publish.

@@ -2001,16 +2001,16 @@ 
  */

 function geodir_set_status_draft_to_publish_for_own_post($post)

 {

-    $user_id = get_current_user_id();

+	$user_id = get_current_user_id();

 

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

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

 

-    $gd_post_types = geodir_get_posttypes();

+	$gd_post_types = geodir_get_posttypes();

 

-    if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {

-        $post[0]->post_status = 'publish';

-    }

-    return $post;

+	if (!empty($post) && $post[0]->post_author == $user_id && in_array($post[0]->post_type, $gd_post_types) && !isset($_REQUEST['fl_builder'])) {

+		$post[0]->post_status = 'publish';

+	}

+	return $post;

 }

 

 

@@ -2102,33 +2102,33 @@ 
  */

 function geodir_detail_page_tab_headings_change($tabs_arr)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $post_type = geodir_get_current_posttype();

+	$post_type = geodir_get_current_posttype();

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {

+	if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes)) {

 

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

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

-        }

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

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

+		}

 

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

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

-        }

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

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

+		}

 

-    }

+	}

 

-    return $tabs_arr;

+	return $tabs_arr;

 

 }

 

@@ -2141,10 +2141,10 @@ 
  */

 function geodir_remove_template_redirect_actions()

 {

-    if (geodir_is_page('login')){

-        remove_all_actions('template_redirect');

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

-    }

+	if (geodir_is_page('login')){

+		remove_all_actions('template_redirect');

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

+	}

 }

 

 

@@ -2166,51 +2166,51 @@ 
 function geodirectory_before_featured_image_delete($attachment_id)

 {

 

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_id = get_post_field('post_parent', $attachment_id);

+	$post_id = get_post_field('post_parent', $attachment_id);

 

-    $attachment_url = wp_get_attachment_url($attachment_id);

+	$attachment_url = wp_get_attachment_url($attachment_id);

 

-    if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {

+	if ($post_id > 0 && (isset($_REQUEST['action']) && $_REQUEST['action'] == 'delete')) {

 

-        $post_type = get_post_type($post_id);

+		$post_type = get_post_type($post_id);

 

-        $all_postypes = geodir_get_posttypes();

+		$all_postypes = geodir_get_posttypes();

 

-        if (!in_array($post_type, $all_postypes) || !is_admin())

-            return false;

+		if (!in_array($post_type, $all_postypes) || !is_admin())

+			return false;

 

-        $uploads = wp_upload_dir();

+		$uploads = wp_upload_dir();

 

-        $split_img_path = explode($uploads['baseurl'], $attachment_url);

+		$split_img_path = explode($uploads['baseurl'], $attachment_url);

 

-        $split_img_file_path = isset($split_img_path[1]) ? $split_img_path[1] : '';

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

-                array($post_id, $split_img_file_path)

-            )

-        );

+		$wpdb->query(

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

-                array($post_id)

-            )

-        );

+		$attachment_data = $wpdb->get_row(

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

-        }

+		if (!empty($attachment_data)) {

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

+		geodir_set_wp_featured_image($post_id);

 

-    }

+	}

 

 }

 

@@ -2228,79 +2228,79 @@ 
 function geodir_temp_set_post_attachment()

 {

 

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    foreach ($all_postypes as $posttype) {

+	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)) {

+		if (!empty($get_post_data)) {

 

-            foreach ($get_post_data as $data) {

+			foreach ($get_post_data as $data) {

 

-                $post_id = $data->post_id;

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

+				if (!empty($attachment_data)) {

 

-                    foreach ($attachment_data as $attach) {

+					foreach ($attachment_data as $attach) {

 

-                        $file_info = pathinfo($attach->file);

+						$file_info = pathinfo($attach->file);

 

-                        $sub_dir = '';

-                        if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

-                            $sub_dir = stripslashes_deep($file_info['dirname']);

+						$sub_dir = '';

+						if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')

+							$sub_dir = stripslashes_deep($file_info['dirname']);

 

-                        $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

-                        $uploads_path = $uploads['basedir'];

+						$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs

+						$uploads_path = $uploads['basedir'];

 

-                        $file_name = $file_info['basename'];

+						$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'])) {

+						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 (!empty($attachment_data)) {

 

-                        if ($attachment_data->ID)

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

+						if ($attachment_data->ID)

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

 

-                    } else {

+					} else {

 

-                        if (has_post_thumbnail($post_id)) {

+						if (has_post_thumbnail($post_id)) {

 

-                            $post_thumbnail_id = get_post_thumbnail_id($post_id);

+							$post_thumbnail_id = get_post_thumbnail_id($post_id);

 

-                            wp_delete_attachment($post_thumbnail_id);

+							wp_delete_attachment($post_thumbnail_id);

 

-                        }

+						}

 

-                    }

+					}

 

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

+					geodir_set_wp_featured_image($post_id);

 

-                }

+				}

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

 }

 

@@ -2318,9 +2318,9 @@ 
 function geodir_default_rating_star_icon()

 {

 

-    if (!get_option('geodir_default_rating_star_icon')) {

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

-    }

+	if (!get_option('geodir_default_rating_star_icon')) {

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

+	}

 

 }

 

@@ -2338,27 +2338,27 @@ 
  */

 function geodir_user_post_listing_count($user_id=null)

 {

-    global $wpdb, $plugin_prefix, $current_user;

-    if(!$user_id){

-        $user_id = $current_user->ID;

-    }

+	global $wpdb, $plugin_prefix, $current_user;

+	if(!$user_id){

+		$user_id = $current_user->ID;

+	}

 

-    $user_id = $current_user->ID;

-    $all_postypes = geodir_get_posttypes();

-    $all_posts = get_option('geodir_listing_link_user_dashboard');

+	$user_id = $current_user->ID;

+	$all_postypes = geodir_get_posttypes();

+	$all_posts = get_option('geodir_listing_link_user_dashboard');

 

-    $user_listing = array();

-    if (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' )");

+	$user_listing = array();

+	if (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' )");

 

-            if ($total_posts > 0) {

-                $user_listing[$ptype] = $total_posts;

-            }

-        }

-    }

+			if ($total_posts > 0) {

+				$user_listing[$ptype] = $total_posts;

+			}

+		}

+	}

 

-    return $user_listing;

+	return $user_listing;

 }

 

 

@@ -2378,189 +2378,189 @@ 
  */

 function geodir_detail_page_custom_field_tab($tabs_arr)

 {

-    global $post;

-

-    $post_type = geodir_get_current_posttype();

-    $all_postypes = geodir_get_posttypes();

-

-    if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {

-        $package_info = array();

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

-        $post_package_id = !empty($package_info->pid) ? $package_info->pid : '';

-        $fields_location = 'owntab';

-

-        $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']){

-            $unset_video = true;

-        }

-

-        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)){

-                    unset($custom_fields[$key]);

-                }

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

-                    unset($custom_fields[$key]);

-                }

-            }

-        }

-

-

-        if (!empty($custom_fields)) {

-            $parse_custom_fields = array();

-            foreach ($custom_fields as $field) {

-                $field = stripslashes_deep($field); // strip slashes

-                $type = $field;

-                $field_name = $field['htmlvar_name'];

-                if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {

-                    $post->{$field_name} = $_REQUEST[$field_name];

-                }

+	global $post;

 

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

-                    }

+	$post_type = geodir_get_current_posttype();

+	$all_postypes = geodir_get_posttypes();

 

-                    $parse_custom_fields[] = $field;

-                }

-            }

-            $custom_fields = $parse_custom_fields;

-        }

-        //print_r($custom_fields);

-        if (!empty($custom_fields)) {

+	if (!empty($tabs_arr) && $post_type != '' && in_array($post_type, $all_postypes) && (geodir_is_page('detail') || geodir_is_page('preview'))) {

+		$package_info = array();

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

+		$post_package_id = !empty($package_info->pid) ? $package_info->pid : '';

+		$fields_location = 'owntab';

 

-            global $field_set_start;

+		$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']){

+			$unset_video = true;

+		}

 

-            $post = stripslashes_deep($post); // strip slashes

-            

-            $field_set_start = 0;

-            $fieldset_count = 0;

-            $fieldset = '';

-            $total_fields = count($custom_fields);

-            $count_field = 0;

-            $fieldset_arr = array();

-            $i = 0;

-            $geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL;

-

-            foreach ($custom_fields as $field) {

-                $count_field++;

-                $field_name = $field['htmlvar_name'];

-                if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {

-                    $post->{$field_name} = $_REQUEST[$field_name];

-                }

+		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)){

+					unset($custom_fields[$key]);

+				}

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

+					unset($custom_fields[$key]);

+				}

+			}

+		}

 

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

-                    $variables_array = array();

 

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

-                        continue;

-                    }

+		if (!empty($custom_fields)) {

+			$parse_custom_fields = array();

+			foreach ($custom_fields as $field) {

+				$field = stripslashes_deep($field); // strip slashes

+				$type = $field;

+				$field_name = $field['htmlvar_name'];

+				if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {

+					$post->{$field_name} = $_REQUEST[$field_name];

+				}

 

-                    if ($type['type'] != 'fieldset') {

-                        $i++;

-                        $variables_array['post_id'] = $post->ID;

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

-                        $variables_array['value'] = '';

-                        $variables_array['value'] = $post->{$type['htmlvar_name']};

-                    }else{

-                        $i = 0;

-                        $fieldset_count++;

-                        $field_set_start = 1;

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

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

-                    }

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

+					}

 

+					$parse_custom_fields[] = $field;

+				}

+			}

+			$custom_fields = $parse_custom_fields;

+		}

+		//print_r($custom_fields);

+		if (!empty($custom_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;}

-                    $html = '';

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

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

-                    $field_icon = geodir_field_icon_proccess($type);

-                    $filed_type = $type['type'];

-

-                    /**

-                     * Filter the output for custom fields.

-                     *

-                     * Here we can remove or add new functions depending on the field type.

-                     *

-                     * @param string $html The html to be filtered (blank).

-                     * @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);

-

-

-                    /**

-                     * Filter custom field output in tab.

-                     *

-                     * @since 1.5.6

-                     *

-                     * @param string $html_var The HTML variable name for the field.

-                     * @param string $html Custom field unfiltered HTML.

-                     * @param array $variables_array Custom field variables array.

-                     */

-                    $html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);

-

-                    $fieldset_html = '';

-                    if ($field_set_start == 1) {

-                        $add_html = false;

-                        if ($type['type'] == 'fieldset' && $fieldset_count > 1) {

-                            if ($fieldset != '') {

-                                $add_html = true;

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

-                                $htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name'];

-                            }

-                            $fieldset_html = $fieldset;

-                            $fieldset = '';

-                        } else {

-                            $fieldset .= $html;

-                            if ($total_fields == $count_field && $fieldset != '') {

-                                $add_html = true;

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

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

-                                $fieldset_html = $fieldset;

-                            }

-                        }

+			global $field_set_start;

 

-                        if ($add_html) {

-                            $tabs_arr[$htmlvar_name] = array(

-                                'heading_text' => __($label, 'geodirectory'),

-                                'is_active_tab' => false,

-                                /**

-                                 * Filter if a custom field should be displayed on the details page tab.

-                                 *

-                                 * @since 1.0.0

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

-                            );

-                        }

-                    } else {

-                        if ($html != '') {

-                            $tabs_arr[$html_var] = array(

-                                'heading_text' => __($label, 'geodirectory'),

-                                'is_active_tab' => false,

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

-                                'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),

-                                'tab_content' => $html

-                            );

-                        }

-                    }

-                }

-            }

-        }

-    }

-    return $tabs_arr;

+			$post = stripslashes_deep($post); // strip slashes

+            

+			$field_set_start = 0;

+			$fieldset_count = 0;

+			$fieldset = '';

+			$total_fields = count($custom_fields);

+			$count_field = 0;

+			$fieldset_arr = array();

+			$i = 0;

+			$geodir_post_info = isset($post->ID) && !empty($post->ID) ? geodir_get_post_info($post->ID) : NULL;

+

+			foreach ($custom_fields as $field) {

+				$count_field++;

+				$field_name = $field['htmlvar_name'];

+				if (empty($geodir_post_info) && geodir_is_page('preview') && $field_name != '' && !isset($post->{$field_name}) && isset($_REQUEST[$field_name])) {

+					$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'))) {

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

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

+					$type = $field;

+					$variables_array = array();

+

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

+						continue;

+					}

+

+					if ($type['type'] != 'fieldset') {

+						$i++;

+						$variables_array['post_id'] = $post->ID;

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

+						$variables_array['value'] = '';

+						$variables_array['value'] = $post->{$type['htmlvar_name']};

+					}else{

+						$i = 0;

+						$fieldset_count++;

+						$field_set_start = 1;

+						$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'];}

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

+					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';}

+					$field_icon = geodir_field_icon_proccess($type);

+					$filed_type = $type['type'];

+

+					/**

+					 * Filter the output for custom fields.

+					 *

+					 * Here we can remove or add new functions depending on the field type.

+					 *

+					 * @param string $html The html to be filtered (blank).

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

+

+

+					/**

+					 * Filter custom field output in tab.

+					 *

+					 * @since 1.5.6

+					 *

+					 * @param string $html_var The HTML variable name for the field.

+					 * @param string $html Custom field unfiltered HTML.

+					 * @param array $variables_array Custom field variables array.

+					 */

+					$html = apply_filters("geodir_tab_show_{$html_var}", $html, $variables_array);

+

+					$fieldset_html = '';

+					if ($field_set_start == 1) {

+						$add_html = false;

+						if ($type['type'] == 'fieldset' && $fieldset_count > 1) {

+							if ($fieldset != '') {

+								$add_html = true;

+								$label = $fieldset_arr[$fieldset_count - 1]['label'];

+								$htmlvar_name = $fieldset_arr[$fieldset_count - 1]['htmlvar_name'];

+							}

+							$fieldset_html = $fieldset;

+							$fieldset = '';

+						} else {

+							$fieldset .= $html;

+							if ($total_fields == $count_field && $fieldset != '') {

+								$add_html = true;

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

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

+								$fieldset_html = $fieldset;

+							}

+						}

+

+						if ($add_html) {

+							$tabs_arr[$htmlvar_name] = array(

+								'heading_text' => __($label, 'geodirectory'),

+								'is_active_tab' => false,

+								/**

+								 * Filter if a custom field should be displayed on the details page tab.

+								 *

+								 * @since 1.0.0

+								 * @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>'

+							);

+						}

+					} else {

+						if ($html != '') {

+							$tabs_arr[$html_var] = array(

+								'heading_text' => __($label, 'geodirectory'),

+								'is_active_tab' => false,

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

+								'is_display' => apply_filters('geodir_detail_page_tab_is_display', true, $field['htmlvar_name']),

+								'tab_content' => $html

+							);

+						}

+					}

+				}

+			}

+		}

+	}

+	return $tabs_arr;

 }

 

 /* display add listing page for wpml */

@@ -2584,39 +2584,39 @@ 
  */

 function geodir_add_post_status_author_page()

 {

-    global $wpdb, $post;

-

-    $html = '';

-    if (get_current_user_id()) {

-

-        $is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));

-        if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {

-

-            // we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them.

-            $real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");

-            $status = "<strong>(";

-            $status_icon = '<i class="fa fa-play"></i>';

-            if ($real_status == 'publish') {

-                $status .= __('Published', 'geodirectory');

-            } else {

-                $status .= __('Not published', 'geodirectory');

-                $status_icon = '<i class="fa fa-pause"></i>';

-            }

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

+	global $wpdb, $post;

+

+	$html = '';

+	if (get_current_user_id()) {

+

+		$is_author_page = apply_filters('geodir_post_status_is_author_page', geodir_is_page('author'));

+		if ($is_author_page && !empty($post) && isset($post->post_author) && $post->post_author == get_current_user_id()) {

+

+			// we need to query real status direct as we dynamically change the status for author on author page so even non author status can view them.

+			$real_status = $wpdb->get_var("SELECT post_status from $wpdb->posts WHERE ID=$post->ID");

+			$status = "<strong>(";

+			$status_icon = '<i class="fa fa-play"></i>';

+			if ($real_status == 'publish') {

+				$status .= __('Published', 'geodirectory');

+			} else {

+				$status .= __('Not published', 'geodirectory');

+				$status_icon = '<i class="fa fa-pause"></i>';

+			}

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

+		}

+	}

 

-    if ($html != '') {

-        /**

-         * Filter the post status text on the author page.

-         *

-         * @since 1.0.0

-         * @param string $html The HTML of the status.

-         */

-        echo apply_filters('geodir_filter_status_text_on_author_page', $html);

-    }

+	if ($html != '') {

+		/**

+		 * Filter the post status text on the author page.

+		 *

+		 * @since 1.0.0

+		 * @param string $html The HTML of the status.

+		 */

+		echo apply_filters('geodir_filter_status_text_on_author_page', $html);

+	}

 

 

 }

@@ -2630,21 +2630,21 @@ 
  */

 function geodir_init_no_rating()

 {

-    if (get_option('geodir_disable_rating')) {

-        remove_action('comment_form_logged_in_after', 'geodir_comment_rating_fields');

-        remove_action('comment_form_before_fields', 'geodir_comment_rating_fields');

-        remove_action('comment_form_logged_in_after', 'geodir_reviewrating_comment_rating_fields');

-        remove_action('comment_form_before_fields', 'geodir_reviewrating_comment_rating_fields');

-        remove_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');

-        remove_action('add_meta_boxes', 'geodir_reviewrating_comment_metabox', 13);

-        remove_filter('comment_text', 'geodir_wrap_comment_text', 40);

-

-        add_action('comment_form_logged_in_after', 'geodir_no_rating_rating_fields');

-        add_action('comment_form_before_fields', 'geodir_no_rating_rating_fields');

-        add_filter('comment_text', 'geodir_no_rating_comment_text', 100, 2);

-        add_filter('geodir_detail_page_review_rating_html', 'geodir_no_rating_review_rating_html', 100);

-        add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);

-    }

+	if (get_option('geodir_disable_rating')) {

+		remove_action('comment_form_logged_in_after', 'geodir_comment_rating_fields');

+		remove_action('comment_form_before_fields', 'geodir_comment_rating_fields');

+		remove_action('comment_form_logged_in_after', 'geodir_reviewrating_comment_rating_fields');

+		remove_action('comment_form_before_fields', 'geodir_reviewrating_comment_rating_fields');

+		remove_action('add_meta_boxes_comment', 'geodir_comment_add_meta_box');

+		remove_action('add_meta_boxes', 'geodir_reviewrating_comment_metabox', 13);

+		remove_filter('comment_text', 'geodir_wrap_comment_text', 40);

+

+		add_action('comment_form_logged_in_after', 'geodir_no_rating_rating_fields');

+		add_action('comment_form_before_fields', 'geodir_no_rating_rating_fields');

+		add_filter('comment_text', 'geodir_no_rating_comment_text', 100, 2);

+		add_filter('geodir_detail_page_review_rating_html', 'geodir_no_rating_review_rating_html', 100);

+		add_filter('geodir_get_sort_options', 'geodir_no_rating_get_sort_options', 100, 2);

+	}

 }

 

 /**

@@ -2656,24 +2656,24 @@ 
  */

 function geodir_no_rating_rating_fields()

 {

-    global $post;

+	global $post;

 

-    $post_types = geodir_get_posttypes();

+	$post_types = geodir_get_posttypes();

 

-    if (!empty($post) && isset($post->post_type) && in_array($post->post_type, $post_types)) {

-        if (is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php')) {

-            if (get_option('geodir_reviewrating_enable_rating')) {

-                echo '<input type="hidden" value="1" name="geodir_rating[overall]" />';

-            } else {

-                echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />';

-            }

-            if (get_option('geodir_reviewrating_enable_images')) {

-                geodir_reviewrating_rating_img_html();

-            }

-        } else {

-            echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />';

-        }

-    }

+	if (!empty($post) && isset($post->post_type) && in_array($post->post_type, $post_types)) {

+		if (is_plugin_active('geodir_review_rating_manager/geodir_review_rating_manager.php')) {

+			if (get_option('geodir_reviewrating_enable_rating')) {

+				echo '<input type="hidden" value="1" name="geodir_rating[overall]" />';

+			} else {

+				echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />';

+			}

+			if (get_option('geodir_reviewrating_enable_images')) {

+				geodir_reviewrating_rating_img_html();

+			}

+		} else {

+			echo '<input type="hidden" id="geodir_overallrating" name="geodir_overallrating" value="1" />';

+		}

+	}

 }

 

 /**

@@ -2687,11 +2687,11 @@ 
  */

 function geodir_no_rating_comment_text($content, $comment = '')

 {

-    if (!is_admin()) {

-        return '<div class="description">' . $content . '</div>';

-    } else {

-        return $content;

-    }

+	if (!is_admin()) {

+		return '<div class="description">' . $content . '</div>';

+	} else {

+		return $content;

+	}

 }

 

 /**

@@ -2704,7 +2704,7 @@ 
  */

 function geodir_no_rating_review_rating_html($content = '')

 {

-    return NULL;

+	return NULL;

 }

 

 /**

@@ -2718,19 +2718,19 @@ 
  */

 function geodir_no_rating_get_sort_options($options, $post_type = '')

 {

-    $new_options = array();

-    if (!empty($options)) {

-        foreach ($options as $option) {

-            if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {

-                continue;

-            }

-            $new_options[] = $option;

-        }

+	$new_options = array();

+	if (!empty($options)) {

+		foreach ($options as $option) {

+			if (is_object($option) && isset($option->htmlvar_name) && $option->htmlvar_name == 'overall_rating') {

+				continue;

+			}

+			$new_options[] = $option;

+		}

 

-        $options = $new_options;

-    }

+		$options = $new_options;

+	}

 

-    return $options;

+	return $options;

 }

 

 add_filter('geodir_all_js_msg', 'geodir_all_js_msg_no_rating', 100);

@@ -2744,11 +2744,11 @@ 
  */

 function geodir_all_js_msg_no_rating($msg = array())

 {

-    if (get_option('geodir_disable_rating')) {

-        $msg['gd_cmt_no_rating'] = true;

-    }

+	if (get_option('geodir_disable_rating')) {

+		$msg['gd_cmt_no_rating'] = true;

+	}

 

-    return $msg;

+	return $msg;

 }

 

 add_filter('body_class', 'geodir_body_class_no_rating', 100);

@@ -2762,13 +2762,13 @@ 
  */

 function geodir_body_class_no_rating($classes = array())

 {

-    if (get_option('geodir_disable_rating')) {

-        $classes[] = 'gd-no-rating';

-    }

+	if (get_option('geodir_disable_rating')) {

+		$classes[] = 'gd-no-rating';

+	}

     

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

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

 

-    return $classes;

+	return $classes;

 }

 

 add_filter('admin_body_class', 'geodir_admin_body_class_no_rating', 100);

@@ -2782,13 +2782,13 @@ 
  */

 function geodir_admin_body_class_no_rating($class = '')

 {

-    if (get_option('geodir_disable_rating')) {

-        $class .= ' gd-no-rating';

-    }

+	if (get_option('geodir_disable_rating')) {

+		$class .= ' gd-no-rating';

+	}

     

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

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

 

-    return $class;

+	return $class;

 }

 

 add_action('wp_head', 'geodir_wp_head_no_rating');

@@ -2801,10 +2801,10 @@ 
  */

 function geodir_wp_head_no_rating()

 {

-    if (get_option('geodir_disable_rating')) {

-        echo '<style>body .geodir-rating, body .geodir-bubble-rating, body .gd_ratings_module_box{display:none!important;}</style>';

-        echo '<script type="text/javascript">jQuery(function(){jQuery(".gd_rating_show").parent(".geodir-rating").remove();});</script>';

-    }

+	if (get_option('geodir_disable_rating')) {

+		echo '<style>body .geodir-rating, body .geodir-bubble-rating, body .gd_ratings_module_box{display:none!important;}</style>';

+		echo '<script type="text/javascript">jQuery(function(){jQuery(".gd_rating_show").parent(".geodir-rating").remove();});</script>';

+	}

 }

 

 add_filter('geodir_load_db_language', 'geodir_load_custom_field_translation');

@@ -2821,36 +2821,36 @@ 
  * @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();

-

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

-

-    /**

-     * Filters the geodirectory option names that requires to add for translation.

-     *

-     * @since 1.5.7

-     * @package GeoDirectory

-     *

-     * @param  array $gd_options Array of option names.

-     */

-    $gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);

-    $gd_options = array_unique($gd_options);

-

-    if (!empty($gd_options)) {

-        foreach ($gd_options as $gd_option) {

-            if ($gd_option != '' && $option_value = get_option($gd_option)) {

-                $option_value = is_string($option_value) ? stripslashes_deep($option_value) : '';

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

+

+	/**

+	 * Filters the geodirectory option names that requires to add for translation.

+	 *

+	 * @since 1.5.7

+	 * @package GeoDirectory

+	 *

+	 * @param  array $gd_options Array of option names.

+	 */

+	$gd_options = apply_filters('geodir_gd_options_for_translation', $gd_options);

+	$gd_options = array_unique($gd_options);

+

+	if (!empty($gd_options)) {

+		foreach ($gd_options as $gd_option) {

+			if ($gd_option != '' && $option_value = get_option($gd_option)) {

+				$option_value = is_string($option_value) ? stripslashes_deep($option_value) : '';

                 

-                if ($option_value != '' && !in_array($option_value, $translation_texts)) {

-                    $translation_texts[] = stripslashes_deep($option_value);

-                }

-            }

-        }

-    }

+				if ($option_value != '' && !in_array($option_value, $translation_texts)) {

+					$translation_texts[] = stripslashes_deep($option_value);

+				}

+			}

+		}

+	}

 

-    $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

+	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

-    return $translation_texts;

+	return $translation_texts;

 }

 

 add_filter('geodir_load_db_language', 'geodir_load_gd_options_text_translation');

@@ -2864,15 +2864,15 @@ 
 

 add_filter('get_comments_link', 'gd_get_comments_link', 10, 2);

 function gd_get_comments_link($comments_link, $post_id) {

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $all_postypes = geodir_get_posttypes();

-    if (in_array($post_type, $all_postypes)) {

-        $comments_link = str_replace('#comments', '#reviews', $comments_link);

-        $comments_link = str_replace('#respond', '#reviews', $comments_link);

-    }

+	$all_postypes = geodir_get_posttypes();

+	if (in_array($post_type, $all_postypes)) {

+		$comments_link = str_replace('#comments', '#reviews', $comments_link);

+		$comments_link = str_replace('#respond', '#reviews', $comments_link);

+	}

 

-    return $comments_link;

+	return $comments_link;

 }

 

 

@@ -2890,11 +2890,11 @@ 
 function geodir_add_nav_menu_class( $args )

 {

 

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

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

-        }

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

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

+		}

     

-    return $args;

+	return $args;

 }

 

 add_filter( 'wp_nav_menu_args', 'geodir_add_nav_menu_class' );

@@ -2911,15 +2911,15 @@ 
  * @return string Filtered locale ID.

  */

 function geodir_wpml_filter_locale($locale) {

-    global $sitepress;

+	global $sitepress;

     

-    $post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : '');

+	$post_type = !empty($_REQUEST['post_type']) ? $_REQUEST['post_type'] : (!empty($_REQUEST['post']) ? get_post_type($_REQUEST['post']) : '');

     

-    if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {

-        $locale = $sitepress->get_locale($current_lang);

-    }

+	if (!empty($sitepress) && $sitepress->is_post_edit_screen() && $post_type && in_array($post_type, geodir_get_posttypes()) && $current_lang = $sitepress->get_current_language()) {

+		$locale = $sitepress->get_locale($current_lang);

+	}

     

-    return $locale;

+	return $locale;

 }

 

 /**

@@ -2929,15 +2929,15 @@ 
  * @package GeoDirectory

  */

 function geodir_wpml_set_filter() {

-    if (function_exists('icl_object_id')) {

-        global $sitepress;

+	if (function_exists('icl_object_id')) {

+		global $sitepress;

         

-        if ($sitepress->get_setting('sync_comments_on_duplicates')) {

-            add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);

-        }

+		if ($sitepress->get_setting('sync_comments_on_duplicates')) {

+			add_action('comment_post', 'gepdir_wpml_sync_comment', 100, 1);

+		}

         

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

-    }

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

+	}

 }

 add_filter('plugins_loaded', 'geodir_wpml_set_filter');

 

@@ -2950,44 +2950,44 @@ 
  * @return array Filtered languages.

  */

 function geodir_wpml_filter_ls_languages($languages) {

-    global $gd_icl_ls_languages;

+	global $gd_icl_ls_languages;

     

-    if (geodir_is_geodir_page()) {

-        if ($gd_icl_ls_languages) {

-            return $languages;

-        }

+	if (geodir_is_geodir_page()) {

+		if ($gd_icl_ls_languages) {

+			return $languages;

+		}

         

-        $keep_vars = array();

+		$keep_vars = array();

         

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

-            $keep_vars = array('listing_type', 'package_id');

-        } else if (geodir_is_page('search')) {

-            $keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');

-        } else if (geodir_is_page('author')) {

-            $keep_vars = array('geodir_dashbord', 'stype', 'list');

-        } else if (geodir_is_page('login')) {

-            $keep_vars = array('forgot', 'signup');

-        }        

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

+			$keep_vars = array('listing_type', 'package_id');

+		} else if (geodir_is_page('search')) {

+			$keep_vars = array('geodir_search', 'stype', 'snear', 'set_location_type', 'set_location_val', 'sgeo_lat', 'sgeo_lon');

+		} else if (geodir_is_page('author')) {

+			$keep_vars = array('geodir_dashbord', 'stype', 'list');

+		} else if (geodir_is_page('login')) {

+			$keep_vars = array('forgot', 'signup');

+		}        

         

-        if (!empty($keep_vars)) {

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

-                $filter_url = $url['url'];

+		if (!empty($keep_vars)) {

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

+				$filter_url = $url['url'];

                 

-                foreach ($keep_vars as $var) {

-                    if (isset($_GET[$var]) && !is_array($_GET[$var])) {

-                        $filter_url = remove_query_arg(array($var), $filter_url);

-                        $filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url);

-                    }

-                }

+				foreach ($keep_vars as $var) {

+					if (isset($_GET[$var]) && !is_array($_GET[$var])) {

+						$filter_url = remove_query_arg(array($var), $filter_url);

+						$filter_url = add_query_arg(array($var => $_GET[$var]), $filter_url);

+					}

+				}

                 

-                if ($filter_url != $url['url']) {

-                    $languages[$code]['url'] = $filter_url;

-                }

-            }

-            $gd_icl_ls_languages = true;

-        }

-    }

+				if ($filter_url != $url['url']) {

+					$languages[$code]['url'] = $filter_url;

+				}

+			}

+			$gd_icl_ls_languages = true;

+		}

+	}

 

-    return $languages;

+	return $languages;

 }

 add_filter( 'icl_ls_languages', 'geodir_wpml_filter_ls_languages', 11, 1 );
\ No newline at end of file

language.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 define('LISTING_DETAILS_TEXT', __('Enter Listing Details', 'geodirectory'));

 

 define('PLACE_TITLE_TEXT', __('Listing Title', 'geodirectory')); // depreciated @since 1.6.3

-define('PLACE_DESC_TEXT', __('Listing Description', 'geodirectory'));// depreciated @since 1.6.3

+define('PLACE_DESC_TEXT', __('Listing Description', 'geodirectory')); // depreciated @since 1.6.3

 

 define('LISTING_ADDRESS_TEXT', __('Listing Address:', 'geodirectory'));

 define('PLACE_ADDRESS', __('Address:', 'geodirectory'));

geodirectory-templates/listing-detail.php

Indentation +31 added lines, -31 removed lines

@@ -11,7 +11,7 @@ 
 

 // We are submitting iframes etc so we turn this off to allow them to show on preview.

 if(geodir_is_page('preview')){

-    header("X-XSS-Protection: 0");

+	header("X-XSS-Protection: 0");

 }

 

 

@@ -38,12 +38,12 @@ 
 

 ###### SIDEBAR ON LEFT ######

 if (get_option('geodir_detail_sidebar_left_section')) {

-    /**

-     * Adds the details page sidebar to the details template page.

-     *

-     * @since 1.1.0

-     */

-    do_action('geodir_detail_sidebar');

+	/**

+	 * Adds the details page sidebar to the details template page.

+	 *

+	 * @since 1.1.0

+	 */

+	do_action('geodir_detail_sidebar');

 }

 

 ###### MAIN CONTENT WRAPPERS OPEN ######

@@ -72,29 +72,29 @@ 
 // this call the main page content

 global $preview;

 if (have_posts() && !$preview) {

-    the_post();

-    global $post, $post_images;

-    /**

-     * Calls the details page main content on the details template page.

-     *

-     * @since 1.1.0

-     * @param object $post The current post object.

-     */

-    do_action('geodir_details_main_content', $post);

+	the_post();

+	global $post, $post_images;

+	/**

+	 * Calls the details page main content on the details template page.

+	 *

+	 * @since 1.1.0

+	 * @param object $post The current post object.

+	 */

+	do_action('geodir_details_main_content', $post);

 } elseif ($preview) {

-    /**

-     * Called on the details page if the page is being previewed.

-     *

-     * This sets the value of `$post` to the preview values before the main content is called.

-     *

-     * @since 1.1.0

-     */

-    do_action('geodir_action_geodir_set_preview_post'); // set the $post to the preview values

-    if (defined( 'GD_TESTING_MODE' )) {

-        global $post;

-    }

-    /** This action is documented in geodirectory-templates/listing-detail.php */

-    do_action('geodir_details_main_content', $post);

+	/**

+	 * Called on the details page if the page is being previewed.

+	 *

+	 * This sets the value of `$post` to the preview values before the main content is called.

+	 *

+	 * @since 1.1.0

+	 */

+	do_action('geodir_action_geodir_set_preview_post'); // set the $post to the preview values

+	if (defined( 'GD_TESTING_MODE' )) {

+		global $post;

+	}

+	/** This action is documented in geodirectory-templates/listing-detail.php */

+	do_action('geodir_details_main_content', $post);

 }

 

 /** This action is documented in geodirectory-templates/geodir-home.php */

@@ -118,8 +118,8 @@ 
 

 ###### SIDEBAR ON RIGHT ######

 if (!get_option('geodir_detail_sidebar_left_section')) {

-    /** This action is documented in geodirectory-templates/listing-detail.php */

-    do_action('geodir_detail_sidebar');

+	/** This action is documented in geodirectory-templates/listing-detail.php */

+	do_action('geodir_detail_sidebar');

 }

 

 

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
  */

 

 // We are submitting iframes etc so we turn this off to allow them to show on preview.

-if(geodir_is_page('preview')){

+if (geodir_is_page('preview')) {

     header("X-XSS-Protection: 0");

 }

 

@@ -63,7 +63,7 @@ 
  * @param string $itemtype The itemtype value of the HTML element.

  * @see 'geodir_article_close'

  */

-do_action('geodir_article_open', 'details-page', 'post-' . get_the_ID(), get_post_class(), '');

+do_action('geodir_article_open', 'details-page', 'post-'.get_the_ID(), get_post_class(), '');

 

 ###### MAIN CONTENT ######

 /** This action is documented in geodirectory-templates/geodir-home.php */

@@ -90,7 +90,7 @@ 
      * @since 1.1.0

      */

     do_action('geodir_action_geodir_set_preview_post'); // set the $post to the preview values

-    if (defined( 'GD_TESTING_MODE' )) {

+    if (defined('GD_TESTING_MODE')) {

         global $post;

     }

     /** This action is documented in geodirectory-templates/listing-detail.php */

geodirectory-functions/general_functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -2301,7 +2301,7 @@ 
  * @global string $table_prefix  WordPress Database Table prefix.

  *

  * @param array $query_args      The query array.

- * @param  int|bool $count_only  If true returns listings count only, otherwise returns array

+ * @param  boolean $count_only  If true returns listings count only, otherwise returns array

  *

  * @return mixed Result object.

  */

@@ -3958,7 +3958,7 @@ 
  * @since   1.0.0

  * @since   1.6.1 Fixed add listing page load time.

  * @package GeoDirectory

- * @return bool

+ * @return null|boolean

  */

 function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {

 	if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {

Braces +9 added lines, -5 removed lines

@@ -29,8 +29,10 @@ 
 

 	if ( is_ssl() ) :

 		return str_replace( 'http://', 'https://', WP_PLUGIN_URL ) . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) );

-	else :

-		return WP_PLUGIN_URL . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) );

+	else {
+		:

+		return WP_PLUGIN_URL . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) );
+	}
 	endif;

 }

 

@@ -764,7 +766,7 @@ 
 			$post_author = get_post_field( 'post_author', $post_id );

 			if(is_super_admin( $post_author  )){// if admin probably not the post author so change name

 				$toEmailName = __('Business Owner','geodirectory');

-			}elseif(defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id,'claimed')!='1'){// if claim manager installed but listing not claimed

+			} elseif(defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id,'claimed')!='1'){// if claim manager installed but listing not claimed

 				$toEmailName = __('Business Owner','geodirectory');

 			}

 

@@ -1569,12 +1571,14 @@ 
 	 */

 	function geodir_allow_wpadmin() {

 		global $wpdb;

-		if ( get_option( 'geodir_allow_wpadmin' ) == '0' && is_user_logged_in() && ( ! defined( 'DOING_AJAX' ) ) ) // checking action in request to allow ajax request go through

+		if ( get_option( 'geodir_allow_wpadmin' ) == '0' && is_user_logged_in() && ( ! defined( 'DOING_AJAX' ) ) ) {
+			// checking action in request to allow ajax request go through

 		{

 			if ( current_user_can( 'administrator' ) ) {

 			} else {

 

-				wp_redirect( home_url() );

+				wp_redirect( home_url() );
+		}
 				exit;

 			}

 

Indentation +8 added lines, -8 removed lines

@@ -325,7 +325,7 @@ 
 			break;

 		case 'preview':

 			if ( ( is_page() && get_query_var( 'page_id' ) == geodir_preview_page_id() ) && isset( $_REQUEST['listing_type'] )

-			     && in_array( $_REQUEST['listing_type'], geodir_get_posttypes() )

+				 && in_array( $_REQUEST['listing_type'], geodir_get_posttypes() )

 			) {

 				return true;

 			}

@@ -526,9 +526,9 @@ 
 

 //check if homepage

 		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] )

-		     && ! isset( $wp->query_vars['page_id'] )

-		     && ! isset( $wp->query_vars['pagename'] )

-		     && is_page_geodir_home()

+			 && ! isset( $wp->query_vars['page_id'] )

+			 && ! isset( $wp->query_vars['pagename'] )

+			 && is_page_geodir_home()

 		) {

 			$wp->query_vars['gd_is_geodir_page'] = true;

 		}

@@ -713,8 +713,8 @@ 
 		$deltaLatitude  = deg2rad( (float) $point2['latitude'] - (float) $point1['latitude'] );

 		$deltaLongitude = deg2rad( (float) $point2['longitude'] - (float) $point1['longitude'] );

 		$a              = sin( $deltaLatitude / 2 ) * sin( $deltaLatitude / 2 ) +

-		                  cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) *

-		                  sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 );

+						  cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) *

+						  sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 );

 		$c              = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) );

 		$distance       = $earthMeanRadius * $c;

 

@@ -5290,7 +5290,7 @@ 
  * @param string $name The name of the string which helps to know what's being translated.

  */

 function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {

-    do_action( 'wpml_register_single_string', $domain, $name, $string );

+	do_action( 'wpml_register_single_string', $domain, $name, $string );

 }

 

 /**

@@ -5306,5 +5306,5 @@ 
  * @return string The translated string.

  */

 function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {

-    return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code );

+	return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code );

 }
\ No newline at end of file

Spacing +1271 added lines, -1271 removed lines

@@ -10,7 +10,7 @@ 
 /**

  * Get All Plugin functions from WordPress

  */

-include_once( ABSPATH . 'wp-admin/includes/plugin.php' );

+include_once(ABSPATH.'wp-admin/includes/plugin.php');

 

 /*-----------------------------------------------------------------------------------*/

 /* Helper functions */

@@ -27,10 +27,10 @@ 
  */

 function geodir_plugin_url() {

 

-	if ( is_ssl() ) :

-		return str_replace( 'http://', 'https://', WP_PLUGIN_URL ) . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) );

+	if (is_ssl()) :

+		return str_replace('http://', 'https://', WP_PLUGIN_URL)."/".plugin_basename(dirname(dirname(__FILE__)));

 	else :

-		return WP_PLUGIN_URL . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) );

+		return WP_PLUGIN_URL."/".plugin_basename(dirname(dirname(__FILE__)));

 	endif;

 }

 

@@ -45,10 +45,10 @@ 
  * @return string example url eg: /home/geo/public_html/wp-content/plugins/geodirectory

  */

 function geodir_plugin_path() {

-	if ( defined( 'GD_TESTING_MODE' ) && GD_TESTING_MODE ) {

-		return dirname( dirname( __FILE__ ) );

+	if (defined('GD_TESTING_MODE') && GD_TESTING_MODE) {

+		return dirname(dirname(__FILE__));

 	} else {

-		return WP_PLUGIN_DIR . "/" . plugin_basename( dirname( dirname( __FILE__ ) ) );

+		return WP_PLUGIN_DIR."/".plugin_basename(dirname(dirname(__FILE__)));

 	}

 }

 

@@ -63,10 +63,10 @@ 
  * @return bool true or false.

  * @todo    check if this is faster than normal WP check and remove if not.

  */

-function geodir_is_plugin_active( $plugin ) {

-	$active_plugins = get_option( 'active_plugins' );

-	foreach ( $active_plugins as $key => $active_plugin ) {

-		if ( strstr( $active_plugin, $plugin ) ) {

+function geodir_is_plugin_active($plugin) {

+	$active_plugins = get_option('active_plugins');

+	foreach ($active_plugins as $key => $active_plugin) {

+		if (strstr($active_plugin, $plugin)) {

 			return true;

 		}

 	}

@@ -88,8 +88,8 @@ 
  *

  * @return bool|int|string the formatted date.

  */

-function geodir_get_formated_date( $date ) {

-	return mysql2date( get_option( 'date_format' ), $date );

+function geodir_get_formated_date($date) {

+	return mysql2date(get_option('date_format'), $date);

 }

 

 /**

@@ -105,8 +105,8 @@ 
  *

  * @return bool|int|string the formatted time.

  */

-function geodir_get_formated_time( $time ) {

-	return mysql2date( get_option( 'time_format' ), $time, $translate = true );

+function geodir_get_formated_time($time) {

+	return mysql2date(get_option('time_format'), $time, $translate = true);

 }

 

 

@@ -124,35 +124,35 @@ 
  *

  * @return string Formatted link.

  */

-function geodir_getlink( $url, $params = array(), $use_existing_arguments = false ) {

-	if ( $use_existing_arguments ) {

+function geodir_getlink($url, $params = array(), $use_existing_arguments = false) {

+	if ($use_existing_arguments) {

 		$params = $params + $_GET;

 	}

-	if ( ! $params ) {

+	if (!$params) {

 		return $url;

 	}

 	$link = $url;

-	if ( strpos( $link, '?' ) === false ) {

+	if (strpos($link, '?') === false) {

 		$link .= '?';

 	} //If there is no '?' add one at the end

-	elseif ( strpos( $link, '//maps.google.com/maps/api/js?language=' ) ) {

+	elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) {

 		$link .= '&';

 	} //If there is no '&' at the END, add one.

-	elseif ( ! preg_match( '/(\?|\&(amp;)?)$/', $link ) ) {

+	elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) {

 		$link .= '&';

 	} //If there is no '&' at the END, add one.

 

 	$params_arr = array();

-	foreach ( $params as $key => $value ) {

-		if ( gettype( $value ) == 'array' ) { //Handle array data properly

-			foreach ( $value as $val ) {

-				$params_arr[] = $key . '[]=' . urlencode( $val );

+	foreach ($params as $key => $value) {

+		if (gettype($value) == 'array') { //Handle array data properly

+			foreach ($value as $val) {

+				$params_arr[] = $key.'[]='.urlencode($val);

 			}

 		} else {

-			$params_arr[] = $key . '=' . urlencode( $value );

+			$params_arr[] = $key.'='.urlencode($value);

 		}

 	}

-	$link .= implode( '&', $params_arr );

+	$link .= implode('&', $params_arr);

 

 	return $link;

 }

@@ -169,18 +169,18 @@ 
  *

  * @return string Listing page url if valid. Otherwise home url will be returned.

  */

-function geodir_get_addlisting_link( $post_type = '' ) {

+function geodir_get_addlisting_link($post_type = '') {

 	global $wpdb;

 

 	//$check_pkg  = $wpdb->get_var("SELECT pid FROM ".GEODIR_PRICE_TABLE." WHERE post_type='".$post_type."' and status != '0'");

 	$check_pkg = 1;

-	if ( post_type_exists( $post_type ) && $check_pkg ) {

+	if (post_type_exists($post_type) && $check_pkg) {

 

-		$add_listing_link = get_page_link( geodir_add_listing_page_id() );

+		$add_listing_link = get_page_link(geodir_add_listing_page_id());

 

-		return esc_url( add_query_arg( array( 'listing_type' => $post_type ), $add_listing_link ) );

+		return esc_url(add_query_arg(array('listing_type' => $post_type), $add_listing_link));

 	} else {

-		return get_bloginfo( 'url' );

+		return get_bloginfo('url');

 	}

 }

 

@@ -208,7 +208,7 @@ 
 	if (!empty($_SERVER['PHP_SELF']) && !empty($_SERVER['REQUEST_URI'])) {

 		// To build the entire URI we need to prepend the protocol, and the http host

 		// to the URI string.

-		$pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];

+		$pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];

 	} else {

 		/*

 		 * Since we do not have REQUEST_URI to work with, we will assume we are

@@ -217,11 +217,11 @@ 
 		 *

 		 * IIS uses the SCRIPT_NAME variable instead of a REQUEST_URI variable... thanks, MS

 		 */

-		$pageURL .= $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME'];

+		$pageURL .= $_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'];

 		

 		// If the query string exists append it to the URI string

 		if (isset($_SERVER['QUERY_STRING']) && !empty($_SERVER['QUERY_STRING'])) {

-			$pageURL .= '?' . $_SERVER['QUERY_STRING'];

+			$pageURL .= '?'.$_SERVER['QUERY_STRING'];

 		}

 	}

 	

@@ -232,7 +232,7 @@ 
 	 *

 	 * @param string $pageURL The URL of the current page.

 	 */

-	return apply_filters( 'geodir_curPageURL', $pageURL );

+	return apply_filters('geodir_curPageURL', $pageURL);

 }

 

 /**

@@ -247,12 +247,12 @@ 
  *

  * @return string Cleaned variable.

  */

-function geodir_clean( $string ) {

+function geodir_clean($string) {

 

-	$string = trim( strip_tags( stripslashes( $string ) ) );

-	$string = str_replace( " ", "-", $string ); // Replaces all spaces with hyphens.

-	$string = preg_replace( '/[^A-Za-z0-9\-\_]/', '', $string ); // Removes special chars.

-	$string = preg_replace( '/-+/', '-', $string ); // Replaces multiple hyphens with single one.

+	$string = trim(strip_tags(stripslashes($string)));

+	$string = str_replace(" ", "-", $string); // Replaces all spaces with hyphens.

+	$string = preg_replace('/[^A-Za-z0-9\-\_]/', '', $string); // Removes special chars.

+	$string = preg_replace('/-+/', '-', $string); // Replaces multiple hyphens with single one.

 

 	return $string;

 }

@@ -266,13 +266,13 @@ 
  */

 function geodir_get_weekday() {

 	return array(

-		__( 'Sunday', 'geodirectory' ),

-		__( 'Monday', 'geodirectory' ),

-		__( 'Tuesday', 'geodirectory' ),

-		__( 'Wednesday', 'geodirectory' ),

-		__( 'Thursday', 'geodirectory' ),

-		__( 'Friday', 'geodirectory' ),

-		__( 'Saturday', 'geodirectory' )

+		__('Sunday', 'geodirectory'),

+		__('Monday', 'geodirectory'),

+		__('Tuesday', 'geodirectory'),

+		__('Wednesday', 'geodirectory'),

+		__('Thursday', 'geodirectory'),

+		__('Friday', 'geodirectory'),

+		__('Saturday', 'geodirectory')

 	);

 }

 

@@ -285,11 +285,11 @@ 
  */

 function geodir_get_weeks() {

 	return array(

-		__( 'First', 'geodirectory' ),

-		__( 'Second', 'geodirectory' ),

-		__( 'Third', 'geodirectory' ),

-		__( 'Fourth', 'geodirectory' ),

-		__( 'Last', 'geodirectory' )

+		__('First', 'geodirectory'),

+		__('Second', 'geodirectory'),

+		__('Third', 'geodirectory'),

+		__('Fourth', 'geodirectory'),

+		__('Last', 'geodirectory')

 	);

 }

 

@@ -308,112 +308,112 @@ 
  *

  * @return bool If valid returns true. Otherwise false.

  */

-function geodir_is_page( $gdpage = '' ) {

+function geodir_is_page($gdpage = '') {

 

 	global $wp_query, $post, $wp;

 	//if(!is_admin()):

 

-	switch ( $gdpage ):

+	switch ($gdpage):

 		case 'add-listing':

 

-			if ( is_page() && get_query_var( 'page_id' ) == geodir_add_listing_page_id() ) {

+			if (is_page() && get_query_var('page_id') == geodir_add_listing_page_id()) {

 				return true;

-			} elseif ( is_page() && isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {

+			} elseif (is_page() && isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

 				return true;

 			}

 

 			break;

 		case 'preview':

-			if ( ( is_page() && get_query_var( 'page_id' ) == geodir_preview_page_id() ) && isset( $_REQUEST['listing_type'] )

-			     && in_array( $_REQUEST['listing_type'], geodir_get_posttypes() )

+			if ((is_page() && get_query_var('page_id') == geodir_preview_page_id()) && isset($_REQUEST['listing_type'])

+			     && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

 			) {

 				return true;

 			}

 			break;

 		case 'listing-success':

-			if ( is_page() && get_query_var( 'page_id' ) == geodir_success_page_id() ) {

+			if (is_page() && get_query_var('page_id') == geodir_success_page_id()) {

 				return true;

 			}

 			break;

 		case 'detail':

-			$post_type = get_query_var( 'post_type' );

-			if ( is_array( $post_type ) ) {

-				$post_type = reset( $post_type );

+			$post_type = get_query_var('post_type');

+			if (is_array($post_type)) {

+				$post_type = reset($post_type);

 			}

-			if ( is_single() && in_array( $post_type, geodir_get_posttypes() ) ) {

+			if (is_single() && in_array($post_type, geodir_get_posttypes())) {

 				return true;

 			}

 			break;

 		case 'pt':

-			$post_type = get_query_var( 'post_type' );

-			if ( is_array( $post_type ) ) {

-				$post_type = reset( $post_type );

+			$post_type = get_query_var('post_type');

+			if (is_array($post_type)) {

+				$post_type = reset($post_type);

 			}

-			if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) && ! is_tax() ) {

+			if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes()) && !is_tax()) {

 				return true;

 			}

 

 			break;

 		case 'listing':

-			if ( is_tax() && geodir_get_taxonomy_posttype() ) {

+			if (is_tax() && geodir_get_taxonomy_posttype()) {

 				global $current_term, $taxonomy, $term;

 

 				return true;

 			}

-			$post_type = get_query_var( 'post_type' );

-			if ( is_array( $post_type ) ) {

-				$post_type = reset( $post_type );

+			$post_type = get_query_var('post_type');

+			if (is_array($post_type)) {

+				$post_type = reset($post_type);

 			}

-			if ( is_post_type_archive() && in_array( $post_type, geodir_get_posttypes() ) ) {

+			if (is_post_type_archive() && in_array($post_type, geodir_get_posttypes())) {

 				return true;

 			}

 

 			break;

 		case 'home':

 

-			if ( ( is_page() && get_query_var( 'page_id' ) == geodir_home_page_id() ) || is_page_geodir_home() ) {

+			if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home()) {

 				return true;

 			}

 

 			break;

 		case 'location':

-			if ( is_page() && get_query_var( 'page_id' ) == geodir_location_page_id() ) {

+			if (is_page() && get_query_var('page_id') == geodir_location_page_id()) {

 				return true;

 			}

 			break;

 		case 'author':

-			if ( is_author() && isset( $_REQUEST['geodir_dashbord'] ) ) {

+			if (is_author() && isset($_REQUEST['geodir_dashbord'])) {

 				return true;

 			}

 

-			if ( function_exists( 'bp_loggedin_user_id' ) && function_exists( 'bp_displayed_user_id' ) && $my_id = (int) bp_loggedin_user_id() ) {

-				if ( ( (bool) bp_is_current_component( 'listings' ) || (bool) bp_is_current_component( 'favorites' ) ) && $my_id > 0 && $my_id == (int) bp_displayed_user_id() ) {

+			if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int) bp_loggedin_user_id()) {

+				if (((bool) bp_is_current_component('listings') || (bool) bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int) bp_displayed_user_id()) {

 					return true;

 				}

 			}

 			break;

 		case 'search':

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

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

 				return true;

 			}

 			break;

 		case 'info':

-			if ( is_page() && get_query_var( 'page_id' ) == geodir_info_page_id() ) {

+			if (is_page() && get_query_var('page_id') == geodir_info_page_id()) {

 				return true;

 			}

 			break;

 		case 'login':

-			if ( is_page() && get_query_var( 'page_id' ) == geodir_login_page_id() ) {

+			if (is_page() && get_query_var('page_id') == geodir_login_page_id()) {

 				return true;

 			}

 			break;

 		case 'checkout':

-			if ( is_page() && function_exists( 'geodir_payment_checkout_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_checkout_page_id() ) {

+			if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id()) {

 				return true;

 			}

 			break;

 		case 'invoices':

-			if ( is_page() && function_exists( 'geodir_payment_invoices_page_id' ) && get_query_var( 'page_id' ) == geodir_payment_invoices_page_id() ) {

+			if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id()) {

 				return true;

 			}

 			break;

@@ -438,25 +438,25 @@ 
  *

  * @param object $wp WordPress object.

  */

-function geodir_set_is_geodir_page( $wp ) {

-	if ( ! is_admin() ) {

+function geodir_set_is_geodir_page($wp) {

+	if (!is_admin()) {

 		//$wp->query_vars['gd_is_geodir_page'] = false;

 		//print_r()

-		if ( empty( $wp->query_vars ) || ! array_diff( array_keys( $wp->query_vars ), array(

+		if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array(

 				'preview',

 				'page',

 				'paged',

 				'cpage'

-			) )

+			))

 		) {

-			if ( geodir_is_page( 'home' ) ) {

+			if (geodir_is_page('home')) {

 				$wp->query_vars['gd_is_geodir_page'] = true;

 			}

 

 

 		}

 

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['page_id'] ) ) {

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['page_id'])) {

 			if (

 				$wp->query_vars['page_id'] == geodir_add_listing_page_id()

 				|| $wp->query_vars['page_id'] == geodir_preview_page_id()

@@ -465,26 +465,26 @@ 
 				|| $wp->query_vars['page_id'] == geodir_home_page_id()

 				|| $wp->query_vars['page_id'] == geodir_info_page_id()

 				|| $wp->query_vars['page_id'] == geodir_login_page_id()

-				|| ( function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() )

-				|| ( function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() )

+				|| (function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())

+				|| (function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())

 			) {

 				$wp->query_vars['gd_is_geodir_page'] = true;

 			}

 		}

 

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['pagename'] ) ) {

-			$page = get_page_by_path( $wp->query_vars['pagename'] );

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['pagename'])) {

+			$page = get_page_by_path($wp->query_vars['pagename']);

 

-			if ( ! empty( $page ) && (

+			if (!empty($page) && (

 					$page->ID == geodir_add_listing_page_id()

 					|| $page->ID == geodir_preview_page_id()

 					|| $page->ID == geodir_success_page_id()

 					|| $page->ID == geodir_location_page_id()

-					|| ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_home_page_id() )

-					|| ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_info_page_id() )

-					|| ( isset( $wp->query_vars['page_id'] ) && $wp->query_vars['page_id'] == geodir_login_page_id() )

-					|| ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_checkout_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id() )

-					|| ( isset( $wp->query_vars['page_id'] ) && function_exists( 'geodir_payment_invoices_page_id' ) && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id() )

+					|| (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_home_page_id())

+					|| (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_info_page_id())

+					|| (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_login_page_id())

+					|| (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())

+					|| (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())

 				)

 			) {

 				$wp->query_vars['gd_is_geodir_page'] = true;

@@ -492,20 +492,20 @@ 
 		}

 

 

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['post_type'] ) && $wp->query_vars['post_type'] != '' ) {

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {

 			$requested_post_type = $wp->query_vars['post_type'];

 			// check if this post type is geodirectory post types

 			$post_type_array = geodir_get_posttypes();

-			if ( in_array( $requested_post_type, $post_type_array ) ) {

+			if (in_array($requested_post_type, $post_type_array)) {

 				$wp->query_vars['gd_is_geodir_page'] = true;

 			}

 		}

 

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) ) {

-			$geodir_taxonomis = geodir_get_taxonomies( '', true );

-			if ( ! empty( $geodir_taxonomis ) ) {

-				foreach ( $geodir_taxonomis as $taxonomy ) {

-					if ( array_key_exists( $taxonomy, $wp->query_vars ) ) {

+		if (!isset($wp->query_vars['gd_is_geodir_page'])) {

+			$geodir_taxonomis = geodir_get_taxonomies('', true);

+			if (!empty($geodir_taxonomis)) {

+				foreach ($geodir_taxonomis as $taxonomy) {

+					if (array_key_exists($taxonomy, $wp->query_vars)) {

 						$wp->query_vars['gd_is_geodir_page'] = true;

 						break;

 					}

@@ -514,20 +514,20 @@ 
 

 		}

 

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $wp->query_vars['author_name'] ) && isset( $_REQUEST['geodir_dashbord'] ) ) {

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord'])) {

 			$wp->query_vars['gd_is_geodir_page'] = true;

 		}

 

 

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] ) && isset( $_REQUEST['geodir_search'] ) ) {

+		if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search'])) {

 			$wp->query_vars['gd_is_geodir_page'] = true;

 		}

 

 

 //check if homepage

-		if ( ! isset( $wp->query_vars['gd_is_geodir_page'] )

-		     && ! isset( $wp->query_vars['page_id'] )

-		     && ! isset( $wp->query_vars['pagename'] )

+		if (!isset($wp->query_vars['gd_is_geodir_page'])

+		     && !isset($wp->query_vars['page_id'])

+		     && !isset($wp->query_vars['pagename'])

 		     && is_page_geodir_home()

 		) {

 			$wp->query_vars['gd_is_geodir_page'] = true;

@@ -551,14 +551,14 @@ 
  */

 function geodir_is_geodir_page() {

 	global $wp;

-	if ( isset( $wp->query_vars['gd_is_geodir_page'] ) && $wp->query_vars['gd_is_geodir_page'] ) {

+	if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page']) {

 		return true;

 	} else {

 		return false;

 	}

 }

 

-if ( ! function_exists( 'geodir_get_imagesize' ) ) {

+if (!function_exists('geodir_get_imagesize')) {

 	/**

 	 * Get image size using the size key .

 	 *

@@ -569,13 +569,13 @@ 
 	 *

 	 * @return array|mixed|void|WP_Error If valid returns image size. Else returns error.

 	 */

-	function geodir_get_imagesize( $size = '' ) {

+	function geodir_get_imagesize($size = '') {

 

 		$imagesizes = array(

-			'list-thumb'   => array( 'w' => 283, 'h' => 188 ),

-			'thumbnail'    => array( 'w' => 125, 'h' => 125 ),

-			'widget-thumb' => array( 'w' => 50, 'h' => 50 ),

-			'slider-thumb' => array( 'w' => 100, 'h' => 100 )

+			'list-thumb'   => array('w' => 283, 'h' => 188),

+			'thumbnail'    => array('w' => 125, 'h' => 125),

+			'widget-thumb' => array('w' => 50, 'h' => 50),

+			'slider-thumb' => array('w' => 100, 'h' => 100)

 		);

 

 		/**

@@ -585,9 +585,9 @@ 
 		 *

 		 * @param array $imagesizes Image size array.

 		 */

-		$imagesizes = apply_filters( 'geodir_imagesizes', $imagesizes );

+		$imagesizes = apply_filters('geodir_imagesizes', $imagesizes);

 

-		if ( ! empty( $size ) && array_key_exists( $size, $imagesizes ) ) {

+		if (!empty($size) && array_key_exists($size, $imagesizes)) {

 			/**

 			 * Filters image size of the passed key.

 			 *

@@ -595,11 +595,11 @@ 
 			 *

 			 * @param array $imagesizes [$size] Image size array of the passed key.

 			 */

-			return apply_filters( 'geodir_get_imagesize_' . $size, $imagesizes[ $size ] );

+			return apply_filters('geodir_get_imagesize_'.$size, $imagesizes[$size]);

 

-		} elseif ( ! empty( $size ) ) {

+		} elseif (!empty($size)) {

 

-			return new WP_Error( 'geodir_no_imagesize', __( "Given image size is not valid", 'geodirectory' ) );

+			return new WP_Error('geodir_no_imagesize', __("Given image size is not valid", 'geodirectory'));

 

 		}

 

@@ -623,7 +623,7 @@ 
 */

 

 

-if ( ! function_exists( 'createRandomString' ) ) {

+if (!function_exists('createRandomString')) {

 	/**

 	 * Creates random string.

 	 *

@@ -633,21 +633,21 @@ 
 	 */

 	function createRandomString() {

 		$chars = "abcdefghijkmlnopqrstuvwxyz1023456789";

-		srand( (double) microtime() * 1000000 );

+		srand((double) microtime() * 1000000);

 		$i       = 0;

 		$rstring = '';

-		while ( $i <= 25 ) {

+		while ($i <= 25) {

 			$num     = rand() % 33;

-			$tmp     = substr( $chars, $num, 1 );

-			$rstring = $rstring . $tmp;

-			$i ++;

+			$tmp     = substr($chars, $num, 1);

+			$rstring = $rstring.$tmp;

+			$i++;

 		}

 

 		return $rstring;

 	}

 }

 

-if ( ! function_exists( 'geodir_getDistanceRadius' ) ) {

+if (!function_exists('geodir_getDistanceRadius')) {

 	/**

 	 * Calculates the distance radius.

 	 *

@@ -658,9 +658,9 @@ 
 	 *

 	 * @return float The mean radius.

 	 */

-	function geodir_getDistanceRadius( $uom = 'km' ) {

+	function geodir_getDistanceRadius($uom = 'km') {

 //	Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude

-		switch ( geodir_strtolower( $uom ) ):

+		switch (geodir_strtolower($uom)):

 			case 'km'    :

 				$earthMeanRadius = 6371.009; // km

 				break;

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

 

 

-if ( ! function_exists( 'geodir_calculateDistanceFromLatLong' ) ) {

+if (!function_exists('geodir_calculateDistanceFromLatLong')) {

 	/**

 	 * Calculate the great circle distance between two points identified by longitude and latitude.

 	 *

@@ -705,17 +705,17 @@ 
 	 *

 	 * @return float The distance.

 	 */

-	function geodir_calculateDistanceFromLatLong( $point1, $point2, $uom = 'km' ) {

+	function geodir_calculateDistanceFromLatLong($point1, $point2, $uom = 'km') {

 //	Use Haversine formula to calculate the great circle distance between two points identified by longitude and latitude

 

-		$earthMeanRadius = geodir_getDistanceRadius( $uom );

+		$earthMeanRadius = geodir_getDistanceRadius($uom);

 

-		$deltaLatitude  = deg2rad( (float) $point2['latitude'] - (float) $point1['latitude'] );

-		$deltaLongitude = deg2rad( (float) $point2['longitude'] - (float) $point1['longitude'] );

-		$a              = sin( $deltaLatitude / 2 ) * sin( $deltaLatitude / 2 ) +

-		                  cos( deg2rad( (float) $point1['latitude'] ) ) * cos( deg2rad( (float) $point2['latitude'] ) ) *

-		                  sin( $deltaLongitude / 2 ) * sin( $deltaLongitude / 2 );

-		$c              = 2 * atan2( sqrt( $a ), sqrt( 1 - $a ) );

+		$deltaLatitude  = deg2rad((float) $point2['latitude'] - (float) $point1['latitude']);

+		$deltaLongitude = deg2rad((float) $point2['longitude'] - (float) $point1['longitude']);

+		$a              = sin($deltaLatitude / 2) * sin($deltaLatitude / 2) +

+		                  cos(deg2rad((float) $point1['latitude'])) * cos(deg2rad((float) $point2['latitude'])) *

+		                  sin($deltaLongitude / 2) * sin($deltaLongitude / 2);

+		$c              = 2 * atan2(sqrt($a), sqrt(1 - $a));

 		$distance       = $earthMeanRadius * $c;

 

 		return $distance;

@@ -724,7 +724,7 @@ 
 }

 

 

-if ( ! function_exists( 'geodir_sendEmail' ) ) {

+if (!function_exists('geodir_sendEmail')) {

 	/**

 	 * The main function that send transactional emails using the args provided.

 	 *

@@ -743,93 +743,93 @@ 
 	 * @param string $post_id       The post ID.

 	 * @param string $user_id       The user ID.

 	 */

-	function geodir_sendEmail( $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '' ) {

+	function geodir_sendEmail($fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra = '', $message_type, $post_id = '', $user_id = '') {

 		$login_details = '';

 

 		// strip slashes from subject & message text

-		$to_subject = stripslashes_deep( $to_subject );

-		$to_message = stripslashes_deep( $to_message );

+		$to_subject = stripslashes_deep($to_subject);

+		$to_message = stripslashes_deep($to_message);

 

-		if ( $message_type == 'send_friend' ) {

-			$subject = get_option( 'geodir_email_friend_subject' );

-			$message = get_option( 'geodir_email_friend_content' );

-		} elseif ( $message_type == 'send_enquiry' ) {

-			$subject = get_option( 'geodir_email_enquiry_subject' );

-			$message = get_option( 'geodir_email_enquiry_content' );

+		if ($message_type == 'send_friend') {

+			$subject = get_option('geodir_email_friend_subject');

+			$message = get_option('geodir_email_friend_content');

+		} elseif ($message_type == 'send_enquiry') {

+			$subject = get_option('geodir_email_enquiry_subject');

+			$message = get_option('geodir_email_enquiry_content');

 

 			// change to name in some cases

-			$post_author = get_post_field( 'post_author', $post_id );

-			if(is_super_admin( $post_author  )){// if admin probably not the post author so change name

-				$toEmailName = __('Business Owner','geodirectory');

-			}elseif(defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id,'claimed')!='1'){// if claim manager installed but listing not claimed

-				$toEmailName = __('Business Owner','geodirectory');

+			$post_author = get_post_field('post_author', $post_id);

+			if (is_super_admin($post_author)) {// if admin probably not the post author so change name

+				$toEmailName = __('Business Owner', 'geodirectory');

+			}elseif (defined('GEODIRCLAIM_VERSION') && geodir_get_post_meta($post_id, 'claimed') != '1') {// if claim manager installed but listing not claimed

+				$toEmailName = __('Business Owner', 'geodirectory');

 			}

 

 

-		} elseif ( $message_type == 'forgot_password' ) {

-			$subject       = get_option( 'geodir_forgot_password_subject' );

-			$message       = get_option( 'geodir_forgot_password_content' );

+		} elseif ($message_type == 'forgot_password') {

+			$subject       = get_option('geodir_forgot_password_subject');

+			$message       = get_option('geodir_forgot_password_content');

 			$login_details = $to_message;

-		} elseif ( $message_type == 'registration' ) {

-			$subject       = get_option( 'geodir_registration_success_email_subject' );

-			$message       = get_option( 'geodir_registration_success_email_content' );

+		} elseif ($message_type == 'registration') {

+			$subject       = get_option('geodir_registration_success_email_subject');

+			$message       = get_option('geodir_registration_success_email_content');

 			$login_details = $to_message;

-		} elseif ( $message_type == 'post_submit' ) {

-			$subject = get_option( 'geodir_post_submited_success_email_subject' );

-			$message = get_option( 'geodir_post_submited_success_email_content' );

-		} elseif ( $message_type == 'listing_published' ) {

-			$subject = get_option( 'geodir_post_published_email_subject' );

-			$message = get_option( 'geodir_post_published_email_content' );

-		} elseif ( $message_type == 'listing_edited' ) {

-			$subject = get_option( 'geodir_post_edited_email_subject_admin' );

-			$message = get_option( 'geodir_post_edited_email_content_admin' );

+		} elseif ($message_type == 'post_submit') {

+			$subject = get_option('geodir_post_submited_success_email_subject');

+			$message = get_option('geodir_post_submited_success_email_content');

+		} elseif ($message_type == 'listing_published') {

+			$subject = get_option('geodir_post_published_email_subject');

+			$message = get_option('geodir_post_published_email_content');

+		} elseif ($message_type == 'listing_edited') {

+			$subject = get_option('geodir_post_edited_email_subject_admin');

+			$message = get_option('geodir_post_edited_email_content_admin');

 		}

 

-		if ( ! empty( $subject ) ) {

-			$subject = __( stripslashes_deep( $subject ), 'geodirectory' );

+		if (!empty($subject)) {

+			$subject = __(stripslashes_deep($subject), 'geodirectory');

 		}

 

-		if ( ! empty( $message ) ) {

-			$message = __( stripslashes_deep( $message ), 'geodirectory' );

+		if (!empty($message)) {

+			$message = __(stripslashes_deep($message), 'geodirectory');

 		}

 

-		$to_message        = nl2br( $to_message );

-		$sitefromEmail     = get_option( 'site_email' );

+		$to_message        = nl2br($to_message);

+		$sitefromEmail     = get_option('site_email');

 		$sitefromEmailName = get_site_emailName();

-		$productlink       = get_permalink( $post_id );

+		$productlink       = get_permalink($post_id);

 

 		$user_login = '';

-		if ( $user_id > 0 && $user_info = get_userdata( $user_id ) ) {

+		if ($user_id > 0 && $user_info = get_userdata($user_id)) {

 			$user_login = $user_info->user_login;

 		}

 

 		$posted_date = '';

 		$listingLink = '';

 

-		$post_info = get_post( $post_id );

+		$post_info = get_post($post_id);

 

-		if ( $post_info ) {

+		if ($post_info) {

 			$posted_date = $post_info->post_date;

-			$listingLink = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>';

+			$listingLink = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>';

 		}

 		$siteurl       = home_url();

-		$siteurl_link  = '<a href="' . $siteurl . '">' . $siteurl . '</a>';

+		$siteurl_link  = '<a href="'.$siteurl.'">'.$siteurl.'</a>';

 		$loginurl      = geodir_login_url();

-		$loginurl_link = '<a href="' . $loginurl . '">login</a>';

+		$loginurl_link = '<a href="'.$loginurl.'">login</a>';

 

-		$post_author_id   = ! empty( $post_info ) ? $post_info->post_author : 0;

-		$post_author_name = geodir_get_client_name( $post_author_id );

-		$current_date     = date_i18n( 'Y-m-d H:i:s', current_time( 'timestamp' ) );

+		$post_author_id   = !empty($post_info) ? $post_info->post_author : 0;

+		$post_author_name = geodir_get_client_name($post_author_id);

+		$current_date     = date_i18n('Y-m-d H:i:s', current_time('timestamp'));

 

-		if ( $fromEmail == '' ) {

-			$fromEmail = get_option( 'site_email' );

+		if ($fromEmail == '') {

+			$fromEmail = get_option('site_email');

 		}

 

-		if ( $fromEmailName == '' ) {

-			$fromEmailName = get_option( 'site_email_name' );

+		if ($fromEmailName == '') {

+			$fromEmailName = get_option('site_email_name');

 		}

 

-		$search_array  = array(

+		$search_array = array(

 			'[#listing_link#]',

 			'[#site_name_url#]',

 			'[#post_id#]',

@@ -869,7 +869,7 @@ 
 			$post_author_name,

 			$current_date

 		);

-		$message       = str_replace( $search_array, $replace_array, $message );

+		$message       = str_replace($search_array, $replace_array, $message);

 

 		$search_array  = array(

 			'[#listing_link#]',

@@ -905,12 +905,12 @@ 
 			$post_author_name,

 			$current_date

 		);

-		$subject       = str_replace( $search_array, $replace_array, $subject );

+		$subject = str_replace($search_array, $replace_array, $subject);

 

-		$headers =  array();

+		$headers = array();

 		$headers[] = 'Content-type: text/html; charset=UTF-8';

-		$headers[] = "Reply-To: " . $fromEmail;

-		$headers[] = 'From: ' . $sitefromEmailName . ' <' . $sitefromEmail . '>';

+		$headers[] = "Reply-To: ".$fromEmail;

+		$headers[] = 'From: '.$sitefromEmailName.' <'.$sitefromEmail.'>';

 

 		$to = $toEmail;

 

@@ -932,7 +932,7 @@ 
 		 * @param string $post_id       The post ID.

 		 * @param string $user_id       The user ID.

 		 */

-		$to = apply_filters( 'geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id );

+		$to = apply_filters('geodir_sendEmail_to', $to, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);

 		/**

 		 * Filter the client email subject.

 		 *

@@ -951,7 +951,7 @@ 
 		 * @param string $post_id       The post ID.

 		 * @param string $user_id       The user ID.

 		 */

-		$subject = apply_filters( 'geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id );

+		$subject = apply_filters('geodir_sendEmail_subject', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);

 		/**

 		 * Filter the client email message.

 		 *

@@ -970,7 +970,7 @@ 
 		 * @param string $post_id       The post ID.

 		 * @param string $user_id       The user ID.

 		 */

-		$message = apply_filters( 'geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id );

+		$message = apply_filters('geodir_sendEmail_message', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);

 		/**

 		 * Filter the client email headers.

 		 *

@@ -989,39 +989,39 @@ 
 		 * @param string $post_id       The post ID.

 		 * @param string $user_id       The user ID.

 		 */

-		$headers = apply_filters( 'geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id );

+		$headers = apply_filters('geodir_sendEmail_headers', $headers, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);

 

-		$sent = wp_mail( $to, $subject, $message, $headers );

+		$sent = wp_mail($to, $subject, $message, $headers);

 

-		if ( ! $sent ) {

-			if ( is_array( $to ) ) {

-				$to = implode( ',', $to );

+		if (!$sent) {

+			if (is_array($to)) {

+				$to = implode(',', $to);

 			}

 			$log_message = sprintf(

-				__( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+				__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

 				$message_type,

-				date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+				date_i18n('F j Y H:i:s', current_time('timestamp')),

 				$to,

 				$subject

 			);

-			geodir_error_log( $log_message );

+			geodir_error_log($log_message);

 		}

 

 		///////// ADMIN BCC EMIALS

-		$adminEmail = get_bloginfo( 'admin_email' );

+		$adminEmail = get_bloginfo('admin_email');

 		$to         = $adminEmail;

 

 		$admin_bcc = false;

-		if ( $message_type == 'registration' ) {

-			$message_raw  = explode( __( "Password:", 'geodirectory' ), $message );

-			$message_raw2 = explode( "</p>", $message_raw[1], 2 );

-			$message      = $message_raw[0] . __( 'Password:', 'geodirectory' ) . ' **********</p>' . $message_raw2[1];

+		if ($message_type == 'registration') {

+			$message_raw  = explode(__("Password:", 'geodirectory'), $message);

+			$message_raw2 = explode("</p>", $message_raw[1], 2);

+			$message      = $message_raw[0].__('Password:', 'geodirectory').' **********</p>'.$message_raw2[1];

 		}

-		if ( $message_type == 'post_submit' ) {

-			$subject = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_subject_admin' ) ), 'geodirectory' );

-			$message = __( stripslashes_deep( get_option( 'geodir_post_submited_success_email_content_admin' ) ), 'geodirectory' );

+		if ($message_type == 'post_submit') {

+			$subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');

+			$message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');

 

-			$search_array  = array(

+			$search_array = array(

 				'[#listing_link#]',

 				'[#site_name_url#]',

 				'[#post_id#]',

@@ -1053,7 +1053,7 @@ 
 				$user_login,

 				$user_login

 			);

-			$message       = str_replace( $search_array, $replace_array, $message );

+			$message       = str_replace($search_array, $replace_array, $message);

 

 			$search_array  = array(

 				'[#listing_link#]',

@@ -1081,26 +1081,26 @@ 
 				$user_login,

 				$user_login

 			);

-			$subject       = str_replace( $search_array, $replace_array, $subject );

+			$subject = str_replace($search_array, $replace_array, $subject);

 

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

 

-		} elseif ( $message_type == 'registration' && get_option( 'geodir_bcc_new_user' ) ) {

+		} elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

-		} elseif ( $message_type == 'send_friend' && get_option( 'geodir_bcc_friend' ) ) {

+		} elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

-		} elseif ( $message_type == 'send_enquiry' && get_option( 'geodir_bcc_enquiry' ) ) {

+		} elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

-		} elseif ( $message_type == 'listing_published' && get_option( 'geodir_bcc_listing_published' ) ) {

+		} elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {

 			$subject .= ' - ADMIN BCC COPY';

 			$admin_bcc = true;

 		}

 

-		if ( $admin_bcc === true ) {

+		if ($admin_bcc === true) {

 

 			/**

 			 * Filter the client email subject.

@@ -1120,7 +1120,7 @@ 
 			 * @param string $post_id       The post ID.

 			 * @param string $user_id       The user ID.

 			 */

-			$subject = apply_filters( 'geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id );

+			$subject = apply_filters('geodir_sendEmail_subject_admin_bcc', $subject, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);

 			/**

 			 * Filter the client email message.

 			 *

@@ -1139,23 +1139,23 @@ 
 			 * @param string $post_id       The post ID.

 			 * @param string $user_id       The user ID.

 			 */

-			$message = apply_filters( 'geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id );

+			$message = apply_filters('geodir_sendEmail_message_admin_bcc', $message, $fromEmail, $fromEmailName, $toEmail, $toEmailName, $to_subject, $to_message, $extra, $message_type, $post_id, $user_id);

 

 

-			$sent = wp_mail( $to, $subject, $message, $headers );

+			$sent = wp_mail($to, $subject, $message, $headers);

 

-			if ( ! $sent ) {

-				if ( is_array( $to ) ) {

-					$to = implode( ',', $to );

+			if (!$sent) {

+				if (is_array($to)) {

+					$to = implode(',', $to);

 				}

 				$log_message = sprintf(

-					__( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+					__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

 					$message_type,

-					date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+					date_i18n('F j Y H:i:s', current_time('timestamp')),

 					$to,

 					$subject

 				);

-				geodir_error_log( $log_message );

+				geodir_error_log($log_message);

 			}

 		}

 

@@ -1171,49 +1171,49 @@ 
  */

 function geodir_taxonomy_breadcrumb() {

 

-	$term   = get_term_by( 'slug', get_query_var( 'term' ), get_query_var( 'taxonomy' ) );

+	$term   = get_term_by('slug', get_query_var('term'), get_query_var('taxonomy'));

 	$parent = $term->parent;

 

-	while ( $parent ):

+	while ($parent):

 		$parents[]  = $parent;

-		$new_parent = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) );

+		$new_parent = get_term_by('id', $parent, get_query_var('taxonomy'));

 		$parent     = $new_parent->parent;

 	endwhile;

 

-	if ( ! empty( $parents ) ):

-		$parents = array_reverse( $parents );

+	if (!empty($parents)):

+		$parents = array_reverse($parents);

 

-		foreach ( $parents as $parent ):

-			$item = get_term_by( 'id', $parent, get_query_var( 'taxonomy' ) );

-			$url  = get_term_link( $item, get_query_var( 'taxonomy' ) );

-			echo '<li> > <a href="' . $url . '">' . $item->name . '</a></li>';

+		foreach ($parents as $parent):

+			$item = get_term_by('id', $parent, get_query_var('taxonomy'));

+			$url  = get_term_link($item, get_query_var('taxonomy'));

+			echo '<li> > <a href="'.$url.'">'.$item->name.'</a></li>';

 		endforeach;

 

 	endif;

 

-	echo '<li> > ' . $term->name . '</li>';

+	echo '<li> > '.$term->name.'</li>';

 }

 

-function geodir_wpml_post_type_archive_link($link, $post_type){

+function geodir_wpml_post_type_archive_link($link, $post_type) {

 	if (function_exists('icl_object_id')) {

-		$post_types   = get_option( 'geodir_post_types' );

-		$slug         = $post_types[ $post_type ]['rewrite']['slug'];

+		$post_types   = get_option('geodir_post_types');

+		$slug         = $post_types[$post_type]['rewrite']['slug'];

 

 		// Alter the CPT slug if WPML is set to do so

-		if ( function_exists( 'icl_object_id' ) ) {

-			if ( gd_wpml_slug_translation_turned_on( $post_type ) && $language_code = gd_wpml_get_lang_from_url( $link) ) {

+		if (function_exists('icl_object_id')) {

+			if (gd_wpml_slug_translation_turned_on($post_type) && $language_code = gd_wpml_get_lang_from_url($link)) {

 

 				$org_slug = $slug;

-				$slug     = apply_filters( 'wpml_translate_single_string',

+				$slug     = apply_filters('wpml_translate_single_string',

 					$slug,

 					'WordPress',

-					'URL slug: ' . $slug,

-					$language_code );

+					'URL slug: '.$slug,

+					$language_code);

                     

-				if ( ! $slug ) {

+				if (!$slug) {

 					$slug = $org_slug;

 				} else {

-					$link = str_replace( $org_slug, $slug, $link );

+					$link = str_replace($org_slug, $slug, $link);

 				}

 			}

 		}

@@ -1221,7 +1221,7 @@ 
 

 	return $link;

 }

-add_filter( 'post_type_archive_link','geodir_wpml_post_type_archive_link', 1000, 2);

+add_filter('post_type_archive_link', 'geodir_wpml_post_type_archive_link', 1000, 2);

 

 /**

  * Main function that generates breadcrumb for all pages.

@@ -1242,9 +1242,9 @@ 
 	 *

 	 * @since 1.0.0

 	 */

-	$separator = apply_filters( 'geodir_breadcrumb_separator', ' > ' );

+	$separator = apply_filters('geodir_breadcrumb_separator', ' > ');

 

-	if ( ! geodir_is_page( 'home' ) ) {

+	if (!geodir_is_page('home')) {

 		$breadcrumb    = '';

 		$url_categoris = '';

 		$breadcrumb .= '<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">';

@@ -1253,167 +1253,167 @@ 
 		 *

 		 * @since 1.0.0

 		 */

-		$breadcrumb .= '<li>' . apply_filters( 'geodir_breadcrumb_first_link', '<a href="' . home_url() . '">' . __( 'Home', 'geodirectory' ) . '</a>' ) . '</li>';

+		$breadcrumb .= '<li>'.apply_filters('geodir_breadcrumb_first_link', '<a href="'.home_url().'">'.__('Home', 'geodirectory').'</a>').'</li>';

 

 		$gd_post_type   = geodir_get_current_posttype();

-		$post_type_info = get_post_type_object( $gd_post_type );

+		$post_type_info = get_post_type_object($gd_post_type);

 

-		remove_filter( 'post_type_archive_link', 'geodir_get_posttype_link' );

+		remove_filter('post_type_archive_link', 'geodir_get_posttype_link');

 

-		$listing_link = get_post_type_archive_link( $gd_post_type );

+		$listing_link = get_post_type_archive_link($gd_post_type);

 

-		add_filter( 'post_type_archive_link', 'geodir_get_posttype_link', 10, 2 );

-		$listing_link = rtrim( $listing_link, '/' );

+		add_filter('post_type_archive_link', 'geodir_get_posttype_link', 10, 2);

+		$listing_link = rtrim($listing_link, '/');

 		$listing_link .= '/';

 

 		$post_type_for_location_link = $listing_link;

-		$location_terms              = geodir_get_current_location_terms( 'query_vars', $gd_post_type );

+		$location_terms              = geodir_get_current_location_terms('query_vars', $gd_post_type);

 

 		global $wp, $gd_session;

 		$location_link = $post_type_for_location_link;

 

-		if ( geodir_is_page( 'detail' ) || geodir_is_page( 'listing' ) ) {

+		if (geodir_is_page('detail') || geodir_is_page('listing')) {

 			global $post;

-			$location_manager     = defined( 'POST_LOCATION_TABLE' ) ? true : false;

-			$neighbourhood_active = $location_manager && get_option( 'location_neighbourhoods' ) ? true : false;

+			$location_manager     = defined('POST_LOCATION_TABLE') ? true : false;

+			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

 

-			if ( geodir_is_page( 'detail' ) && isset( $post->country_slug ) ) {

+			if (geodir_is_page('detail') && isset($post->country_slug)) {

 				$location_terms = array(

 					'gd_country' => $post->country_slug,

 					'gd_region'  => $post->region_slug,

 					'gd_city'    => $post->city_slug

 				);

 

-				if ( $neighbourhood_active && ! empty( $location_terms['gd_city'] ) && $gd_ses_neighbourhood = $gd_session->get( 'gd_neighbourhood' ) ) {

+				if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {

 					$location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

 				}

 			}

 

-			$geodir_show_location_url = get_option( 'geodir_show_location_url' );

+			$geodir_show_location_url = get_option('geodir_show_location_url');

 

 			$hide_url_part = array();

-			if ( $location_manager ) {

-				$hide_country_part = get_option( 'geodir_location_hide_country_part' );

-				$hide_region_part  = get_option( 'geodir_location_hide_region_part' );

-

-				if ( $hide_region_part && $hide_country_part ) {

-					$hide_url_part = array( 'gd_country', 'gd_region' );

-				} else if ( $hide_region_part && ! $hide_country_part ) {

-					$hide_url_part = array( 'gd_region' );

-				} else if ( ! $hide_region_part && $hide_country_part ) {

-					$hide_url_part = array( 'gd_country' );

+			if ($location_manager) {

+				$hide_country_part = get_option('geodir_location_hide_country_part');

+				$hide_region_part  = get_option('geodir_location_hide_region_part');

+

+				if ($hide_region_part && $hide_country_part) {

+					$hide_url_part = array('gd_country', 'gd_region');

+				} else if ($hide_region_part && !$hide_country_part) {

+					$hide_url_part = array('gd_region');

+				} else if (!$hide_region_part && $hide_country_part) {

+					$hide_url_part = array('gd_country');

 				}

 			}

 

 			$hide_text_part = array();

-			if ( $geodir_show_location_url == 'country_city' ) {

-				$hide_text_part = array( 'gd_region' );

+			if ($geodir_show_location_url == 'country_city') {

+				$hide_text_part = array('gd_region');

 

-				if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {

-					unset( $location_terms['gd_region'] );

+				if (isset($location_terms['gd_region']) && !$location_manager) {

+					unset($location_terms['gd_region']);

 				}

-			} else if ( $geodir_show_location_url == 'region_city' ) {

-				$hide_text_part = array( 'gd_country' );

+			} else if ($geodir_show_location_url == 'region_city') {

+				$hide_text_part = array('gd_country');

 

-				if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {

-					unset( $location_terms['gd_country'] );

+				if (isset($location_terms['gd_country']) && !$location_manager) {

+					unset($location_terms['gd_country']);

 				}

-			} else if ( $geodir_show_location_url == 'city' ) {

-				$hide_text_part = array( 'gd_country', 'gd_region' );

+			} else if ($geodir_show_location_url == 'city') {

+				$hide_text_part = array('gd_country', 'gd_region');

 

-				if ( isset( $location_terms['gd_country'] ) && ! $location_manager ) {

-					unset( $location_terms['gd_country'] );

+				if (isset($location_terms['gd_country']) && !$location_manager) {

+					unset($location_terms['gd_country']);

 				}

-				if ( isset( $location_terms['gd_region'] ) && ! $location_manager ) {

-					unset( $location_terms['gd_region'] );

+				if (isset($location_terms['gd_region']) && !$location_manager) {

+					unset($location_terms['gd_region']);

 				}

 			}

 

 			$is_location_last = '';

 			$is_taxonomy_last = '';

 			$breadcrumb .= '<li>';

-			if ( get_query_var( $gd_post_type . 'category' ) ) {

-				$gd_taxonomy = $gd_post_type . 'category';

-			} elseif ( get_query_var( $gd_post_type . '_tags' ) ) {

-				$gd_taxonomy = $gd_post_type . '_tags';

+			if (get_query_var($gd_post_type.'category')) {

+				$gd_taxonomy = $gd_post_type.'category';

+			} elseif (get_query_var($gd_post_type.'_tags')) {

+				$gd_taxonomy = $gd_post_type.'_tags';

 			}

 

-			$breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __( ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>';

-			if ( ! empty( $gd_taxonomy ) || geodir_is_page( 'detail' ) ) {

+			$breadcrumb .= $separator.'<a href="'.$listing_link.'">'.__(ucfirst($post_type_info->label), 'geodirectory').'</a>';

+			if (!empty($gd_taxonomy) || geodir_is_page('detail')) {

 				$is_location_last = false;

 			} else {

 				$is_location_last = true;

 			}

 

-			if ( ! empty( $gd_taxonomy ) && geodir_is_page( 'listing' ) ) {

+			if (!empty($gd_taxonomy) && geodir_is_page('listing')) {

 				$is_taxonomy_last = true;

 			} else {

 				$is_taxonomy_last = false;

 			}

 

-			if ( ! empty( $location_terms ) ) {

-				$geodir_get_locations = function_exists( 'get_actual_location_name' ) ? true : false;

+			if (!empty($location_terms)) {

+				$geodir_get_locations = function_exists('get_actual_location_name') ? true : false;

 

-				foreach ( $location_terms as $key => $location_term ) {

-					if ( $location_term != '' ) {

-						if ( ! empty( $hide_url_part ) && in_array( $key, $hide_url_part ) ) { // Hide location part from url & breadcrumb.

+				foreach ($location_terms as $key => $location_term) {

+					if ($location_term != '') {

+						if (!empty($hide_url_part) && in_array($key, $hide_url_part)) { // Hide location part from url & breadcrumb.

 							continue;

 						}

 

-						$gd_location_link_text = preg_replace( '/-(\d+)$/', '', $location_term );

-						$gd_location_link_text = preg_replace( '/[_-]/', ' ', $gd_location_link_text );

-						$gd_location_link_text = ucfirst( $gd_location_link_text );

+						$gd_location_link_text = preg_replace('/-(\d+)$/', '', $location_term);

+						$gd_location_link_text = preg_replace('/[_-]/', ' ', $gd_location_link_text);

+						$gd_location_link_text = ucfirst($gd_location_link_text);

 

 						$location_term_actual_country = '';

 						$location_term_actual_region  = '';

 						$location_term_actual_city    = '';

 						$location_term_actual_neighbourhood = '';

-						if ( $geodir_get_locations ) {

-							if ( $key == 'gd_country' ) {

-								$location_term_actual_country = get_actual_location_name( 'country', $location_term, true );

-							} else if ( $key == 'gd_region' ) {

-								$location_term_actual_region = get_actual_location_name( 'region', $location_term, true );

-							} else if ( $key == 'gd_city' ) {

-								$location_term_actual_city = get_actual_location_name( 'city', $location_term, true );

-							} else if ( $key == 'gd_neighbourhood' ) {

-								$location_term_actual_neighbourhood = get_actual_location_name( 'neighbourhood', $location_term, true );

+						if ($geodir_get_locations) {

+							if ($key == 'gd_country') {

+								$location_term_actual_country = get_actual_location_name('country', $location_term, true);

+							} else if ($key == 'gd_region') {

+								$location_term_actual_region = get_actual_location_name('region', $location_term, true);

+							} else if ($key == 'gd_city') {

+								$location_term_actual_city = get_actual_location_name('city', $location_term, true);

+							} else if ($key == 'gd_neighbourhood') {

+								$location_term_actual_neighbourhood = get_actual_location_name('neighbourhood', $location_term, true);

 							}

 						} else {

 							$location_info = geodir_get_location();

 

-							if ( ! empty( $location_info ) && isset( $location_info->location_id ) ) {

-								if ( $key == 'gd_country' ) {

-									$location_term_actual_country = __( $location_info->country, 'geodirectory' );

-								} else if ( $key == 'gd_region' ) {

-									$location_term_actual_region = __( $location_info->region, 'geodirectory' );

-								} else if ( $key == 'gd_city' ) {

-									$location_term_actual_city = __( $location_info->city, 'geodirectory' );

+							if (!empty($location_info) && isset($location_info->location_id)) {

+								if ($key == 'gd_country') {

+									$location_term_actual_country = __($location_info->country, 'geodirectory');

+								} else if ($key == 'gd_region') {

+									$location_term_actual_region = __($location_info->region, 'geodirectory');

+								} else if ($key == 'gd_city') {

+									$location_term_actual_city = __($location_info->city, 'geodirectory');

 								}

 							}

 						}

 

-						if ( $is_location_last && $key == 'gd_country' && ! ( isset( $location_terms['gd_region'] ) && $location_terms['gd_region'] != '' ) && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {

-							$breadcrumb .= $location_term_actual_country != '' ? $separator . $location_term_actual_country : $separator . $gd_location_link_text;

-						} else if ( $is_location_last && $key == 'gd_region' && ! ( isset( $location_terms['gd_city'] ) && $location_terms['gd_city'] != '' ) ) {

-							$breadcrumb .= $location_term_actual_region != '' ? $separator . $location_term_actual_region : $separator . $gd_location_link_text;

-						} else if ( $is_location_last && $key == 'gd_city' && empty( $location_terms['gd_neighbourhood'] ) ) {

-							$breadcrumb .= $location_term_actual_city != '' ? $separator . $location_term_actual_city : $separator . $gd_location_link_text;

-						} else if ( $is_location_last && $key == 'gd_neighbourhood' ) {

-							$breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator . $location_term_actual_neighbourhood : $separator . $gd_location_link_text;

+						if ($is_location_last && $key == 'gd_country' && !(isset($location_terms['gd_region']) && $location_terms['gd_region'] != '') && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {

+							$breadcrumb .= $location_term_actual_country != '' ? $separator.$location_term_actual_country : $separator.$gd_location_link_text;

+						} else if ($is_location_last && $key == 'gd_region' && !(isset($location_terms['gd_city']) && $location_terms['gd_city'] != '')) {

+							$breadcrumb .= $location_term_actual_region != '' ? $separator.$location_term_actual_region : $separator.$gd_location_link_text;

+						} else if ($is_location_last && $key == 'gd_city' && empty($location_terms['gd_neighbourhood'])) {

+							$breadcrumb .= $location_term_actual_city != '' ? $separator.$location_term_actual_city : $separator.$gd_location_link_text;

+						} else if ($is_location_last && $key == 'gd_neighbourhood') {

+							$breadcrumb .= $location_term_actual_neighbourhood != '' ? $separator.$location_term_actual_neighbourhood : $separator.$gd_location_link_text;

 						} else {

-							if ( get_option( 'permalink_structure' ) != '' ) {

-								$location_link .= $location_term . '/';

+							if (get_option('permalink_structure') != '') {

+								$location_link .= $location_term.'/';

 							} else {

-								$location_link .= "&$key=" . $location_term;

+								$location_link .= "&$key=".$location_term;

 							}

 

-							if ( $key == 'gd_country' && $location_term_actual_country != '' ) {

+							if ($key == 'gd_country' && $location_term_actual_country != '') {

 								$gd_location_link_text = $location_term_actual_country;

-							} else if ( $key == 'gd_region' && $location_term_actual_region != '' ) {

+							} else if ($key == 'gd_region' && $location_term_actual_region != '') {

 								$gd_location_link_text = $location_term_actual_region;

-							} else if ( $key == 'gd_city' && $location_term_actual_city != '' ) {

+							} else if ($key == 'gd_city' && $location_term_actual_city != '') {

 								$gd_location_link_text = $location_term_actual_city;

-							} else if ( $key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '' ) {

+							} else if ($key == 'gd_neighbourhood' && $location_term_actual_neighbourhood != '') {

 								$gd_location_link_text = $location_term_actual_neighbourhood;

 							}

 

@@ -1423,76 +1423,76 @@ 
                             }

                             */

 

-							$breadcrumb .= $separator . '<a href="' . $location_link . '">' . $gd_location_link_text . '</a>';

+							$breadcrumb .= $separator.'<a href="'.$location_link.'">'.$gd_location_link_text.'</a>';

 						}

 					}

 				}

 			}

 

-			if ( ! empty( $gd_taxonomy ) ) {

+			if (!empty($gd_taxonomy)) {

 				$term_index = 1;

 

 				//if(get_option('geodir_add_categories_url'))

 				{

-					if ( get_query_var( $gd_post_type . '_tags' ) ) {

-						$cat_link = $listing_link . 'tags/';

+					if (get_query_var($gd_post_type.'_tags')) {

+						$cat_link = $listing_link.'tags/';

 					} else {

 						$cat_link = $listing_link;

 					}

 

-					foreach ( $location_terms as $key => $location_term ) {

-						if ( $location_manager && in_array( $key, $hide_url_part ) ) {

+					foreach ($location_terms as $key => $location_term) {

+						if ($location_manager && in_array($key, $hide_url_part)) {

 							continue;

 						}

 

-						if ( $location_term != '' ) {

-							if ( get_option( 'permalink_structure' ) != '' ) {

-								$cat_link .= $location_term . '/';

+						if ($location_term != '') {

+							if (get_option('permalink_structure') != '') {

+								$cat_link .= $location_term.'/';

 							}

 						}

 					}

 

-					$term_array = explode( "/", trim( $wp_query->query[ $gd_taxonomy ], "/" ) );

-					foreach ( $term_array as $term ) {

-						$term_link_text = preg_replace( '/-(\d+)$/', '', $term );

-						$term_link_text = preg_replace( '/[_-]/', ' ', $term_link_text );

+					$term_array = explode("/", trim($wp_query->query[$gd_taxonomy], "/"));

+					foreach ($term_array as $term) {

+						$term_link_text = preg_replace('/-(\d+)$/', '', $term);

+						$term_link_text = preg_replace('/[_-]/', ' ', $term_link_text);

 

 						// get term actual name

-						$term_info = get_term_by( 'slug', $term, $gd_taxonomy, 'ARRAY_A' );

-						if ( ! empty( $term_info ) && isset( $term_info['name'] ) && $term_info['name'] != '' ) {

-							$term_link_text = urldecode( $term_info['name'] );

+						$term_info = get_term_by('slug', $term, $gd_taxonomy, 'ARRAY_A');

+						if (!empty($term_info) && isset($term_info['name']) && $term_info['name'] != '') {

+							$term_link_text = urldecode($term_info['name']);

 						} else {

 							continue;

 							//$term_link_text = wp_strip_all_tags(geodir_ucwords(urldecode($term_link_text)));

 						}

 

-						if ( $term_index == count( $term_array ) && $is_taxonomy_last ) {

-							$breadcrumb .= $separator . $term_link_text;

+						if ($term_index == count($term_array) && $is_taxonomy_last) {

+							$breadcrumb .= $separator.$term_link_text;

 						} else {

-							$cat_link .= $term . '/';

-							$breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>';

+							$cat_link .= $term.'/';

+							$breadcrumb .= $separator.'<a href="'.$cat_link.'">'.$term_link_text.'</a>';

 						}

-						$term_index ++;

+						$term_index++;

 					}

 				}

 

 

 			}

 

-			if ( geodir_is_page( 'detail' ) ) {

-				$breadcrumb .= $separator . get_the_title();

+			if (geodir_is_page('detail')) {

+				$breadcrumb .= $separator.get_the_title();

 			}

 

 			$breadcrumb .= '</li>';

 

 

-		} elseif ( geodir_is_page( 'author' ) ) {

+		} elseif (geodir_is_page('author')) {

 			$user_id             = get_current_user_id();

-			$author_link         = get_author_posts_url( $user_id );

-			$default_author_link = geodir_getlink( $author_link, array(

+			$author_link         = get_author_posts_url($user_id);

+			$default_author_link = geodir_getlink($author_link, array(

 				'geodir_dashbord' => 'true',

 				'stype'           => 'gd_place'

-			), false );

+			), false);

 

 			/**

 			 * Filter author page link.

@@ -1502,16 +1502,16 @@ 
 			 * @param string $default_author_link Default author link.

 			 * @param int $user_id                Author ID.

 			 */

-			$default_author_link = apply_filters( 'geodir_dashboard_author_link', $default_author_link, $user_id );

+			$default_author_link = apply_filters('geodir_dashboard_author_link', $default_author_link, $user_id);

 

 			$breadcrumb .= '<li>';

-			$breadcrumb .= $separator . '<a href="' . $default_author_link . '">' . __( 'My Dashboard', 'geodirectory' ) . '</a>';

+			$breadcrumb .= $separator.'<a href="'.$default_author_link.'">'.__('My Dashboard', 'geodirectory').'</a>';

 

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

-				$author_link = geodir_getlink( $author_link, array(

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

+				$author_link = geodir_getlink($author_link, array(

 					'geodir_dashbord' => 'true',

 					'stype'           => $_REQUEST['stype']

-				), false );

+				), false);

 

 				/**

 				 * Filter author page link.

@@ -1522,61 +1522,61 @@ 
 				 * @param int $user_id        Author ID.

 				 * @param string $_REQUEST    ['stype'] Post type.

 				 */

-				$author_link = apply_filters( 'geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype'] );

+				$author_link = apply_filters('geodir_dashboard_author_link', $author_link, $user_id, $_REQUEST['stype']);

 

-				$breadcrumb .= $separator . '<a href="' . $author_link . '">' . __( ucfirst( $post_type_info->label ), 'geodirectory' ) . '</a>';

-				$breadcrumb .= $separator . ucfirst( __( 'My', 'geodirectory' ) . ' ' . $_REQUEST['list'] );

+				$breadcrumb .= $separator.'<a href="'.$author_link.'">'.__(ucfirst($post_type_info->label), 'geodirectory').'</a>';

+				$breadcrumb .= $separator.ucfirst(__('My', 'geodirectory').' '.$_REQUEST['list']);

 			} else {

-				$breadcrumb .= $separator . __( ucfirst( $post_type_info->label ), 'geodirectory' );

+				$breadcrumb .= $separator.__(ucfirst($post_type_info->label), 'geodirectory');

 			}

 

 			$breadcrumb .= '</li>';

-		} elseif ( is_category() || is_single() ) {

+		} elseif (is_category() || is_single()) {

 			$category = get_the_category();

-			if ( is_category() ) {

-				$breadcrumb .= '<li>' . $separator . $category[0]->cat_name . '</li>';

+			if (is_category()) {

+				$breadcrumb .= '<li>'.$separator.$category[0]->cat_name.'</li>';

 			}

-			if ( is_single() ) {

-				$breadcrumb .= '<li>' . $separator . '<a href="' . get_category_link( $category[0]->term_id ) . '">' . $category[0]->cat_name . '</a></li>';

-				$breadcrumb .= '<li>' . $separator . get_the_title() . '</li>';

+			if (is_single()) {

+				$breadcrumb .= '<li>'.$separator.'<a href="'.get_category_link($category[0]->term_id).'">'.$category[0]->cat_name.'</a></li>';

+				$breadcrumb .= '<li>'.$separator.get_the_title().'</li>';

 			}

 			/* End of my version ##################################################### */

-		} else if ( is_page() ) {

+		} else if (is_page()) {

 			$page_title = get_the_title();

 

-			if ( geodir_is_page( 'location' ) ) {

+			if (geodir_is_page('location')) {

 				$location_page_id = geodir_location_page_id();

-				$loc_post         = get_post( $location_page_id );

+				$loc_post         = get_post($location_page_id);

 				$post_name        = $loc_post->post_name;

-				$slug             = ucwords( str_replace( '-', ' ', $post_name ) );

-				$page_title       = ! empty( $slug ) ? $slug : __( 'Location', 'geodirectory' );

+				$slug             = ucwords(str_replace('-', ' ', $post_name));

+				$page_title       = !empty($slug) ? $slug : __('Location', 'geodirectory');

 			}

 

-			$breadcrumb .= '<li>' . $separator;

-			$breadcrumb .= stripslashes_deep( $page_title );

+			$breadcrumb .= '<li>'.$separator;

+			$breadcrumb .= stripslashes_deep($page_title);

 			$breadcrumb .= '</li>';

-		} else if ( is_tag() ) {

-			$breadcrumb .= "<li> " . $separator . single_tag_title( '', false ) . '</li>';

-		} else if ( is_day() ) {

-			$breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " ";

-			the_time( 'F jS, Y' );

+		} else if (is_tag()) {

+			$breadcrumb .= "<li> ".$separator.single_tag_title('', false).'</li>';

+		} else if (is_day()) {

+			$breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";

+			the_time('F jS, Y');

 			$breadcrumb .= '</li>';

-		} else if ( is_month() ) {

-			$breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " ";

-			the_time( 'F, Y' );

+		} else if (is_month()) {

+			$breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";

+			the_time('F, Y');

 			$breadcrumb .= '</li>';

-		} else if ( is_year() ) {

-			$breadcrumb .= "<li> " . $separator . __( " Archive for", 'geodirectory' ) . " ";

-			the_time( 'Y' );

+		} else if (is_year()) {

+			$breadcrumb .= "<li> ".$separator.__(" Archive for", 'geodirectory')." ";

+			the_time('Y');

 			$breadcrumb .= '</li>';

-		} else if ( is_author() ) {

-			$breadcrumb .= "<li> " . $separator . __( " Author Archive", 'geodirectory' );

+		} else if (is_author()) {

+			$breadcrumb .= "<li> ".$separator.__(" Author Archive", 'geodirectory');

 			$breadcrumb .= '</li>';

-		} else if ( isset( $_GET['paged'] ) && ! empty( $_GET['paged'] ) ) {

-			$breadcrumb .= "<li>" . $separator . __( "Blog Archives", 'geodirectory' );

+		} else if (isset($_GET['paged']) && !empty($_GET['paged'])) {

+			$breadcrumb .= "<li>".$separator.__("Blog Archives", 'geodirectory');

 			$breadcrumb .= '</li>';

-		} else if ( is_search() ) {

-			$breadcrumb .= "<li> " . $separator . __( " Search Results", 'geodirectory' );

+		} else if (is_search()) {

+			$breadcrumb .= "<li> ".$separator.__(" Search Results", 'geodirectory');

 			$breadcrumb .= '</li>';

 		}

 		$breadcrumb .= '</ul></div>';

@@ -1589,13 +1589,13 @@ 
 		 * @param string $breadcrumb Breadcrumb HTML.

 		 * @param string $separator  Breadcrumb separator.

 		 */

-		echo $breadcrumb = apply_filters( 'geodir_breadcrumb', $breadcrumb, $separator );

+		echo $breadcrumb = apply_filters('geodir_breadcrumb', $breadcrumb, $separator);

 	}

 }

 

 

-add_action( "admin_init", "geodir_allow_wpadmin" ); // check user is admin

-if ( ! function_exists( 'geodir_allow_wpadmin' ) ) {

+add_action("admin_init", "geodir_allow_wpadmin"); // check user is admin

+if (!function_exists('geodir_allow_wpadmin')) {

 	/**

 	 * Allow only admins to access wp-admin.

 	 *

@@ -1607,12 +1607,12 @@ 
 	 */

 	function geodir_allow_wpadmin() {

 		global $wpdb;

-		if ( get_option( 'geodir_allow_wpadmin' ) == '0' && is_user_logged_in() && ( ! defined( 'DOING_AJAX' ) ) ) // checking action in request to allow ajax request go through

+		if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!defined('DOING_AJAX'))) // checking action in request to allow ajax request go through

 		{

-			if ( current_user_can( 'administrator' ) ) {

+			if (current_user_can('administrator')) {

 			} else {

 

-				wp_redirect( home_url() );

+				wp_redirect(home_url());

 				exit;

 			}

 

@@ -1631,23 +1631,23 @@ 
  *

  * @return array|WP_Error The uploaded data as array. When failure returns error.

  */

-function fetch_remote_file( $url ) {

+function fetch_remote_file($url) {

 	// extract the file name and extension from the url

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

-	$file_name = basename( $url );

-	if ( strpos( $file_name, '?' ) !== false ) {

-		list( $file_name ) = explode( '?', $file_name );

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

+	$file_name = basename($url);

+	if (strpos($file_name, '?') !== false) {

+		list($file_name) = explode('?', $file_name);

 	}

 	$dummy        = false;

 	$add_to_cache = false;

 	$key          = null;

-	if ( strpos( $url, '/dummy/' ) !== false ) {

+	if (strpos($url, '/dummy/') !== false) {

 		$dummy = true;

-		$key   = "dummy_" . str_replace( '.', '_', $file_name );

-		$value = get_transient( 'cached_dummy_images' );

-		if ( $value ) {

-			if ( isset( $value[ $key ] ) ) {

-				return $value[ $key ];

+		$key   = "dummy_".str_replace('.', '_', $file_name);

+		$value = get_transient('cached_dummy_images');

+		if ($value) {

+			if (isset($value[$key])) {

+				return $value[$key];

 			} else {

 				$add_to_cache = true;

 			}

@@ -1658,58 +1658,58 @@ 
 

 	// get placeholder file in the upload dir with a unique, sanitized filename

 

-	$post_upload_date = isset( $post['upload_date'] ) ? $post['upload_date'] : '';

+	$post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : '';

 

-	$upload = wp_upload_bits( $file_name, 0, '', $post_upload_date );

-	if ( $upload['error'] ) {

-		return new WP_Error( 'upload_dir_error', $upload['error'] );

+	$upload = wp_upload_bits($file_name, 0, '', $post_upload_date);

+	if ($upload['error']) {

+		return new WP_Error('upload_dir_error', $upload['error']);

 	}

 

 

-	sleep( 0.3 );// if multiple remote file this can cause the remote server to timeout so we add a slight delay

+	sleep(0.3); // if multiple remote file this can cause the remote server to timeout so we add a slight delay

 

 	// fetch the remote url and write it to the placeholder file

-	$headers = wp_remote_get( $url, array( 'stream' => true, 'filename' => $upload['file'] ) );

+	$headers = wp_remote_get($url, array('stream' => true, 'filename' => $upload['file']));

 

 	$log_message = '';

-	if ( is_wp_error( $headers ) ) {

-		echo 'file: ' . $url;

+	if (is_wp_error($headers)) {

+		echo 'file: '.$url;

 

-		return new WP_Error( 'import_file_error', $headers->get_error_message() );

+		return new WP_Error('import_file_error', $headers->get_error_message());

 	}

 

-	$filesize = filesize( $upload['file'] );

+	$filesize = filesize($upload['file']);

 	// request failed

-	if ( ! $headers ) {

-		$log_message = __( 'Remote server did not respond', 'geodirectory' );

+	if (!$headers) {

+		$log_message = __('Remote server did not respond', 'geodirectory');

 	} // make sure the fetch was successful

-	elseif ( $headers['response']['code'] != '200' ) {

-		$log_message = sprintf( __( 'Remote server returned error response %1$d %2$s', 'geodirectory' ), esc_html( $headers['response'] ), get_status_header_desc( $headers['response'] ) );

-	} elseif ( isset( $headers['headers']['content-length'] ) && $filesize != $headers['headers']['content-length'] ) {

-		$log_message = __( 'Remote file is incorrect size', 'geodirectory' );

-	} elseif ( 0 == $filesize ) {

-		$log_message = __( 'Zero size file downloaded', 'geodirectory' );

-	}

-

-	if ( $log_message ) {

-		$del = unlink( $upload['file'] );

-		if ( ! $del ) {

-			geodir_error_log( __( 'GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory' ) );

+	elseif ($headers['response']['code'] != '200') {

+		$log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));

+	} elseif (isset($headers['headers']['content-length']) && $filesize != $headers['headers']['content-length']) {

+		$log_message = __('Remote file is incorrect size', 'geodirectory');

+	} elseif (0 == $filesize) {

+		$log_message = __('Zero size file downloaded', 'geodirectory');

+	}

+

+	if ($log_message) {

+		$del = unlink($upload['file']);

+		if (!$del) {

+			geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));

 		}

 

-		return new WP_Error( 'import_file_error', $log_message );

+		return new WP_Error('import_file_error', $log_message);

 	}

 

-	if ( $dummy && $add_to_cache && is_array( $upload ) ) {

-		$images = get_transient( 'cached_dummy_images' );

-		if ( is_array( $images ) ) {

-			$images[ $key ] = $upload;

+	if ($dummy && $add_to_cache && is_array($upload)) {

+		$images = get_transient('cached_dummy_images');

+		if (is_array($images)) {

+			$images[$key] = $upload;

 		} else {

-			$images = array( $key => $upload );

+			$images = array($key => $upload);

 		}

 

 		//setting the cache using the WP Transient API

-		set_transient( 'cached_dummy_images', $images, 60 * 10 ); //10 minutes cache

+		set_transient('cached_dummy_images', $images, 60 * 10); //10 minutes cache

 	}

 

 	return $upload;

@@ -1723,12 +1723,12 @@ 
  * @return string|void Max upload size.

  */

 function geodir_max_upload_size() {

-	$max_filesize = (float) get_option( 'geodir_upload_max_filesize', 2 );

+	$max_filesize = (float) get_option('geodir_upload_max_filesize', 2);

 

-	if ( $max_filesize > 0 && $max_filesize < 1 ) {

-		$max_filesize = (int) ( $max_filesize * 1024 ) . 'kb';

+	if ($max_filesize > 0 && $max_filesize < 1) {

+		$max_filesize = (int) ($max_filesize * 1024).'kb';

 	} else {

-		$max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

+		$max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb';

 	}

 

 	/**

@@ -1738,7 +1738,7 @@ 
 	 *

 	 * @param string $max_filesize Max file upload size. Ex. 10mb, 512kb.

 	 */

-	return apply_filters( 'geodir_default_image_upload_size_limit', $max_filesize );

+	return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

 }

 

 /**

@@ -1751,8 +1751,8 @@ 
  * @return bool If dummy folder exists returns true, else false.

  */

 function geodir_dummy_folder_exists() {

-	$path = geodir_plugin_path() . '/geodirectory-admin/dummy/';

-	if ( ! is_dir( $path ) ) {

+	$path = geodir_plugin_path().'/geodirectory-admin/dummy/';

+	if (!is_dir($path)) {

 		return false;

 	} else {

 		return true;

@@ -1771,17 +1771,17 @@ 
  *

  * @return object Author info.

  */

-function geodir_get_author_info( $aid ) {

+function geodir_get_author_info($aid) {

 	global $wpdb;

 	/*$infosql = "select * from $wpdb->users where ID=$aid";*/

-	$infosql = $wpdb->prepare( "select * from $wpdb->users where ID=%d", array( $aid ) );

-	$info    = $wpdb->get_results( $infosql );

-	if ( $info ) {

+	$infosql = $wpdb->prepare("select * from $wpdb->users where ID=%d", array($aid));

+	$info    = $wpdb->get_results($infosql);

+	if ($info) {

 		return $info[0];

 	}

 }

 

-if ( ! function_exists( 'adminEmail' ) ) {

+if (!function_exists('adminEmail')) {

 	/**

 	 * Send emails to client on post submission, renew etc.

 	 *

@@ -1794,67 +1794,67 @@ 
 	 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 	 * @param string $custom_1     Custom data to be sent.

 	 */

-	function adminEmail( $page_id, $user_id, $message_type, $custom_1 = '' ) {

+	function adminEmail($page_id, $user_id, $message_type, $custom_1 = '') {

 		global $wpdb;

-		if ( $message_type == 'expiration' ) {

-			$subject        = stripslashes( __( get_option( 'renew_email_subject' ), 'geodirectory' ) );

-			$client_message = stripslashes( __( get_option( 'renew_email_content' ), 'geodirectory' ) );

-		} elseif ( $message_type == 'post_submited' ) {

-			$subject        = __( get_option( 'post_submited_success_email_subject_admin' ), 'geodirectory' );

-			$client_message = __( get_option( 'post_submited_success_email_content_admin' ), 'geodirectory' );

-		} elseif ( $message_type == 'renew' ) {

-			$subject        = __( get_option( 'post_renew_success_email_subject_admin' ), 'geodirectory' );

-			$client_message = __( get_option( 'post_renew_success_email_content_admin' ), 'geodirectory' );

-		} elseif ( $message_type == 'upgrade' ) {

-			$subject        = __( get_option( 'post_upgrade_success_email_subject_admin' ), 'geodirectory' );

-			$client_message = __( get_option( 'post_upgrade_success_email_content_admin' ), 'geodirectory' );

-		} elseif ( $message_type == 'claim_approved' ) {

-			$subject        = __( get_option( 'claim_approved_email_subject' ), 'geodirectory' );

-			$client_message = __( get_option( 'claim_approved_email_content' ), 'geodirectory' );

-		} elseif ( $message_type == 'claim_rejected' ) {

-			$subject        = __( get_option( 'claim_rejected_email_subject' ), 'geodirectory' );

-			$client_message = __( get_option( 'claim_rejected_email_content' ), 'geodirectory' );

-		} elseif ( $message_type == 'claim_requested' ) {

-			$subject        = __( get_option( 'claim_email_subject_admin' ), 'geodirectory' );

-			$client_message = __( get_option( 'claim_email_content_admin' ), 'geodirectory' );

-		} elseif ( $message_type == 'auto_claim' ) {

-			$subject        = __( get_option( 'auto_claim_email_subject' ), 'geodirectory' );

-			$client_message = __( get_option( 'auto_claim_email_content' ), 'geodirectory' );

-		} elseif ( $message_type == 'payment_success' ) {

-			$subject        = __( get_option( 'post_payment_success_admin_email_subject' ), 'geodirectory' );

-			$client_message = __( get_option( 'post_payment_success_admin_email_content' ), 'geodirectory' );

-		} elseif ( $message_type == 'payment_fail' ) {

-			$subject        = __( get_option( 'post_payment_fail_admin_email_subject' ), 'geodirectory' );

-			$client_message = __( get_option( 'post_payment_fail_admin_email_content' ), 'geodirectory' );

+		if ($message_type == 'expiration') {

+			$subject        = stripslashes(__(get_option('renew_email_subject'), 'geodirectory'));

+			$client_message = stripslashes(__(get_option('renew_email_content'), 'geodirectory'));

+		} elseif ($message_type == 'post_submited') {

+			$subject        = __(get_option('post_submited_success_email_subject_admin'), 'geodirectory');

+			$client_message = __(get_option('post_submited_success_email_content_admin'), 'geodirectory');

+		} elseif ($message_type == 'renew') {

+			$subject        = __(get_option('post_renew_success_email_subject_admin'), 'geodirectory');

+			$client_message = __(get_option('post_renew_success_email_content_admin'), 'geodirectory');

+		} elseif ($message_type == 'upgrade') {

+			$subject        = __(get_option('post_upgrade_success_email_subject_admin'), 'geodirectory');

+			$client_message = __(get_option('post_upgrade_success_email_content_admin'), 'geodirectory');

+		} elseif ($message_type == 'claim_approved') {

+			$subject        = __(get_option('claim_approved_email_subject'), 'geodirectory');

+			$client_message = __(get_option('claim_approved_email_content'), 'geodirectory');

+		} elseif ($message_type == 'claim_rejected') {

+			$subject        = __(get_option('claim_rejected_email_subject'), 'geodirectory');

+			$client_message = __(get_option('claim_rejected_email_content'), 'geodirectory');

+		} elseif ($message_type == 'claim_requested') {

+			$subject        = __(get_option('claim_email_subject_admin'), 'geodirectory');

+			$client_message = __(get_option('claim_email_content_admin'), 'geodirectory');

+		} elseif ($message_type == 'auto_claim') {

+			$subject        = __(get_option('auto_claim_email_subject'), 'geodirectory');

+			$client_message = __(get_option('auto_claim_email_content'), 'geodirectory');

+		} elseif ($message_type == 'payment_success') {

+			$subject        = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');

+			$client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');

+		} elseif ($message_type == 'payment_fail') {

+			$subject        = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');

+			$client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');

 		}

 		$transaction_details = $custom_1;

-		$fromEmail           = get_option( 'site_email' );

+		$fromEmail           = get_option('site_email');

 		$fromEmailName       = get_site_emailName();

 //$alivedays = get_post_meta($page_id,'alive_days',true);

-		$pkg_limit            = get_property_price_info_listing( $page_id );

+		$pkg_limit            = get_property_price_info_listing($page_id);

 		$alivedays            = $pkg_limit['days'];

-		$productlink          = get_permalink( $page_id );

-		$post_info            = get_post( $page_id );

-		$post_date            = date( 'dS F,Y', strtotime( $post_info->post_date ) );

-		$listingLink          = '<a href="' . $productlink . '"><b>' . $post_info->post_title . '</b></a>';

+		$productlink          = get_permalink($page_id);

+		$post_info            = get_post($page_id);

+		$post_date            = date('dS F,Y', strtotime($post_info->post_date));

+		$listingLink          = '<a href="'.$productlink.'"><b>'.$post_info->post_title.'</b></a>';

 		$loginurl             = geodir_login_url();

-		$loginurl_link        = '<a href="' . $loginurl . '">login</a>';

+		$loginurl_link        = '<a href="'.$loginurl.'">login</a>';

 		$siteurl              = home_url();

-		$siteurl_link         = '<a href="' . $siteurl . '">' . $fromEmailName . '</a>';

-		$user_info            = get_userdata( $user_id );

+		$siteurl_link         = '<a href="'.$siteurl.'">'.$fromEmailName.'</a>';

+		$user_info            = get_userdata($user_id);

 		$user_email           = $user_info->user_email;

-		$display_name         = geodir_get_client_name( $user_id );

+		$display_name         = geodir_get_client_name($user_id);

 		$user_login           = $user_info->user_login;

-		$number_of_grace_days = get_option( 'ptthemes_listing_preexpiry_notice_days' );

-		if ( $number_of_grace_days == '' ) {

+		$number_of_grace_days = get_option('ptthemes_listing_preexpiry_notice_days');

+		if ($number_of_grace_days == '') {

 			$number_of_grace_days = 1;

 		}

-		if ( $post_info->post_type == 'event' ) {

+		if ($post_info->post_type == 'event') {

 			$post_type = 'event';

 		} else {

 			$post_type = 'listing';

 		}

-		$renew_link     = '<a href="' . $siteurl . '?ptype=post_' . $post_type . '&renew=1&pid=' . $page_id . '">' . RENEW_LINK . '</a>';

+		$renew_link     = '<a href="'.$siteurl.'?ptype=post_'.$post_type.'&renew=1&pid='.$page_id.'">'.RENEW_LINK.'</a>';

 		$search_array   = array(

 			'[#client_name#]',

 			'[#listing_link#]',

@@ -1870,7 +1870,7 @@ 
 			'[#site_name#]',

 			'[#transaction_details#]'

 		);

-		$replace_array  = array(

+		$replace_array = array(

 			$display_name,

 			$listingLink,

 			$post_date,

@@ -1885,13 +1885,13 @@ 
 			$fromEmailName,

 			$transaction_details

 		);

-		$client_message = str_replace( $search_array, $replace_array, $client_message );

-		$subject        = str_replace( $search_array, $replace_array, $subject );

+		$client_message = str_replace($search_array, $replace_array, $client_message);

+		$subject        = str_replace($search_array, $replace_array, $subject);

 		

 		

-		$headers  = array();

+		$headers = array();

 		$headers[] = 'Content-type: text/html; charset=UTF-8';

-		$headers[] = 'From: ' . $fromEmailName . ' <' . $fromEmail . '>';

+		$headers[] = 'From: '.$fromEmailName.' <'.$fromEmail.'>';

 

 		$to      = $fromEmail;

 		$message = $client_message;

@@ -1909,7 +1909,7 @@ 
 		 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 		 * @param string $custom_1     Custom data to be sent.

 		 */

-		$to = apply_filters( 'geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1 );

+		$to = apply_filters('geodir_adminEmail_to', $to, $page_id, $user_id, $message_type, $custom_1);

 		/**

 		 * Filter the admin email subject.

 		 *

@@ -1922,7 +1922,7 @@ 
 		 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 		 * @param string $custom_1     Custom data to be sent.

 		 */

-		$subject = apply_filters( 'geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1 );

+		$subject = apply_filters('geodir_adminEmail_subject', $subject, $page_id, $user_id, $message_type, $custom_1);

 		/**

 		 * Filter the admin email message.

 		 *

@@ -1935,7 +1935,7 @@ 
 		 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 		 * @param string $custom_1     Custom data to be sent.

 		 */

-		$message = apply_filters( 'geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1 );

+		$message = apply_filters('geodir_adminEmail_message', $message, $page_id, $user_id, $message_type, $custom_1);

 		/**

 		 * Filter the admin email headers.

 		 *

@@ -1948,22 +1948,22 @@ 
 		 * @param string $message_type Can be 'expiration','post_submited','renew','upgrade','claim_approved','claim_rejected','claim_requested','auto_claim','payment_success','payment_fail'.

 		 * @param string $custom_1     Custom data to be sent.

 		 */

-		$headers = apply_filters( 'geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1 );

+		$headers = apply_filters('geodir_adminEmail_headers', $headers, $page_id, $user_id, $message_type, $custom_1);

 

 

-		$sent = wp_mail( $to, $subject, $message, $headers );

-		if ( ! $sent ) {

-			if ( is_array( $to ) ) {

-				$to = implode( ',', $to );

+		$sent = wp_mail($to, $subject, $message, $headers);

+		if (!$sent) {

+			if (is_array($to)) {

+				$to = implode(',', $to);

 			}

 			$log_message = sprintf(

-				__( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+				__("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

 				$message_type,

-				date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+				date_i18n('F j Y H:i:s', current_time('timestamp')),

 				$to,

 				$subject

 			);

-			geodir_error_log( $log_message );

+			geodir_error_log($log_message);

 		}

 	}

 }

@@ -1983,12 +1983,12 @@ 
  *

  * @return array Category IDs.

  */

-function gd_lang_object_ids( $ids_array, $type ) {

-	if ( function_exists( 'icl_object_id' ) ) {

+function gd_lang_object_ids($ids_array, $type) {

+	if (function_exists('icl_object_id')) {

 		$res = array();

-		foreach ( $ids_array as $id ) {

-			$xlat = icl_object_id( $id, $type, false );

-			if ( ! is_null( $xlat ) ) {

+		foreach ($ids_array as $id) {

+			$xlat = icl_object_id($id, $type, false);

+			if (!is_null($xlat)) {

 				$res[] = $xlat;

 			}

 		}

@@ -2012,20 +2012,20 @@ 
  *

  * @return array Modified Body CSS classes.

  */

-function geodir_custom_posts_body_class( $classes ) {

+function geodir_custom_posts_body_class($classes) {

 	global $wpdb, $wp;

-	$post_types = geodir_get_posttypes( 'object' );

-	if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {

+	$post_types = geodir_get_posttypes('object');

+	if (!empty($post_types) && count((array) $post_types) > 1) {

 		$classes[] = 'geodir_custom_posts';

 	}

 

 	// fix body class for signup page

-	if ( geodir_is_page( 'login' ) ) {

+	if (geodir_is_page('login')) {

 		$new_classes   = array();

 		$new_classes[] = 'signup page-geodir-signup';

-		if ( ! empty( $classes ) ) {

-			foreach ( $classes as $class ) {

-				if ( $class && $class != 'home' && $class != 'blog' ) {

+		if (!empty($classes)) {

+			foreach ($classes as $class) {

+				if ($class && $class != 'home' && $class != 'blog') {

 					$new_classes[] = $class;

 				}

 			}

@@ -2033,14 +2033,14 @@ 
 		$classes = $new_classes;

 	}

 

-	if ( geodir_is_geodir_page() ) {

+	if (geodir_is_geodir_page()) {

 		$classes[] = 'geodir-page';

 	}

 

 	return $classes;

 }

 

-add_filter( 'body_class', 'geodir_custom_posts_body_class' ); // let's add a class to the body so we can style the new addition to the search

+add_filter('body_class', 'geodir_custom_posts_body_class'); // let's add a class to the body so we can style the new addition to the search

 

 

 /**

@@ -2056,7 +2056,7 @@ 
 	 *

 	 * @since 1.0.0

 	 */

-	return apply_filters( 'geodir_map_zoom_level', array(

+	return apply_filters('geodir_map_zoom_level', array(

 		1,

 		2,

 		3,

@@ -2076,7 +2076,7 @@ 
 		17,

 		18,

 		19

-	) );

+	));

 

 }

 

@@ -2089,12 +2089,12 @@ 
  *

  * @param string $geodir_option_name Option key.

  */

-function geodir_option_version_backup( $geodir_option_name ) {

+function geodir_option_version_backup($geodir_option_name) {

 	$version_date  = time();

-	$geodir_option = get_option( $geodir_option_name );

+	$geodir_option = get_option($geodir_option_name);

 

-	if ( ! empty( $geodir_option ) ) {

-		add_option( $geodir_option_name . '_' . $version_date, $geodir_option );

+	if (!empty($geodir_option)) {

+		add_option($geodir_option_name.'_'.$version_date, $geodir_option);

 	}

 }

 

@@ -2108,10 +2108,10 @@ 
  *

  * @return int Page ID.

  */

-function get_page_id_geodir_add_listing_page( $page_id ) {

-	if ( geodir_wpml_multilingual_status() ) {

+function get_page_id_geodir_add_listing_page($page_id) {

+	if (geodir_wpml_multilingual_status()) {

 		$post_type = 'post_page';

-		$page_id   = geodir_get_wpml_element_id( $page_id, $post_type );

+		$page_id   = geodir_get_wpml_element_id($page_id, $post_type);

 	}

 

 	return $page_id;

@@ -2125,7 +2125,7 @@ 
  * @return bool Returns true when sitepress multilingual CMS active. else returns false.

  */

 function geodir_wpml_multilingual_status() {

-	if ( function_exists( 'icl_object_id' ) ) {

+	if (function_exists('icl_object_id')) {

 		return true;

 	}

 

@@ -2143,19 +2143,19 @@ 
  *

  * @return int Element ID when exists. Else the page id.

  */

-function geodir_get_wpml_element_id( $page_id, $post_type ) {

+function geodir_get_wpml_element_id($page_id, $post_type) {

 	global $sitepress;

-	if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {

-		$trid = $sitepress->get_element_trid( $page_id, $post_type );

+	if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {

+		$trid = $sitepress->get_element_trid($page_id, $post_type);

 

-		if ( $trid > 0 ) {

-			$translations = $sitepress->get_element_translations( $trid, $post_type );

+		if ($trid > 0) {

+			$translations = $sitepress->get_element_translations($trid, $post_type);

 

 			$lang = $sitepress->get_current_language();

 			$lang = $lang ? $lang : $sitepress->get_default_language();

 

-			if ( ! empty( $translations ) && ! empty( $lang ) && isset( $translations[ $lang ] ) && isset( $translations[ $lang ]->element_id ) && ! empty( $translations[ $lang ]->element_id ) ) {

-				$page_id = $translations[ $lang ]->element_id;

+			if (!empty($translations) && !empty($lang) && isset($translations[$lang]) && isset($translations[$lang]->element_id) && !empty($translations[$lang]->element_id)) {

+				$page_id = $translations[$lang]->element_id;

 			}

 		}

 	}

@@ -2172,15 +2172,15 @@ 
  */

 function geodir_wpml_check_element_id() {

 	global $sitepress;

-	if ( geodir_wpml_multilingual_status() && ! empty( $sitepress ) && isset( $sitepress->queries ) ) {

+	if (geodir_wpml_multilingual_status() && !empty($sitepress) && isset($sitepress->queries)) {

 		$el_type      = 'post_page';

-		$el_id        = get_option( 'geodir_add_listing_page' );

+		$el_id        = get_option('geodir_add_listing_page');

 		$default_lang = $sitepress->get_default_language();

-		$el_details   = $sitepress->get_element_language_details( $el_id, $el_type );

+		$el_details   = $sitepress->get_element_language_details($el_id, $el_type);

 

-		if ( ! ( $el_id > 0 && $default_lang && ! empty( $el_details ) && isset( $el_details->language_code ) && $el_details->language_code == $default_lang ) ) {

-			if ( ! $el_details->source_language_code ) {

-				$sitepress->set_element_language_details( $el_id, $el_type, '', $default_lang );

+		if (!($el_id > 0 && $default_lang && !empty($el_details) && isset($el_details->language_code) && $el_details->language_code == $default_lang)) {

+			if (!$el_details->source_language_code) {

+				$sitepress->set_element_language_details($el_id, $el_type, '', $default_lang);

 				$sitepress->icl_translations_cache->clear();

 			}

 		}

@@ -2199,41 +2199,41 @@ 
  *

  * @return string Orderby SQL.

  */

-function geodir_widget_listings_get_order( $query_args ) {

+function geodir_widget_listings_get_order($query_args) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

-		return $wpdb->posts . ".post_date DESC, ";

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

+		return $wpdb->posts.".post_date DESC, ";

 	}

 

-	$post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type'];

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

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

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

 

-	$sort_by = ! empty( $query_args['order_by'] ) ? $query_args['order_by'] : '';

+	$sort_by = !empty($query_args['order_by']) ? $query_args['order_by'] : '';

 

-	switch ( $sort_by ) {

+	switch ($sort_by) {

 		case 'latest':

 		case 'newest':

-			$orderby = $wpdb->posts . ".post_date DESC, ";

+			$orderby = $wpdb->posts.".post_date DESC, ";

 			break;

 		case 'featured':

-			$orderby = $table . ".is_featured ASC, ". $wpdb->posts . ".post_date DESC, ";

+			$orderby = $table.".is_featured ASC, ".$wpdb->posts.".post_date DESC, ";

 			break;

 		case 'az':

-			$orderby = $wpdb->posts . ".post_title ASC, ";

+			$orderby = $wpdb->posts.".post_title ASC, ";

 			break;

 		case 'high_review':

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

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

 			break;

 		case 'high_rating':

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

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

 			break;

 		case 'random':

 			$orderby = "RAND(), ";

 			break;

 		default:

-			$orderby = $wpdb->posts . ".post_title ASC, ";

+			$orderby = $wpdb->posts.".post_title ASC, ";

 			break;

 	}

 

@@ -2256,15 +2256,15 @@ 
  *

  * @return mixed Result object.

  */

-function geodir_get_widget_listings( $query_args = array(), $count_only = false ) {

+function geodir_get_widget_listings($query_args = array(), $count_only = false) {

 	global $wpdb, $plugin_prefix, $table_prefix;

 	$GLOBALS['gd_query_args_widgets'] = $query_args;

 	$gd_query_args_widgets            = $query_args;

 

-	$post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type'];

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

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

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

 

-	$fields = $wpdb->posts . ".*, " . $table . ".*";

+	$fields = $wpdb->posts.".*, ".$table.".*";

 	/**

 	 * Filter widget listing fields string part that is being used for query.

 	 *

@@ -2274,17 +2274,17 @@ 
 	 * @param string $table     Table name.

 	 * @param string $post_type Post type.

 	 */

-	$fields = apply_filters( 'geodir_filter_widget_listings_fields', $fields, $table, $post_type );

+	$fields = apply_filters('geodir_filter_widget_listings_fields', $fields, $table, $post_type);

 

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

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

 

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

 

-	if ( function_exists( 'icl_object_id' ) ) {

+	if (function_exists('icl_object_id')) {

 		global $sitepress;

 		$lang_code = ICL_LANGUAGE_CODE;

-		if ( $lang_code ) {

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

+		if ($lang_code) {

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

 		}

 	}

 

@@ -2298,15 +2298,15 @@ 
 	 * @param string $join      Join clause string.

 	 * @param string $post_type Post type.

 	 */

-	$join = apply_filters( 'geodir_filter_widget_listings_join', $join, $post_type );

+	$join = apply_filters('geodir_filter_widget_listings_join', $join, $post_type);

 

-	$post_status = is_super_admin() ? " OR " . $wpdb->posts . ".post_status = 'private'" : '';

+	$post_status = is_super_admin() ? " OR ".$wpdb->posts.".post_status = 'private'" : '';

 

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

+	$where = " AND ( ".$wpdb->posts.".post_status = 'publish' ".$post_status." ) AND ".$wpdb->posts.".post_type = '".$post_type."'";

 

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

-	if ( function_exists( 'icl_object_id' ) ) {

-		if ( $lang_code ) {

+	if (function_exists('icl_object_id')) {

+		if ($lang_code) {

 			$where .= " AND icl_t.language_code = '$lang_code' AND icl_t.element_type = 'post_$post_type' ";

 		}

 	}

@@ -2319,8 +2319,8 @@ 
 	 * @param string $where     Where clause string.

 	 * @param string $post_type Post type.

 	 */

-	$where = apply_filters( 'geodir_filter_widget_listings_where', $where, $post_type );

-	$where = $where != '' ? " WHERE 1=1 " . $where : '';

+	$where = apply_filters('geodir_filter_widget_listings_where', $where, $post_type);

+	$where = $where != '' ? " WHERE 1=1 ".$where : '';

 

 	$groupby = " GROUP BY $wpdb->posts.ID "; //@todo is this needed? faster withotu

 	/**

@@ -2331,15 +2331,15 @@ 
 	 * @param string $groupby   Group by clause string.

 	 * @param string $post_type Post type.

 	 */

-	$groupby = apply_filters( 'geodir_filter_widget_listings_groupby', $groupby, $post_type );

+	$groupby = apply_filters('geodir_filter_widget_listings_groupby', $groupby, $post_type);

 

-	if ( $count_only ) {

-		$sql  = "SELECT COUNT(DISTINCT " . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . "

-			" . $join . "

+	if ($count_only) {

+		$sql  = "SELECT COUNT(DISTINCT ".$wpdb->posts.".ID) AS total FROM ".$wpdb->posts."

+			" . $join."

 			" . $where;

-		$rows = (int) $wpdb->get_var( $sql );

+		$rows = (int) $wpdb->get_var($sql);

 	} else {

-		$orderby = geodir_widget_listings_get_order( $query_args );

+		$orderby = geodir_widget_listings_get_order($query_args);

 		/**

 		 * Filter widget listing orderby clause string part that is being used for query.

 		 *

@@ -2349,11 +2349,11 @@ 
 		 * @param string $table     Table name.

 		 * @param string $post_type Post type.

 		 */

-		$orderby = apply_filters( 'geodir_filter_widget_listings_orderby', $orderby, $table, $post_type );

-		$orderby .= $wpdb->posts . ".post_title ASC";

-		$orderby = $orderby != '' ? " ORDER BY " . $orderby : '';

+		$orderby = apply_filters('geodir_filter_widget_listings_orderby', $orderby, $table, $post_type);

+		$orderby .= $wpdb->posts.".post_title ASC";

+		$orderby = $orderby != '' ? " ORDER BY ".$orderby : '';

 

-		$limit = ! empty( $query_args['posts_per_page'] ) ? $query_args['posts_per_page'] : 5;

+		$limit = !empty($query_args['posts_per_page']) ? $query_args['posts_per_page'] : 5;

 		/**

 		 * Filter widget listing limit that is being used for query.

 		 *

@@ -2362,27 +2362,27 @@ 
 		 * @param int $limit        Query results limit.

 		 * @param string $post_type Post type.

 		 */

-		$limit = apply_filters( 'geodir_filter_widget_listings_limit', $limit, $post_type );

+		$limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);

 

-		$page = ! empty( $query_args['pageno'] ) ? absint( $query_args['pageno'] ) : 1;

-		if ( ! $page ) {

+		$page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1;

+		if (!$page) {

 			$page = 1;

 		}

 

-		$limit = (int) $limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int) $limit ) . ", " . (int) $limit : "";

+		$limit = (int) $limit > 0 ? " LIMIT ".absint(($page - 1) * (int) $limit).", ".(int) $limit : "";

 

 		//@todo removed SQL_CALC_FOUND_ROWS from below as don't think it is needed and query is faster without

-		$sql  = "SELECT " . $fields . " FROM " . $wpdb->posts . "

-			" . $join . "

-			" . $where . "

-			" . $groupby . "

-			" . $orderby . "

+		$sql = "SELECT ".$fields." FROM ".$wpdb->posts."

+			" . $join."

+			" . $where."

+			" . $groupby."

+			" . $orderby."

 			" . $limit;

-		$rows = $wpdb->get_results( $sql );

+		$rows = $wpdb->get_results($sql);

 	}

 

-	unset( $GLOBALS['gd_query_args_widgets'] );

-	unset( $gd_query_args_widgets );

+	unset($GLOBALS['gd_query_args_widgets']);

+	unset($gd_query_args_widgets);

 

 	return $rows;

 }

@@ -2399,11 +2399,11 @@ 
  *

  * @return string Modified fields SQL.

  */

-function geodir_function_widget_listings_fields( $fields ) {

+function geodir_function_widget_listings_fields($fields) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $fields;

 	}

 

@@ -2422,24 +2422,24 @@ 
  *

  * @return string Modified join clause SQL.

  */

-function geodir_function_widget_listings_join( $join ) {

+function geodir_function_widget_listings_join($join) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $join;

 	}

 

-	$post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type'];

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

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

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

 

-	if ( ! empty( $query_args['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%' )";

+	if (!empty($query_args['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%' )";

 	}

 

-	if ( ! empty( $query_args['tax_query'] ) ) {

-		$tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' );

-		if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {

+	if (!empty($query_args['tax_query'])) {

+		$tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID');

+		if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {

 			$join .= $tax_queries['join'];

 		}

 	}

@@ -2459,49 +2459,49 @@ 
  *

  * @return string Modified where clause SQL.

  */

-function geodir_function_widget_listings_where( $where ) {

+function geodir_function_widget_listings_where($where) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $where;

 	}

-	$post_type = empty( $query_args['post_type'] ) ? 'gd_place' : $query_args['post_type'];

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

+	$post_type = empty($query_args['post_type']) ? 'gd_place' : $query_args['post_type'];

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

 

-	if ( ! empty( $query_args ) ) {

-		if ( ! empty( $query_args['gd_location'] ) && function_exists( 'geodir_default_location_where' ) ) {

-			$where = geodir_default_location_where( $where, $table );

+	if (!empty($query_args)) {

+		if (!empty($query_args['gd_location']) && function_exists('geodir_default_location_where')) {

+			$where = geodir_default_location_where($where, $table);

 		}

 

-		if ( ! empty( $query_args['post_author'] ) ) {

-			$where .= " AND " . $wpdb->posts . ".post_author = " . (int) $query_args['post_author'];

+		if (!empty($query_args['post_author'])) {

+			$where .= " AND ".$wpdb->posts.".post_author = ".(int) $query_args['post_author'];

 		}

 

-		if ( ! empty( $query_args['show_featured_only'] ) ) {

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

+		if (!empty($query_args['show_featured_only'])) {

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

 		}

 

-		if ( ! empty( $query_args['show_special_only'] ) ) {

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

+		if (!empty($query_args['show_special_only'])) {

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

 		}

 

-		if ( ! empty( $query_args['with_pics_only'] ) ) {

-			$where .= " AND " . GEODIR_ATTACHMENT_TABLE . ".ID IS NOT NULL ";

+		if (!empty($query_args['with_pics_only'])) {

+			$where .= " AND ".GEODIR_ATTACHMENT_TABLE.".ID IS NOT NULL ";

 		}

 

-		if ( ! empty( $query_args['featured_image_only'] ) ) {

-			$where .= " AND " . $table . ".featured_image IS NOT NULL AND " . $table . ".featured_image!='' ";

+		if (!empty($query_args['featured_image_only'])) {

+			$where .= " AND ".$table.".featured_image IS NOT NULL AND ".$table.".featured_image!='' ";

 		}

 

-		if ( ! empty( $query_args['with_videos_only'] ) ) {

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

+		if (!empty($query_args['with_videos_only'])) {

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

 		}

 

-		if ( ! empty( $query_args['tax_query'] ) ) {

-			$tax_queries = get_tax_sql( $query_args['tax_query'], $wpdb->posts, 'ID' );

+		if (!empty($query_args['tax_query'])) {

+			$tax_queries = get_tax_sql($query_args['tax_query'], $wpdb->posts, 'ID');

 

-			if ( ! empty( $tax_queries['join'] ) && ! empty( $tax_queries['where'] ) ) {

+			if (!empty($tax_queries['join']) && !empty($tax_queries['where'])) {

 				$where .= $tax_queries['where'];

 			}

 		}

@@ -2522,11 +2522,11 @@ 
  *

  * @return string Modified orderby clause SQL.

  */

-function geodir_function_widget_listings_orderby( $orderby ) {

+function geodir_function_widget_listings_orderby($orderby) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $orderby;

 	}

 

@@ -2545,15 +2545,15 @@ 
  *

  * @return int Query limit.

  */

-function geodir_function_widget_listings_limit( $limit ) {

+function geodir_function_widget_listings_limit($limit) {

 	global $wpdb, $plugin_prefix, $gd_query_args_widgets;

 

 	$query_args = $gd_query_args_widgets;

-	if ( empty( $query_args ) || empty( $query_args['is_geodir_loop'] ) ) {

+	if (empty($query_args) || empty($query_args['is_geodir_loop'])) {

 		return $limit;

 	}

 

-	if ( ! empty( $query_args ) && ! empty( $query_args['posts_per_page'] ) ) {

+	if (!empty($query_args) && !empty($query_args['posts_per_page'])) {

 		$limit = (int) $query_args['posts_per_page'];

 	}

 

@@ -2571,12 +2571,12 @@ 
  *

  * @return int Large size width.

  */

-function geodir_media_image_large_width( $default = 800, $params = '' ) {

-	$large_size_w = get_option( 'large_size_w' );

+function geodir_media_image_large_width($default = 800, $params = '') {

+	$large_size_w = get_option('large_size_w');

 	$large_size_w = $large_size_w > 0 ? $large_size_w : $default;

-	$large_size_w = absint( $large_size_w );

+	$large_size_w = absint($large_size_w);

 

-	if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {

+	if (!get_option('geodir_use_wp_media_large_size')) {

 		$large_size_w = 800;

 	}

 

@@ -2589,7 +2589,7 @@ 
 	 * @param int $default         Default width.

 	 * @param string|array $params Image parameters.

 	 */

-	$large_size_w = apply_filters( 'geodir_filter_media_image_large_width', $large_size_w, $default, $params );

+	$large_size_w = apply_filters('geodir_filter_media_image_large_width', $large_size_w, $default, $params);

 

 	return $large_size_w;

 }

@@ -2605,12 +2605,12 @@ 
  *

  * @return int Large size height.

  */

-function geodir_media_image_large_height( $default = 800, $params = '' ) {

-	$large_size_h = get_option( 'large_size_h' );

+function geodir_media_image_large_height($default = 800, $params = '') {

+	$large_size_h = get_option('large_size_h');

 	$large_size_h = $large_size_h > 0 ? $large_size_h : $default;

-	$large_size_h = absint( $large_size_h );

+	$large_size_h = absint($large_size_h);

 

-	if ( ! get_option( 'geodir_use_wp_media_large_size' ) ) {

+	if (!get_option('geodir_use_wp_media_large_size')) {

 		$large_size_h = 800;

 	}

 

@@ -2623,7 +2623,7 @@ 
 	 * @param int $default         Default height.

 	 * @param string|array $params Image parameters.

 	 */

-	$large_size_h = apply_filters( 'geodir_filter_media_image_large_height', $large_size_h, $default, $params );

+	$large_size_h = apply_filters('geodir_filter_media_image_large_height', $large_size_h, $default, $params);

 

 	return $large_size_h;

 }

@@ -2640,8 +2640,8 @@ 
  *

  * @return string Sanitized name.

  */

-function geodir_sanitize_location_name( $type, $name, $translate = true ) {

-	if ( $name == '' ) {

+function geodir_sanitize_location_name($type, $name, $translate = true) {

+	if ($name == '') {

 		return null;

 	}

 

@@ -2650,13 +2650,13 @@ 
 	$type = $type == 'gd_city' ? 'city' : $type;

 

 	$return = $name;

-	if ( function_exists( 'get_actual_location_name' ) ) {

-		$return = get_actual_location_name( $type, $name, $translate );

+	if (function_exists('get_actual_location_name')) {

+		$return = get_actual_location_name($type, $name, $translate);

 	} else {

-		$return = preg_replace( '/-(\d+)$/', '', $return );

-		$return = preg_replace( '/[_-]/', ' ', $return );

-		$return = geodir_ucwords( $return );

-		$return = $translate ? __( $return, 'geodirectory' ) : $return;

+		$return = preg_replace('/-(\d+)$/', '', $return);

+		$return = preg_replace('/[_-]/', ' ', $return);

+		$return = geodir_ucwords($return);

+		$return = $translate ? __($return, 'geodirectory') : $return;

 	}

 

 	return $return;

@@ -2671,14 +2671,14 @@ 
  *

  * @param int $number Comments number.

  */

-function geodir_comments_number( $number ) {

+function geodir_comments_number($number) {

 

-	if ( $number > 1 ) {

-		$output = str_replace( '%', number_format_i18n( $number ), __( '% Reviews', 'geodirectory' ) );

-	} elseif ( $number == 0 || $number == '' ) {

-		$output = __( 'No Reviews', 'geodirectory' );

+	if ($number > 1) {

+		$output = str_replace('%', number_format_i18n($number), __('% Reviews', 'geodirectory'));

+	} elseif ($number == 0 || $number == '') {

+		$output = __('No Reviews', 'geodirectory');

 	} else { // must be one

-		$output = __( '1 Review', 'geodirectory' );

+		$output = __('1 Review', 'geodirectory');

 	}

 	echo $output;

 }

@@ -2693,18 +2693,18 @@ 
  */

 function is_page_geodir_home() {

 	global $wpdb;

-	$cur_url = str_replace( array( "https://", "http://", "www." ), array( '', '', '' ), geodir_curPageURL() );

-	if ( function_exists( 'geodir_location_geo_home_link' ) ) {

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

+	$cur_url = str_replace(array("https://", "http://", "www."), array('', '', ''), geodir_curPageURL());

+	if (function_exists('geodir_location_geo_home_link')) {

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

 	}

-	$home_url = home_url( '', 'http' );

-	if ( function_exists( 'geodir_location_geo_home_link' ) ) {

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

+	$home_url = home_url('', 'http');

+	if (function_exists('geodir_location_geo_home_link')) {

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

 	}

-	$home_url = str_replace( "www.", "", $home_url );

-	if ( ( strpos( $home_url, $cur_url ) !== false || strpos( $home_url . '/', $cur_url ) !== false ) && ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) ) {

+	$home_url = str_replace("www.", "", $home_url);

+	if ((strpos($home_url, $cur_url) !== false || strpos($home_url.'/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page'))) {

 		return true;

-	} elseif ( get_query_var( 'page_id' ) == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && get_option( 'page_on_front' ) == get_option( 'geodir_home_page' ) ) {

+	} elseif (get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page')) {

 		return true;

 	} else {

 		return false;

@@ -2724,18 +2724,18 @@ 
  *

  * @return string The canonical URL.

  */

-function geodir_wpseo_homepage_canonical( $url ) {

+function geodir_wpseo_homepage_canonical($url) {

 	global $post;

 

-	if ( is_page_geodir_home() ) {

+	if (is_page_geodir_home()) {

 		return home_url();

 	}

 

 	return $url;

 }

 

-add_filter( 'wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10 );

-add_filter( 'aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10 );

+add_filter('wpseo_canonical', 'geodir_wpseo_homepage_canonical', 10);

+add_filter('aioseop_canonical_url', 'geodir_wpseo_homepage_canonical', 10);

 

 /**

  * Add extra fields to google maps script call.

@@ -2748,20 +2748,20 @@ 
  *

  * @return string Modified extra string.

  */

-function geodir_googlemap_script_extra_details_page( $extra ) {

+function geodir_googlemap_script_extra_details_page($extra) {

 	global $post;

 	$add_google_places_api = false;

-	if ( isset( $post->post_content ) && has_shortcode( $post->post_content, 'gd_add_listing' ) ) {

+	if (isset($post->post_content) && has_shortcode($post->post_content, 'gd_add_listing')) {

 		$add_google_places_api = true;

 	}

-	if ( ! str_replace( 'libraries=places', '', $extra ) && ( geodir_is_page( 'detail' ) || $add_google_places_api ) ) {

+	if (!str_replace('libraries=places', '', $extra) && (geodir_is_page('detail') || $add_google_places_api)) {

 		$extra .= "&amp;libraries=places";

 	}

 

 	return $extra;

 }

 

-add_filter( 'geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1 );

+add_filter('geodir_googlemap_script_extra', 'geodir_googlemap_script_extra_details_page', 101, 1);

 

 

 /**

@@ -2779,104 +2779,104 @@ 
  *                                          after_widget.

  * @param array|string $instance            The settings for the particular instance of the widget.

  */

-function geodir_popular_post_category_output( $args = '', $instance = '' ) {

+function geodir_popular_post_category_output($args = '', $instance = '') {

 	// prints the widget

 	global $wpdb, $plugin_prefix, $geodir_post_category_str;

-	extract( $args, EXTR_SKIP );

+	extract($args, EXTR_SKIP);

 

 	echo $before_widget;

 

 	/** This filter is documented in geodirectory_widgets.php */

-	$title = empty( $instance['title'] ) ? __( 'Popular Categories', 'geodirectory' ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? __('Popular Categories', 'geodirectory') : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 

 	$gd_post_type = geodir_get_current_posttype();

 

-	$category_limit = isset( $instance['category_limit'] ) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15;

+	$category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15;

 	if (!isset($category_restrict)) {

 		$category_restrict = false;

 	}

-	if ( ! empty( $gd_post_type ) ) {

+	if (!empty($gd_post_type)) {

 		$default_post_type = $gd_post_type;

-	} elseif ( isset( $instance['default_post_type'] ) && gdsc_is_post_type_valid( $instance['default_post_type'] ) ) {

+	} elseif (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type'])) {

 		$default_post_type = $instance['default_post_type'];

 	} else {

 		$all_gd_post_type  = geodir_get_posttypes();

-		$default_post_type = ( isset( $all_gd_post_type[0] ) ) ? $all_gd_post_type[0] : '';

+		$default_post_type = (isset($all_gd_post_type[0])) ? $all_gd_post_type[0] : '';

 	}

-	$parent_only = !empty( $instance['parent_only'] ) ? true : false;

+	$parent_only = !empty($instance['parent_only']) ? true : false;

 

 	$taxonomy = array();

-	if ( ! empty( $gd_post_type ) ) {

-		$taxonomy[] = $gd_post_type . "category";

+	if (!empty($gd_post_type)) {

+		$taxonomy[] = $gd_post_type."category";

 	} else {

-		$taxonomy = geodir_get_taxonomies( $gd_post_type );

+		$taxonomy = geodir_get_taxonomies($gd_post_type);

 	}

 

 	$taxonomy = apply_filters('geodir_pp_category_taxonomy', $taxonomy);

 

-	$term_args = array( 'taxonomy' => $taxonomy );

-	if ( $parent_only ) {

+	$term_args = array('taxonomy' => $taxonomy);

+	if ($parent_only) {

 		$term_args['parent'] = 0;

 	}

 

-	$terms   = get_terms( $term_args );

+	$terms   = get_terms($term_args);

 	$a_terms = array();

 	$b_terms = array();

 

-	foreach ( $terms as $term ) {

-		if ( $term->count > 0 ) {

-			$a_terms[ $term->taxonomy ][] = $term;

+	foreach ($terms as $term) {

+		if ($term->count > 0) {

+			$a_terms[$term->taxonomy][] = $term;

 		}

 	}

 

-	if ( ! empty( $a_terms ) ) {

-		foreach ( $a_terms as $b_key => $b_val ) {

-			$b_terms[ $b_key ] = geodir_sort_terms( $b_val, 'count' );

+	if (!empty($a_terms)) {

+		foreach ($a_terms as $b_key => $b_val) {

+			$b_terms[$b_key] = geodir_sort_terms($b_val, 'count');

 		}

 

-		$default_taxonomy = $default_post_type != '' && isset( $b_terms[ $default_post_type . 'category' ] ) ? $default_post_type . 'category' : '';

+		$default_taxonomy = $default_post_type != '' && isset($b_terms[$default_post_type.'category']) ? $default_post_type.'category' : '';

 

 		$tax_change_output = '';

-		if ( count( $b_terms ) > 1 ) {

-			$tax_change_output .= "<select data-limit='$category_limit' data-parent='" . (int)$parent_only . "' class='geodir-cat-list-tax'  onchange='geodir_get_post_term(this);'>";

-			foreach ( $b_terms as $key => $val ) {

-				$ptype    = get_post_type_object( str_replace( "category", "", $key ) );

-				$cpt_name = __( $ptype->labels->singular_name, 'geodirectory' );

-				$tax_change_output .= "<option value='$key' " . selected( $key, $default_taxonomy, false ) . ">" . sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name ) . "</option>";

+		if (count($b_terms) > 1) {

+			$tax_change_output .= "<select data-limit='$category_limit' data-parent='".(int) $parent_only."' class='geodir-cat-list-tax'  onchange='geodir_get_post_term(this);'>";

+			foreach ($b_terms as $key => $val) {

+				$ptype    = get_post_type_object(str_replace("category", "", $key));

+				$cpt_name = __($ptype->labels->singular_name, 'geodirectory');

+				$tax_change_output .= "<option value='$key' ".selected($key, $default_taxonomy, false).">".sprintf(__('%s Categories', 'geodirectory'), $cpt_name)."</option>";

 			}

 			$tax_change_output .= "</select>";

 		}

 

-		if ( ! empty( $b_terms ) ) {

-			$terms = $default_taxonomy != '' && isset( $b_terms[ $default_taxonomy ] ) ? $b_terms[ $default_taxonomy ] : reset( $b_terms );// get the first array

-			global $cat_count;//make global so we can change via function

+		if (!empty($b_terms)) {

+			$terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array

+			global $cat_count; //make global so we can change via function

 			$cat_count = 0;

 			?>

 			<div class="geodir-category-list-in clearfix">

 				<div class="geodir-cat-list clearfix">

 					<?php

-					echo $before_title . __( $title ) . $after_title;

+					echo $before_title.__($title).$after_title;

 

 					echo $tax_change_output;

 

 					echo '<ul class="geodir-popular-cat-list">';

 

-					geodir_helper_cat_list_output( $terms, $category_limit, $category_restrict);

+					geodir_helper_cat_list_output($terms, $category_limit, $category_restrict);

 

 					echo '</ul>';

 					?>

 				</div>

 				<?php

 				$hide = '';

-				if ( $cat_count < $category_limit ) {

+				if ($cat_count < $category_limit) {

 					$hide = 'style="display:none;"';

 				}

 				echo "<div class='geodir-cat-list-more' $hide >";

-				echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">' . __( 'More Categories', 'geodirectory' ) . '</a>';

-				echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">' . __( 'Less Categories', 'geodirectory' ) . '</a>';

+				echo '<a href="javascript:void(0)" class="geodir-morecat geodir-showcat">'.__('More Categories', 'geodirectory').'</a>';

+				echo '<a href="javascript:void(0)" class="geodir-morecat geodir-hidecat geodir-hide">'.__('Less Categories', 'geodirectory').'</a>';

 				echo "</div>";

 				/* add scripts */

-				add_action( 'wp_footer', 'geodir_popular_category_add_scripts', 100 );

+				add_action('wp_footer', 'geodir_popular_category_add_scripts', 100);

 				?>

 			</div>

 			<?php

@@ -2896,28 +2896,28 @@ 
  * @param int $category_limit               Number of categories to display by default.

  * @param bool $category_restrict           If the cat limit shoudl be hidden or not shown.

  */

-function geodir_helper_cat_list_output( $terms, $category_limit , $category_restrict=false) {

+function geodir_helper_cat_list_output($terms, $category_limit, $category_restrict = false) {

 	global $geodir_post_category_str, $cat_count;

 	$term_icons = geodir_get_term_icon();

 

 	$geodir_post_category_str = array();

 

 

-	foreach ( $terms as $cat ) {

-		$post_type     = str_replace( "category", "", $cat->taxonomy );

-		$term_icon_url = ! empty( $term_icons ) && isset( $term_icons[ $cat->term_id ] ) ? $term_icons[ $cat->term_id ] : '';

+	foreach ($terms as $cat) {

+		$post_type     = str_replace("category", "", $cat->taxonomy);

+		$term_icon_url = !empty($term_icons) && isset($term_icons[$cat->term_id]) ? $term_icons[$cat->term_id] : '';

 

-		$cat_count ++;

+		$cat_count++;

 

-		$geodir_post_category_str[] = array( 'posttype' => $post_type, 'termid' => $cat->term_id );

+		$geodir_post_category_str[] = array('posttype' => $post_type, 'termid' => $cat->term_id);

 

-		$class_row  = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show';

-		if($category_restrict && $cat_count > $category_limit ){

+		$class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show';

+		if ($category_restrict && $cat_count > $category_limit) {

 			continue;

 		}

 		$total_post = $cat->count;

 

-		$term_link = get_term_link( $cat, $cat->taxonomy );

+		$term_link = get_term_link($cat, $cat->taxonomy);

 		/**

 		 * Filer the category term link.

 		 *

@@ -2927,11 +2927,11 @@ 
 		 * @param int $cat          ->term_id The term id.

 		 * @param string $post_type Wordpress post type.

 		 */

-		$term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type );

+		$term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);

 

-		echo '<li class="' . $class_row . '"><a href="' . $term_link . '">';

-		echo '<img alt="' . esc_attr( $cat->name ) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">';

-		echo $cat->name . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';

+		echo '<li class="'.$class_row.'"><a href="'.$term_link.'">';

+		echo '<img alt="'.esc_attr($cat->name).' icon" style="height:20px;vertical-align:middle;" src="'.$term_icon_url.'"/> <span class="cat-link">';

+		echo $cat->name.'</span> <span class="geodir_term_class geodir_link_span geodir_category_class_'.$post_type.'_'.$cat->term_id.'">('.$total_post.')</span> ';

 		echo '</a></li>';

 	}

 }

@@ -2946,14 +2946,14 @@ 
  * @param array|string $args     Display arguments including before_title, after_title, before_widget, and after_widget.

  * @param array|string $instance The settings for the particular instance of the widget.

  */

-function geodir_listing_slider_widget_output( $args = '', $instance = '' ) {

+function geodir_listing_slider_widget_output($args = '', $instance = '') {

 	// prints the widget

-	extract( $args, EXTR_SKIP );

+	extract($args, EXTR_SKIP);

 

 	echo $before_widget;

 

 	/** This filter is documented in geodirectory_widgets.php */

-	$title = empty( $instance['title'] ) ? '' : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? '' : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 	/**

 	 * Filter the widget post type.

 	 *

@@ -2961,7 +2961,7 @@ 
 	 *

 	 * @param string $instance ['post_type'] Post type of listing.

 	 */

-	$post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] );

+	$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);

 	/**

 	 * Filter the widget's term.

 	 *

@@ -2969,7 +2969,7 @@ 
 	 *

 	 * @param string $instance ['category'] Filter by term. Can be any valid term.

 	 */

-	$category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] );

+	$category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);

 	/**

 	 * Filter widget's "add_location_filter" value.

 	 *

@@ -2977,7 +2977,7 @@ 
 	 *

 	 * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0.

 	 */

-	$add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] );

+	$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);

 	/**

 	 * Filter the widget listings limit.

 	 *

@@ -2985,7 +2985,7 @@ 
 	 *

 	 * @param string $instance ['post_number'] Number of listings to display.

 	 */

-	$post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] );

+	$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);

 	/**

 	 * Filter the widget listings limit shown at one time.

 	 *

@@ -2993,7 +2993,7 @@ 
 	 *

 	 * @param string $instance ['max_show'] Number of listings to display on screen.

 	 */

-	$max_show = empty( $instance['max_show'] ) ? '1' : apply_filters( 'widget_max_show', $instance['max_show'] );

+	$max_show = empty($instance['max_show']) ? '1' : apply_filters('widget_max_show', $instance['max_show']);

 	/**

 	 * Filter the widget slide width.

 	 *

@@ -3001,7 +3001,7 @@ 
 	 *

 	 * @param string $instance ['slide_width'] Width of the slides shown.

 	 */

-	$slide_width = empty( $instance['slide_width'] ) ? '' : apply_filters( 'widget_slide_width', $instance['slide_width'] );

+	$slide_width = empty($instance['slide_width']) ? '' : apply_filters('widget_slide_width', $instance['slide_width']);

 	/**

 	 * Filter widget's "show title" value.

 	 *

@@ -3009,7 +3009,7 @@ 
 	 *

 	 * @param string|bool $instance ['show_title'] Do you want to display title? Can be 1 or 0.

 	 */

-	$show_title = empty( $instance['show_title'] ) ? '' : apply_filters( 'widget_show_title', $instance['show_title'] );

+	$show_title = empty($instance['show_title']) ? '' : apply_filters('widget_show_title', $instance['show_title']);

 	/**

 	 * Filter widget's "slideshow" value.

 	 *

@@ -3017,7 +3017,7 @@ 
 	 *

 	 * @param int $instance ['slideshow'] Setup a slideshow for the slider to animate automatically.

 	 */

-	$slideshow = empty( $instance['slideshow'] ) ? 0 : apply_filters( 'widget_slideshow', $instance['slideshow'] );

+	$slideshow = empty($instance['slideshow']) ? 0 : apply_filters('widget_slideshow', $instance['slideshow']);

 	/**

 	 * Filter widget's "animationLoop" value.

 	 *

@@ -3025,7 +3025,7 @@ 
 	 *

 	 * @param int $instance ['animationLoop'] Gives the slider a seamless infinite loop.

 	 */

-	$animationLoop = empty( $instance['animationLoop'] ) ? 0 : apply_filters( 'widget_animationLoop', $instance['animationLoop'] );

+	$animationLoop = empty($instance['animationLoop']) ? 0 : apply_filters('widget_animationLoop', $instance['animationLoop']);

 	/**

 	 * Filter widget's "directionNav" value.

 	 *

@@ -3033,7 +3033,7 @@ 
 	 *

 	 * @param int $instance ['directionNav'] Enable previous/next arrow navigation?. Can be 1 or 0.

 	 */

-	$directionNav = empty( $instance['directionNav'] ) ? 0 : apply_filters( 'widget_directionNav', $instance['directionNav'] );

+	$directionNav = empty($instance['directionNav']) ? 0 : apply_filters('widget_directionNav', $instance['directionNav']);

 	/**

 	 * Filter widget's "slideshowSpeed" value.

 	 *

@@ -3041,7 +3041,7 @@ 
 	 *

 	 * @param int $instance ['slideshowSpeed'] Set the speed of the slideshow cycling, in milliseconds.

 	 */

-	$slideshowSpeed = empty( $instance['slideshowSpeed'] ) ? 5000 : apply_filters( 'widget_slideshowSpeed', $instance['slideshowSpeed'] );

+	$slideshowSpeed = empty($instance['slideshowSpeed']) ? 5000 : apply_filters('widget_slideshowSpeed', $instance['slideshowSpeed']);

 	/**

 	 * Filter widget's "animationSpeed" value.

 	 *

@@ -3049,7 +3049,7 @@ 
 	 *

 	 * @param int $instance ['animationSpeed'] Set the speed of animations, in milliseconds.

 	 */

-	$animationSpeed = empty( $instance['animationSpeed'] ) ? 600 : apply_filters( 'widget_animationSpeed', $instance['animationSpeed'] );

+	$animationSpeed = empty($instance['animationSpeed']) ? 600 : apply_filters('widget_animationSpeed', $instance['animationSpeed']);

 	/**

 	 * Filter widget's "animation" value.

 	 *

@@ -3057,7 +3057,7 @@ 
 	 *

 	 * @param string $instance ['animation'] Controls the animation type, "fade" or "slide".

 	 */

-	$animation = empty( $instance['animation'] ) ? 'slide' : apply_filters( 'widget_animation', $instance['animation'] );

+	$animation = empty($instance['animation']) ? 'slide' : apply_filters('widget_animation', $instance['animation']);

 	/**

 	 * Filter widget's "list_sort" type.

 	 *

@@ -3065,10 +3065,10 @@ 
 	 *

 	 * @param string $instance ['list_sort'] Listing sort by type.

 	 */

-	$list_sort          = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] );

-	$show_featured_only = ! empty( $instance['show_featured_only'] ) ? 1 : null;

+	$list_sort          = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);

+	$show_featured_only = !empty($instance['show_featured_only']) ? 1 : null;

 

-	wp_enqueue_script( 'geodirectory-jquery-flexslider-js' );

+	wp_enqueue_script('geodirectory-jquery-flexslider-js');

 	?>

 	<script type="text/javascript">

 		jQuery(window).load(function () {

@@ -3086,23 +3086,23 @@ 
 				itemWidth: 75,

 				itemMargin: 5,

 				asNavFor: '#geodir_widget_slider',

-				rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>

+				rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>

 			});

 

 			jQuery('#geodir_widget_slider').flexslider({

-				animation: "<?php echo $animation;?>",

+				animation: "<?php echo $animation; ?>",

 				selector: ".geodir-slides > li",

 				namespace: "geodir-",

 				controlNav: true,

-				animationLoop: <?php echo $animationLoop;?>,

-				slideshow: <?php echo $slideshow;?>,

-				slideshowSpeed: <?php echo $slideshowSpeed;?>,

-				animationSpeed: <?php echo $animationSpeed;?>,

-				directionNav: <?php echo $directionNav;?>,

-				maxItems: <?php echo $max_show;?>,

+				animationLoop: <?php echo $animationLoop; ?>,

+				slideshow: <?php echo $slideshow; ?>,

+				slideshowSpeed: <?php echo $slideshowSpeed; ?>,

+				animationSpeed: <?php echo $animationSpeed; ?>,

+				directionNav: <?php echo $directionNav; ?>,

+				maxItems: <?php echo $max_show; ?>,

 				move: 1,

-				<?php if ( $slide_width ) {

-				echo "itemWidth: " . $slide_width . ",";

+				<?php if ($slide_width) {

+				echo "itemWidth: ".$slide_width.",";

 			}?>

 				sync: "#geodir_widget_carousel",

 				start: function (slider) {

@@ -3114,7 +3114,7 @@ 
 					jQuery('#geodir_widget_slider').css({'visibility': 'visible'});

 					jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});

 				},

-				rtl: <?php echo( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>

+				rtl: <?php echo(is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>

 			});

 		});

 	</script>

@@ -3127,62 +3127,62 @@ 
 		'order_by'       => $list_sort

 	);

 

-	if ( $show_featured_only ) {

+	if ($show_featured_only) {

 		$query_args['show_featured_only'] = 1;

 	}

 

-	if ( $category != 0 || $category != '' ) {

-		$category_taxonomy = geodir_get_taxonomies( $post_type );

+	if ($category != 0 || $category != '') {

+		$category_taxonomy = geodir_get_taxonomies($post_type);

 		$tax_query         = array(

 			'taxonomy' => $category_taxonomy[0],

 			'field'    => 'id',

 			'terms'    => $category

 		);

 

-		$query_args['tax_query'] = array( $tax_query );

+		$query_args['tax_query'] = array($tax_query);

 	}

 

 	// we want listings with featured image only

 	$query_args['featured_image_only'] = 1;

 

-	if ( $post_type == 'gd_event' ) {

+	if ($post_type == 'gd_event') {

 		$query_args['gedir_event_listing_filter'] = 'upcoming';

 	}// show only upcoming events

 

-	$widget_listings = geodir_get_widget_listings( $query_args );

-	if ( ! empty( $widget_listings ) || ( isset( $with_no_results ) && $with_no_results ) ) {

-		if ( $title ) {

-			echo $before_title . $title . $after_title;

+	$widget_listings = geodir_get_widget_listings($query_args);

+	if (!empty($widget_listings) || (isset($with_no_results) && $with_no_results)) {

+		if ($title) {

+			echo $before_title.$title.$after_title;

 		}

 

 		global $post;

 

-		$current_post = $post;// keep current post info

+		$current_post = $post; // keep current post info

 

 		$widget_main_slides = '';

 		$nav_slides         = '';

 		$widget_slides      = 0;

 

-		foreach ( $widget_listings as $widget_listing ) {

+		foreach ($widget_listings as $widget_listing) {

 			global $gd_widget_listing_type;

 			$post         = $widget_listing;

-			$widget_image = geodir_get_featured_image( $post->ID, 'thumbnail', get_option( 'geodir_listing_no_img' ) );

+			$widget_image = geodir_get_featured_image($post->ID, 'thumbnail', get_option('geodir_listing_no_img'));

 

-			if ( ! empty( $widget_image ) ) {

-				if ( $widget_image->height >= 200 ) {

+			if (!empty($widget_image)) {

+				if ($widget_image->height >= 200) {

 					$widget_spacer_height = 0;

 				} else {

-					$widget_spacer_height = ( ( 200 - $widget_image->height ) / 2 );

+					$widget_spacer_height = ((200 - $widget_image->height) / 2);

 				}

 

-				$widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="' . geodir_plugin_url() . "/geodirectory-assets/images/spacer.gif" . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:' . $widget_spacer_height . 'px !important;margin:0 auto;" width="100" />';

+				$widget_main_slides .= '<li class="geodir-listing-slider-widget"><img class="geodir-listing-slider-spacer" src="'.geodir_plugin_url()."/geodirectory-assets/images/spacer.gif".'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:'.$widget_spacer_height.'px !important;margin:0 auto;" width="100" />';

 

 				$title = '';

-				if ( $show_title ) {

-					$title_html     = '<div class="geodir-slider-title"><a href="' . get_permalink( $post->ID ) . '">' . get_the_title( $post->ID ) . '</a></div>';

+				if ($show_title) {

+					$title_html     = '<div class="geodir-slider-title"><a href="'.get_permalink($post->ID).'">'.get_the_title($post->ID).'</a></div>';

 					$post_id        = $post->ID;

-					$post_permalink = get_permalink( $post->ID );

-					$post_title     = get_the_title( $post->ID );

+					$post_permalink = get_permalink($post->ID);

+					$post_title     = get_the_title($post->ID);

 					/**

 					 * Filter the listing slider widget title.

 					 *

@@ -3193,12 +3193,12 @@ 
 					 * @param string $post_permalink The post permalink url.

 					 * @param string $post_title     The post title text.

 					 */

-					$title = apply_filters( 'geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title );

+					$title = apply_filters('geodir_listing_slider_title', $title_html, $post_id, $post_permalink, $post_title);

 				}

 

-				$widget_main_slides .= $title . '<img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:200px;margin:0 auto;" /></li>';

-				$nav_slides .= '<li><img src="' . $widget_image->src . '" alt="' . $widget_image->title . '" title="' . $widget_image->title . '" style="max-height:48px;margin:0 auto;" /></li>';

-				$widget_slides ++;

+				$widget_main_slides .= $title.'<img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:200px;margin:0 auto;" /></li>';

+				$nav_slides .= '<li><img src="'.$widget_image->src.'" alt="'.$widget_image->title.'" title="'.$widget_image->title.'" style="max-height:48px;margin:0 auto;" /></li>';

+				$widget_slides++;

 			}

 		}

 		?>

@@ -3207,7 +3207,7 @@ 
 			<div id="geodir_widget_slider" class="geodir_flexslider">

 				<ul class="geodir-slides clearfix"><?php echo $widget_main_slides; ?></ul>

 			</div>

-			<?php if ( $widget_slides > 1 ) { ?>

+			<?php if ($widget_slides > 1) { ?>

 				<div id="geodir_widget_carousel" class="geodir_flexslider">

 					<ul class="geodir-slides clearfix"><?php echo $nav_slides; ?></ul>

 				</div>

@@ -3215,7 +3215,7 @@ 
 		</div>

 		<?php

 		$GLOBALS['post'] = $current_post;

-		setup_postdata( $current_post );

+		setup_postdata($current_post);

 	}

 	echo $after_widget;

 }

@@ -3231,46 +3231,46 @@ 
  * @param array|string $args     Display arguments including before_title, after_title, before_widget, and after_widget.

  * @param array|string $instance The settings for the particular instance of the widget.

  */

-function geodir_loginwidget_output( $args = '', $instance = '' ) {

+function geodir_loginwidget_output($args = '', $instance = '') {

 	//print_r($args);

 	//print_r($instance);

 	// prints the widget

-	extract( $args, EXTR_SKIP );

+	extract($args, EXTR_SKIP);

 

 	/** This filter is documented in geodirectory_widgets.php */

-	$title = empty( $instance['title'] ) ? __( 'My Dashboard', 'geodirectory' ) : apply_filters( 'my_dashboard_widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? __('My Dashboard', 'geodirectory') : apply_filters('my_dashboard_widget_title', __($instance['title'], 'geodirectory'));

 

 	echo $before_widget;

-	echo $before_title . $title . $after_title;

+	echo $before_title.$title.$after_title;

 

-	if ( is_user_logged_in() ) {

+	if (is_user_logged_in()) {

 		global $current_user;

 

-		$author_link = get_author_posts_url( $current_user->data->ID );

-		$author_link = geodir_getlink( $author_link, array( 'geodir_dashbord' => 'true' ), false );

+		$author_link = get_author_posts_url($current_user->data->ID);

+		$author_link = geodir_getlink($author_link, array('geodir_dashbord' => 'true'), false);

 

 		echo '<ul class="geodir-loginbox-list">';

 		ob_start();

 		?>

 		<li><a class="signin"

-		       href="<?php echo wp_logout_url( home_url() ); ?>"><?php _e( 'Logout', 'geodirectory' ); ?></a></li>

+		       href="<?php echo wp_logout_url(home_url()); ?>"><?php _e('Logout', 'geodirectory'); ?></a></li>

 		<?php

-		$post_types                           = geodir_get_posttypes( 'object' );

-		$show_add_listing_post_types_main_nav = get_option( 'geodir_add_listing_link_user_dashboard' );

-		$geodir_allow_posttype_frontend       = get_option( 'geodir_allow_posttype_frontend' );

+		$post_types                           = geodir_get_posttypes('object');

+		$show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_user_dashboard');

+		$geodir_allow_posttype_frontend       = get_option('geodir_allow_posttype_frontend');

 

-		if ( ! empty( $show_add_listing_post_types_main_nav ) ) {

+		if (!empty($show_add_listing_post_types_main_nav)) {

 			$addlisting_links = '';

-			foreach ( $post_types as $key => $postobj ) {

+			foreach ($post_types as $key => $postobj) {

 

-				if ( in_array( $key, $show_add_listing_post_types_main_nav ) ) {

+				if (in_array($key, $show_add_listing_post_types_main_nav)) {

 

-					if ( $add_link = geodir_get_addlisting_link( $key ) ) {

+					if ($add_link = geodir_get_addlisting_link($key)) {

 

 						$name = $postobj->labels->name;

 

 						$selected = '';

-						if ( geodir_get_current_posttype() == $key && geodir_is_page( 'add-listing' ) ) {

+						if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {

 							$selected = 'selected="selected"';

 						}

 

@@ -3283,22 +3283,22 @@ 
 						 * @param string $key       Add listing array key.

 						 * @param int $current_user ->ID Current user ID.

 						 */

-						$add_link = apply_filters( 'geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID );

+						$add_link = apply_filters('geodir_dashboard_link_add_listing', $add_link, $key, $current_user->ID);

 

-						$addlisting_links .= '<option ' . $selected . ' value="' . $add_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>';

+						$addlisting_links .= '<option '.$selected.' value="'.$add_link.'">'.__(ucfirst($name), 'geodirectory').'</option>';

 

 					}

 				}

 

 			}

 

-			if ( $addlisting_links != '' ) { ?>

+			if ($addlisting_links != '') { ?>

 

 				<li><select id="geodir_add_listing" class="chosen_select" onchange="window.location.href=this.value"

 				            option-autoredirect="1" name="geodir_add_listing" option-ajaxchosen="false"

-				            data-placeholder="<?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?>">

+				            data-placeholder="<?php echo esc_attr(__('Add Listing', 'geodirectory')); ?>">

 						<option value="" disabled="disabled" selected="selected"

-						        style='display:none;'><?php echo esc_attr( __( 'Add Listing', 'geodirectory' ) ); ?></option>

+						        style='display:none;'><?php echo esc_attr(__('Add Listing', 'geodirectory')); ?></option>

 						<?php echo $addlisting_links; ?>

 					</select></li> <?php

 

@@ -3306,23 +3306,23 @@ 
 

 		}

 		// My Favourites in Dashboard

-		$show_favorite_link_user_dashboard = get_option( 'geodir_favorite_link_user_dashboard' );

+		$show_favorite_link_user_dashboard = get_option('geodir_favorite_link_user_dashboard');

 		$user_favourite                    = geodir_user_favourite_listing_count();

 

-		if ( ! empty( $show_favorite_link_user_dashboard ) && ! empty( $user_favourite ) ) {

+		if (!empty($show_favorite_link_user_dashboard) && !empty($user_favourite)) {

 			$favourite_links = '';

 

-			foreach ( $post_types as $key => $postobj ) {

-				if ( in_array( $key, $show_favorite_link_user_dashboard ) && array_key_exists( $key, $user_favourite ) ) {

+			foreach ($post_types as $key => $postobj) {

+				if (in_array($key, $show_favorite_link_user_dashboard) && array_key_exists($key, $user_favourite)) {

 					$name           = $postobj->labels->name;

-					$post_type_link = geodir_getlink( $author_link, array(

+					$post_type_link = geodir_getlink($author_link, array(

 						'stype' => $key,

 						'list'  => 'favourite'

-					), false );

+					), false);

 

 					$selected = '';

 

-					if ( isset( $_REQUEST['list'] ) && $_REQUEST['list'] == 'favourite' && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key && isset( $_REQUEST['geodir_dashbord'] ) ) {

+					if (isset($_REQUEST['list']) && $_REQUEST['list'] == 'favourite' && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key && isset($_REQUEST['geodir_dashbord'])) {

 						$selected = 'selected="selected"';

 					}

 					/**

@@ -3334,20 +3334,20 @@ 
 					 * @param string $key            Favorite listing array key.

 					 * @param int $current_user      ->ID Current user ID.

 					 */

-					$post_type_link = apply_filters( 'geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID );

+					$post_type_link = apply_filters('geodir_dashboard_link_favorite_listing', $post_type_link, $key, $current_user->ID);

 

-					$favourite_links .= '<option ' . $selected . ' value="' . $post_type_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>';

+					$favourite_links .= '<option '.$selected.' value="'.$post_type_link.'">'.__(ucfirst($name), 'geodirectory').'</option>';

 				}

 			}

 

-			if ( $favourite_links != '' ) {

+			if ($favourite_links != '') {

 				?>

 				<li>

 					<select id="geodir_my_favourites" class="chosen_select" onchange="window.location.href=this.value"

 					        option-autoredirect="1" name="geodir_my_favourites" option-ajaxchosen="false"

-					        data-placeholder="<?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?>">

+					        data-placeholder="<?php echo esc_attr(__('My Favorites', 'geodirectory')); ?>">

 						<option value="" disabled="disabled" selected="selected"

-						        style='display:none;'><?php echo esc_attr( __( 'My Favorites', 'geodirectory' ) ); ?></option>

+						        style='display:none;'><?php echo esc_attr(__('My Favorites', 'geodirectory')); ?></option>

 						<?php echo $favourite_links; ?>

 					</select>

 				</li>

@@ -3356,19 +3356,19 @@ 
 		}

 

 

-		$show_listing_link_user_dashboard = get_option( 'geodir_listing_link_user_dashboard' );

+		$show_listing_link_user_dashboard = get_option('geodir_listing_link_user_dashboard');

 		$user_listing                     = geodir_user_post_listing_count();

 

-		if ( ! empty( $show_listing_link_user_dashboard ) && ! empty( $user_listing ) ) {

+		if (!empty($show_listing_link_user_dashboard) && !empty($user_listing)) {

 			$listing_links = '';

 

-			foreach ( $post_types as $key => $postobj ) {

-				if ( in_array( $key, $show_listing_link_user_dashboard ) && array_key_exists( $key, $user_listing ) ) {

+			foreach ($post_types as $key => $postobj) {

+				if (in_array($key, $show_listing_link_user_dashboard) && array_key_exists($key, $user_listing)) {

 					$name         = $postobj->labels->name;

-					$listing_link = geodir_getlink( $author_link, array( 'stype' => $key ), false );

+					$listing_link = geodir_getlink($author_link, array('stype' => $key), false);

 

 					$selected = '';

-					if ( ! isset( $_REQUEST['list'] ) && isset( $_REQUEST['geodir_dashbord'] ) && isset( $_REQUEST['stype'] ) && $_REQUEST['stype'] == $key ) {

+					if (!isset($_REQUEST['list']) && isset($_REQUEST['geodir_dashbord']) && isset($_REQUEST['stype']) && $_REQUEST['stype'] == $key) {

 						$selected = 'selected="selected"';

 					}

 

@@ -3381,20 +3381,20 @@ 
 					 * @param string $key          My listing array key.

 					 * @param int $current_user    ->ID Current user ID.

 					 */

-					$listing_link = apply_filters( 'geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID );

+					$listing_link = apply_filters('geodir_dashboard_link_my_listing', $listing_link, $key, $current_user->ID);

 

-					$listing_links .= '<option ' . $selected . ' value="' . $listing_link . '">' . __( ucfirst( $name ), 'geodirectory' ) . '</option>';

+					$listing_links .= '<option '.$selected.' value="'.$listing_link.'">'.__(ucfirst($name), 'geodirectory').'</option>';

 				}

 			}

 

-			if ( $listing_links != '' ) {

+			if ($listing_links != '') {

 				?>

 				<li>

 					<select id="geodir_my_listings" class="chosen_select" onchange="window.location.href=this.value"

 					        option-autoredirect="1" name="geodir_my_listings" option-ajaxchosen="false"

-					        data-placeholder="<?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?>">

+					        data-placeholder="<?php echo esc_attr(__('My Listings', 'geodirectory')); ?>">

 						<option value="" disabled="disabled" selected="selected"

-						        style='display:none;'><?php echo esc_attr( __( 'My Listings', 'geodirectory' ) ); ?></option>

+						        style='display:none;'><?php echo esc_attr(__('My Listings', 'geodirectory')); ?></option>

 						<?php echo $listing_links; ?>

 					</select>

 				</li>

@@ -3410,7 +3410,7 @@ 
 		 *

 		 * @param string $dashboard_link Dashboard links HTML.

 		 */

-		echo apply_filters( 'geodir_dashboard_links', $dashboard_link );

+		echo apply_filters('geodir_dashboard_links', $dashboard_link);

 		echo '</ul>';

 

 		/**

@@ -3418,7 +3418,7 @@ 
 		 *

 		 * @since 1.6.6

 		 */

-		do_action( 'geodir_after_loginwidget_form_logged_in' );

+		do_action('geodir_after_loginwidget_form_logged_in');

 

 

 	} else {

@@ -3433,18 +3433,18 @@ 
 		<form name="loginform" class="loginform1"

 		      action="<?php echo geodir_login_url(); ?>"

 		      method="post">

-			<div class="geodir_form_row"><input placeholder="<?php _e( 'Email', 'geodirectory' ); ?>" name="log"

+			<div class="geodir_form_row"><input placeholder="<?php _e('Email', 'geodirectory'); ?>" name="log"

 			                                    type="text" class="textfield user_login1"/> <span

 					class="user_loginInfo"></span></div>

-			<div class="geodir_form_row"><input placeholder="<?php _e( 'Password', 'geodirectory' ); ?>"

+			<div class="geodir_form_row"><input placeholder="<?php _e('Password', 'geodirectory'); ?>"

 			                                    name="pwd" type="password"

 			                                    class="textfield user_pass1 input-text"/><span

 					class="user_passInfo"></span></div>

 

-			<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars( geodir_curPageURL() ); ?>"/>

+			<input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(geodir_curPageURL()); ?>"/>

 			<input type="hidden" name="testcookie" value="1"/>

 

-				<?php do_action( 'login_form' ); ?>

+				<?php do_action('login_form'); ?>

 

 			<div class="geodir_form_row clearfix"><input type="submit" name="submit"

 			                                             value="<?php echo SIGN_IN_BUTTON; ?>" class="b_signin"/>

@@ -3457,7 +3457,7 @@ 
 					 * @since 1.0.0

 					 */

 					?>

-					<a href="<?php echo geodir_login_url( array( 'signup' => true ) ); ?>"

+					<a href="<?php echo geodir_login_url(array('signup' => true)); ?>"

 					   class="goedir-newuser-link"><?php echo NEW_USER_TEXT; ?></a>

 

 					<?php

@@ -3467,7 +3467,7 @@ 
 					 * @since 1.0.0

 					 */

 					?>

-					<a href="<?php echo geodir_login_url( array( 'forgot' => true ) ); ?>"

+					<a href="<?php echo geodir_login_url(array('forgot' => true)); ?>"

 					   class="goedir-forgot-link"><?php echo FORGOT_PW_TEXT; ?></a></p></div>

 		</form>

 		<?php

@@ -3476,7 +3476,7 @@ 
 		 *

 		 * @since 1.6.6

 		 */

-		do_action( 'geodir_after_loginwidget_form_logged_out' );

+		do_action('geodir_after_loginwidget_form_logged_out');

 	}

 

 	echo $after_widget;

@@ -3498,16 +3498,16 @@ 
  *                                         after_widget.

  * @param array|string $instance           The settings for the particular instance of the widget.

  */

-function geodir_popular_postview_output( $args = '', $instance = '' ) {

+function geodir_popular_postview_output($args = '', $instance = '') {

 	global $gd_session;

 

 	// prints the widget

-	extract( $args, EXTR_SKIP );

+	extract($args, EXTR_SKIP);

 

 	echo $before_widget;

 

 	/** This filter is documented in geodirectory_widgets.php */

-	$title = empty( $instance['title'] ) ? geodir_ucwords( $instance['category_title'] ) : apply_filters( 'widget_title', __( $instance['title'], 'geodirectory' ) );

+	$title = empty($instance['title']) ? geodir_ucwords($instance['category_title']) : apply_filters('widget_title', __($instance['title'], 'geodirectory'));

 	/**

 	 * Filter the widget post type.

 	 *

@@ -3515,7 +3515,7 @@ 
 	 *

 	 * @param string $instance ['post_type'] Post type of listing.

 	 */

-	$post_type = empty( $instance['post_type'] ) ? 'gd_place' : apply_filters( 'widget_post_type', $instance['post_type'] );

+	$post_type = empty($instance['post_type']) ? 'gd_place' : apply_filters('widget_post_type', $instance['post_type']);

 	/**

 	 * Filter the widget's term.

 	 *

@@ -3523,7 +3523,7 @@ 
 	 *

 	 * @param string $instance ['category'] Filter by term. Can be any valid term.

 	 */

-	$category = empty( $instance['category'] ) ? '0' : apply_filters( 'widget_category', $instance['category'] );

+	$category = empty($instance['category']) ? '0' : apply_filters('widget_category', $instance['category']);

 	/**

 	 * Filter the widget listings limit.

 	 *

@@ -3531,7 +3531,7 @@ 
 	 *

 	 * @param string $instance ['post_number'] Number of listings to display.

 	 */

-	$post_number = empty( $instance['post_number'] ) ? '5' : apply_filters( 'widget_post_number', $instance['post_number'] );

+	$post_number = empty($instance['post_number']) ? '5' : apply_filters('widget_post_number', $instance['post_number']);

 	/**

 	 * Filter widget's "layout" type.

 	 *

@@ -3539,7 +3539,7 @@ 
 	 *

 	 * @param string $instance ['layout'] Widget layout type.

 	 */

-	$layout = empty( $instance['layout'] ) ? 'gridview_onehalf' : apply_filters( 'widget_layout', $instance['layout'] );

+	$layout = empty($instance['layout']) ? 'gridview_onehalf' : apply_filters('widget_layout', $instance['layout']);

 	/**

 	 * Filter widget's "add_location_filter" value.

 	 *

@@ -3547,7 +3547,7 @@ 
 	 *

 	 * @param string|bool $instance ['add_location_filter'] Do you want to add location filter? Can be 1 or 0.

 	 */

-	$add_location_filter = empty( $instance['add_location_filter'] ) ? '0' : apply_filters( 'widget_add_location_filter', $instance['add_location_filter'] );

+	$add_location_filter = empty($instance['add_location_filter']) ? '0' : apply_filters('widget_add_location_filter', $instance['add_location_filter']);

 	/**

 	 * Filter widget's listing width.

 	 *

@@ -3555,7 +3555,7 @@ 
 	 *

 	 * @param string $instance ['listing_width'] Listing width.

 	 */

-	$listing_width = empty( $instance['listing_width'] ) ? '' : apply_filters( 'widget_listing_width', $instance['listing_width'] );

+	$listing_width = empty($instance['listing_width']) ? '' : apply_filters('widget_listing_width', $instance['listing_width']);

 	/**

 	 * Filter widget's "list_sort" type.

 	 *

@@ -3563,25 +3563,25 @@ 
 	 *

 	 * @param string $instance ['list_sort'] Listing sort by type.

 	 */

-	$list_sort             = empty( $instance['list_sort'] ) ? 'latest' : apply_filters( 'widget_list_sort', $instance['list_sort'] );

-	$use_viewing_post_type = ! empty( $instance['use_viewing_post_type'] ) ? true : false;

+	$list_sort             = empty($instance['list_sort']) ? 'latest' : apply_filters('widget_list_sort', $instance['list_sort']);

+	$use_viewing_post_type = !empty($instance['use_viewing_post_type']) ? true : false;

 

 	// set post type to current viewing post type

-	if ( $use_viewing_post_type ) {

+	if ($use_viewing_post_type) {

 		$current_post_type = geodir_get_current_posttype();

-		if ( $current_post_type != '' && $current_post_type != $post_type ) {

+		if ($current_post_type != '' && $current_post_type != $post_type) {

 			$post_type = $current_post_type;

 			$category  = array(); // old post type category will not work for current changed post type

 		}

 	}

 	// replace widget title dynamically

-	$posttype_plural_label   = __( get_post_type_plural_label( $post_type ), 'geodirectory' );

-	$posttype_singular_label = __( get_post_type_singular_label( $post_type ), 'geodirectory' );

+	$posttype_plural_label   = __(get_post_type_plural_label($post_type), 'geodirectory');

+	$posttype_singular_label = __(get_post_type_singular_label($post_type), 'geodirectory');

 

-	$title = str_replace( "%posttype_plural_label%", $posttype_plural_label, $title );

-	$title = str_replace( "%posttype_singular_label%", $posttype_singular_label, $title );

+	$title = str_replace("%posttype_plural_label%", $posttype_plural_label, $title);

+	$title = str_replace("%posttype_singular_label%", $posttype_singular_label, $title);

 

-	if ( isset( $instance['character_count'] ) ) {

+	if (isset($instance['character_count'])) {

 		/**

 		 * Filter the widget's excerpt character count.

 		 *

@@ -3589,37 +3589,37 @@ 
 		 *

 		 * @param int $instance ['character_count'] Excerpt character count.

 		 */

-		$character_count = apply_filters( 'widget_list_character_count', $instance['character_count'] );

+		$character_count = apply_filters('widget_list_character_count', $instance['character_count']);

 	} else {

 		$character_count = '';

 	}

 

-	if ( empty( $title ) || $title == 'All' ) {

-		$title .= ' ' . __( get_post_type_plural_label( $post_type ), 'geodirectory' );

+	if (empty($title) || $title == 'All') {

+		$title .= ' '.__(get_post_type_plural_label($post_type), 'geodirectory');

 	}

 

 	$location_url = array();

-	$city         = get_query_var( 'gd_city' );

-	if ( ! empty( $city ) ) {

-		$country = get_query_var( 'gd_country' );

-		$region  = get_query_var( 'gd_region' );

+	$city         = get_query_var('gd_city');

+	if (!empty($city)) {

+		$country = get_query_var('gd_country');

+		$region  = get_query_var('gd_region');

 

-		$geodir_show_location_url = get_option( 'geodir_show_location_url' );

+		$geodir_show_location_url = get_option('geodir_show_location_url');

 

-		if ( $geodir_show_location_url == 'all' ) {

-			if ( $country != '' ) {

+		if ($geodir_show_location_url == 'all') {

+			if ($country != '') {

 				$location_url[] = $country;

 			}

 

-			if ( $region != '' ) {

+			if ($region != '') {

 				$location_url[] = $region;

 			}

-		} else if ( $geodir_show_location_url == 'country_city' ) {

-			if ( $country != '' ) {

+		} else if ($geodir_show_location_url == 'country_city') {

+			if ($country != '') {

 				$location_url[] = $country;

 			}

-		} else if ( $geodir_show_location_url == 'region_city' ) {

-			if ( $region != '' ) {

+		} else if ($geodir_show_location_url == 'region_city') {

+			if ($region != '') {

 				$location_url[] = $region;

 			}

 		}

@@ -3627,37 +3627,37 @@ 
 		$location_url[] = $city;

 	}

 

-	$location_url  = implode( '/', $location_url );

+	$location_url  = implode('/', $location_url);

 	$skip_location = false;

-	if ( ! $add_location_filter && $gd_session->get( 'gd_multi_location' ) ) {

+	if (!$add_location_filter && $gd_session->get('gd_multi_location')) {

 		$skip_location = true;

-		$gd_session->un_set( 'gd_multi_location' );

+		$gd_session->un_set('gd_multi_location');

 	}

 

-	if ( get_option( 'permalink_structure' ) ) {

-		$viewall_url = get_post_type_archive_link( $post_type );

+	if (get_option('permalink_structure')) {

+		$viewall_url = get_post_type_archive_link($post_type);

 	} else {

-		$viewall_url = get_post_type_archive_link( $post_type );

+		$viewall_url = get_post_type_archive_link($post_type);

 	}

 

-	if ( ! empty( $category ) && $category[0] != '0' ) {

+	if (!empty($category) && $category[0] != '0') {

 		global $geodir_add_location_url;

 

 		$geodir_add_location_url = '0';

 

-		if ( $add_location_filter != '0' ) {

+		if ($add_location_filter != '0') {

 			$geodir_add_location_url = '1';

 		}

 

-		$viewall_url = get_term_link( (int) $category[0], $post_type . 'category' );

+		$viewall_url = get_term_link((int) $category[0], $post_type.'category');

 

 		$geodir_add_location_url = null;

 	}

-	if ( $skip_location ) {

-		$gd_session->set( 'gd_multi_location', 1 );

+	if ($skip_location) {

+		$gd_session->set('gd_multi_location', 1);

 	}

 

-	if ( is_wp_error( $viewall_url ) ) {

+	if (is_wp_error($viewall_url)) {

 		$viewall_url = '';

 	}

 

@@ -3669,34 +3669,34 @@ 
 		'order_by'       => $list_sort

 	);

 

-	if ( $character_count ) {

+	if ($character_count) {

 		$query_args['excerpt_length'] = $character_count;

 	}

 

-	if ( ! empty( $instance['show_featured_only'] ) ) {

+	if (!empty($instance['show_featured_only'])) {

 		$query_args['show_featured_only'] = 1;

 	}

 

-	if ( ! empty( $instance['show_special_only'] ) ) {

+	if (!empty($instance['show_special_only'])) {

 		$query_args['show_special_only'] = 1;

 	}

 

-	if ( ! empty( $instance['with_pics_only'] ) ) {

+	if (!empty($instance['with_pics_only'])) {

 		$query_args['with_pics_only']      = 0;

 		$query_args['featured_image_only'] = 1;

 	}

 

-	if ( ! empty( $instance['with_videos_only'] ) ) {

+	if (!empty($instance['with_videos_only'])) {

 		$query_args['with_videos_only'] = 1;

 	}

-	$with_no_results = ! empty( $instance['without_no_results'] ) ? false : true;

+	$with_no_results = !empty($instance['without_no_results']) ? false : true;

 

-	if ( ! empty( $category ) && $category[0] != '0' ) {

-		$category_taxonomy = geodir_get_taxonomies( $post_type );

+	if (!empty($category) && $category[0] != '0') {

+		$category_taxonomy = geodir_get_taxonomies($post_type);

 

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

-		if ( function_exists( 'icl_object_id' ) ) {

-			$category = gd_lang_object_ids( $category, $category_taxonomy[0] );

+		if (function_exists('icl_object_id')) {

+			$category = gd_lang_object_ids($category, $category_taxonomy[0]);

 		}

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

 

@@ -3706,14 +3706,14 @@ 
 			'terms'    => $category

 		);

 

-		$query_args['tax_query'] = array( $tax_query );

+		$query_args['tax_query'] = array($tax_query);

 	}

 

 	global $gridview_columns_widget, $geodir_is_widget_listing;

 

-	$widget_listings = geodir_get_widget_listings( $query_args );

+	$widget_listings = geodir_get_widget_listings($query_args);

 

-	if ( ! empty( $widget_listings ) || $with_no_results ) {

+	if (!empty($widget_listings) || $with_no_results) {

 		?>

 		<div class="geodir_locations geodir_location_listing">

 

@@ -3723,11 +3723,11 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			do_action( 'geodir_before_view_all_link_in_widget' ); ?>

+			do_action('geodir_before_view_all_link_in_widget'); ?>

 			<div class="geodir_list_heading clearfix">

-				<?php echo $before_title . $title . $after_title; ?>

+				<?php echo $before_title.$title.$after_title; ?>

 				<a href="<?php echo $viewall_url; ?>"

-				   class="geodir-viewall"><?php _e( 'View all', 'geodirectory' ); ?></a>

+				   class="geodir-viewall"><?php _e('View all', 'geodirectory'); ?></a>

 			</div>

 			<?php

 			/**

@@ -3735,10 +3735,10 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			do_action( 'geodir_after_view_all_link_in_widget' ); ?>

+			do_action('geodir_after_view_all_link_in_widget'); ?>

 			<?php

-			if ( strstr( $layout, 'gridview' ) ) {

-				$listing_view_exp        = explode( '_', $layout );

+			if (strstr($layout, 'gridview')) {

+				$listing_view_exp        = explode('_', $layout);

 				$gridview_columns_widget = $layout;

 				$layout                  = $listing_view_exp[0];

 			} else {

@@ -3750,8 +3750,8 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			$template = apply_filters( "geodir_template_part-widget-listing-listview", geodir_locate_template( 'widget-listing-listview' ) );

-			if ( ! isset( $character_count ) ) {

+			$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));

+			if (!isset($character_count)) {

 				/**

 				 * Filter the widget's excerpt character count.

 				 *

@@ -3759,7 +3759,7 @@ 
 				 *

 				 * @param int $instance ['character_count'] Excerpt character count.

 				 */

-				$character_count = $character_count == '' ? 50 : apply_filters( 'widget_character_count', $character_count );

+				$character_count = $character_count == '' ? 50 : apply_filters('widget_character_count', $character_count);

 			}

 

 			global $post, $map_jason, $map_canvas_arr;

@@ -3774,13 +3774,13 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			include( $template );

+			include($template);

 

 			$geodir_is_widget_listing = false;

 

 			$GLOBALS['post'] = $current_post;

-			if ( ! empty( $current_post ) ) {

-				setup_postdata( $current_post );

+			if (!empty($current_post)) {

+				setup_postdata($current_post);

 			}

 			$map_jason      = $current_map_jason;

 			$map_canvas_arr = $current_map_canvas_arr;

@@ -3811,12 +3811,12 @@ 
  *

  * @return int Reviews count.

  */

-function geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type ) {

+function geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type) {

 	global $wpdb, $plugin_prefix;

 

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

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

 

-	$sql = "SELECT COALESCE(SUM(rating_count),0) FROM " . $detail_table . " WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(" . $term_id . ", " . $taxonomy . ")";

+	$sql = "SELECT COALESCE(SUM(rating_count),0) FROM ".$detail_table." WHERE post_status = 'publish' AND rating_count > 0 AND FIND_IN_SET(".$term_id.", ".$taxonomy.")";

 

 	/**

 	 * Filter count review sql query.

@@ -3828,9 +3828,9 @@ 
 	 * @param int $taxonomy     The taxonomy Id.

 	 * @param string $post_type The post type.

 	 */

-	$sql = apply_filters( 'geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type );

+	$sql = apply_filters('geodir_count_reviews_by_term_sql', $sql, $term_id, $taxonomy, $post_type);

 

-	$count = $wpdb->get_var( $sql );

+	$count = $wpdb->get_var($sql);

 

 	return $count;

 }

@@ -3848,7 +3848,7 @@ 
  *

  * @return array Term array data.

  */

-function geodir_count_reviews_by_terms( $force_update = false, $post_ID = 0 ) {

+function geodir_count_reviews_by_terms($force_update = false, $post_ID = 0) {

 	/**

 	 * Filter review count option data.

 	 *

@@ -3858,78 +3858,78 @@ 
 	 * @param bool $force_update Force update option value?. Default.false.

 	 * @param int $post_ID       The post id to update if any.

 	 */

-	$option_data = apply_filters( 'geodir_count_reviews_by_terms_before', '', $force_update, $post_ID );

-	if ( ! empty( $option_data ) ) {

+	$option_data = apply_filters('geodir_count_reviews_by_terms_before', '', $force_update, $post_ID);

+	if (!empty($option_data)) {

 		return $option_data;

 	}

 

-	$option_data = get_option( 'geodir_global_review_count' );

+	$option_data = get_option('geodir_global_review_count');

 

-	if ( ! $option_data || $force_update ) {

-		if ( (int) $post_ID > 0 ) { // Update reviews count for specific post categories only.

+	if (!$option_data || $force_update) {

+		if ((int) $post_ID > 0) { // Update reviews count for specific post categories only.

 			global $gd_session;

 			$term_array = (array) $option_data;

-			$post_type  = get_post_type( $post_ID );

-			$taxonomy   = $post_type . 'category';

-			$terms      = wp_get_object_terms( $post_ID, $taxonomy, array( 'fields' => 'ids' ) );

-

-			if ( ! empty( $terms ) && ! is_wp_error( $terms ) ) {

-				foreach ( $terms as $term_id ) {

-					$count                  = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type );

-					$children               = get_term_children( $term_id, $taxonomy );

-					$term_array[ $term_id ] = $count;

+			$post_type  = get_post_type($post_ID);

+			$taxonomy   = $post_type.'category';

+			$terms      = wp_get_object_terms($post_ID, $taxonomy, array('fields' => 'ids'));

+

+			if (!empty($terms) && !is_wp_error($terms)) {

+				foreach ($terms as $term_id) {

+					$count                  = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type);

+					$children               = get_term_children($term_id, $taxonomy);

+					$term_array[$term_id] = $count;

 				}

 			}

 

-			$session_listing = $gd_session->get( 'listing' );

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

 

 			$terms = array();

-			if ( isset( $_POST['post_category'][ $taxonomy ] ) ) {

-				$terms = (array) $_POST['post_category'][ $taxonomy ];

-			} else if ( ! empty( $session_listing ) && isset( $session_listing['post_category'][ $taxonomy ] ) ) {

-				$terms = (array) $session_listing['post_category'][ $taxonomy ];

+			if (isset($_POST['post_category'][$taxonomy])) {

+				$terms = (array) $_POST['post_category'][$taxonomy];

+			} else if (!empty($session_listing) && isset($session_listing['post_category'][$taxonomy])) {

+				$terms = (array) $session_listing['post_category'][$taxonomy];

 			}

 

-			if ( ! empty( $terms ) ) {

-				foreach ( $terms as $term_id ) {

-					if ( $term_id > 0 ) {

-						$count                  = geodir_count_reviews_by_term_id( $term_id, $taxonomy, $post_type );

-						$children               = get_term_children( $term_id, $taxonomy );

-						$term_array[ $term_id ] = $count;

+			if (!empty($terms)) {

+				foreach ($terms as $term_id) {

+					if ($term_id > 0) {

+						$count                  = geodir_count_reviews_by_term_id($term_id, $taxonomy, $post_type);

+						$children               = get_term_children($term_id, $taxonomy);

+						$term_array[$term_id] = $count;

 					}

 				}

 			}

 		} else { // Update reviews count for all post categories.

 			$term_array = array();

 			$post_types = geodir_get_posttypes();

-			foreach ( $post_types as $post_type ) {

+			foreach ($post_types as $post_type) {

 

-				$taxonomy = geodir_get_taxonomies( $post_type );

+				$taxonomy = geodir_get_taxonomies($post_type);

 				$taxonomy = $taxonomy[0];

 

 				$args = array(

 					'hide_empty' => false

 				);

 

-				$terms = get_terms( $taxonomy, $args );

+				$terms = get_terms($taxonomy, $args);

 

-				foreach ( $terms as $term ) {

-					$count    = geodir_count_reviews_by_term_id( $term->term_id, $taxonomy, $post_type );

-					$children = get_term_children( $term->term_id, $taxonomy );

+				foreach ($terms as $term) {

+					$count    = geodir_count_reviews_by_term_id($term->term_id, $taxonomy, $post_type);

+					$children = get_term_children($term->term_id, $taxonomy);

 					/*if ( is_array( $children ) ) {

                         foreach ( $children as $child_id ) {

                             $child_count = geodir_count_reviews_by_term_id($child_id, $taxonomy, $post_type);

                             $count = $count + $child_count;

                         }

                     }*/

-					$term_array[ $term->term_id ] = $count;

+					$term_array[$term->term_id] = $count;

 				}

 			}

 		}

 

-		update_option( 'geodir_global_review_count', $term_array );

+		update_option('geodir_global_review_count', $term_array);

 		//clear cache

-		wp_cache_delete( 'geodir_global_review_count' );

+		wp_cache_delete('geodir_global_review_count');

 

 		return $term_array;

 	} else {

@@ -3945,39 +3945,39 @@ 
  * @package GeoDirectory

  * @return bool

  */

-function geodir_term_review_count_force_update( $new_status, $old_status = '', $post = '' ) {

-	if ( isset( $_REQUEST['action'] ) && $_REQUEST['action'] == 'geodir_import_export' ) {

+function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '') {

+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {

 		return; // do not run if importing listings

 	}

 

-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {

+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {

 		return;

 	}

 

 	$post_ID = 0;

-	if ( ! empty( $post ) ) {

-		if ( isset( $post->post_type ) && strpos( $post->post_type, 'gd_' ) !== 0 ) {

+	if (!empty($post)) {

+		if (isset($post->post_type) && strpos($post->post_type, 'gd_') !== 0) {

 			return;

 		}

 

-		if ( $new_status == 'auto-draft' && $old_status == 'new' ) {

+		if ($new_status == 'auto-draft' && $old_status == 'new') {

 			return;

 		}

 

-		if ( ! empty( $post->ID ) ) {

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

 			$post_ID = $post->ID;

 		}

 	}

 

-	if ( $new_status != $old_status ) {

-		geodir_count_reviews_by_terms( true, $post_ID );

+	if ($new_status != $old_status) {

+		geodir_count_reviews_by_terms(true, $post_ID);

 	}

 

 	return true;

 }

 

-function geodir_term_review_count_force_update_single_post( $post_id ) {

-	geodir_count_reviews_by_terms( true, $post_id );

+function geodir_term_review_count_force_update_single_post($post_id) {

+	geodir_count_reviews_by_terms(true, $post_id);

 }

 

 /*-----------------------------------------------------------------------------------*/

@@ -3994,11 +3994,11 @@ 
  *

  * @return int Post count.

  */

-function geodir_count_posts_by_term( $data, $term ) {

+function geodir_count_posts_by_term($data, $term) {

 

-	if ( $data ) {

-		if ( isset( $data[ $term->term_id ] ) ) {

-			return $data[ $term->term_id ];

+	if ($data) {

+		if (isset($data[$term->term_id])) {

+			return $data[$term->term_id];

 		} else {

 			return 0;

 		}

@@ -4015,8 +4015,8 @@ 
  * param array $terms An array of term objects.

  * @return array Sorted terms array.

  */

-function geodir_sort_terms_by_count( $terms ) {

-	usort( $terms, "geodir_sort_by_count_obj" );

+function geodir_sort_terms_by_count($terms) {

+	usort($terms, "geodir_sort_by_count_obj");

 

 	return $terms;

 }

@@ -4031,8 +4031,8 @@ 
  *

  * @return array Sorted terms array.

  */

-function geodir_sort_terms_by_review_count( $terms ) {

-	usort( $terms, "geodir_sort_by_review_count_obj" );

+function geodir_sort_terms_by_review_count($terms) {

+	usort($terms, "geodir_sort_by_review_count_obj");

 

 	return $terms;

 }

@@ -4048,12 +4048,12 @@ 
  *

  * @return array Sorted terms array.

  */

-function geodir_sort_terms( $terms, $sort = 'count' ) {

-	if ( $sort == 'count' ) {

-		return geodir_sort_terms_by_count( $terms );

+function geodir_sort_terms($terms, $sort = 'count') {

+	if ($sort == 'count') {

+		return geodir_sort_terms_by_count($terms);

 	}

-	if ( $sort == 'review_count' ) {

-		return geodir_sort_terms_by_review_count( $terms );

+	if ($sort == 'review_count') {

+		return geodir_sort_terms_by_review_count($terms);

 	}

 }

 

@@ -4071,7 +4071,7 @@ 
  *

  * @return bool

  */

-function geodir_sort_by_count( $a, $b ) {

+function geodir_sort_by_count($a, $b) {

 	return $a['count'] < $b['count'];

 }

 

@@ -4086,7 +4086,7 @@ 
  *

  * @return bool

  */

-function geodir_sort_by_count_obj( $a, $b ) {

+function geodir_sort_by_count_obj($a, $b) {

 	return $a->count < $b->count;

 }

 

@@ -4101,7 +4101,7 @@ 
  *

  * @return bool

  */

-function geodir_sort_by_review_count_obj( $a, $b ) {

+function geodir_sort_by_review_count_obj($a, $b) {

 	return $a->review_count < $b->review_count;

 }

 

@@ -4118,35 +4118,35 @@ 
 	 * @since   1.4.2

 	 * @package GeoDirectory

 	 */

-	$locale = apply_filters( 'plugin_locale', get_locale(), 'geodirectory' );

+	$locale = apply_filters('plugin_locale', get_locale(), 'geodirectory');

 

-	load_textdomain( 'geodirectory', WP_LANG_DIR . '/' . 'geodirectory' . '/' . 'geodirectory' . '-' . $locale . '.mo' );

-	load_plugin_textdomain( 'geodirectory', false, plugin_basename( dirname( dirname( __FILE__ ) ) ) . '/geodirectory-languages' );

+	load_textdomain('geodirectory', WP_LANG_DIR.'/'.'geodirectory'.'/'.'geodirectory'.'-'.$locale.'.mo');

+	load_plugin_textdomain('geodirectory', false, plugin_basename(dirname(dirname(__FILE__))).'/geodirectory-languages');

 

 	/**

 	 * Define language constants.

 	 *

 	 * @since 1.0.0

 	 */

-	require_once( geodir_plugin_path() . '/language.php' );

+	require_once(geodir_plugin_path().'/language.php');

 

-	$language_file = geodir_plugin_path() . '/db-language.php';

+	$language_file = geodir_plugin_path().'/db-language.php';

 

 	// Load language string file if not created yet

-	if ( ! file_exists( $language_file ) ) {

+	if (!file_exists($language_file)) {

 		geodirectory_load_db_language();

 	}

 

-	if ( file_exists( $language_file ) ) {

+	if (file_exists($language_file)) {

 		/**

 		 * Language strings from database.

 		 *

 		 * @since 1.4.2

 		 */

 		try {

-			require_once( $language_file );

-		} catch ( Exception $e ) {

-			error_log( 'Language Error: ' . $e->getMessage() );

+			require_once($language_file);

+		} catch (Exception $e) {

+			error_log('Language Error: '.$e->getMessage());

 		}

 	}

 }

@@ -4163,19 +4163,19 @@ 
  */

 function geodirectory_load_db_language() {

 	global $wp_filesystem;

-	if ( empty( $wp_filesystem ) ) {

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

+	if (empty($wp_filesystem)) {

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

 		WP_Filesystem();

 		global $wp_filesystem;

 	}

 

-	$language_file = geodir_plugin_path() . '/db-language.php';

+	$language_file = geodir_plugin_path().'/db-language.php';

 

-	if ( is_file( $language_file ) && ! is_writable( $language_file ) ) {

+	if (is_file($language_file) && !is_writable($language_file)) {

 		return false;

 	} // Not possible to create.

 

-	if ( ! is_file( $language_file ) && ! is_writable( dirname( $language_file ) ) ) {

+	if (!is_file($language_file) && !is_writable(dirname($language_file))) {

 		return false;

 	} // Not possible to create.

 

@@ -4189,9 +4189,9 @@ 
 	 *

 	 * @param array $contents_strings Array of strings.

 	 */

-	$contents_strings = apply_filters( 'geodir_load_db_language', $contents_strings );

+	$contents_strings = apply_filters('geodir_load_db_language', $contents_strings);

 

-	$contents_strings = array_unique( $contents_strings );

+	$contents_strings = array_unique($contents_strings);

 

 	$contents_head   = array();

 	$contents_head[] = "<?php";

@@ -4208,21 +4208,21 @@ 
 	$contents_foot[] = "";

 	$contents_foot[] = "";

 

-	$contents = implode( PHP_EOL, $contents_head );

+	$contents = implode(PHP_EOL, $contents_head);

 

-	if ( ! empty( $contents_strings ) ) {

-		foreach ( $contents_strings as $string ) {

-			if ( is_scalar( $string ) && $string != '' ) {

-				$string = str_replace( "'", "\'", $string );

-				geodir_wpml_register_string( $string );

-				$contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";

+	if (!empty($contents_strings)) {

+		foreach ($contents_strings as $string) {

+			if (is_scalar($string) && $string != '') {

+				$string = str_replace("'", "\'", $string);

+				geodir_wpml_register_string($string);

+				$contents .= PHP_EOL."__('".$string."', 'geodirectory');";

 			}

 		}

 	}

 

-	$contents .= implode( PHP_EOL, $contents_foot );

+	$contents .= implode(PHP_EOL, $contents_foot);

 

-	if ( $wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE ) ) {

+	if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE)) {

 		return false;

 	} // Failure; could not write file.

 

@@ -4243,49 +4243,49 @@ 
  *

  * @return array Translation texts.

  */

-function geodir_load_custom_field_translation( $translation_texts = array() ) {

+function geodir_load_custom_field_translation($translation_texts = array()) {

 	global $wpdb;

 

 	// Custom fields table

-	$sql  = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM " . GEODIR_CUSTOM_FIELDS_TABLE;

-	$rows = $wpdb->get_results( $sql );

+	$sql  = "SELECT admin_title, admin_desc, site_title, clabels, required_msg, default_value, option_values, validation_msg FROM ".GEODIR_CUSTOM_FIELDS_TABLE;

+	$rows = $wpdb->get_results($sql);

 

-	if ( ! empty( $rows ) ) {

-		foreach ( $rows as $row ) {

-			if ( ! empty( $row->admin_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->admin_title );

+	if (!empty($rows)) {

+		foreach ($rows as $row) {

+			if (!empty($row->admin_title)) {

+				$translation_texts[] = stripslashes_deep($row->admin_title);

 			}

 

-			if ( ! empty( $row->admin_desc ) ) {

-				$translation_texts[] = stripslashes_deep( $row->admin_desc );

+			if (!empty($row->admin_desc)) {

+				$translation_texts[] = stripslashes_deep($row->admin_desc);

 			}

 

-			if ( ! empty( $row->site_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->site_title );

+			if (!empty($row->site_title)) {

+				$translation_texts[] = stripslashes_deep($row->site_title);

 			}

 

-			if ( ! empty( $row->clabels ) ) {

-				$translation_texts[] = stripslashes_deep( $row->clabels );

+			if (!empty($row->clabels)) {

+				$translation_texts[] = stripslashes_deep($row->clabels);

 			}

 

-			if ( ! empty( $row->required_msg ) ) {

-				$translation_texts[] = stripslashes_deep( $row->required_msg );

+			if (!empty($row->required_msg)) {

+				$translation_texts[] = stripslashes_deep($row->required_msg);

 			}

             

-			if ( ! empty( $row->validation_msg ) ) {

-				$translation_texts[] = stripslashes_deep( $row->validation_msg );

+			if (!empty($row->validation_msg)) {

+				$translation_texts[] = stripslashes_deep($row->validation_msg);

 			}

 

-			if ( ! empty( $row->default_value ) ) {

-				$translation_texts[] = stripslashes_deep( $row->default_value );

+			if (!empty($row->default_value)) {

+				$translation_texts[] = stripslashes_deep($row->default_value);

 			}

 

-			if ( ! empty( $row->option_values ) ) {

-				$option_values = geodir_string_values_to_options( stripslashes_deep( $row->option_values ) );

+			if (!empty($row->option_values)) {

+				$option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values));

 

-				if ( ! empty( $option_values ) ) {

-					foreach ( $option_values as $option_value ) {

-						if ( ! empty( $option_value['label'] ) ) {

+				if (!empty($option_values)) {

+					foreach ($option_values as $option_value) {

+						if (!empty($option_value['label'])) {

 							$translation_texts[] = $option_value['label'];

 						}

 					}

@@ -4295,56 +4295,56 @@ 
 	}

 

 	// Custom sorting fields table

-	$sql  = "SELECT site_title, asc_title, desc_title FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE;

-	$rows = $wpdb->get_results( $sql );

+	$sql  = "SELECT site_title, asc_title, desc_title FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE;

+	$rows = $wpdb->get_results($sql);

 

-	if ( ! empty( $rows ) ) {

-		foreach ( $rows as $row ) {

-			if ( ! empty( $row->site_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->site_title );

+	if (!empty($rows)) {

+		foreach ($rows as $row) {

+			if (!empty($row->site_title)) {

+				$translation_texts[] = stripslashes_deep($row->site_title);

 			}

 

-			if ( ! empty( $row->asc_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->asc_title );

+			if (!empty($row->asc_title)) {

+				$translation_texts[] = stripslashes_deep($row->asc_title);

 			}

 

-			if ( ! empty( $row->desc_title ) ) {

-				$translation_texts[] = stripslashes_deep( $row->desc_title );

+			if (!empty($row->desc_title)) {

+				$translation_texts[] = stripslashes_deep($row->desc_title);

 			}

 		}

 	}

 

 	// Advance search filter fields table

-	if ( defined( 'GEODIR_ADVANCE_SEARCH_TABLE' ) ) {

-		$sql  = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE;

-		$rows = $wpdb->get_results( $sql );

-

-		if ( ! empty( $rows ) ) {

-			foreach ( $rows as $row ) {

-				if ( ! empty( $row->field_site_name ) ) {

-					$translation_texts[] = stripslashes_deep( $row->field_site_name );

+	if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {

+		$sql  = "SELECT field_site_name, front_search_title, first_search_text, last_search_text, field_desc FROM ".GEODIR_ADVANCE_SEARCH_TABLE;

+		$rows = $wpdb->get_results($sql);

+

+		if (!empty($rows)) {

+			foreach ($rows as $row) {

+				if (!empty($row->field_site_name)) {

+					$translation_texts[] = stripslashes_deep($row->field_site_name);

 				}

 

-				if ( ! empty( $row->front_search_title ) ) {

-					$translation_texts[] = stripslashes_deep( $row->front_search_title );

+				if (!empty($row->front_search_title)) {

+					$translation_texts[] = stripslashes_deep($row->front_search_title);

 				}

 

-				if ( ! empty( $row->first_search_text ) ) {

-					$translation_texts[] = stripslashes_deep( $row->first_search_text );

+				if (!empty($row->first_search_text)) {

+					$translation_texts[] = stripslashes_deep($row->first_search_text);

 				}

 

-				if ( ! empty( $row->last_search_text ) ) {

-					$translation_texts[] = stripslashes_deep( $row->last_search_text );

+				if (!empty($row->last_search_text)) {

+					$translation_texts[] = stripslashes_deep($row->last_search_text);

 				}

 

-				if ( ! empty( $row->field_desc ) ) {

-					$translation_texts[] = stripslashes_deep( $row->field_desc );

+				if (!empty($row->field_desc)) {

+					$translation_texts[] = stripslashes_deep($row->field_desc);

 				}

 			}

 		}

 	}

 

-	$translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts;

+	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

 	return $translation_texts;

 }

@@ -4366,7 +4366,7 @@ 
 	 *

 	 * @param array $geodir_allowed_mime_types and file extensions.

 	 */

-	return apply_filters( 'geodir_allowed_mime_types', array(

+	return apply_filters('geodir_allowed_mime_types', array(

 			'Image'       => array( // Image formats.

 				'jpg'  => 'image/jpeg',

 				'jpe'  => 'image/jpeg',

@@ -4434,18 +4434,18 @@ 
  *

  * @return string User display name.

  */

-function geodir_get_client_name( $user_id ) {

+function geodir_get_client_name($user_id) {

 	$client_name = '';

 

-	$user_data = get_userdata( $user_id );

+	$user_data = get_userdata($user_id);

 

-	if ( ! empty( $user_data ) ) {

-		if ( isset( $user_data->display_name ) && trim( $user_data->display_name ) != '' ) {

-			$client_name = trim( $user_data->display_name );

-		} else if ( isset( $user_data->user_nicename ) && trim( $user_data->user_nicename ) != '' ) {

-			$client_name = trim( $user_data->user_nicename );

+	if (!empty($user_data)) {

+		if (isset($user_data->display_name) && trim($user_data->display_name) != '') {

+			$client_name = trim($user_data->display_name);

+		} else if (isset($user_data->user_nicename) && trim($user_data->user_nicename) != '') {

+			$client_name = trim($user_data->user_nicename);

 		} else {

-			$client_name = trim( $user_data->user_login );

+			$client_name = trim($user_data->user_login);

 		}

 	}

 

@@ -4453,19 +4453,19 @@ 
 }

 

 

-add_filter( 'wpseo_replacements', 'geodir_wpseo_replacements', 10, 1 );

+add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);

 /*

  * Add location variables to wpseo replacements.

  *

  * @since 1.5.4

  */

-function geodir_wpseo_replacements( $vars ) {

+function geodir_wpseo_replacements($vars) {

 

 	global $wp;

 	$title = '';

 	// location variables

 	$gd_post_type   = geodir_get_current_posttype();

-	$location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type );

+	$location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);

 	/**

 	 * Filter the title variables location variables array

 	 *

@@ -4475,20 +4475,20 @@ 
 	 * @param array $location_array The array of location variables.

 	 * @param array $vars           The page title variables.

 	 */

-	$location_array  = apply_filters( 'geodir_filter_title_variables_location_arr_seo', $location_array, $vars );

+	$location_array  = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);

 	$location_titles = array();

-	if ( get_query_var( 'gd_country_full' ) ) {

-		if ( get_query_var( 'gd_country_full' ) ) {

-			$location_array['gd_country'] = get_query_var( 'gd_country_full' );

+	if (get_query_var('gd_country_full')) {

+		if (get_query_var('gd_country_full')) {

+			$location_array['gd_country'] = get_query_var('gd_country_full');

 		}

-		if ( get_query_var( 'gd_region_full' ) ) {

-			$location_array['gd_region'] = get_query_var( 'gd_region_full' );

+		if (get_query_var('gd_region_full')) {

+			$location_array['gd_region'] = get_query_var('gd_region_full');

 		}

-		if ( get_query_var( 'gd_city_full' ) ) {

-			$location_array['gd_city'] = get_query_var( 'gd_city_full' );

+		if (get_query_var('gd_city_full')) {

+			$location_array['gd_city'] = get_query_var('gd_city_full');

 		}

-		if ( get_query_var( 'gd_neighbourhood_full' ) ) {

-			$location_array['gd_neighbourhood'] = get_query_var( 'gd_neighbourhood_full' );

+		if (get_query_var('gd_neighbourhood_full')) {

+			$location_array['gd_neighbourhood'] = get_query_var('gd_neighbourhood_full');

 		}

 	}

 	

@@ -4503,7 +4503,7 @@ 
 	 * @param string $gd_page       The page being filtered.

 	 * @param string $sep           The separator, default: `|`.

 	 */

-	$title = apply_filters( 'geodir_replace_location_variables_seo', $title, $location_array, '', '' );

+	$title = apply_filters('geodir_replace_location_variables_seo', $title, $location_array, '', '');

 

 	/**

 	 * Filter the title variables after standard ones have been filtered for wpseo.

@@ -4514,13 +4514,13 @@ 
 	 * @param string $vars          The title with variables.

 	 * @param array $location_array The array of location variables.

 	 */

-	return apply_filters( 'geodir_wpseo_replacements_vars', $vars, $location_array );

+	return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);

 }

 

 

-add_filter( 'geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3 );

-add_filter( 'geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2 );

-add_filter( 'geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3 );

+add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);

+add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);

+add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);

 

 /**

  * Filter the title variables.

@@ -4562,14 +4562,14 @@ 
  *

  * @return string Title after filtered variables.

  */

-function geodir_filter_title_variables( $title, $gd_page, $sep = '' ) {

+function geodir_filter_title_variables($title, $gd_page, $sep = '') {

 	global $wp, $post;

 

-	if ( ! $gd_page || ! $title ) {

+	if (!$gd_page || !$title) {

 		return $title; // if no a GD page then bail.

 	}

 

-	if ( $sep == '' ) {

+	if ($sep == '') {

 		/**

 		 * Filter the page title separator.

 		 *

@@ -4578,100 +4578,100 @@ 
 		 *

 		 * @param string $sep The separator, default: `|`.

 		 */

-		$sep = apply_filters( 'geodir_page_title_separator', '|' );

+		$sep = apply_filters('geodir_page_title_separator', '|');

 	}

 

-	if ( strpos( $title, '%%title%%' ) !== false ) {

-		$title = str_replace( "%%title%%", $post->post_title, $title );

+	if (strpos($title, '%%title%%') !== false) {

+		$title = str_replace("%%title%%", $post->post_title, $title);

 	}

 

-	if ( strpos( $title, '%%sitename%%' ) !== false ) {

-		$title = str_replace( "%%sitename%%", get_bloginfo( 'name' ), $title );

+	if (strpos($title, '%%sitename%%') !== false) {

+		$title = str_replace("%%sitename%%", get_bloginfo('name'), $title);

 	}

 

-	if ( strpos( $title, '%%sitedesc%%' ) !== false ) {

-		$title = str_replace( "%%sitedesc%%", get_bloginfo( 'description' ), $title );

+	if (strpos($title, '%%sitedesc%%') !== false) {

+		$title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);

 	}

 

-	if ( strpos( $title, '%%excerpt%%' ) !== false ) {

-		$title = str_replace( "%%excerpt%%", strip_tags( get_the_excerpt() ), $title );

+	if (strpos($title, '%%excerpt%%') !== false) {

+		$title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);

 	}

 

-	if ( $gd_page == 'search' || $gd_page == 'author' ) {

-		$post_type = isset( $_REQUEST['stype'] ) ? sanitize_text_field( $_REQUEST['stype'] ) : '';

-	} else if ( $gd_page == 'add-listing' ) {

-		$post_type = ( isset( $_REQUEST['listing_type'] ) ) ? sanitize_text_field( $_REQUEST['listing_type'] ) : '';

-		$post_type = ! $post_type && ! empty( $_REQUEST['pid'] ) ? get_post_type( (int) $_REQUEST['pid'] ) : $post_type;

-	} else if ( isset( $post->post_type ) && $post->post_type && in_array( $post->post_type, geodir_get_posttypes() ) ) {

+	if ($gd_page == 'search' || $gd_page == 'author') {

+		$post_type = isset($_REQUEST['stype']) ? sanitize_text_field($_REQUEST['stype']) : '';

+	} else if ($gd_page == 'add-listing') {

+		$post_type = (isset($_REQUEST['listing_type'])) ? sanitize_text_field($_REQUEST['listing_type']) : '';

+		$post_type = !$post_type && !empty($_REQUEST['pid']) ? get_post_type((int) $_REQUEST['pid']) : $post_type;

+	} else if (isset($post->post_type) && $post->post_type && in_array($post->post_type, geodir_get_posttypes())) {

 		$post_type = $post->post_type;

 	} else {

-		$post_type = get_query_var( 'post_type' );

+		$post_type = get_query_var('post_type');

 	}

 

-	if ( strpos( $title, '%%pt_single%%' ) !== false ) {

+	if (strpos($title, '%%pt_single%%') !== false) {

 		$singular_name = '';

-		if ( $post_type && $singular_name = get_post_type_singular_label( $post_type ) ) {

-			$singular_name = __( $singular_name, 'geodirectory' );

+		if ($post_type && $singular_name = get_post_type_singular_label($post_type)) {

+			$singular_name = __($singular_name, 'geodirectory');

 		}

 

-		$title = str_replace( "%%pt_single%%", $singular_name, $title );

+		$title = str_replace("%%pt_single%%", $singular_name, $title);

 	}

 

-	if ( strpos( $title, '%%pt_plural%%' ) !== false ) {

+	if (strpos($title, '%%pt_plural%%') !== false) {

 		$plural_name = '';

-		if ( $post_type && $plural_name = get_post_type_plural_label( $post_type ) ) {

-			$plural_name = __( $plural_name, 'geodirectory' );

+		if ($post_type && $plural_name = get_post_type_plural_label($post_type)) {

+			$plural_name = __($plural_name, 'geodirectory');

 		}

 

-		$title = str_replace( "%%pt_plural%%", $plural_name, $title );

+		$title = str_replace("%%pt_plural%%", $plural_name, $title);

 	}

 

-	if ( strpos( $title, '%%category%%' ) !== false ) {

+	if (strpos($title, '%%category%%') !== false) {

 		$cat_name = '';

 

-		if ( $gd_page == 'detail' ) {

-			if ( $post->default_category ) {

-				$cat      = get_term( $post->default_category, $post->post_type . 'category' );

-				$cat_name = ( isset( $cat->name ) ) ? $cat->name : '';

+		if ($gd_page == 'detail') {

+			if ($post->default_category) {

+				$cat      = get_term($post->default_category, $post->post_type.'category');

+				$cat_name = (isset($cat->name)) ? $cat->name : '';

 			}

-		} else if ( $gd_page == 'listing' ) {

+		} else if ($gd_page == 'listing') {

 			$queried_object = get_queried_object();

-			if ( isset( $queried_object->name ) ) {

+			if (isset($queried_object->name)) {

 				$cat_name = $queried_object->name;

 			}

 		}

-		$title = str_replace( "%%category%%", $cat_name, $title );

+		$title = str_replace("%%category%%", $cat_name, $title);

 	}

 

-	if ( strpos( $title, '%%tag%%' ) !== false ) {

+	if (strpos($title, '%%tag%%') !== false) {

 		$cat_name = '';

 

-		if ( $gd_page == 'detail' ) {

-			if ( $post->default_category ) {

-				$cat      = get_term( $post->default_category, $post->post_type . 'category' );

-				$cat_name = ( isset( $cat->name ) ) ? $cat->name : '';

+		if ($gd_page == 'detail') {

+			if ($post->default_category) {

+				$cat      = get_term($post->default_category, $post->post_type.'category');

+				$cat_name = (isset($cat->name)) ? $cat->name : '';

 			}

-		} else if ( $gd_page == 'listing' ) {

+		} else if ($gd_page == 'listing') {

 			$queried_object = get_queried_object();

-			if ( isset( $queried_object->name ) ) {

+			if (isset($queried_object->name)) {

 				$cat_name = $queried_object->name;

 			}

 		}

-		$title = str_replace( "%%tag%%", $cat_name, $title );

+		$title = str_replace("%%tag%%", $cat_name, $title);

 	}

 

-	if ( strpos( $title, '%%id%%' ) !== false ) {

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

-		$title = str_replace( "%%id%%", $ID, $title );

+	if (strpos($title, '%%id%%') !== false) {

+		$ID    = (isset($post->ID)) ? $post->ID : '';

+		$title = str_replace("%%id%%", $ID, $title);

 	}

 

-	if ( strpos( $title, '%%sep%%' ) !== false ) {

-		$title = str_replace( "%%sep%%", $sep, $title );

+	if (strpos($title, '%%sep%%') !== false) {

+		$title = str_replace("%%sep%%", $sep, $title);

 	}

 

 	// location variables

 	$gd_post_type   = geodir_get_current_posttype();

-	$location_array = geodir_get_current_location_terms( 'query_vars', $gd_post_type );

+	$location_array = geodir_get_current_location_terms('query_vars', $gd_post_type);

 	

 	/**

 	 * Filter the title variables location variables array

@@ -4684,20 +4684,20 @@ 
 	 * @param string $gd_page       The page being filtered.

 	 * @param string $sep           The separator, default: `|`.

 	 */

-	$location_array  = apply_filters( 'geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep );

+	$location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);

 	

-	if ( $gd_page == 'location' && get_query_var( 'gd_country_full' ) ) {

-		if ( get_query_var( 'gd_country_full' ) ) {

-			$location_array['gd_country'] = get_query_var( 'gd_country_full' );

+	if ($gd_page == 'location' && get_query_var('gd_country_full')) {

+		if (get_query_var('gd_country_full')) {

+			$location_array['gd_country'] = get_query_var('gd_country_full');

 		}

-		if ( get_query_var( 'gd_region_full' ) ) {

-			$location_array['gd_region'] = get_query_var( 'gd_region_full' );

+		if (get_query_var('gd_region_full')) {

+			$location_array['gd_region'] = get_query_var('gd_region_full');

 		}

-		if ( get_query_var( 'gd_city_full' ) ) {

-			$location_array['gd_city'] = get_query_var( 'gd_city_full' );

+		if (get_query_var('gd_city_full')) {

+			$location_array['gd_city'] = get_query_var('gd_city_full');

 		}

-		if ( get_query_var( 'gd_neighbourhood_full' ) ) {

-			$location_array['gd_neighbourhood'] = get_query_var( 'gd_neighbourhood_full' );

+		if (get_query_var('gd_neighbourhood_full')) {

+			$location_array['gd_neighbourhood'] = get_query_var('gd_neighbourhood_full');

 		}

 	}

 	

@@ -4712,57 +4712,57 @@ 
 	 * @param string $gd_page       The page being filtered.

 	 * @param string $sep           The separator, default: `|`.

 	 */

-	$title = apply_filters( 'geodir_replace_location_variables', $title, $location_array, $gd_page, $sep );

+	$title = apply_filters('geodir_replace_location_variables', $title, $location_array, $gd_page, $sep);

 	

-	if ( strpos( $title, '%%search_term%%' ) !== false ) {

+	if (strpos($title, '%%search_term%%') !== false) {

 		$search_term = '';

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

-			$search_term = esc_attr( $_REQUEST['s'] );

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

+			$search_term = esc_attr($_REQUEST['s']);

 		}

-		$title = str_replace( "%%search_term%%", $search_term, $title );

+		$title = str_replace("%%search_term%%", $search_term, $title);

 	}

 

-	if ( strpos( $title, '%%search_near%%' ) !== false ) {

+	if (strpos($title, '%%search_near%%') !== false) {

 		$search_term = '';

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

-			$search_term = esc_attr( $_REQUEST['snear'] );

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

+			$search_term = esc_attr($_REQUEST['snear']);

 		}

-		$title = str_replace( "%%search_near%%", $search_term, $title );

+		$title = str_replace("%%search_near%%", $search_term, $title);

 	}

 

-	if ( strpos( $title, '%%name%%' ) !== false ) {

-		if ( is_author() ) {

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

+	if (strpos($title, '%%name%%') !== false) {

+		if (is_author()) {

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

 			$author_name = $curauth->display_name;

 		} else {

 			$author_name = get_the_author();

 		}

-		if ( ! $author_name || $author_name === '' ) {

+		if (!$author_name || $author_name === '') {

 			$queried_object = get_queried_object();

 

-			if ( isset( $queried_object->data->user_nicename ) ) {

+			if (isset($queried_object->data->user_nicename)) {

 				$author_name = $queried_object->data->display_name;

 			}

 		}

-		$title = str_replace( "%%name%%", $author_name, $title );

+		$title = str_replace("%%name%%", $author_name, $title);

 	}

 

-	if ( strpos( $title, '%%page%%' ) !== false ) {

-		$page  = geodir_title_meta_page( $sep );

-		$title = str_replace( "%%page%%", $page, $title );

+	if (strpos($title, '%%page%%') !== false) {

+		$page  = geodir_title_meta_page($sep);

+		$title = str_replace("%%page%%", $page, $title);

 	}

-	if ( strpos( $title, '%%pagenumber%%' ) !== false ) {

+	if (strpos($title, '%%pagenumber%%') !== false) {

 		$pagenumber = geodir_title_meta_pagenumber();

-		$title      = str_replace( "%%pagenumber%%", $pagenumber, $title );

+		$title      = str_replace("%%pagenumber%%", $pagenumber, $title);

 	}

-	if ( strpos( $title, '%%pagetotal%%' ) !== false ) {

+	if (strpos($title, '%%pagetotal%%') !== false) {

 		$pagetotal = geodir_title_meta_pagetotal();

-		$title     = str_replace( "%%pagetotal%%", $pagetotal, $title );

+		$title     = str_replace("%%pagetotal%%", $pagetotal, $title);

 	}

 

-	$title = wptexturize( $title );

-	$title = convert_chars( $title );

-	$title = esc_html( $title );

+	$title = wptexturize($title);

+	$title = convert_chars($title);

+	$title = esc_html($title);

 

 	/**

 	 * Filter the title variables after standard ones have been filtered.

@@ -4776,7 +4776,7 @@ 
 	 * @param string $sep           The separator, default: `|`.

 	 */

 

-	return apply_filters( 'geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep );

+	return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);

 }

 

 /**

@@ -4789,82 +4789,82 @@ 
  *

  * @return array Translation texts.

  */

-function geodir_load_cpt_text_translation( $translation_texts = array() ) {

-	$gd_post_types = geodir_get_posttypes( 'array' );

+function geodir_load_cpt_text_translation($translation_texts = array()) {

+	$gd_post_types = geodir_get_posttypes('array');

 

-	if ( ! empty( $gd_post_types ) ) {

-		foreach ( $gd_post_types as $post_type => $cpt_info ) {

-			$labels      = isset( $cpt_info['labels'] ) ? $cpt_info['labels'] : '';

-			$description = isset( $cpt_info['description'] ) ? $cpt_info['description'] : '';

-			$seo         = isset( $cpt_info['seo'] ) ? $cpt_info['seo'] : '';

+	if (!empty($gd_post_types)) {

+		foreach ($gd_post_types as $post_type => $cpt_info) {

+			$labels      = isset($cpt_info['labels']) ? $cpt_info['labels'] : '';

+			$description = isset($cpt_info['description']) ? $cpt_info['description'] : '';

+			$seo         = isset($cpt_info['seo']) ? $cpt_info['seo'] : '';

 

-			if ( ! empty( $labels ) ) {

-				if ( $labels['name'] != '' && ! in_array( $labels['name'], $translation_texts ) ) {

+			if (!empty($labels)) {

+				if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {

 					$translation_texts[] = $labels['name'];

 				}

-				if ( $labels['singular_name'] != '' && ! in_array( $labels['singular_name'], $translation_texts ) ) {

+				if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {

 					$translation_texts[] = $labels['singular_name'];

 				}

-				if ( $labels['add_new'] != '' && ! in_array( $labels['add_new'], $translation_texts ) ) {

+				if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {

 					$translation_texts[] = $labels['add_new'];

 				}

-				if ( $labels['add_new_item'] != '' && ! in_array( $labels['add_new_item'], $translation_texts ) ) {

+				if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {

 					$translation_texts[] = $labels['add_new_item'];

 				}

-				if ( $labels['edit_item'] != '' && ! in_array( $labels['edit_item'], $translation_texts ) ) {

+				if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {

 					$translation_texts[] = $labels['edit_item'];

 				}

-				if ( $labels['new_item'] != '' && ! in_array( $labels['new_item'], $translation_texts ) ) {

+				if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {

 					$translation_texts[] = $labels['new_item'];

 				}

-				if ( $labels['view_item'] != '' && ! in_array( $labels['view_item'], $translation_texts ) ) {

+				if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {

 					$translation_texts[] = $labels['view_item'];

 				}

-				if ( $labels['search_items'] != '' && ! in_array( $labels['search_items'], $translation_texts ) ) {

+				if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {

 					$translation_texts[] = $labels['search_items'];

 				}

-				if ( $labels['not_found'] != '' && ! in_array( $labels['not_found'], $translation_texts ) ) {

+				if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {

 					$translation_texts[] = $labels['not_found'];

 				}

-				if ( $labels['not_found_in_trash'] != '' && ! in_array( $labels['not_found_in_trash'], $translation_texts ) ) {

+				if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {

 					$translation_texts[] = $labels['not_found_in_trash'];

 				}

-				if ( isset( $labels['label_post_profile'] ) && $labels['label_post_profile'] != '' && ! in_array( $labels['label_post_profile'], $translation_texts ) ) {

+				if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {

 					$translation_texts[] = $labels['label_post_profile'];

 				}

-				if ( isset( $labels['label_post_info'] ) && $labels['label_post_info'] != '' && ! in_array( $labels['label_post_info'], $translation_texts ) ) {

+				if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {

 					$translation_texts[] = $labels['label_post_info'];

 				}

-				if ( isset( $labels['label_post_images'] ) && $labels['label_post_images'] != '' && ! in_array( $labels['label_post_images'], $translation_texts ) ) {

+				if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {

 					$translation_texts[] = $labels['label_post_images'];

 				}

-				if ( isset( $labels['label_post_map'] ) && $labels['label_post_map'] != '' && ! in_array( $labels['label_post_map'], $translation_texts ) ) {

+				if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {

 					$translation_texts[] = $labels['label_post_map'];

 				}

-				if ( isset( $labels['label_reviews'] ) && $labels['label_reviews'] != '' && ! in_array( $labels['label_reviews'], $translation_texts ) ) {

+				if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {

 					$translation_texts[] = $labels['label_reviews'];

 				}

-				if ( isset( $labels['label_related_listing'] ) && $labels['label_related_listing'] != '' && ! in_array( $labels['label_related_listing'], $translation_texts ) ) {

+				if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {

 					$translation_texts[] = $labels['label_related_listing'];

 				}

 			}

 

-			if ( $description != '' && ! in_array( $description, $translation_texts ) ) {

-				$translation_texts[] = normalize_whitespace( $description );

+			if ($description != '' && !in_array($description, $translation_texts)) {

+				$translation_texts[] = normalize_whitespace($description);

 			}

 

-			if ( ! empty( $seo ) ) {

-				if ( isset( $seo['meta_keyword'] ) && $seo['meta_keyword'] != '' && ! in_array( $seo['meta_keyword'], $translation_texts ) ) {

-					$translation_texts[] = normalize_whitespace( $seo['meta_keyword'] );

+			if (!empty($seo)) {

+				if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {

+					$translation_texts[] = normalize_whitespace($seo['meta_keyword']);

 				}

 

-				if ( isset( $seo['meta_description'] ) && $seo['meta_description'] != '' && ! in_array( $seo['meta_description'], $translation_texts ) ) {

-					$translation_texts[] = normalize_whitespace( $seo['meta_description'] );

+				if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {

+					$translation_texts[] = normalize_whitespace($seo['meta_description']);

 				}

 			}

 		}

 	}

-	$translation_texts = ! empty( $translation_texts ) ? array_unique( $translation_texts ) : $translation_texts;

+	$translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

 	return $translation_texts;

 }

@@ -4879,27 +4879,27 @@ 
  *

  * @return array Location terms.

  */

-function geodir_remove_location_terms( $location_terms = array() ) {

-	$location_manager = defined( 'POST_LOCATION_TABLE' ) ? true : false;

+function geodir_remove_location_terms($location_terms = array()) {

+	$location_manager = defined('POST_LOCATION_TABLE') ? true : false;

 

-	if ( ! empty( $location_terms ) && $location_manager ) {

-		$hide_country_part = get_option( 'geodir_location_hide_country_part' );

-		$hide_region_part  = get_option( 'geodir_location_hide_region_part' );

+	if (!empty($location_terms) && $location_manager) {

+		$hide_country_part = get_option('geodir_location_hide_country_part');

+		$hide_region_part  = get_option('geodir_location_hide_region_part');

 

-		if ( $hide_region_part && $hide_country_part ) {

-			if ( isset( $location_terms['gd_country'] ) ) {

-				unset( $location_terms['gd_country'] );

+		if ($hide_region_part && $hide_country_part) {

+			if (isset($location_terms['gd_country'])) {

+				unset($location_terms['gd_country']);

 			}

-			if ( isset( $location_terms['gd_region'] ) ) {

-				unset( $location_terms['gd_region'] );

+			if (isset($location_terms['gd_region'])) {

+				unset($location_terms['gd_region']);

 			}

-		} else if ( $hide_region_part && ! $hide_country_part ) {

-			if ( isset( $location_terms['gd_region'] ) ) {

-				unset( $location_terms['gd_region'] );

+		} else if ($hide_region_part && !$hide_country_part) {

+			if (isset($location_terms['gd_region'])) {

+				unset($location_terms['gd_region']);

 			}

-		} else if ( ! $hide_region_part && $hide_country_part ) {

-			if ( isset( $location_terms['gd_country'] ) ) {

-				unset( $location_terms['gd_country'] );

+		} else if (!$hide_region_part && $hide_country_part) {

+			if (isset($location_terms['gd_country'])) {

+				unset($location_terms['gd_country']);

 			}

 		}

 	}

@@ -4917,33 +4917,33 @@ 
  * @param WP_Post $post Post object.

  * @param bool $update  Whether this is an existing listing being updated or not.

  */

-function geodir_on_wp_insert_post( $post_ID, $post, $update ) {

-	if ( ! $update ) {

+function geodir_on_wp_insert_post($post_ID, $post, $update) {

+	if (!$update) {

 		return;

 	}

 

-	$action      = isset( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : '';

-	$is_admin    = is_admin() && ( ! defined( 'DOING_AJAX' ) || ( defined( 'DOING_AJAX' ) && ! DOING_AJAX ) ) ? true : false;

+	$action      = isset($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';

+	$is_admin    = is_admin() && (!defined('DOING_AJAX') || (defined('DOING_AJAX') && !DOING_AJAX)) ? true : false;

 	$inline_save = $action == 'inline-save' ? true : false;

 

-	if ( empty( $post->post_type ) || $is_admin || $inline_save || ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) ) {

+	if (empty($post->post_type) || $is_admin || $inline_save || (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)) {

 		return;

 	}

 

-	if ( $action != '' && in_array( $action, array( 'geodir_import_export' ) ) ) {

+	if ($action != '' && in_array($action, array('geodir_import_export'))) {

 		return;

 	}

 

 	$user_id = (int) get_current_user_id();

 

-	if ( $user_id > 0 && get_option( 'geodir_notify_post_edited' ) && ! wp_is_post_revision( $post_ID ) && in_array( $post->post_type, geodir_get_posttypes() ) ) {

-		$author_id = ! empty( $post->post_author ) ? $post->post_author : 0;

+	if ($user_id > 0 && get_option('geodir_notify_post_edited') && !wp_is_post_revision($post_ID) && in_array($post->post_type, geodir_get_posttypes())) {

+		$author_id = !empty($post->post_author) ? $post->post_author : 0;

 

-		if ( $user_id == $author_id && ! is_super_admin() ) {

-			$from_email   = get_option( 'site_email' );

+		if ($user_id == $author_id && !is_super_admin()) {

+			$from_email   = get_option('site_email');

 			$from_name    = get_site_emailName();

-			$to_email     = get_option( 'admin_email' );

-			$to_name      = get_option( 'name' );

+			$to_email     = get_option('admin_email');

+			$to_name      = get_option('name');

 			$message_type = 'listing_edited';

 

 			$notify_edited = true;

@@ -4955,9 +4955,9 @@ 
 			 * @param bool $notify_edited Notify on listing edited by author?

 			 * @param object $post        The current post object.

 			 */

-			$notify_edited = apply_filters( 'geodir_notify_on_listing_edited', $notify_edited, $post );

+			$notify_edited = apply_filters('geodir_notify_on_listing_edited', $notify_edited, $post);

 

-			geodir_sendEmail( $from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID );

+			geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);

 		}

 	}

 }

@@ -4972,14 +4972,14 @@ 
  *

  * @return string|null The current page start & end numbering.

  */

-function geodir_title_meta_page( $sep ) {

+function geodir_title_meta_page($sep) {

 	$replacement = null;

 

-	$max = geodir_title_meta_pagenumbering( 'max' );

-	$nr  = geodir_title_meta_pagenumbering( 'nr' );

+	$max = geodir_title_meta_pagenumbering('max');

+	$nr  = geodir_title_meta_pagenumbering('nr');

 

-	if ( $max > 1 && $nr > 1 ) {

-		$replacement = sprintf( $sep . ' ' . __( 'Page %1$d of %2$d', 'geodirectory' ), $nr, $max );

+	if ($max > 1 && $nr > 1) {

+		$replacement = sprintf($sep.' '.__('Page %1$d of %2$d', 'geodirectory'), $nr, $max);

 	}

 

 	return $replacement;

@@ -4996,8 +4996,8 @@ 
 function geodir_title_meta_pagenumber() {

 	$replacement = null;

 

-	$nr = geodir_title_meta_pagenumbering( 'nr' );

-	if ( isset( $nr ) && $nr > 0 ) {

+	$nr = geodir_title_meta_pagenumbering('nr');

+	if (isset($nr) && $nr > 0) {

 		$replacement = (string) $nr;

 	}

 

@@ -5015,8 +5015,8 @@ 
 function geodir_title_meta_pagetotal() {

 	$replacement = null;

 

-	$max = geodir_title_meta_pagenumbering( 'max' );

-	if ( isset( $max ) && $max > 0 ) {

+	$max = geodir_title_meta_pagenumbering('max');

+	if (isset($max) && $max > 0) {

 		$replacement = (string) $max;

 	}

 

@@ -5036,36 +5036,36 @@ 
  *

  * @return int|null The current page numbering.

  */

-function geodir_title_meta_pagenumbering( $request = 'nr' ) {

+function geodir_title_meta_pagenumbering($request = 'nr') {

 	global $wp_query, $post;

 	$max_num_pages = null;

 	$page_number   = null;

 

 	$max_num_pages = 1;

 

-	if ( ! is_singular() ) {

-		$page_number = get_query_var( 'paged' );

-		if ( $page_number === 0 || $page_number === '' ) {

+	if (!is_singular()) {

+		$page_number = get_query_var('paged');

+		if ($page_number === 0 || $page_number === '') {

 			$page_number = 1;

 		}

 

-		if ( isset( $wp_query->max_num_pages ) && ( $wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0 ) ) {

+		if (isset($wp_query->max_num_pages) && ($wp_query->max_num_pages != '' && $wp_query->max_num_pages != 0)) {

 			$max_num_pages = $wp_query->max_num_pages;

 		}

 	} else {

-		$page_number = get_query_var( 'page' );

-		if ( $page_number === 0 || $page_number === '' ) {

+		$page_number = get_query_var('page');

+		if ($page_number === 0 || $page_number === '') {

 			$page_number = 1;

 		}

 

-		if ( isset( $post->post_content ) ) {

-			$max_num_pages = ( substr_count( $post->post_content, '<!--nextpage-->' ) + 1 );

+		if (isset($post->post_content)) {

+			$max_num_pages = (substr_count($post->post_content, '<!--nextpage-->') + 1);

 		}

 	}

 

 	$return = null;

 

-	switch ( $request ) {

+	switch ($request) {

 		case 'nr':

 			$return = $page_number;

 			break;

@@ -5086,14 +5086,14 @@ 
  *

  * @return array Terms.

  */

-function geodir_filter_empty_terms( $terms ) {

-	if ( empty( $terms ) ) {

+function geodir_filter_empty_terms($terms) {

+	if (empty($terms)) {

 		return $terms;

 	}

 

 	$return = array();

-	foreach ( $terms as $term ) {

-		if ( isset( $term->count ) && $term->count > 0 ) {

+	foreach ($terms as $term) {

+		if (isset($term->count) && $term->count > 0) {

 			$return[] = $term;

 		} else {

 			/**

@@ -5104,7 +5104,7 @@ 
 			 * @param array $return The array of terms to return.

 			 * @param object $term  The term object.

 			 */

-			$return = apply_filters( 'geodir_filter_empty_terms_filter', $return, $term );

+			$return = apply_filters('geodir_filter_empty_terms_filter', $return, $term);

 		}

 	}

 

@@ -5121,15 +5121,15 @@ 
  *

  * @return array

  */

-function geodir_remove_hentry( $class ) {

-	if ( geodir_is_page( 'detail' ) ) {

-		$class = array_diff( $class, array( 'hentry' ) );

+function geodir_remove_hentry($class) {

+	if (geodir_is_page('detail')) {

+		$class = array_diff($class, array('hentry'));

 	}

 

 	return $class;

 }

 

-add_filter( 'post_class', 'geodir_remove_hentry' );

+add_filter('post_class', 'geodir_remove_hentry');

 

 /**

  * Registers a individual text string for WPML translation.

@@ -5141,8 +5141,8 @@ 
  * @param string $domain The plugin domain. Default geodirectory.

  * @param string $name The name of the string which helps to know what's being translated.

  */

-function geodir_wpml_register_string( $string, $domain = 'geodirectory', $name = '' ) {

-    do_action( 'wpml_register_single_string', $domain, $name, $string );

+function geodir_wpml_register_string($string, $domain = 'geodirectory', $name = '') {

+    do_action('wpml_register_single_string', $domain, $name, $string);

 }

 

 /**

@@ -5157,6 +5157,6 @@ 
  * @param string $language_code Return the translation in this language. Default is NULL which returns the current language.

  * @return string The translated string.

  */

-function geodir_wpml_translate_string( $string, $domain = 'geodirectory', $name = '', $language_code = NULL ) {

-    return apply_filters( 'wpml_translate_single_string', $string, $domain, $name, $language_code );

+function geodir_wpml_translate_string($string, $domain = 'geodirectory', $name = '', $language_code = NULL) {

+    return apply_filters('wpml_translate_single_string', $string, $domain, $name, $language_code);

 }
\ No newline at end of file

upgrade.php

Braces +1 added lines, -1 removed lines

@@ -324,7 +324,7 @@
 

             if(!empty($show_in_arr )){

                 $show_in_arr = implode(',',$show_in_arr);

-            }else{

+            } else{

                 $show_in_arr = '';

             }

 

Spacing +58 added lines, -58 removed lines

@@ -9,7 +9,7 @@ 
 

 global $wpdb;

 

-if (get_option('geodirectory' . '_db_version') != GEODIRECTORY_VERSION) {

+if (get_option('geodirectory'.'_db_version') != GEODIRECTORY_VERSION) {

     /**

      * Include custom database table related functions.

      *

@@ -48,9 +48,9 @@ 
 

 

 

-    add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

+    add_action('init', 'gd_fix_cpt_rewrite_slug', 11); // this needs to be kept for a few versions

 

-    update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

+    update_option('geodirectory'.'_db_version', GEODIRECTORY_VERSION);

 

 }

 

@@ -86,7 +86,7 @@ 
  * @since 1.0.0

  * @package GeoDirectory

  */

-function geodir_upgrade_146(){

+function geodir_upgrade_146() {

     gd_convert_virtual_pages();

 }

 

@@ -96,7 +96,7 @@ 
  * @since 1.5.0

  * @package GeoDirectory

  */

-function geodir_upgrade_150(){

+function geodir_upgrade_150() {

     gd_fix_cpt_rewrite_slug();

 }

 

@@ -108,12 +108,12 @@ 
  * @since 1.4.8

  * @package GeoDirectory

  */

-function geodir_upgrade_148(){

+function geodir_upgrade_148() {

     /*

      * Blank the users google password if present as we now use oAuth 2.0

      */

-    update_option('geodir_ga_pass','');

-    update_option('geodir_ga_user','');

+    update_option('geodir_ga_pass', '');

+    update_option('geodir_ga_user', '');

 

 }

 

@@ -124,7 +124,7 @@ 
  * @since 1.5.3

  * @package GeoDirectory

  */

-function geodir_upgrade_153(){

+function geodir_upgrade_153() {

     geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

     geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 }

@@ -135,7 +135,7 @@ 
  * @since 1.5.3

  * @package GeoDirectory

  */

-function geodir_upgrade_154(){

+function geodir_upgrade_154() {

     geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

 }

 

@@ -145,7 +145,7 @@ 
  * @since 1.5.2

  * @package GeoDirectory

  */

-function geodir_upgrade_152(){

+function geodir_upgrade_152() {

     gd_fix_address_detail_table_limit();

 }

 

@@ -181,7 +181,7 @@ 
 function geodir_fix_review_date()

 {

     global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

+    $wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

 }

 

 /**

@@ -194,7 +194,7 @@ 
 function geodir_fix_review_post_status()

 {

     global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

+    $wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

 }

 

 /**

@@ -208,7 +208,7 @@ 
 function geodir_fix_review_content()

 {

     global $wpdb;

-    if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

+    if ($wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

         return true;

     } else {

         return false;

@@ -233,7 +233,7 @@ 
         foreach ($all_postypes as $key) {

             // update each GD CTP

 

-            $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

+            $wpdb->query("UPDATE ".GEODIR_REVIEW_TABLE." gdr JOIN ".$wpdb->prefix."geodir_".$key."_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

 

         }

         return true;

@@ -257,7 +257,7 @@ 
     if (!empty($all_postypes)) {

         foreach ($all_postypes as $key) {

             // update each GD CTP

-            $reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

+            $reviews = $wpdb->get_results("SELECT post_id FROM ".$wpdb->prefix."geodir_".$key."_detail d");

 

             if (!empty($reviews)) {

                 foreach ($reviews as $post_id) {

@@ -272,51 +272,51 @@ 
 }

 

 

-function gd_convert_custom_field_display(){

+function gd_convert_custom_field_display() {

     global $wpdb;

 

-    $field_info = $wpdb->get_results("select * from " . GEODIR_CUSTOM_FIELDS_TABLE);

+    $field_info = $wpdb->get_results("select * from ".GEODIR_CUSTOM_FIELDS_TABLE);

 

     $has_run = get_option('gd_convert_custom_field_display');

-    if($has_run){return;}

+    if ($has_run) {return; }

 

     // set the field_type_key for standard fields

     $wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET field_type_key = field_type");

 

 

-    if(is_array( $field_info)){

+    if (is_array($field_info)) {

 

-        foreach( $field_info as $cf){

+        foreach ($field_info as $cf) {

 

             $id = $cf->id;

 

-            if(!property_exists($cf,'show_in') || !$id){return;}

+            if (!property_exists($cf, 'show_in') || !$id) {return; }

 

             $show_in_arr = array();

 

-            if($cf->is_default){

+            if ($cf->is_default) {

                 $show_in_arr[] = "[detail]";

             }

 

-            if($cf->show_on_detail){

+            if ($cf->show_on_detail) {

                 $show_in_arr[] = "[moreinfo]";

             }

 

-            if($cf->show_on_listing){

+            if ($cf->show_on_listing) {

                 $show_in_arr[] = "[listing]";

             }

 

-            if($cf->show_as_tab || $cf->htmlvar_name=='geodir_video' || $cf->htmlvar_name=='geodir_special_offers'){

+            if ($cf->show_as_tab || $cf->htmlvar_name == 'geodir_video' || $cf->htmlvar_name == 'geodir_special_offers') {

                 $show_in_arr[] = "[owntab]";

             }

 

-            if($cf->htmlvar_name=='post' || $cf->htmlvar_name=='geodir_contact' || $cf->htmlvar_name=='geodir_timing'){

+            if ($cf->htmlvar_name == 'post' || $cf->htmlvar_name == 'geodir_contact' || $cf->htmlvar_name == 'geodir_timing') {

                 $show_in_arr[] = "[mapbubble]";

             }

 

-            if(!empty($show_in_arr )){

-                $show_in_arr = implode(',',$show_in_arr);

-            }else{

+            if (!empty($show_in_arr)) {

+                $show_in_arr = implode(',', $show_in_arr);

+            } else {

                 $show_in_arr = '';

             }

 

@@ -324,7 +324,7 @@ 
 

         }

 

-        update_option('gd_convert_custom_field_display',1);

+        update_option('gd_convert_custom_field_display', 1);

     }

 }

 

@@ -701,7 +701,7 @@ 
 

     update_option('gd_theme_compats', $theme_compat);

 

-    gd_set_theme_compat();// set the compat pack if avail

+    gd_set_theme_compat(); // set the compat pack if avail

 }

 

 

@@ -712,61 +712,61 @@ 
  * @package GeoDirectory

  * @global object $wpdb WordPress Database object.

  */

-function gd_convert_virtual_pages(){

+function gd_convert_virtual_pages() {

     global $wpdb;

 

     // Update the add listing page settings

     $add_listing_page = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

             array('add-listing')

         )

     );

 

-    if($add_listing_page){

-        wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

-        update_option( 'geodir_add_listing_page', $add_listing_page);

+    if ($add_listing_page) {

+        wp_update_post(array('ID' => $add_listing_page, 'post_status' => 'publish'));

+        update_option('geodir_add_listing_page', $add_listing_page);

     }

 

     // Update the listing preview page settings

     $listing_preview_page = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

             array('listing-preview')

         )

     );

 

-    if($listing_preview_page){

-        wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

-        update_option( 'geodir_preview_page', $listing_preview_page);

+    if ($listing_preview_page) {

+        wp_update_post(array('ID' => $listing_preview_page, 'post_status' => 'publish'));

+        update_option('geodir_preview_page', $listing_preview_page);

     }

 

     // Update the listing success page settings

     $listing_success_page = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

             array('listing-success')

         )

     );

 

-    if($listing_success_page){

-        wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

-        update_option( 'geodir_success_page', $listing_success_page);

+    if ($listing_success_page) {

+        wp_update_post(array('ID' => $listing_success_page, 'post_status' => 'publish'));

+        update_option('geodir_success_page', $listing_success_page);

     }

 

     // Update the listing success page settings

     $location_page = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

             array('location')

         )

     );

 

-    if($location_page){

+    if ($location_page) {

         $location_slug = get_option('geodir_location_prefix');

-        if(!$location_slug ){$location_slug  = 'location';}

-        wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

-        update_option( 'geodir_location_page', $location_page);

+        if (!$location_slug) {$location_slug = 'location'; }

+        wp_update_post(array('ID' => $location_page, 'post_status' => 'publish', 'post_name' => $location_slug));

+        update_option('geodir_location_page', $location_page);

     }

 

 }

@@ -785,13 +785,13 @@ 
     $post_types = get_option('geodir_post_types');

 

 

-    if (is_array($post_types)){

+    if (is_array($post_types)) {

 

         foreach ($post_types as $post_type => $args) {

 

 

-            if(isset($args['rewrite']['slug'])){

-                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

+            if (isset($args['rewrite']['slug'])) {

+                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%", "", $args['rewrite']['slug']);

             }

 

                 $alt_post_types[$post_type] = $args;

@@ -799,8 +799,8 @@ 
         }

     }

 

-    if(!empty($alt_post_types)) {

-        update_option('geodir_post_types',$alt_post_types);

+    if (!empty($alt_post_types)) {

+        update_option('geodir_post_types', $alt_post_types);

         }

 

 

@@ -826,9 +826,9 @@ 
         foreach ($all_postypes as $key) {

             // update each GD CTP

             try {

-                $wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

-            } catch(Exception $e) {

-                error_log( 'Error: ' . $e->getMessage() );

+                $wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_".$key."_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

+            } catch (Exception $e) {

+                error_log('Error: '.$e->getMessage());

             }

         }

     }

Indentation +558 added lines, -558 removed lines

@@ -10,47 +10,47 @@ 
 global $wpdb;

 

 if (get_option('geodirectory' . '_db_version') != GEODIRECTORY_VERSION) {

-    /**

-     * Include custom database table related functions.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once('geodirectory-admin/admin_db_install.php');

-    add_action('plugins_loaded', 'geodirectory_upgrade_all', 10);

-    if (GEODIRECTORY_VERSION <= '1.3.6') {

-        add_action('plugins_loaded', 'geodir_upgrade_136', 11);

-    }

+	/**

+	 * Include custom database table related functions.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once('geodirectory-admin/admin_db_install.php');

+	add_action('plugins_loaded', 'geodirectory_upgrade_all', 10);

+	if (GEODIRECTORY_VERSION <= '1.3.6') {

+		add_action('plugins_loaded', 'geodir_upgrade_136', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.4.6') {

-        add_action('init', 'geodir_upgrade_146', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.4.6') {

+		add_action('init', 'geodir_upgrade_146', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.4.8') {

-        add_action('init', 'geodir_upgrade_148', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.4.8') {

+		add_action('init', 'geodir_upgrade_148', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.5.0') {

-        add_action('init', 'geodir_upgrade_150', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.5.0') {

+		add_action('init', 'geodir_upgrade_150', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.5.2') {

-        add_action('init', 'geodir_upgrade_152', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.5.2') {

+		add_action('init', 'geodir_upgrade_152', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.5.3') {

-        add_action('init', 'geodir_upgrade_153', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.5.3') {

+		add_action('init', 'geodir_upgrade_153', 11);

+	}

 

-    if (GEODIRECTORY_VERSION <= '1.5.4') {

-        add_action('init', 'geodir_upgrade_154', 11);

-    }

+	if (GEODIRECTORY_VERSION <= '1.5.4') {

+		add_action('init', 'geodir_upgrade_154', 11);

+	}

 

 

 

-    add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

+	add_action('init', 'gd_fix_cpt_rewrite_slug', 11);// this needs to be kept for a few versions

 

-    update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

+	update_option('geodirectory' . '_db_version', GEODIRECTORY_VERSION);

 

 }

 

@@ -63,10 +63,10 @@ 
  */

 function geodirectory_upgrade_all()

 {

-    geodir_create_tables();

-    geodir_update_review_db();

-    gd_install_theme_compat();

-    gd_convert_custom_field_display();

+	geodir_create_tables();

+	geodir_update_review_db();

+	gd_install_theme_compat();

+	gd_convert_custom_field_display();

 }

 

 /**

@@ -77,7 +77,7 @@ 
  */

 function geodir_upgrade_136()

 {

-    geodir_fix_review_overall_rating();

+	geodir_fix_review_overall_rating();

 }

 

 /**

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

  */

 function geodir_upgrade_146(){

-    gd_convert_virtual_pages();

+	gd_convert_virtual_pages();

 }

 

 /**

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

  */

 function geodir_upgrade_150(){

-    gd_fix_cpt_rewrite_slug();

+	gd_fix_cpt_rewrite_slug();

 }

 

 

@@ -109,11 +109,11 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_148(){

-    /*

+	/*

      * Blank the users google password if present as we now use oAuth 2.0

      */

-    update_option('geodir_ga_pass','');

-    update_option('geodir_ga_user','');

+	update_option('geodir_ga_pass','');

+	update_option('geodir_ga_user','');

 

 }

 

@@ -125,8 +125,8 @@ 
  * @package GeoDirectory

  */

 function geodir_upgrade_153(){

-    geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

-    geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-info', 'page_slug', 'geodirectory')), 'geodir_info_page', __('Info', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-login', 'page_slug', 'geodirectory')), 'geodir_login_page', __('Login', 'geodirectory'), '');

 }

 

 /**

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

  */

 function geodir_upgrade_154(){

-    geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

+	geodir_create_page(esc_sql(_x('gd-home', 'page_slug', 'geodirectory')), 'geodir_home_page', __('GD Home page', 'geodirectory'), '');

 }

 

 /**

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

  */

 function geodir_upgrade_152(){

-    gd_fix_address_detail_table_limit();

+	gd_fix_address_detail_table_limit();

 }

 

 

@@ -162,12 +162,12 @@ 
  */

 function geodir_update_review_db()

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    geodir_fix_review_date();

-    geodir_fix_review_post_status();

-    geodir_fix_review_content();

-    geodir_fix_review_location();

+	geodir_fix_review_date();

+	geodir_fix_review_post_status();

+	geodir_fix_review_content();

+	geodir_fix_review_location();

 

 }

 

@@ -180,8 +180,8 @@ 
  */

 function geodir_fix_review_date()

 {

-    global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

+	global $wpdb;

+	$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.post_date = c.comment_date WHERE gdr.post_date='0000-00-00 00:00:00'");

 }

 

 /**

@@ -193,8 +193,8 @@ 
  */

 function geodir_fix_review_post_status()

 {

-    global $wpdb;

-    $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

+	global $wpdb;

+	$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->posts p ON gdr.post_id=p.ID SET gdr.post_status = 1 WHERE gdr.post_status IS NULL AND p.post_status='publish'");

 }

 

 /**

@@ -207,12 +207,12 @@ 
  */

 function geodir_fix_review_content()

 {

-    global $wpdb;

-    if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

-        return true;

-    } else {

-        return false;

-    }

+	global $wpdb;

+	if ($wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN $wpdb->comments c ON gdr.comment_id=c.comment_ID SET gdr.comment_content = c.comment_content WHERE gdr.comment_content IS NULL")) {

+		return true;

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -225,20 +225,20 @@ 
  */

 function geodir_fix_review_location()

 {

-    global $wpdb;

+	global $wpdb;

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

 

-            $wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

+			$wpdb->query("UPDATE " . GEODIR_REVIEW_TABLE . " gdr JOIN " . $wpdb->prefix . "geodir_" . $key . "_detail d ON gdr.post_id=d.post_id SET gdr.post_latitude = d.post_latitude, gdr.post_longitude = d.post_longitude, gdr.post_city = d.post_city,  gdr.post_region=d.post_region, gdr.post_country=d.post_country WHERE gdr.post_latitude IS NULL OR gdr.post_city IS NULL");

 

-        }

-        return true;

-    }

-    return false;

+		}

+		return true;

+	}

+	return false;

 }

 

 /**

@@ -250,82 +250,82 @@ 
  */

 function geodir_fix_review_overall_rating()

 {

-    global $wpdb;

+	global $wpdb;

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            $reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			$reviews = $wpdb->get_results("SELECT post_id FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

 

-            if (!empty($reviews)) {

-                foreach ($reviews as $post_id) {

-                    geodir_update_postrating($post_id->post_id, $key);

-                }

+			if (!empty($reviews)) {

+				foreach ($reviews as $post_id) {

+					geodir_update_postrating($post_id->post_id, $key);

+				}

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 }

 

 

 function gd_convert_custom_field_display(){

-    global $wpdb;

+	global $wpdb;

 

-    $field_info = $wpdb->get_results("select * from " . GEODIR_CUSTOM_FIELDS_TABLE);

+	$field_info = $wpdb->get_results("select * from " . GEODIR_CUSTOM_FIELDS_TABLE);

 

-    $has_run = get_option('gd_convert_custom_field_display');

-    if($has_run){return;}

+	$has_run = get_option('gd_convert_custom_field_display');

+	if($has_run){return;}

 

-    // set the field_type_key for standard fields

-    $wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET field_type_key = field_type");

+	// set the field_type_key for standard fields

+	$wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET field_type_key = field_type");

 

 

-    if(is_array( $field_info)){

+	if(is_array( $field_info)){

 

-        foreach( $field_info as $cf){

+		foreach( $field_info as $cf){

 

-            $id = $cf->id;

+			$id = $cf->id;

 

-            if(!property_exists($cf,'show_in') || !$id){return;}

+			if(!property_exists($cf,'show_in') || !$id){return;}

 

-            $show_in_arr = array();

+			$show_in_arr = array();

 

-            if($cf->is_default){

-                $show_in_arr[] = "[detail]";

-            }

+			if($cf->is_default){

+				$show_in_arr[] = "[detail]";

+			}

 

-            if($cf->show_on_detail){

-                $show_in_arr[] = "[moreinfo]";

-            }

+			if($cf->show_on_detail){

+				$show_in_arr[] = "[moreinfo]";

+			}

 

-            if($cf->show_on_listing){

-                $show_in_arr[] = "[listing]";

-            }

+			if($cf->show_on_listing){

+				$show_in_arr[] = "[listing]";

+			}

 

-            if($cf->show_as_tab || $cf->htmlvar_name=='geodir_video' || $cf->htmlvar_name=='geodir_special_offers'){

-                $show_in_arr[] = "[owntab]";

-            }

+			if($cf->show_as_tab || $cf->htmlvar_name=='geodir_video' || $cf->htmlvar_name=='geodir_special_offers'){

+				$show_in_arr[] = "[owntab]";

+			}

 

-            if($cf->htmlvar_name=='post' || $cf->htmlvar_name=='geodir_contact' || $cf->htmlvar_name=='geodir_timing'){

-                $show_in_arr[] = "[mapbubble]";

-            }

+			if($cf->htmlvar_name=='post' || $cf->htmlvar_name=='geodir_contact' || $cf->htmlvar_name=='geodir_timing'){

+				$show_in_arr[] = "[mapbubble]";

+			}

 

-            if(!empty($show_in_arr )){

-                $show_in_arr = implode(',',$show_in_arr);

-            }else{

-                $show_in_arr = '';

-            }

+			if(!empty($show_in_arr )){

+				$show_in_arr = implode(',',$show_in_arr);

+			}else{

+				$show_in_arr = '';

+			}

 

-            $wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET show_in='$show_in_arr' WHERE id=$id");

+			$wpdb->query("UPDATE ".GEODIR_CUSTOM_FIELDS_TABLE." SET show_in='$show_in_arr' WHERE id=$id");

 

-        }

+		}

 

-        update_option('gd_convert_custom_field_display',1);

-    }

+		update_option('gd_convert_custom_field_display',1);

+	}

 }

 

 ############################################

@@ -341,384 +341,384 @@ 
  */

 function gd_install_theme_compat()

 {

-    global $wpdb;

+	global $wpdb;

 

-    $theme_compat = array();

-    $theme_compat = get_option('gd_theme_compats');

+	$theme_compat = array();

+	$theme_compat = get_option('gd_theme_compats');

 //GDF

-    $theme_compat['GeoDirectory_Framework'] = array(

-        'geodir_wrapper_open_id' => 'geodir_wrapper',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

-        'geodir_wrapper_content_open_id' => 'geodir_content',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<!-- removed -->',

-        'geodir_main_content_close_replace' => '<!-- removed -->',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => '',

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => ''

-    );

+	$theme_compat['GeoDirectory_Framework'] = array(

+		'geodir_wrapper_open_id' => 'geodir_wrapper',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

+		'geodir_wrapper_content_open_id' => 'geodir_content',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<!-- removed -->',

+		'geodir_main_content_close_replace' => '<!-- removed -->',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => '',

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => ''

+	);

 

 //Directory Theme

-    $theme_compat['Directory_Starter'] = array(

-        'geodir_wrapper_open_id' => 'geodir_wrapper',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

-        'geodir_wrapper_content_open_id' => 'geodir_content',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<!-- removed -->',

-        'geodir_main_content_close_replace' => '<!-- removed -->',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => '',

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => ''

-    );

+	$theme_compat['Directory_Starter'] = array(

+		'geodir_wrapper_open_id' => 'geodir_wrapper',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

+		'geodir_wrapper_content_open_id' => 'geodir_content',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  id="gd-sidebar-wrapper" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<!-- removed -->',

+		'geodir_main_content_close_replace' => '<!-- removed -->',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '<div class="clearfix geodir-common">',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => '',

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => ''

+	);

 

 //Jobby

-    $theme_compat['Jobby'] = $theme_compat['Directory_Starter'];

+	$theme_compat['Jobby'] = $theme_compat['Directory_Starter'];

 

 //GeoProperty

-    $theme_compat['GeoProperty'] = $theme_compat['Directory_Starter'];

+	$theme_compat['GeoProperty'] = $theme_compat['Directory_Starter'];

 

 //Avada

-    $theme_compat['Avada'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '<!-- removed -->',

-        'geodir_wrapper_close_replace' => '<!-- removed -->',

-        'geodir_wrapper_content_open_id' => 'content',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_right_close_replace' => '</div><!-- end sidebar -->',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

-        'geodir_sidebar_left_close_replace' => '</div><!-- end sidebar -->',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<!-- removed -->',

-        'geodir_main_content_close_replace' => '<!-- removed -->',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.geodir-sidebar-left{float:left}select,textarea{border-style:solid;border-width:1px}.top-menu li > div{visibility:visible}.geodir-chosen-container-single .chosen-single{height:auto}ul li#menu-item-gd-location-switcher ul{width:222px}ul li#menu-item-gd-location-switcher ul li{padding-right:0!important}#mobile-nav li#mobile-menu-item-gd-location-switcher li a{padding-left:10px;padding-right:10px}#menu-item-gd-location-switcher dd,#mobile-menu-item-gd-location-switcher{margin-left:0}#menu-item-gd-location-switcher dd a{display:block}.geodir-chosen-container .chosen-results li.highlighted{background-color:#eee;background-image:none;color:#444}#mobile-nav li.mobile-nav-item li a:before{content:\'\';margin:0}#mobile-nav li.mobile-nav-item li a{padding:10px;width:auto}.geodir-listing-search{text-align:center}.geodir-search{float:none;margin:0}.geodir-search select,.geodir-search .search_by_post,.geodir-search input[type="text"],.geodir-search button[type="button"], .geodir-search input[type="button"],.geodir-search input[type="submit"]{display:inline-block;float:none}.geodir-cat-list ul li,.map_category ul li{list-style-type:none}.wpgeo-avada .page-title ul li:after{content:\'\'}.top_banner_section{margin-bottom:0}.geodir-category-list-in{margin:0;padding:15px}.geodir_full_page .geodir-cat-list .widget-title{margin-top:0}.geodir_full_page .geodir-cat-list ul li{padding-left:0}.geodir-loc-bar{border:none;margin:0;padding:0}.geodir-loc-bar-in{padding:15px 0}.geodir_full_page section.widget{margin-bottom:20px}.sidebar .geodir-loginbox-list li{margin-bottom:10px;padding-bottom:10px}.sidebar .geodir-loginbox-list li a{display:block}.sidebar .geodir-chosen-container .chosen-results li{margin:0;padding:5px 6px}.sidebar .geodir-chosen-container .chosen-results li.highlighted{background:#eee;background-image:none;color:#000}.sidebar .geodir_category_list_view li.geodir-gridview{display:inline-block;margin-bottom:15px}.wpgeo-avada.double-sidebars #main #sidebar{margin-left:3%}.wpgeo-avada.double-sidebars #main #sidebar-2{margin-left:-100%}.wpgeo-avada.double-sidebars #content{float:left;margin-left:0}.geodir_full_page section.widget{margin-bottom: 0px;} .sidebar .widget .geodir-hide {display: none;}li.fusion-mobile-nav-item .geodir_location_tab_container a:before{content: "" !important; margin-right: auto !important;}li.fusion-mobile-nav-item .geodir_location_tab_container a{padding-left:5px !important;}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Avada'

-    );

+	$theme_compat['Avada'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '<!-- removed -->',

+		'geodir_wrapper_close_replace' => '<!-- removed -->',

+		'geodir_wrapper_content_open_id' => 'content',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_right_close_replace' => '</div><!-- end sidebar -->',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<div id="sidebar" class="sidebar [class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>',

+		'geodir_sidebar_left_close_replace' => '</div><!-- end sidebar -->',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<!-- removed -->',

+		'geodir_main_content_close_replace' => '<!-- removed -->',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.geodir-sidebar-left{float:left}select,textarea{border-style:solid;border-width:1px}.top-menu li > div{visibility:visible}.geodir-chosen-container-single .chosen-single{height:auto}ul li#menu-item-gd-location-switcher ul{width:222px}ul li#menu-item-gd-location-switcher ul li{padding-right:0!important}#mobile-nav li#mobile-menu-item-gd-location-switcher li a{padding-left:10px;padding-right:10px}#menu-item-gd-location-switcher dd,#mobile-menu-item-gd-location-switcher{margin-left:0}#menu-item-gd-location-switcher dd a{display:block}.geodir-chosen-container .chosen-results li.highlighted{background-color:#eee;background-image:none;color:#444}#mobile-nav li.mobile-nav-item li a:before{content:\'\';margin:0}#mobile-nav li.mobile-nav-item li a{padding:10px;width:auto}.geodir-listing-search{text-align:center}.geodir-search{float:none;margin:0}.geodir-search select,.geodir-search .search_by_post,.geodir-search input[type="text"],.geodir-search button[type="button"], .geodir-search input[type="button"],.geodir-search input[type="submit"]{display:inline-block;float:none}.geodir-cat-list ul li,.map_category ul li{list-style-type:none}.wpgeo-avada .page-title ul li:after{content:\'\'}.top_banner_section{margin-bottom:0}.geodir-category-list-in{margin:0;padding:15px}.geodir_full_page .geodir-cat-list .widget-title{margin-top:0}.geodir_full_page .geodir-cat-list ul li{padding-left:0}.geodir-loc-bar{border:none;margin:0;padding:0}.geodir-loc-bar-in{padding:15px 0}.geodir_full_page section.widget{margin-bottom:20px}.sidebar .geodir-loginbox-list li{margin-bottom:10px;padding-bottom:10px}.sidebar .geodir-loginbox-list li a{display:block}.sidebar .geodir-chosen-container .chosen-results li{margin:0;padding:5px 6px}.sidebar .geodir-chosen-container .chosen-results li.highlighted{background:#eee;background-image:none;color:#000}.sidebar .geodir_category_list_view li.geodir-gridview{display:inline-block;margin-bottom:15px}.wpgeo-avada.double-sidebars #main #sidebar{margin-left:3%}.wpgeo-avada.double-sidebars #main #sidebar-2{margin-left:-100%}.wpgeo-avada.double-sidebars #content{float:left;margin-left:0}.geodir_full_page section.widget{margin-bottom: 0px;} .sidebar .widget .geodir-hide {display: none;}li.fusion-mobile-nav-item .geodir_location_tab_container a:before{content: "" !important; margin-right: auto !important;}li.fusion-mobile-nav-item .geodir_location_tab_container a{padding-left:5px !important;}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Avada'

+	);

 

 //Enfold

-    $theme_compat['Enfold'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '</div></main>',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '',

-        'geodir_sidebar_right_close_replace' => '</div></aside><!-- sidebar ends here-->',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '',

-        'geodir_sidebar_left_close_replace' => '</div></aside><!-- sidebar ends here-->',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.geodir_full_page .top_banner_section{margin-bottom:0}.widget .geodir-cat-list ul li{clear:none}.wpgeo-enfold .av-main-nav ul{width:222px}.geodir-listing-search .geodir-loc-bar{border-top:none;padding:0}#main .geodir-listing-search,.geodir-listing-search .geodir-loc-bar{margin-bottom:0}#main .geodir-loc-bar-in,#main .geodir-category-list-in{background-color:#fcfcfc;margin:20px 0;padding:20px}#main .geodir_full_page .geodir-loc-bar-in,#main .geodir_full_page .geodir-loc-bar,#main .geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}#main .geodir-loc-bar-in{padding:20px}#main .geodir-search{margin:0;width:100%}#main .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#main .geodir-search input[type="text"]{margin:0 3% 0 0;padding:10px;width:32.4%}#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"]{font-size:inherit;line-height:2.25;margin:0;padding:7px;width:13%}.enfold-home-top section.widget{margin:0;padding:0}.enfold-home-top .top_banner_section{margin-bottom:0}.enfold-home-top .geodir-loc-bar{background:#fcfcfc;border:none;margin:0;padding:0}#main .enfold-home-top .geodir-loc-bar-in{background:none;border:none;margin:0 auto;padding:20px 0}#main .geodir-breadcrumb{border-bottom-style:solid;border-bottom-width:1px}#gd-tabs dt{clear:none}#geodir_slider ul li{list-style-type:none;margin:0;padding:0}#respond{clear:both}#comments .comments-title span{display:inline;font-size:inherit;font-weight:700}#reviewsTab .comments-area .bypostauthor cite span{display:inline}#top #comments .commentlist .comment,#top #comments .commentlist .comment > div{min-height:0}.commentlist .commenttext{padding-top:15px}#comment_imagesdropbox{margin-bottom:20px}.wpgeo-enfold .geodir_category_list_view li{margin-left:0;padding:0}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_category_list_view li .geodir-post-img{display:block}.wpgeo-enfold .geodir_event_listing_calendar tr.title{background:#ccc}@media only screen and (max-width:480px){.geodir_category_list_view li .geodir-content,.geodir_category_list_view li .geodir-post-img,.geodir_category_list_view li .geodir-addinfo{float:none;width:100%;margin:10px 0}#main .geodir-search input[type="text"],#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"],#main .geodir-search select{margin:10px 0;width:100%}}#main .geodir_full_page section:last-child .geodir-loc-bar{margin-bottom: -1px;border-bottom: none;}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Enfold'

-    );

+	$theme_compat['Enfold'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '</div></div><!-- content ends here-->',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '</div></main>',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '',

+		'geodir_sidebar_right_close_replace' => '</div></aside><!-- sidebar ends here-->',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '',

+		'geodir_sidebar_left_close_replace' => '</div></aside><!-- sidebar ends here-->',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.geodir_full_page .top_banner_section{margin-bottom:0}.widget .geodir-cat-list ul li{clear:none}.wpgeo-enfold .av-main-nav ul{width:222px}.geodir-listing-search .geodir-loc-bar{border-top:none;padding:0}#main .geodir-listing-search,.geodir-listing-search .geodir-loc-bar{margin-bottom:0}#main .geodir-loc-bar-in,#main .geodir-category-list-in{background-color:#fcfcfc;margin:20px 0;padding:20px}#main .geodir_full_page .geodir-loc-bar-in,#main .geodir_full_page .geodir-loc-bar,#main .geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}#main .geodir-loc-bar-in{padding:20px}#main .geodir-search{margin:0;width:100%}#main .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#main .geodir-search input[type="text"]{margin:0 3% 0 0;padding:10px;width:32.4%}#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"]{font-size:inherit;line-height:2.25;margin:0;padding:7px;width:13%}.enfold-home-top section.widget{margin:0;padding:0}.enfold-home-top .top_banner_section{margin-bottom:0}.enfold-home-top .geodir-loc-bar{background:#fcfcfc;border:none;margin:0;padding:0}#main .enfold-home-top .geodir-loc-bar-in{background:none;border:none;margin:0 auto;padding:20px 0}#main .geodir-breadcrumb{border-bottom-style:solid;border-bottom-width:1px}#gd-tabs dt{clear:none}#geodir_slider ul li{list-style-type:none;margin:0;padding:0}#respond{clear:both}#comments .comments-title span{display:inline;font-size:inherit;font-weight:700}#reviewsTab .comments-area .bypostauthor cite span{display:inline}#top #comments .commentlist .comment,#top #comments .commentlist .comment > div{min-height:0}.commentlist .commenttext{padding-top:15px}#comment_imagesdropbox{margin-bottom:20px}.wpgeo-enfold .geodir_category_list_view li{margin-left:0;padding:0}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_category_list_view li .geodir-post-img{display:block}.wpgeo-enfold .geodir_event_listing_calendar tr.title{background:#ccc}@media only screen and (max-width:480px){.geodir_category_list_view li .geodir-content,.geodir_category_list_view li .geodir-post-img,.geodir_category_list_view li .geodir-addinfo{float:none;width:100%;margin:10px 0}#main .geodir-search input[type="text"],#main .geodir-search input[type="button"],#main .geodir-search input[type="submit"],#main .geodir-search select{margin:10px 0;width:100%}}#main .geodir_full_page section:last-child .geodir-loc-bar{margin-bottom: -1px;border-bottom: none;}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Enfold'

+	);

 

 // X

-    $theme_compat['X'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.x-colophon.bottom{clear:both}#geodir-main-content,.geodir_flex-container{margin-top:16px}.geodir-x ul{list-style:none}.widget ul.geodir_category_list_view{border:none}.geodir_category_list_view li.geodir-gridview:last-child{border-bottom:1px solid #e1e1e1}.home .x-header-landmark{display:none}.geodir-x .x-main .geodir_advance_search_widget{margin:0}.geodir-x .top_banner_section{margin-bottom:0}.geodir-loc-bar{background:rgba(0,0,0,0.05);margin:0;padding:0}.geodir-loc-bar-in{background:none;border:none;padding:10px}.geodir-search{margin:0;width:100%}.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{border:1px solid #ccc;box-shadow:none;height:auto;line-height:21px;margin:0 1% 0 0;padding:5px 10px}.widget .geodir-search select,.geodir-search input[type="text"]{width:28%}.geodir-search input[type="submit"],.geodir-search input[type="button"]{line-height:19px;margin-right:0;width:11%}.geodir-search input:hover[type="submit"],.geodir-search input:hover[type="button"]{background:#333;color:#fff}.geodir-cat-list .widget-title{margin-top:0}.geodir-x .geodir-category-list-in{background:rgba(0,0,0,0.05);border:none}.widget .geodir-cat-list ul.geodir-popular-cat-list{border:none;border-radius:0;box-shadow:none}.geodir_full_page .geodir-cat-list ul li{border:none}.geodir_full_page .geodir-cat-list ul li a{border:none}.post-type-archive .geodir-loc-bar{border:none;margin-top:20px}#menu-item-gd-location-switcher dd{margin-left:0}.geodir-chosen-container-single .chosen-single{height:auto}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_full_page section.widget{clear:both}.x-ethos .entry-title{margin-bottom:20px}.x-ethos .geodir-chosen-container-single .chosen-single{padding:0 0 0 8px}.x-ethos .widget ul li a,.x-ethos .geodir_category_list_view li{color:#333}@media only screen and (max-width:767px){.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{margin:0 0 10px;width:100%}}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-loc-bar,.geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-category-list-in{border-bottom:1px solid rgba(0,0,0,0.1)}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'X'

-    );

+	$theme_compat['X'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.x-colophon.bottom{clear:both}#geodir-main-content,.geodir_flex-container{margin-top:16px}.geodir-x ul{list-style:none}.widget ul.geodir_category_list_view{border:none}.geodir_category_list_view li.geodir-gridview:last-child{border-bottom:1px solid #e1e1e1}.home .x-header-landmark{display:none}.geodir-x .x-main .geodir_advance_search_widget{margin:0}.geodir-x .top_banner_section{margin-bottom:0}.geodir-loc-bar{background:rgba(0,0,0,0.05);margin:0;padding:0}.geodir-loc-bar-in{background:none;border:none;padding:10px}.geodir-search{margin:0;width:100%}.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{border:1px solid #ccc;box-shadow:none;height:auto;line-height:21px;margin:0 1% 0 0;padding:5px 10px}.widget .geodir-search select,.geodir-search input[type="text"]{width:28%}.geodir-search input[type="submit"],.geodir-search input[type="button"]{line-height:19px;margin-right:0;width:11%}.geodir-search input:hover[type="submit"],.geodir-search input:hover[type="button"]{background:#333;color:#fff}.geodir-cat-list .widget-title{margin-top:0}.geodir-x .geodir-category-list-in{background:rgba(0,0,0,0.05);border:none}.widget .geodir-cat-list ul.geodir-popular-cat-list{border:none;border-radius:0;box-shadow:none}.geodir_full_page .geodir-cat-list ul li{border:none}.geodir_full_page .geodir-cat-list ul li a{border:none}.post-type-archive .geodir-loc-bar{border:none;margin-top:20px}#menu-item-gd-location-switcher dd{margin-left:0}.geodir-chosen-container-single .chosen-single{height:auto}.widget ul.geodir-loginbox-list{overflow:visible}.geodir_full_page section.widget{clear:both}.x-ethos .entry-title{margin-bottom:20px}.x-ethos .geodir-chosen-container-single .chosen-single{padding:0 0 0 8px}.x-ethos .widget ul li a,.x-ethos .geodir_category_list_view li{color:#333}@media only screen and (max-width:767px){.widget .geodir-search select,.geodir-search input[type="text"],.geodir-search input[type="button"],.geodir-search input[type="submit"]{margin:0 0 10px;width:100%}}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-loc-bar,.geodir_full_page .geodir-category-list-in{margin-top:0;margin-bottom:0}.geodir_full_page .geodir-loc-bar-in,.geodir_full_page .geodir-category-list-in{border-bottom:1px solid rgba(0,0,0,0.1)}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'X'

+	);

 

 // Divi

-    $theme_compat['Divi'] = array(

-        'geodir_wrapper_open_id' => 'main-content',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => 'left-area',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '<div class="container"><div id="content-area" class="clearfix"><div id="[id]" class="[class]" role="main" >',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => 'sidebar',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_right_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

-        'geodir_sidebar_left_open_id' => 'sidebar',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_left_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('#left-area ul.geodir-direction-nav{list-style-type:none}#sidebar .geodir-company_info{margin-left:30px}#sidebar .geodir-widget{float:none;margin:0 0 30px 30px}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.archive .entry-header,.geodir-breadcrumb{border-bottom:1px solid #e2e2e2}.archive .entry-header h1,ul#breadcrumbs{padding:0 15px;width:100%}#left-area ul.geodir_category_list_view{padding:10px 0}.nav li#menu-item-gd-location-switcher ul{width:222px}#menu-item-gd-location-switcher li.gd-location-switcher-menu-item{padding-right:0}#menu-item-gd-location-switcher dd{margin-left:0}#menu-item-gd-location-switcher .geodir_location_tab_container dd a{padding:5px;width:auto}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type=button],.geodir_full_page .geodir-search input[type=submit],.geodir_full_page .geodir-search input[type=text],.geodir_full_page .geodir-search select{display:inline-block;float:none}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Divi'

-    );

+	$theme_compat['Divi'] = array(

+		'geodir_wrapper_open_id' => 'main-content',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => 'left-area',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '<div class="container"><div id="content-area" class="clearfix"><div id="[id]" class="[class]" role="main" >',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => 'sidebar',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_right_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

+		'geodir_sidebar_left_open_id' => 'sidebar',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_left_close_replace' => '</aside><!-- sidebar ends here--></div></div>',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('#left-area ul.geodir-direction-nav{list-style-type:none}#sidebar .geodir-company_info{margin-left:30px}#sidebar .geodir-widget{float:none;margin:0 0 30px 30px}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.archive .entry-header,.geodir-breadcrumb{border-bottom:1px solid #e2e2e2}.archive .entry-header h1,ul#breadcrumbs{padding:0 15px;width:100%}#left-area ul.geodir_category_list_view{padding:10px 0}.nav li#menu-item-gd-location-switcher ul{width:222px}#menu-item-gd-location-switcher li.gd-location-switcher-menu-item{padding-right:0}#menu-item-gd-location-switcher dd{margin-left:0}#menu-item-gd-location-switcher .geodir_location_tab_container dd a{padding:5px;width:auto}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type=button],.geodir_full_page .geodir-search input[type=submit],.geodir_full_page .geodir-search input[type=text],.geodir_full_page .geodir-search select{display:inline-block;float:none}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Divi'

+	);

 

 // Genesis

-    $theme_compat['Genesis'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => 'content-sidebar-wrap',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => 'content',

-        'geodir_wrapper_content_open_replace' => '<div class="[class]" role="main" >',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => 'sidebar sidebar-primary widget-area',

-        'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => 'sidebar sidebar-secondary widget-area',

-        'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<main  id="[id]" class="entry [class]"  role="main">',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-gd-location-switcher menu-item-has-children gd-location-switcher',

-        'geodir_theme_compat_css' => stripslashes('.full-width-content #geodir-wrapper-content{width:100%}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}.content{float:left}.sidebar-content .content,.sidebar-content #geodir-wrapper-content{float:right}.sidebar .geodir-company_info{background-color:#fff;border:none}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.geodir-breadcrumb-bar{margin-bottom:-35px} .search-page .entry-title,.listings-page .entry-title{font-size: 20px;}.site-inner .geodir-breadcrumb-bar{margin-bottom:0px}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Genesis'

-    );

+	$theme_compat['Genesis'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => 'content-sidebar-wrap',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => 'content',

+		'geodir_wrapper_content_open_replace' => '<div class="[class]" role="main" >',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => 'sidebar sidebar-primary widget-area',

+		'geodir_sidebar_right_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => 'sidebar sidebar-secondary widget-area',

+		'geodir_sidebar_left_open_replace' => '<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]">',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<main  id="[id]" class="entry [class]"  role="main">',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-gd-location-switcher menu-item-has-children gd-location-switcher',

+		'geodir_theme_compat_css' => stripslashes('.full-width-content #geodir-wrapper-content{width:100%}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}.content{float:left}.sidebar-content .content,.sidebar-content #geodir-wrapper-content{float:right}.sidebar .geodir-company_info{background-color:#fff;border:none}.geodir_full_page .geodir-loc-bar{padding:0;margin:0;border:none}.geodir_full_page .geodir-category-list-in{margin-top:0}.geodir_full_page .top_banner_section{margin-bottom:0}.geodir-breadcrumb-bar{margin-bottom:-35px} .search-page .entry-title,.listings-page .entry-title{font-size: 20px;}.site-inner .geodir-breadcrumb-bar{margin-bottom:0px}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Genesis'

+	);

 

 // Jupiter

-    $theme_compat['Jupiter'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => '',

-        'geodir_wrapper_open_replace' => '<div id="theme-page"><div class="mk-main-wrapper-holder"><div  class="theme-page-wrapper mk-main-wrapper  mk-grid vc_row-fluid">',

-        'geodir_wrapper_close_replace' => '</div></div></div>',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '',

-        'geodir_wrapper_content_close_replace' => '',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => 'mk-sidebar',

-        'geodir_sidebar_right_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

-        'geodir_sidebar_right_open_replace' => '',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => 'mk-sidebar',

-        'geodir_sidebar_left_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

-        'geodir_sidebar_left_open_replace' => '',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '',

-        'geodir_main_content_close_replace' => '',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_before_title_filter' => '<h3 class="widgettitle geodir-widget-title">',

-        'geodir_after_title_filter' => '',

-        'geodir_menu_li_class_filter' => 'menu-item menu-item-has-children no-mega-menu',

-        'geodir_sub_menu_ul_class_filter' => '',

-        'geodir_sub_menu_li_class_filter' => '',

-        'geodir_menu_a_class_filter' => 'menu-item-link',

-        'geodir_sub_menu_a_class_filter' => 'menu-item-link one-page-nav-item',

-        'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher menu-item-has-children no-mega-menu',

-        'geodir_location_switcher_menu_a_class_filter' => 'menu-item-link',

-        'geodir_location_switcher_menu_sub_ul_class_filter' => '',

-        'geodir_location_switcher_menu_sub_li_class_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.geodir-widget li,.geodir_category_list_view li{margin:0}#theme-page h3.geodir-entry-title{font-size:14px}#menu-item-gd-location-switcher dd{line-height:44px}#menu-item-gd-location-switcher .geodir_location_sugestion{line-height:20px}.geodir_loginbox{overflow:visible}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

-        'geodir_theme_compat_js' => '',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Jupiter'

-    );

+	$theme_compat['Jupiter'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => '',

+		'geodir_wrapper_open_replace' => '<div id="theme-page"><div class="mk-main-wrapper-holder"><div  class="theme-page-wrapper mk-main-wrapper  mk-grid vc_row-fluid">',

+		'geodir_wrapper_close_replace' => '</div></div></div>',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '',

+		'geodir_wrapper_content_close_replace' => '',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => 'mk-sidebar',

+		'geodir_sidebar_right_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

+		'geodir_sidebar_right_open_replace' => '',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => 'mk-sidebar',

+		'geodir_sidebar_left_open_class' => 'mk-builtin geodir-sidebar-right geodir-listings-sidebar-right',

+		'geodir_sidebar_left_open_replace' => '',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '',

+		'geodir_main_content_close_replace' => '',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_before_title_filter' => '<h3 class="widgettitle geodir-widget-title">',

+		'geodir_after_title_filter' => '',

+		'geodir_menu_li_class_filter' => 'menu-item menu-item-has-children no-mega-menu',

+		'geodir_sub_menu_ul_class_filter' => '',

+		'geodir_sub_menu_li_class_filter' => '',

+		'geodir_menu_a_class_filter' => 'menu-item-link',

+		'geodir_sub_menu_a_class_filter' => 'menu-item-link one-page-nav-item',

+		'geodir_location_switcher_menu_li_class_filter' => 'menu-item menu-item-type-social menu-item-type-social gd-location-switcher menu-item-has-children no-mega-menu',

+		'geodir_location_switcher_menu_a_class_filter' => 'menu-item-link',

+		'geodir_location_switcher_menu_sub_ul_class_filter' => '',

+		'geodir_location_switcher_menu_sub_li_class_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.geodir-widget li,.geodir_category_list_view li{margin:0}#theme-page h3.geodir-entry-title{font-size:14px}#menu-item-gd-location-switcher dd{line-height:44px}#menu-item-gd-location-switcher .geodir_location_sugestion{line-height:20px}.geodir_loginbox{overflow:visible}.geodir_full_page .geodir-listing-search{text-align:center}.geodir_full_page .geodir-search{float:none;margin:0}.geodir_full_page .geodir-search select,.geodir_full_page .geodir-search .search_by_post,.geodir_full_page .geodir-search input[type="text"],.geodir_full_page .geodir-search input[type="button"],.geodir_full_page .geodir-search input[type="submit"]{display:inline-block;float:none}'),

+		'geodir_theme_compat_js' => '',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Jupiter'

+	);

 

 // Multi News

-    $theme_compat['Multi_News'] = array(

-        'geodir_wrapper_open_id' => '',

-        'geodir_wrapper_open_class' => 'main-container clearfix',

-        'geodir_wrapper_open_replace' => '',

-        'geodir_wrapper_close_replace' => '',

-        'geodir_wrapper_content_open_id' => '',

-        'geodir_wrapper_content_open_class' => '',

-        'geodir_wrapper_content_open_replace' => '<div class="main-left" ><div class="main-content  "><div class="site-content page-wrap">',

-        'geodir_wrapper_content_close_replace' => '</div></div></div>',

-        'geodir_article_open_id' => '',

-        'geodir_article_open_class' => '',

-        'geodir_article_open_replace' => '',

-        'geodir_article_close_replace' => '',

-        'geodir_sidebar_right_open_id' => '',

-        'geodir_sidebar_right_open_class' => '',

-        'geodir_sidebar_right_open_replace' => '<aside  class="sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_right_close_replace' => '',

-        'geodir_sidebar_left_open_id' => '',

-        'geodir_sidebar_left_open_class' => '',

-        'geodir_sidebar_left_open_replace' => '<aside  class="secondary-sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_left_close_replace' => '',

-        'geodir_main_content_open_id' => '',

-        'geodir_main_content_open_class' => '',

-        'geodir_main_content_open_replace' => '<div class="site-content page-wrap">',

-        'geodir_main_content_close_replace' => '</div>',

-        'geodir_top_content_add' => '',

-        'geodir_before_main_content_add' => '',

-        'geodir_full_page_class_filter' => 'section full-width-section',

-        'geodir_before_widget_filter' => '',

-        'geodir_after_widget_filter' => '',

-        'geodir_before_title_filter' => '<div class="widget-title"><h2>',

-        'geodir_after_title_filter' => '</h2></div>',

-        'geodir_menu_li_class_filter' => '',

-        'geodir_sub_menu_ul_class_filter' => '',

-        'geodir_sub_menu_li_class_filter' => '',

-        'geodir_menu_a_class_filter' => '',

-        'geodir_sub_menu_a_class_filter' => '',

-        'geodir_location_switcher_menu_li_class_filter' => '',

-        'geodir_location_switcher_menu_a_class_filter' => '',

-        'geodir_location_switcher_menu_sub_ul_class_filter' => '',

-        'geodir_location_switcher_menu_sub_li_class_filter' => '',

-        'geodir_theme_compat_css' => stripslashes('.full-width-section .geodir-search{margin:0;width:100%}.geodir_full_page .geodir-search{margin:0 auto;float:none}.geodir-search input[type=button],.geodir-search input[type=submit]{width:13%}.geodir-search input[type=text]{border:1px solid #ddd;border-radius:0;padding:0 8px}.geodir-category-list-in,.geodir-loc-bar-in{background:#f2f2f2;border-color:#dbdbdb}.geodir-category-list-in{margin-top:0}.geodir-cat-list .widget-title h2{margin:-13px -13px 13px}.widget .geodir-cat-list ul li.geodir-pcat-show a:before{display:none!important}.widget .geodir-cat-list ul li.geodir-pcat-show i{margin-right:5px}.container .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#geodir_carousel,#geodir_slider{border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;margin-bottom:20px!important;border:1px solid #e1e1e1;box-shadow:none}#geodir_carousel{padding:10px}.geodir-tabs-content ol.commentlist{margin:40px 0;padding:0}li#post_mapTab{min-height:400px}#reviewsTab ol.commentlist li{border-bottom:none}#reviewsTab ol.commentlist li article.comment{border-bottom:1px solid #e1e1e1;padding-bottom:10px}.comment-content .rating{display:none}.comment-respond .gd_rating{margin-bottom:20px}div.geodir-rating{width:85px!important}.comment-respond .comment-notes{margin-bottom:10px}.average-review span,.comment-form label,.dtreviewed,.geodir-details-sidebar-user-links a,.geodir-viewall,.geodir_more_info span,.reviewer,dl.geodir-tab-head dd a{font-family:"Archivo Narrow",sans-serif}section.comment-content{margin:0 0 0 12%}#reviewsTab .comments-area .comment-content{width:auto}section.comment-content .description,section.comment-content p{margin:15px 0}dl.geodir-tab-head dd a{background:#f3f3f3;margin-top:-1px;font-size:14px;padding:0 15px}dl.geodir-tab-head dd.geodir-tab-active a{padding-bottom:1px}.geodir-widget .geodir_list_heading,.geodir-widget h3.widget-title{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px;color:#2d2d2d}.geodir-widget .geodir_list_heading h3{background:0 0;border:none}.geodir-widget .geodir_list_heading{margin:-13px -14px 13px}.geodir-map-listing-page{border-width:1px 0 0;border-style:solid;border-color:#dbdbdb}.geodir-sidebar-wrap .geodir-company_info{margin:15px}.geodir-details-sidebar-social-sharing iframe{float:left}.geodir-details-sidebar-rating{overflow:hidden}.geodir-details-sidebar-rating .gd_rating_show,.geodir-details-sidebar-rating .geodir-rating{float:left;margin-right:15px}.geodir-details-sidebar-rating span.item{float:left;margin-top:5px}.geodir-details-sidebar-rating .average-review{top:-4px;position:relative}.geodir-details-sidebar-rating span.item img{margin-top:5px}.geodir_full_page{background:#fff;border:1px solid #e1e1e1;-webkit-box-shadow:0 1px 0 #e5e5e5;box-shadow:0 1px 0 #e5e5e5;padding:15px;margin-bottom:20px;clear:both}.geodir_map_container .main_list img{margin:0 5px}.geodir_category_list_view li.geodir-gridview .geodir-post-img .geodir_thumbnail{margin-bottom:10px}.geodir-addinfo .geodir-pinpoint,.geodir-addinfo a i{margin-right:5px}.geodir_category_list_view li.geodir-gridview h3{font-size:18px;margin-bottom:10px}#related_listingTab ul.geodir_category_list_view{padding:0!important}#reviewsTab #comments .gd_rating{margin-top:5px}.widget .geodir_category_list_view li .geodir-entry-content,.widget .geodir_category_list_view li a:before{display:none!important}.geodir_category_list_view li .geodir-entry-title{margin-bottom:10px}.widget ul.geodir_category_list_view{padding:15px}.sidebar .widget .geodir_category_list_view li{width:calc(100% - 25px)}.widget .geodir-loginbox-list li{overflow:visible!important}.widget ul.chosen-results{margin:0!important}.main_list_selecter{margin-right:5px}.geodir-viewall{float:right;width:auto!important}.widget-title h2{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px}.widget:first-child .geodir_list_heading .widget-title{margin-top:0}.geodir_list_heading .widget-title{float:left;width:80%;margin-top:0}.geodir_list_heading .widget-title h2{padding:0 px;background:0 0;border:none;height:auto;line-height:auto}.chosen-default:before{content:none;display:none;position:absolute;margin-left:-1000000px;float:left}#geodir-wrapper .entry-crumbs{margin-bottom:20px}.geodir-search .mom-select{float:left;width:150px;margin:5px;border:1px solid #ddd;height:40px}.iprelative .gm-style .gm-style-iw{width:100%!important}'),

-        'geodir_theme_compat_js' => 'jQuery(document).ready(function(e){e(".geodir_full_page").length&&""===e.trim(e(".geodir_full_page").html())&&e(".geodir_full_page").css({display:"none"})});',

-        'geodir_theme_compat_default_options' => '',

-        'geodir_theme_compat_code' => 'Multi_News'

-    );

-

-    // Kelo

-    $theme_compat['Kleo'] = array(

-        'geodir_theme_compat_code' => 'Kleo'

-    );

-

-

-    // Twenty Seventeen

-    $theme_compat['Twenty_Seventeen'] = array(

-        'geodir_wrapper_open_replace' => '<div class="wrap">',

-        'geodir_wrapper_content_open_replace' => '<div id="primary" class="content-area" >',

-        'geodir_sidebar_right_open_replace' => '<aside id="secondary"  class="widget-area" itemscope itemtype="[itemtype]" >',

-        'geodir_sidebar_left_open_replace' => '<aside id="secondary"  class="widget-area" itemscope itemtype="[itemtype]" >',

-        'geodir_theme_compat_css' => stripslashes('body.geodir-page #primary header.entry-header {margin-left:0;float:none !important;} .gxeodir_flex-container{float:left;} .geodir-tabs-content.entry-content{width:100% !important;} dl.geodir-tab-head, .geodir_map_container {z-index:2;} .geodir-cat-list ul.geodir-popular-cat-list  li + li {    margin-top: 0;} .geodir-cat-list .geodir-popular-cat-list a img, .entry-content .gm-style a img, .widget .gm-style a img {    box-sizing: none; -webkit-box-shadow: none; -moz-box-shadow: none;}'),

-        'geodir_theme_compat_code' => 'Twenty_Seventeen'

-    );

-

-

-    update_option('gd_theme_compats', $theme_compat);

-

-    gd_set_theme_compat();// set the compat pack if avail

+	$theme_compat['Multi_News'] = array(

+		'geodir_wrapper_open_id' => '',

+		'geodir_wrapper_open_class' => 'main-container clearfix',

+		'geodir_wrapper_open_replace' => '',

+		'geodir_wrapper_close_replace' => '',

+		'geodir_wrapper_content_open_id' => '',

+		'geodir_wrapper_content_open_class' => '',

+		'geodir_wrapper_content_open_replace' => '<div class="main-left" ><div class="main-content  "><div class="site-content page-wrap">',

+		'geodir_wrapper_content_close_replace' => '</div></div></div>',

+		'geodir_article_open_id' => '',

+		'geodir_article_open_class' => '',

+		'geodir_article_open_replace' => '',

+		'geodir_article_close_replace' => '',

+		'geodir_sidebar_right_open_id' => '',

+		'geodir_sidebar_right_open_class' => '',

+		'geodir_sidebar_right_open_replace' => '<aside  class="sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_right_close_replace' => '',

+		'geodir_sidebar_left_open_id' => '',

+		'geodir_sidebar_left_open_class' => '',

+		'geodir_sidebar_left_open_replace' => '<aside  class="secondary-sidebar" role="complementary" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_left_close_replace' => '',

+		'geodir_main_content_open_id' => '',

+		'geodir_main_content_open_class' => '',

+		'geodir_main_content_open_replace' => '<div class="site-content page-wrap">',

+		'geodir_main_content_close_replace' => '</div>',

+		'geodir_top_content_add' => '',

+		'geodir_before_main_content_add' => '',

+		'geodir_full_page_class_filter' => 'section full-width-section',

+		'geodir_before_widget_filter' => '',

+		'geodir_after_widget_filter' => '',

+		'geodir_before_title_filter' => '<div class="widget-title"><h2>',

+		'geodir_after_title_filter' => '</h2></div>',

+		'geodir_menu_li_class_filter' => '',

+		'geodir_sub_menu_ul_class_filter' => '',

+		'geodir_sub_menu_li_class_filter' => '',

+		'geodir_menu_a_class_filter' => '',

+		'geodir_sub_menu_a_class_filter' => '',

+		'geodir_location_switcher_menu_li_class_filter' => '',

+		'geodir_location_switcher_menu_a_class_filter' => '',

+		'geodir_location_switcher_menu_sub_ul_class_filter' => '',

+		'geodir_location_switcher_menu_sub_li_class_filter' => '',

+		'geodir_theme_compat_css' => stripslashes('.full-width-section .geodir-search{margin:0;width:100%}.geodir_full_page .geodir-search{margin:0 auto;float:none}.geodir-search input[type=button],.geodir-search input[type=submit]{width:13%}.geodir-search input[type=text]{border:1px solid #ddd;border-radius:0;padding:0 8px}.geodir-category-list-in,.geodir-loc-bar-in{background:#f2f2f2;border-color:#dbdbdb}.geodir-category-list-in{margin-top:0}.geodir-cat-list .widget-title h2{margin:-13px -13px 13px}.widget .geodir-cat-list ul li.geodir-pcat-show a:before{display:none!important}.widget .geodir-cat-list ul li.geodir-pcat-show i{margin-right:5px}.container .geodir-search select{margin:0 3% 0 0;padding:8px 10px;width:13%}#geodir_carousel,#geodir_slider{border-radius:0;-webkit-border-radius:0;-moz-border-radius:0;margin-bottom:20px!important;border:1px solid #e1e1e1;box-shadow:none}#geodir_carousel{padding:10px}.geodir-tabs-content ol.commentlist{margin:40px 0;padding:0}li#post_mapTab{min-height:400px}#reviewsTab ol.commentlist li{border-bottom:none}#reviewsTab ol.commentlist li article.comment{border-bottom:1px solid #e1e1e1;padding-bottom:10px}.comment-content .rating{display:none}.comment-respond .gd_rating{margin-bottom:20px}div.geodir-rating{width:85px!important}.comment-respond .comment-notes{margin-bottom:10px}.average-review span,.comment-form label,.dtreviewed,.geodir-details-sidebar-user-links a,.geodir-viewall,.geodir_more_info span,.reviewer,dl.geodir-tab-head dd a{font-family:"Archivo Narrow",sans-serif}section.comment-content{margin:0 0 0 12%}#reviewsTab .comments-area .comment-content{width:auto}section.comment-content .description,section.comment-content p{margin:15px 0}dl.geodir-tab-head dd a{background:#f3f3f3;margin-top:-1px;font-size:14px;padding:0 15px}dl.geodir-tab-head dd.geodir-tab-active a{padding-bottom:1px}.geodir-widget .geodir_list_heading,.geodir-widget h3.widget-title{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px;color:#2d2d2d}.geodir-widget .geodir_list_heading h3{background:0 0;border:none}.geodir-widget .geodir_list_heading{margin:-13px -14px 13px}.geodir-map-listing-page{border-width:1px 0 0;border-style:solid;border-color:#dbdbdb}.geodir-sidebar-wrap .geodir-company_info{margin:15px}.geodir-details-sidebar-social-sharing iframe{float:left}.geodir-details-sidebar-rating{overflow:hidden}.geodir-details-sidebar-rating .gd_rating_show,.geodir-details-sidebar-rating .geodir-rating{float:left;margin-right:15px}.geodir-details-sidebar-rating span.item{float:left;margin-top:5px}.geodir-details-sidebar-rating .average-review{top:-4px;position:relative}.geodir-details-sidebar-rating span.item img{margin-top:5px}.geodir_full_page{background:#fff;border:1px solid #e1e1e1;-webkit-box-shadow:0 1px 0 #e5e5e5;box-shadow:0 1px 0 #e5e5e5;padding:15px;margin-bottom:20px;clear:both}.geodir_map_container .main_list img{margin:0 5px}.geodir_category_list_view li.geodir-gridview .geodir-post-img .geodir_thumbnail{margin-bottom:10px}.geodir-addinfo .geodir-pinpoint,.geodir-addinfo a i{margin-right:5px}.geodir_category_list_view li.geodir-gridview h3{font-size:18px;margin-bottom:10px}#related_listingTab ul.geodir_category_list_view{padding:0!important}#reviewsTab #comments .gd_rating{margin-top:5px}.widget .geodir_category_list_view li .geodir-entry-content,.widget .geodir_category_list_view li a:before{display:none!important}.geodir_category_list_view li .geodir-entry-title{margin-bottom:10px}.widget ul.geodir_category_list_view{padding:15px}.sidebar .widget .geodir_category_list_view li{width:calc(100% - 25px)}.widget .geodir-loginbox-list li{overflow:visible!important}.widget ul.chosen-results{margin:0!important}.main_list_selecter{margin-right:5px}.geodir-viewall{float:right;width:auto!important}.widget-title h2{padding:0 15px;background:#e9e9e9;border:1px solid #dbdbdb;height:38px;line-height:38px}.widget:first-child .geodir_list_heading .widget-title{margin-top:0}.geodir_list_heading .widget-title{float:left;width:80%;margin-top:0}.geodir_list_heading .widget-title h2{padding:0 px;background:0 0;border:none;height:auto;line-height:auto}.chosen-default:before{content:none;display:none;position:absolute;margin-left:-1000000px;float:left}#geodir-wrapper .entry-crumbs{margin-bottom:20px}.geodir-search .mom-select{float:left;width:150px;margin:5px;border:1px solid #ddd;height:40px}.iprelative .gm-style .gm-style-iw{width:100%!important}'),

+		'geodir_theme_compat_js' => 'jQuery(document).ready(function(e){e(".geodir_full_page").length&&""===e.trim(e(".geodir_full_page").html())&&e(".geodir_full_page").css({display:"none"})});',

+		'geodir_theme_compat_default_options' => '',

+		'geodir_theme_compat_code' => 'Multi_News'

+	);

+

+	// Kelo

+	$theme_compat['Kleo'] = array(

+		'geodir_theme_compat_code' => 'Kleo'

+	);

+

+

+	// Twenty Seventeen

+	$theme_compat['Twenty_Seventeen'] = array(

+		'geodir_wrapper_open_replace' => '<div class="wrap">',

+		'geodir_wrapper_content_open_replace' => '<div id="primary" class="content-area" >',

+		'geodir_sidebar_right_open_replace' => '<aside id="secondary"  class="widget-area" itemscope itemtype="[itemtype]" >',

+		'geodir_sidebar_left_open_replace' => '<aside id="secondary"  class="widget-area" itemscope itemtype="[itemtype]" >',

+		'geodir_theme_compat_css' => stripslashes('body.geodir-page #primary header.entry-header {margin-left:0;float:none !important;} .gxeodir_flex-container{float:left;} .geodir-tabs-content.entry-content{width:100% !important;} dl.geodir-tab-head, .geodir_map_container {z-index:2;} .geodir-cat-list ul.geodir-popular-cat-list  li + li {    margin-top: 0;} .geodir-cat-list .geodir-popular-cat-list a img, .entry-content .gm-style a img, .widget .gm-style a img {    box-sizing: none; -webkit-box-shadow: none; -moz-box-shadow: none;}'),

+		'geodir_theme_compat_code' => 'Twenty_Seventeen'

+	);

+

+

+	update_option('gd_theme_compats', $theme_compat);

+

+	gd_set_theme_compat();// set the compat pack if avail

 }

 

 

@@ -730,61 +730,61 @@ 
  * @global object $wpdb WordPress Database object.

  */

 function gd_convert_virtual_pages(){

-    global $wpdb;

-

-    // Update the add listing page settings

-    $add_listing_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('add-listing')

-        )

-    );

-

-    if($add_listing_page){

-        wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

-        update_option( 'geodir_add_listing_page', $add_listing_page);

-    }

-

-    // Update the listing preview page settings

-    $listing_preview_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('listing-preview')

-        )

-    );

-

-    if($listing_preview_page){

-        wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

-        update_option( 'geodir_preview_page', $listing_preview_page);

-    }

-

-    // Update the listing success page settings

-    $listing_success_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('listing-success')

-        )

-    );

-

-    if($listing_success_page){

-        wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

-        update_option( 'geodir_success_page', $listing_success_page);

-    }

-

-    // Update the listing success page settings

-    $location_page = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

-            array('location')

-        )

-    );

-

-    if($location_page){

-        $location_slug = get_option('geodir_location_prefix');

-        if(!$location_slug ){$location_slug  = 'location';}

-        wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

-        update_option( 'geodir_location_page', $location_page);

-    }

+	global $wpdb;

+

+	// Update the add listing page settings

+	$add_listing_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('add-listing')

+		)

+	);

+

+	if($add_listing_page){

+		wp_update_post( array('ID' => $add_listing_page, 'post_status' => 'publish') );

+		update_option( 'geodir_add_listing_page', $add_listing_page);

+	}

+

+	// Update the listing preview page settings

+	$listing_preview_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('listing-preview')

+		)

+	);

+

+	if($listing_preview_page){

+		wp_update_post( array('ID' => $listing_preview_page, 'post_status' => 'publish') );

+		update_option( 'geodir_preview_page', $listing_preview_page);

+	}

+

+	// Update the listing success page settings

+	$listing_success_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('listing-success')

+		)

+	);

+

+	if($listing_success_page){

+		wp_update_post( array('ID' => $listing_success_page, 'post_status' => 'publish') );

+		update_option( 'geodir_success_page', $listing_success_page);

+	}

+

+	// Update the listing success page settings

+	$location_page = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s AND post_status='virtual' LIMIT 1;",

+			array('location')

+		)

+	);

+

+	if($location_page){

+		$location_slug = get_option('geodir_location_prefix');

+		if(!$location_slug ){$location_slug  = 'location';}

+		wp_update_post( array('ID' => $location_page, 'post_status' => 'publish','post_name' => $location_slug) );

+		update_option( 'geodir_location_page', $location_page);

+	}

 

 }

 

@@ -798,31 +798,31 @@ 
 function gd_fix_cpt_rewrite_slug()

 {

 

-    $alt_post_types = array();

-    $post_types = get_option('geodir_post_types');

+	$alt_post_types = array();

+	$post_types = get_option('geodir_post_types');

 

 

-    if (is_array($post_types)){

+	if (is_array($post_types)){

 

-        foreach ($post_types as $post_type => $args) {

+		foreach ($post_types as $post_type => $args) {

 

 

-            if(isset($args['rewrite']['slug'])){

-                $args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

-            }

+			if(isset($args['rewrite']['slug'])){

+				$args['rewrite']['slug'] = str_replace("/%gd_taxonomy%","",$args['rewrite']['slug']);

+			}

 

-                $alt_post_types[$post_type] = $args;

+				$alt_post_types[$post_type] = $args;

 

-        }

-    }

+		}

+	}

 

-    if(!empty($alt_post_types)) {

-        update_option('geodir_post_types',$alt_post_types);

-        }

+	if(!empty($alt_post_types)) {

+		update_option('geodir_post_types',$alt_post_types);

+		}

 

 

-    // flush the rewrite rules

-    flush_rewrite_rules();

+	// flush the rewrite rules

+	flush_rewrite_rules();

 }

 

 

@@ -835,18 +835,18 @@ 
  */

 function gd_fix_address_detail_table_limit()

 {

-    global $wpdb;

-

-    $all_postypes = geodir_get_posttypes();

-

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            try {

-                $wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

-            } catch(Exception $e) {

-                error_log( 'Error: ' . $e->getMessage() );

-            }

-        }

-    }

+	global $wpdb;

+

+	$all_postypes = geodir_get_posttypes();

+

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			try {

+				$wpdb->query("ALTER TABLE " . $wpdb->prefix . "geodir_" . $key . "_detail MODIFY post_city VARCHAR( 50 ) NULL,MODIFY post_region VARCHAR( 50 ) NULL,MODIFY post_country VARCHAR( 50 ) NULL");

+			} catch(Exception $e) {

+				error_log( 'Error: ' . $e->getMessage() );

+			}

+		}

+	}

 }

geodirectory-functions/custom_fields_output_functions.php

Braces +25 added lines, -38 removed lines

@@ -22,8 +22,7 @@ 
 function geodir_cf_checkbox($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -76,8 +75,10 @@ 
 
             if ( $post->{$html_var} == '1' ):
                 $html_val = __( 'Yes', 'geodirectory' );
-            else:
+            else {
+            	:
                 $html_val = __( 'No', 'geodirectory' );
+            }
             endif;
 
             $field_icon = geodir_field_icon_proccess($cf);
@@ -115,8 +116,7 @@ 
 function geodir_cf_fieldset($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -195,8 +195,7 @@ 
 function geodir_cf_url($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -310,8 +309,7 @@ 
 function geodir_cf_phone($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -399,8 +397,7 @@ 
 function geodir_cf_time($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -452,9 +449,10 @@ 
         if ($post->{$cf['htmlvar_name']}):
 
             $value = '';
-            if ($post->{$cf['htmlvar_name']} != '')
-                //$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
+            if ($post->{$cf['htmlvar_name']} != '') {
+                            //$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
                 $value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
+            }
 
             $field_icon = geodir_field_icon_proccess($cf);
             if (strpos($field_icon, 'http') !== false) {
@@ -493,8 +491,7 @@ 
 function geodir_cf_datepicker($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -560,13 +557,13 @@ 
                 $date_format = str_replace($search, $replace, $date_format);
 
                 $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
-            }else{
+            } else{
                 $post_htmlvar_value = $post->{$cf['htmlvar_name']};
             }
 
             if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
                 $value = date_i18n($date_format, strtotime($post_htmlvar_value));
-            }else{
+            } else{
                 return '';
             }
 
@@ -609,8 +606,7 @@ 
 function geodir_cf_text($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -700,8 +696,7 @@ 
 function geodir_cf_radio($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -807,8 +802,7 @@ 
 function geodir_cf_select($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -908,8 +902,7 @@ 
 function geodir_cf_multiselect($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1030,8 +1023,7 @@ 
 function geodir_cf_email($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1162,7 +1154,7 @@ 
                      */
                     $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
                     $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
-                }else{
+                } else{
                     $html .=  $email;
                 }
                 $html .= '</span></div>';
@@ -1190,8 +1182,7 @@ 
 function geodir_cf_file($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1330,8 +1321,7 @@ 
 function geodir_cf_textarea($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1420,8 +1410,7 @@ 
 function geodir_cf_html($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1509,8 +1498,7 @@ 
 function geodir_cf_taxonomy($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
@@ -1631,8 +1619,7 @@ 
 function geodir_cf_address($html,$location,$cf,$p=''){
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if(is_int($p)){$post = geodir_get_post_info($p);} else{ global $post;}
 
     if(!is_array($cf) && $cf!=''){
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);

Indentation +1540 added lines, -1540 removed lines

@@ -21,84 +21,84 @@ 
  */
 function geodir_cf_checkbox($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
-        /**
-         * Filter the checkbox html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
-        /**
-         * Filter the checkbox html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the checkbox html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ( (int) $post->{$html_var} == 1 ):
-
-            if ( $post->{$html_var} == '1' ):
-                $html_val = __( 'Yes', 'geodirectory' );
-            else:
-                $html_val = __( 'No', 'geodirectory' );
-            endif;
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
+		/**
+		 * Filter the checkbox html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
+		/**
+		 * Filter the checkbox html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the checkbox html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ( (int) $post->{$html_var} == 1 ):
+
+			if ( $post->{$html_var} == '1' ):
+				$html_val = __( 'Yes', 'geodirectory' );
+			else:
+				$html_val = __( 'No', 'geodirectory' );
+			endif;
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
+			$html .= '</span>' . $html_val . '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_checkbox','geodir_cf_checkbox',10,3);
 
@@ -115,71 +115,71 @@ 
  */
 function geodir_cf_fieldset($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
-        /**
-         * Filter the fieldset html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
-        /**
-         * Filter the fieldset html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the fieldset html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        global $field_set_start;
-        $fieldset_class = 'fieldset-'.sanitize_title_with_dashes($cf['site_title']);
-
-        if ($field_set_start == 1) {
-            $html = '';
-        } else {
-            $html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
-            //$field_set_start = 1;
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
+		/**
+		 * Filter the fieldset html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
+		/**
+		 * Filter the fieldset html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the fieldset html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		global $field_set_start;
+		$fieldset_class = 'fieldset-'.sanitize_title_with_dashes($cf['site_title']);
+
+		if ($field_set_start == 1) {
+			$html = '';
+		} else {
+			$html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
+			//$field_set_start = 1;
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_fieldset','geodir_cf_fieldset',10,3);
 
@@ -196,106 +196,106 @@ 
  */
 function geodir_cf_url($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
-        /**
-         * Filter the url html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
-        /**
-         * Filter the url html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the url html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-
-                if ($cf['name'] == 'geodir_facebook') {
-                    $field_icon_af = '<i class="fa fa-facebook-square"></i>';
-                } elseif ($cf['name'] == 'geodir_twitter') {
-                    $field_icon_af = '<i class="fa fa-twitter-square"></i>';
-                } else {
-                    $field_icon_af = '<i class="fa fa-link"></i>';
-                }
-
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $a_url = geodir_parse_custom_field_url($post->{$cf['htmlvar_name']});
-
-
-            $website = !empty($a_url['url']) ? $a_url['url'] : '';
-            $title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
-            if(!empty($cf['default_value'])){$title = $cf['default_value'];}
-            $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
-
-
-
-            // all search engines that use the nofollow value exclude links that use it from their ranking calculation
-            $rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';
-            /**
-             * Filter custom field website name.
-             *
-             * @since 1.0.0
-             *
-             * @param string $title Website Title.
-             * @param string $website Website URL.
-             * @param int $post->ID Post ID.
-             */
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
-
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
+		/**
+		 * Filter the url html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
+		/**
+		 * Filter the url html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the url html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+
+				if ($cf['name'] == 'geodir_facebook') {
+					$field_icon_af = '<i class="fa fa-facebook-square"></i>';
+				} elseif ($cf['name'] == 'geodir_twitter') {
+					$field_icon_af = '<i class="fa fa-twitter-square"></i>';
+				} else {
+					$field_icon_af = '<i class="fa fa-link"></i>';
+				}
+
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$a_url = geodir_parse_custom_field_url($post->{$cf['htmlvar_name']});
+
+
+			$website = !empty($a_url['url']) ? $a_url['url'] : '';
+			$title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
+			if(!empty($cf['default_value'])){$title = $cf['default_value'];}
+			$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
+
+
+
+			// all search engines that use the nofollow value exclude links that use it from their ranking calculation
+			$rel = strpos($website, get_site_url()) !== false ? '' : 'rel="nofollow"';
+			/**
+			 * Filter custom field website name.
+			 *
+			 * @since 1.0.0
+			 *
+			 * @param string $title Website Title.
+			 * @param string $website Website URL.
+			 * @param int $post->ID Post ID.
+			 */
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_url','geodir_cf_url',10,3);
 
@@ -312,80 +312,80 @@ 
  */
 function geodir_cf_phone($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
-        /**
-         * Filter the phone html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
-        /**
-         * Filter the phone html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the phone html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fa fa-phone"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
-                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
-
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
+		/**
+		 * Filter the phone html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
+		/**
+		 * Filter the phone html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the phone html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fa fa-phone"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
+					$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
+			$html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_phone','geodir_cf_phone',10,3);
 
@@ -402,85 +402,85 @@ 
  */
 function geodir_cf_time($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
-        /**
-         * Filter the time html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
-        /**
-         * Filter the time html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the time html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $value = '';
-            if ($post->{$cf['htmlvar_name']} != '')
-                //$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
-                $value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fa fa-clock-o"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span>' . $value . '</div>';
-
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
+		/**
+		 * Filter the time html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
+		/**
+		 * Filter the time html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the time html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$value = '';
+			if ($post->{$cf['htmlvar_name']} != '')
+				//$value = date('h:i',strtotime($post->{$cf['htmlvar_name']}));
+				$value = date(get_option('time_format'), strtotime($post->{$cf['htmlvar_name']}));
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fa fa-clock-o"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
+			$html .= '</span>' . $value . '</div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_time','geodir_cf_time',10,3);
 
@@ -496,111 +496,111 @@ 
  * @return string The html to output for the custom field.
  */
 function geodir_cf_datepicker($html,$location,$cf,$p=''){
-    global $preview;
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
-        /**
-         * Filter the datepicker html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
-        /**
-         * Filter the datepicker html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the datepicker html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-
-            $date_format = geodir_default_date_format();
-            if ($cf['extra_fields'] != '') {
-                $date_format = stripslashes_deep(unserialize($cf['extra_fields']));
-                $date_format = $date_format['date_format'];
-            }
-            // check if we need to change the format or not
-            $date_format_len = strlen(str_replace(' ', '', $date_format));
-            if($date_format_len>5){// if greater then 4 then it's the old style format.
-
-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-                $replace = array('d','j','l','m','n','F','Y');//PHP date format
-
-                $date_format = str_replace($search, $replace, $date_format);
-
-                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
-            }else{
-                $post_htmlvar_value = $post->{$cf['htmlvar_name']};
-            }
-
-            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
-                $date_format_from = $preview ? $date_format : 'Y-m-d';
-                $value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
-                //$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
-                //$value = date_i18n($date_format, strtotime($post_htmlvar_value));
-            }else{
-                return '';
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fa fa-calendar"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $value . '</div>';
-
-        endif;
-
-    }
-
-    return $html;
+	global $preview;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
+		/**
+		 * Filter the datepicker html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
+		/**
+		 * Filter the datepicker html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the datepicker html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+
+			$date_format = geodir_default_date_format();
+			if ($cf['extra_fields'] != '') {
+				$date_format = stripslashes_deep(unserialize($cf['extra_fields']));
+				$date_format = $date_format['date_format'];
+			}
+			// check if we need to change the format or not
+			$date_format_len = strlen(str_replace(' ', '', $date_format));
+			if($date_format_len>5){// if greater then 4 then it's the old style format.
+
+				$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
+				$replace = array('d','j','l','m','n','F','Y');//PHP date format
+
+				$date_format = str_replace($search, $replace, $date_format);
+
+				$post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
+			}else{
+				$post_htmlvar_value = $post->{$cf['htmlvar_name']};
+			}
+
+			if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
+				$date_format_from = $preview ? $date_format : 'Y-m-d';
+				$value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
+				//$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
+				//$value = date_i18n($date_format, strtotime($post_htmlvar_value));
+			}else{
+				return '';
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fa fa-calendar"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . $value . '</div>';
+
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_datepicker','geodir_cf_datepicker',10,3);
 
@@ -617,97 +617,97 @@ 
  */
 function geodir_cf_text($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
-        /**
-         * Filter the text html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
-        /**
-         * Filter the text html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the text html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
+		/**
+		 * Filter the text html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
+		/**
+		 * Filter the text html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the text html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
 
     
 
-    // If not html then we run the standard output.
-    if(empty($html)){
+	// If not html then we run the standard output.
+	if(empty($html)){
 
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+		if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
 
-            $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
+			$class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = ($cf['htmlvar_name'] == 'geodir_timing') ? '<i class="fa fa-clock-o"></i>' : "";
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>';
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>';
 
-            $value = $post->{$cf['htmlvar_name']};
-            if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
-                $extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
-                if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
-                    if(!ceil($value) > 0){return '';}// dont output blank prices
-                    $value = geodir_currency_format_number($value,$cf);
-                }
-            }
+			$value = $post->{$cf['htmlvar_name']};
+			if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
+				$extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
+				if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
+					if(!ceil($value) > 0){return '';}// dont output blank prices
+					$value = geodir_currency_format_number($value,$cf);
+				}
+			}
 
 
-            $html .= $value;
-            $html .= '</div>';
+			$html .= $value;
+			$html .= '</div>';
 
-        endif;
+		endif;
 
-    }
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_text','geodir_cf_text',10,3);
 
@@ -724,98 +724,98 @@ 
  */
 function geodir_cf_radio($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
-        /**
-         * Filter the radio html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
-        /**
-         * Filter the radio html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the radio html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        $html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
-
-            if ($post->{$cf['htmlvar_name']} == 'f' || $post->{$cf['htmlvar_name']} == '0') {
-                $html_val = __('No', 'geodirectory');
-            } else if ($post->{$cf['htmlvar_name']} == 't' || $post->{$cf['htmlvar_name']} == '1') {
-                $html_val = __('Yes', 'geodirectory');
-            } else {
-                if (!empty($cf['option_values'])) {
-                    $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
-
-                    if (!empty($cf_option_values)) {
-                        foreach ($cf_option_values as $cf_option_value) {
-                            if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
-                                $html_val = $cf_option_value['label'];
-                            }
-                        }
-                    }
-                }
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
+		/**
+		 * Filter the radio html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
+		/**
+		 * Filter the radio html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the radio html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		$html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
+		if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
+
+			if ($post->{$cf['htmlvar_name']} == 'f' || $post->{$cf['htmlvar_name']} == '0') {
+				$html_val = __('No', 'geodirectory');
+			} else if ($post->{$cf['htmlvar_name']} == 't' || $post->{$cf['htmlvar_name']} == '1') {
+				$html_val = __('Yes', 'geodirectory');
+			} else {
+				if (!empty($cf['option_values'])) {
+					$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
+
+					if (!empty($cf_option_values)) {
+						foreach ($cf_option_values as $cf_option_value) {
+							if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
+								$html_val = $cf_option_value['label'];
+							}
+						}
+					}
+				}
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . $html_val . '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_radio','geodir_cf_radio',10,3);
 
@@ -832,92 +832,92 @@ 
  */
 function geodir_cf_select($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
-        /**
-         * Filter the select html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
-        /**
-         * Filter the select html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the select html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($post->{$cf['htmlvar_name']}):
-            $field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
-
-            if (!empty($cf['option_values'])) {
-                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
-
-                if (!empty($cf_option_values)) {
-                    foreach ($cf_option_values as $cf_option_value) {
-                        if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
-                            //$field_value = $cf_option_value['label']; // no longer needed here.
-                        }
-                    }
-                }
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $field_value . '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
+		/**
+		 * Filter the select html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
+		/**
+		 * Filter the select html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the select html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($post->{$cf['htmlvar_name']}):
+			$field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
+
+			if (!empty($cf['option_values'])) {
+				$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
+
+				if (!empty($cf_option_values)) {
+					foreach ($cf_option_values as $cf_option_value) {
+						if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$cf['htmlvar_name']}) {
+							//$field_value = $cf_option_value['label']; // no longer needed here.
+						}
+					}
+				}
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . $field_value . '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_select','geodir_cf_select',10,3);
 
@@ -934,117 +934,117 @@ 
  */
 function geodir_cf_multiselect($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
-        /**
-         * Filter the multiselect html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
-        /**
-         * Filter the multiselect html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the multiselect html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-
-        if (!empty($post->{$cf['htmlvar_name']})):
-
-            if (is_array($post->{$cf['htmlvar_name']})) {
-                $post->{$cf['htmlvar_name']} = implode(', ', $post->{$cf['htmlvar_name']});
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
-
-            if(is_array($field_values)){
-                $field_values = array_map('trim', $field_values);
-            }
-
-            $option_values = array();
-            if (!empty($cf['option_values'])) {
-                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
-
-                if (!empty($cf_option_values)) {
-                    foreach ($cf_option_values as $cf_option_value) {
-                        if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {
-                            $option_values[] = $cf_option_value['label'];
-                        }
-                    }
-                }
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>';
-
-            if (count($option_values) > 1) {
-                $html .= '<ul>';
-
-                foreach ($option_values as $val) {
-                    $html .= '<li>' . $val . '</li>';
-                }
-
-                $html .= '</ul>';
-            } else {
-                $html .= $post->{$cf['htmlvar_name']};
-            }
-
-            $html .= '</div>';
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
+		/**
+		 * Filter the multiselect html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
+		/**
+		 * Filter the multiselect html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the multiselect html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+
+		if (!empty($post->{$cf['htmlvar_name']})):
+
+			if (is_array($post->{$cf['htmlvar_name']})) {
+				$post->{$cf['htmlvar_name']} = implode(', ', $post->{$cf['htmlvar_name']});
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
+
+			if(is_array($field_values)){
+				$field_values = array_map('trim', $field_values);
+			}
+
+			$option_values = array();
+			if (!empty($cf['option_values'])) {
+				$cf_option_values = geodir_string_values_to_options(stripslashes_deep($cf['option_values']), true);
+
+				if (!empty($cf_option_values)) {
+					foreach ($cf_option_values as $cf_option_value) {
+						if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {
+							$option_values[] = $cf_option_value['label'];
+						}
+					}
+				}
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>';
+
+			if (count($option_values) > 1) {
+				$html .= '<ul>';
+
+				foreach ($option_values as $val) {
+					$html .= '<li>' . $val . '</li>';
+				}
+
+				$html .= '</ul>';
+			} else {
+				$html .= $post->{$cf['htmlvar_name']};
+			}
+
+			$html .= '</div>';
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
 
@@ -1061,153 +1061,153 @@ 
  */
 function geodir_cf_email($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
-        /**
-         * Filter the email html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
-        /**
-         * Filter the email html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the email html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        global $preview;
-        if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
-            return ''; // Remove Send Enquiry | Send To Friend from listings page
-        }
-
-        $package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
-
-        if ($cf['htmlvar_name'] == 'geodir_email' && ((isset($package_info['sendtofriend']) && $package_info['sendtofriend']) || $post->{$cf['htmlvar_name']})) {
-            global $send_to_friend;
-            $send_to_friend = true;
-            $b_send_inquiry = '';
-            $b_sendtofriend = '';
-
-            $html = '';
-            if (!$preview) {
-                $b_send_inquiry = 'b_send_inquiry';
-                $b_sendtofriend = 'b_sendtofriend';
-                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
-            }
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '<i class="fa fa-envelope"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-            $seperator = '';
-            if ($post->{$cf['htmlvar_name']}) {
-                $html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
-                $seperator = ' | ';
-            }
-
-            if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
-                $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
-            }
-
-            $html .= '</span></div>';
-
-
-            if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
-            } elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';
-            } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
-                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
-            }
-
-            /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
-
-        } else {
-
-            if ($post->{$cf['htmlvar_name']}) {
-
-                $field_icon = geodir_field_icon_proccess($cf);
-                if (strpos($field_icon, 'http') !== false) {
-                    $field_icon_af = '';
-                } elseif ($field_icon == '') {
-                    $field_icon_af = '<i class="fa fa-envelope"></i>';
-                } else {
-                    $field_icon_af = $field_icon;
-                    $field_icon = '';
-                }
-
-
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span><span class="geodir-email-address-output">';
-                $email = $post->{$cf['htmlvar_name']} ;
-                if($e_split = explode('@',$email)){
-                    /**
-                     * Filter email custom field name output.
-                     *
-                     * @since 1.5.3
-                     *
-                     * @param string $email The email string being output.
-                     * @param array $cf Custom field variables array.
-                     */
-                    $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
-                    $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
-                }else{
-                    $html .=  $email;
-                }
-                $html .= '</span></div>';
-            }
-
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
+		/**
+		 * Filter the email html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
+		/**
+		 * Filter the email html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the email html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		global $preview;
+		if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
+			return ''; // Remove Send Enquiry | Send To Friend from listings page
+		}
+
+		$package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
+
+		if ($cf['htmlvar_name'] == 'geodir_email' && ((isset($package_info['sendtofriend']) && $package_info['sendtofriend']) || $post->{$cf['htmlvar_name']})) {
+			global $send_to_friend;
+			$send_to_friend = true;
+			$b_send_inquiry = '';
+			$b_sendtofriend = '';
+
+			$html = '';
+			if (!$preview) {
+				$b_send_inquiry = 'b_send_inquiry';
+				$b_sendtofriend = 'b_sendtofriend';
+				$html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
+			}
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '<i class="fa fa-envelope"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+			$seperator = '';
+			if ($post->{$cf['htmlvar_name']}) {
+				$html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+				$seperator = ' | ';
+			}
+
+			if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
+				$html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
+			}
+
+			$html .= '</span></div>';
+
+
+			if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
+				$html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
+			} elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
+				$html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';
+			} elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
+				$html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
+			}
+
+			/*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
+
+		} else {
+
+			if ($post->{$cf['htmlvar_name']}) {
+
+				$field_icon = geodir_field_icon_proccess($cf);
+				if (strpos($field_icon, 'http') !== false) {
+					$field_icon_af = '';
+				} elseif ($field_icon == '') {
+					$field_icon_af = '<i class="fa fa-envelope"></i>';
+				} else {
+					$field_icon_af = $field_icon;
+					$field_icon = '';
+				}
+
+
+				$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+				$html .= '</span><span class="geodir-email-address-output">';
+				$email = $post->{$cf['htmlvar_name']} ;
+				if($e_split = explode('@',$email)){
+					/**
+					 * Filter email custom field name output.
+					 *
+					 * @since 1.5.3
+					 *
+					 * @param string $email The email string being output.
+					 * @param array $cf Custom field variables array.
+					 */
+					$email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
+					$html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
+				}else{
+					$html .=  $email;
+				}
+				$html .= '</span></div>';
+			}
+
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_email','geodir_cf_email',10,3);
 
@@ -1224,130 +1224,130 @@ 
  */
 function geodir_cf_file($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
-        /**
-         * Filter the file html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
-        /**
-         * Filter the file html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the file html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if (!empty($post->{$cf['htmlvar_name']})):
-
-            $files = explode(",", $post->{$cf['htmlvar_name']});
-            if (!empty($files)):
-
-                $extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
-                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
-
-                $file_paths = '';
-                foreach ($files as $file) {
-                    if (!empty($file)) {
-
-                        // $filetype = wp_check_filetype($file);
-
-                        $image_name_arr = explode('/', $file);
-                        $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
-                        $filename = end($image_name_arr);
-                        $img_name_arr = explode('.', $filename);
-
-                        $arr_file_type = wp_check_filetype($filename);
-                        if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
-                            continue;
-                        }
-
-                        $uploaded_file_type = $arr_file_type['type'];
-                        $uploaded_file_ext = $arr_file_type['ext'];
-
-                        if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
-                            continue; // Invalid file type.
-                        }
-
-                        //$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
-                        $image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');
-
-                        // If the uploaded file is image
-                        if (in_array($uploaded_file_type, $image_file_types)) {
-                            $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';
-                            $file_paths .= '<a href="'.$file.'">';
-                            $file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);
-                            $file_paths .= '</a>';
-                            //$file_paths .= '<img src="'.$file.'"  />';	
-                            $file_paths .= '</div>';
-                        } else {
-                            $ext_path = '_' . $html_var . '_';
-                            $filename = explode($ext_path, $filename);
-                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
-                        }
-                    }
-                }
-
-                $field_icon = geodir_field_icon_proccess($cf);
-                if (strpos($field_icon, 'http') !== false) {
-                    $field_icon_af = '';
-                } elseif ($field_icon == '') {
-                    $field_icon_af = '';
-                } else {
-                    $field_icon_af = $field_icon;
-                    $field_icon = '';
-                }
-
-                $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span>';
-                $html .= $file_paths . '</div></div>';
-
-            endif;
-        endif;
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
+		/**
+		 * Filter the file html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
+		/**
+		 * Filter the file html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the file html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if (!empty($post->{$cf['htmlvar_name']})):
+
+			$files = explode(",", $post->{$cf['htmlvar_name']});
+			if (!empty($files)):
+
+				$extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
+				$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
+
+				$file_paths = '';
+				foreach ($files as $file) {
+					if (!empty($file)) {
+
+						// $filetype = wp_check_filetype($file);
+
+						$image_name_arr = explode('/', $file);
+						$curr_img_dir = $image_name_arr[count($image_name_arr) - 2];
+						$filename = end($image_name_arr);
+						$img_name_arr = explode('.', $filename);
+
+						$arr_file_type = wp_check_filetype($filename);
+						if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {
+							continue;
+						}
+
+						$uploaded_file_type = $arr_file_type['type'];
+						$uploaded_file_ext = $arr_file_type['ext'];
+
+						if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {
+							continue; // Invalid file type.
+						}
+
+						//$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');
+						$image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');
+
+						// If the uploaded file is image
+						if (in_array($uploaded_file_type, $image_file_types)) {
+							$file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';
+							$file_paths .= '<a href="'.$file.'">';
+							$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);
+							$file_paths .= '</a>';
+							//$file_paths .= '<img src="'.$file.'"  />';	
+							$file_paths .= '</div>';
+						} else {
+							$ext_path = '_' . $html_var . '_';
+							$filename = explode($ext_path, $filename);
+							$file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
+						}
+					}
+				}
+
+				$field_icon = geodir_field_icon_proccess($cf);
+				if (strpos($field_icon, 'http') !== false) {
+					$field_icon_af = '';
+				} elseif ($field_icon == '') {
+					$field_icon_af = '';
+				} else {
+					$field_icon_af = $field_icon;
+					$field_icon = '';
+				}
+
+				$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+				$html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+				$html .= '</span>';
+				$html .= $file_paths . '</div></div>';
+
+			endif;
+		endif;
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_file','geodir_cf_file',10,3);
 
@@ -1365,80 +1365,80 @@ 
  */
 function geodir_cf_textarea($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
-        /**
-         * Filter the textarea html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
-        /**
-         * Filter the textarea html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the textarea html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if (!empty($post->{$cf['htmlvar_name']})) {
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
-
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
+		/**
+		 * Filter the textarea html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
+		/**
+		 * Filter the textarea html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the textarea html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if (!empty($post->{$cf['htmlvar_name']})) {
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_textarea','geodir_cf_textarea',10,3);
 
@@ -1456,79 +1456,79 @@ 
  */
 function geodir_cf_html($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
-        /**
-         * Filter the html html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
-        /**
-         * Filter the html html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the html html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if (!empty($post->{$cf['htmlvar_name']})) {
-
-            $field_icon = geodir_field_icon_proccess($cf);
-            if (strpos($field_icon, 'http') !== false) {
-                $field_icon_af = '';
-            } elseif ($field_icon == '') {
-                $field_icon_af = '';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon = '';
-            }
-
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
-
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
+		/**
+		 * Filter the html html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
+		/**
+		 * Filter the html html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the html html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if (!empty($post->{$cf['htmlvar_name']})) {
+
+			$field_icon = geodir_field_icon_proccess($cf);
+			if (strpos($field_icon, 'http') !== false) {
+				$field_icon_af = '';
+			} elseif ($field_icon == '') {
+				$field_icon_af = '';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon = '';
+			}
+
+			$html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+			$html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_html','geodir_cf_html',10,3);
 
@@ -1546,113 +1546,113 @@ 
  */
 function geodir_cf_taxonomy($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
-        /**
-         * Filter the taxonomy html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
-        /**
-         * Filter the taxonomy html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the taxonomy html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
-            $post_taxonomy = $post->post_type . 'category';
-            $field_value = $post->{$html_var};
-            $links = array();
-            $terms = array();
-            $termsOrdered = array();
-            if (!is_array($field_value)) {
-                $field_value = explode(",", trim($field_value, ","));
-            }
-
-            $field_value = array_unique($field_value);
-
-            if (!empty($field_value)) {
-                foreach ($field_value as $term) {
-                    $term = trim($term);
-
-                    if ($term != '') {
-                        $term = get_term_by('id', $term, $html_var);
-                        if (is_object($term)) {
-                            $links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
-                            $terms[] = $term;
-                        }
-                    }
-                }
-                if (!empty($links)) {
-                    // order alphabetically
-                    asort($links);
-                    foreach (array_keys($links) as $key) {
-                        $termsOrdered[$key] = $terms[$key];
-                    }
-                    $terms = $termsOrdered;
-                }
-            }
-            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
-
-            if ($html_value != '') {
-                $field_icon = geodir_field_icon_proccess($cf);
-                if (strpos($field_icon, 'http') !== false) {
-                    $field_icon_af = '';
-                } else if ($field_icon == '') {
-                    $field_icon_af = '';
-                } else {
-                    $field_icon_af = $field_icon;
-                    $field_icon = '';
-                }
-
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span> ' . $html_value . '</div>';
-            }
-        }
-
-    }
-
-    return $html;
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
+		/**
+		 * Filter the taxonomy html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
+		/**
+		 * Filter the taxonomy html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the taxonomy html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
+			$post_taxonomy = $post->post_type . 'category';
+			$field_value = $post->{$html_var};
+			$links = array();
+			$terms = array();
+			$termsOrdered = array();
+			if (!is_array($field_value)) {
+				$field_value = explode(",", trim($field_value, ","));
+			}
+
+			$field_value = array_unique($field_value);
+
+			if (!empty($field_value)) {
+				foreach ($field_value as $term) {
+					$term = trim($term);
+
+					if ($term != '') {
+						$term = get_term_by('id', $term, $html_var);
+						if (is_object($term)) {
+							$links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
+							$terms[] = $term;
+						}
+					}
+				}
+				if (!empty($links)) {
+					// order alphabetically
+					asort($links);
+					foreach (array_keys($links) as $key) {
+						$termsOrdered[$key] = $terms[$key];
+					}
+					$terms = $termsOrdered;
+				}
+			}
+			$html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
+
+			if ($html_value != '') {
+				$field_icon = geodir_field_icon_proccess($cf);
+				if (strpos($field_icon, 'http') !== false) {
+					$field_icon_af = '';
+				} else if ($field_icon == '') {
+					$field_icon_af = '';
+				} else {
+					$field_icon_af = $field_icon;
+					$field_icon = '';
+				}
+
+				$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
+				$html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+				$html .= '</span> ' . $html_value . '</div>';
+			}
+		}
+
+	}
+
+	return $html;
 }
 add_filter('geodir_custom_field_output_taxonomy','geodir_cf_taxonomy',10,3);
 
@@ -1669,161 +1669,161 @@ 
  */
 function geodir_cf_address($html,$location,$cf,$p=''){
 
-    // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
-
-    if(!is_array($cf) && $cf!=''){
-        $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
-    }
-
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
-        /**
-         * Filter the address html by location.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
-    }
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
-        /**
-         * Filter the address html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
-    }
-
-    // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
-        /**
-         * Filter the address html by field type key.
-         *
-         * @param string $html The html to filter.
-         * @param string $location The location to output the html.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
-    }
-
-    // If not html then we run the standard output.
-    if(empty($html)){
-
-        global $preview;
-        $html_var = $cf['htmlvar_name'] . '_address';
-
-        if ($cf['extra_fields']) {
-
-            $extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
-
-            $addition_fields = '';
-
-            if (!empty($extra_fields)) {
-
-                $show_city_in_address = false;
-                if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
-                    $show_city_in_address = true;
-                }
-                /**
-                 * Filter "show city in address" value.
-                 *
-                 * @since 1.0.0
-                 */
-                $show_city_in_address = apply_filters('geodir_show_city_in_address', $show_city_in_address);
-
-
-                $show_region_in_address = false;
-                if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
-                    $show_region_in_address = true;
-                }
-                /**
-                 * Filter "show region in address" value.
-                 *
-                 * @since 1.6.6
-                 */
-                $show_region_in_address = apply_filters('geodir_show_region_in_address', $show_region_in_address);
-
-                $show_country_in_address = false;
-                if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
-                    $show_country_in_address = true;
-                }
-                /**
-                 * Filter "show country in address" value.
-                 *
-                 * @since 1.6.6
-                 */
-                $show_country_in_address = apply_filters('geodir_show_country_in_address', $show_country_in_address);
-
-                $show_zip_in_address = false;
-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
-                    $show_zip_in_address = true;
-                }
-                /**
-                 * Filter "show zip in address" value.
-                 *
-                 * @since 1.6.6
-                 */
-                $show_zip_in_address = apply_filters('geodir_show_zip_in_address', $show_zip_in_address);
-
-
-            }
-
-        }
-
-
-        if ($post->{$html_var}) {
-
-            $field_icon = geodir_field_icon_proccess( $cf );
-            if ( strpos( $field_icon, 'http' ) !== false ) {
-                $field_icon_af = '';
-            } elseif ( $field_icon == '' ) {
-                $field_icon_af = '<i class="fa fa-home"></i>';
-            } else {
-                $field_icon_af = $field_icon;
-                $field_icon    = '';
-            }
+	// check we have the post value
+	if(is_int($p)){$post = geodir_get_post_info($p);}
+	else{ global $post;}
+
+	if(!is_array($cf) && $cf!=''){
+		$cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
+		if(!$cf){return NULL;}
+	}
+
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a location specific filter.
+	if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
+		/**
+		 * Filter the address html by location.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
+	}
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
+		/**
+		 * Filter the address html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
+	}
+
+	// Check if there is a custom field key specific filter.
+	if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
+		/**
+		 * Filter the address html by field type key.
+		 *
+		 * @param string $html The html to filter.
+		 * @param string $location The location to output the html.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
+	}
+
+	// If not html then we run the standard output.
+	if(empty($html)){
+
+		global $preview;
+		$html_var = $cf['htmlvar_name'] . '_address';
+
+		if ($cf['extra_fields']) {
+
+			$extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
+
+			$addition_fields = '';
+
+			if (!empty($extra_fields)) {
+
+				$show_city_in_address = false;
+				if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {
+					$show_city_in_address = true;
+				}
+				/**
+				 * Filter "show city in address" value.
+				 *
+				 * @since 1.0.0
+				 */
+				$show_city_in_address = apply_filters('geodir_show_city_in_address', $show_city_in_address);
+
+
+				$show_region_in_address = false;
+				if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {
+					$show_region_in_address = true;
+				}
+				/**
+				 * Filter "show region in address" value.
+				 *
+				 * @since 1.6.6
+				 */
+				$show_region_in_address = apply_filters('geodir_show_region_in_address', $show_region_in_address);
+
+				$show_country_in_address = false;
+				if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {
+					$show_country_in_address = true;
+				}
+				/**
+				 * Filter "show country in address" value.
+				 *
+				 * @since 1.6.6
+				 */
+				$show_country_in_address = apply_filters('geodir_show_country_in_address', $show_country_in_address);
+
+				$show_zip_in_address = false;
+				if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
+					$show_zip_in_address = true;
+				}
+				/**
+				 * Filter "show zip in address" value.
+				 *
+				 * @since 1.6.6
+				 */
+				$show_zip_in_address = apply_filters('geodir_show_zip_in_address', $show_zip_in_address);
+
+
+			}
+
+		}
+
+
+		if ($post->{$html_var}) {
+
+			$field_icon = geodir_field_icon_proccess( $cf );
+			if ( strpos( $field_icon, 'http' ) !== false ) {
+				$field_icon_af = '';
+			} elseif ( $field_icon == '' ) {
+				$field_icon_af = '<i class="fa fa-home"></i>';
+			} else {
+				$field_icon_af = $field_icon;
+				$field_icon    = '';
+			}
             
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
-            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
-            $html .= '</span>';
+			$html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
+			$html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
+			$html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
+			$html .= '</span>';
 
-            if ( isset($post->post_address) ) {
-                $html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
-            }
-            if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
-                $html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
-            }
-            if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
-                $html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
-            }
-            if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
-                $html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
-            }
-            if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
-                $html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
-            }
-            $html .= '</div>';
+			if ( isset($post->post_address) ) {
+				$html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
+			}
+			if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
+				$html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
+			}
+			if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
+				$html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
+			}
+			if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
+				$html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
+			}
+			if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
+				$html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
+			}
+			$html .= '</div>';
 
-        }
+		}
 
-    }
+	}
 
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_output_address','geodir_cf_address',10,3);
\ No newline at end of file

Spacing +302 added lines, -302 removed lines

@@ -19,21 +19,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_checkbox($html,$location,$cf,$p=''){
+function geodir_cf_checkbox($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_checkbox_loc_{$location}")) {
         /**
          * Filter the checkbox html by location.
          *
@@ -41,11 +41,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_checkbox_var_{$html_var}")) {
         /**
          * Filter the checkbox html by individual custom field.
          *
@@ -54,11 +54,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}")) {
         /**
          * Filter the checkbox html by field type key.
          *
@@ -67,18 +67,18 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_checkbox_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if ( (int) $post->{$html_var} == 1 ):
+        if ((int) $post->{$html_var} == 1):
 
-            if ( $post->{$html_var} == '1' ):
-                $html_val = __( 'Yes', 'geodirectory' );
+            if ($post->{$html_var} == '1'):
+                $html_val = __('Yes', 'geodirectory');
             else:
-                $html_val = __( 'No', 'geodirectory' );
+                $html_val = __('No', 'geodirectory');
             endif;
 
             $field_icon = geodir_field_icon_proccess($cf);
@@ -91,16 +91,16 @@ 
                 $field_icon = '';
             }
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-checkbox" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-checkbox" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$html_val.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_checkbox','geodir_cf_checkbox',10,3);
+add_filter('geodir_custom_field_output_checkbox', 'geodir_cf_checkbox', 10, 3);
 
 
 /**
@@ -113,21 +113,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_fieldset($html,$location,$cf,$p=''){
+function geodir_cf_fieldset($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_fieldset_loc_{$location}")) {
         /**
          * Filter the fieldset html by location.
          *
@@ -135,11 +135,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_fieldset_var_{$html_var}")) {
         /**
          * Filter the fieldset html by individual custom field.
          *
@@ -148,11 +148,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}")) {
         /**
          * Filter the fieldset html by field type key.
          *
@@ -161,11 +161,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_fieldset_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $field_set_start;
         $fieldset_class = 'fieldset-'.sanitize_title_with_dashes($cf['site_title']);
@@ -173,7 +173,7 @@ 
         if ($field_set_start == 1) {
             $html = '';
         } else {
-            $html = '<h2 class="'.$fieldset_class.'">'. __($cf['site_title'], 'geodirectory') . '</h2>';
+            $html = '<h2 class="'.$fieldset_class.'">'.__($cf['site_title'], 'geodirectory').'</h2>';
             //$field_set_start = 1;
         }
 
@@ -181,7 +181,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_fieldset','geodir_cf_fieldset',10,3);
+add_filter('geodir_custom_field_output_fieldset', 'geodir_cf_fieldset', 10, 3);
 
 
 /**
@@ -194,21 +194,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_url($html,$location,$cf,$p=''){
+function geodir_cf_url($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_url_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_url_loc_{$location}")) {
         /**
          * Filter the url html by location.
          *
@@ -216,11 +216,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_url_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_url_var_{$html_var}")) {
         /**
          * Filter the url html by individual custom field.
          *
@@ -229,11 +229,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_url_key_{$cf['field_type_key']}")) {
         /**
          * Filter the url html by field type key.
          *
@@ -242,11 +242,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_url_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -273,7 +273,7 @@ 
 
             $website = !empty($a_url['url']) ? $a_url['url'] : '';
             $title = !empty($a_url['label']) ? $a_url['label'] : $cf['site_title'];
-            if(!empty($cf['default_value'])){$title = $cf['default_value'];}
+            if (!empty($cf['default_value'])) {$title = $cf['default_value']; }
             $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';
 
 
@@ -289,7 +289,7 @@ 
              * @param string $website Website URL.
              * @param int $post->ID Post ID.
              */
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-website" style="' . $field_icon . '">' . $field_icon_af . '<a href="' . $website . '" target="_blank" ' . $rel . ' ><strong>' . apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID) . '</strong></a></span></div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'"><span class="geodir-i-website" style="'.$field_icon.'">'.$field_icon_af.'<a href="'.$website.'" target="_blank" '.$rel.' ><strong>'.apply_filters('geodir_custom_field_website_name', $title, $website, $post->ID).'</strong></a></span></div>';
 
         endif;
 
@@ -297,7 +297,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_url','geodir_cf_url',10,3);
+add_filter('geodir_custom_field_output_url', 'geodir_cf_url', 10, 3);
 
 
 /**
@@ -310,21 +310,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_phone($html,$location,$cf,$p=''){
+function geodir_cf_phone($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_phone_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_phone_loc_{$location}")) {
         /**
          * Filter the phone html by location.
          *
@@ -332,11 +332,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_phone_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_phone_var_{$html_var}")) {
         /**
          * Filter the phone html by individual custom field.
          *
@@ -345,11 +345,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_phone_key_{$cf['field_type_key']}")) {
         /**
          * Filter the phone html by field type key.
          *
@@ -358,11 +358,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_phone_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -377,9 +377,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-contact" style="' . $field_icon . '">' . $field_icon_af .
-                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span><a href="tel:' . preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}) . '">' . $post->{$cf['htmlvar_name']} . '</a></div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-contact" style="'.$field_icon.'">'.$field_icon_af.
+                    $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
+            $html .= '</span><a href="tel:'.preg_replace('/[^0-9+]/', '', $post->{$cf['htmlvar_name']}).'">'.$post->{$cf['htmlvar_name']}.'</a></div>';
 
         endif;
 
@@ -387,7 +387,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_phone','geodir_cf_phone',10,3);
+add_filter('geodir_custom_field_output_phone', 'geodir_cf_phone', 10, 3);
 
 
 /**
@@ -400,21 +400,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_time($html,$location,$cf,$p=''){
+function geodir_cf_time($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_time_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_time_loc_{$location}")) {
         /**
          * Filter the time html by location.
          *
@@ -422,11 +422,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_time_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_time_var_{$html_var}")) {
         /**
          * Filter the time html by individual custom field.
          *
@@ -435,11 +435,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_time_key_{$cf['field_type_key']}")) {
         /**
          * Filter the time html by field type key.
          *
@@ -448,11 +448,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_time_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -472,9 +472,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-time" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '&nbsp;';
-            $html .= '</span>' . $value . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-time" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
+            $html .= '</span>'.$value.'</div>';
 
         endif;
 
@@ -482,7 +482,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_time','geodir_cf_time',10,3);
+add_filter('geodir_custom_field_output_time', 'geodir_cf_time', 10, 3);
 
 
 /**
@@ -495,21 +495,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_datepicker($html,$location,$cf,$p=''){
+function geodir_cf_datepicker($html, $location, $cf, $p = '') {
     global $preview;
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_datepicker_loc_{$location}")) {
         /**
          * Filter the datepicker html by location.
          *
@@ -517,11 +517,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_datepicker_var_{$html_var}")) {
         /**
          * Filter the datepicker html by individual custom field.
          *
@@ -530,11 +530,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}")) {
         /**
          * Filter the datepicker html by field type key.
          *
@@ -543,11 +543,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_datepicker_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
 
@@ -558,24 +558,24 @@ 
             }
             // check if we need to change the format or not
             $date_format_len = strlen(str_replace(' ', '', $date_format));
-            if($date_format_len>5){// if greater then 4 then it's the old style format.
+            if ($date_format_len > 5) {// if greater then 4 then it's the old style format.
 
-                $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-                $replace = array('d','j','l','m','n','F','Y');//PHP date format
+                $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
+                $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
 
                 $date_format = str_replace($search, $replace, $date_format);
 
-                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y' ) ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
-            }else{
+                $post_htmlvar_value = ($date_format == 'd/m/Y' || $date_format == 'j/n/Y') ? str_replace('/', '-', $post->{$cf['htmlvar_name']}) : $post->{$cf['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format
+            } else {
                 $post_htmlvar_value = $post->{$cf['htmlvar_name']};
             }
 
-            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']}!="0000-00-00") {
+            if ($post->{$cf['htmlvar_name']} != '' && $post->{$cf['htmlvar_name']} != "0000-00-00") {
                 $date_format_from = $preview ? $date_format : 'Y-m-d';
                 $value = geodir_date($post_htmlvar_value, $date_format, $date_format_from); // save as sql format Y-m-d
                 //$post_htmlvar_value = strpos($post_htmlvar_value, '/') !== false ? str_replace('/', '-', $post_htmlvar_value) : $post_htmlvar_value;
                 //$value = date_i18n($date_format, strtotime($post_htmlvar_value));
-            }else{
+            } else {
                 return '';
             }
 
@@ -592,9 +592,9 @@ 
 
 
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-datepicker" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $value . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-datepicker" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$value.'</div>';
 
         endif;
 
@@ -602,7 +602,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_datepicker','geodir_cf_datepicker',10,3);
+add_filter('geodir_custom_field_output_datepicker', 'geodir_cf_datepicker', 10, 3);
 
 
 /**
@@ -615,21 +615,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_text($html,$location,$cf,$p=''){
+function geodir_cf_text($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_text_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_text_loc_{$location}")) {
         /**
          * Filter the text html by location.
          *
@@ -637,11 +637,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_text_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_text_var_{$html_var}")) {
         /**
          * Filter the text html by individual custom field.
          *
@@ -650,11 +650,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_text_key_{$cf['field_type_key']}")) {
         /**
          * Filter the text html by field type key.
          *
@@ -663,15 +663,15 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_text_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != '' ):
+        if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
 
             $class = ($cf['htmlvar_name'] == 'geodir_timing') ? "geodir-i-time" : "geodir-i-text";
 
@@ -686,16 +686,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="'.$class.'" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="'.$class.'" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
             $html .= '</span>';
 
             $value = $post->{$cf['htmlvar_name']};
-            if(isset($cf['data_type']) && ($cf['data_type']=='INT' || $cf['data_type']=='FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']){
+            if (isset($cf['data_type']) && ($cf['data_type'] == 'INT' || $cf['data_type'] == 'FLOAT') && isset($cf['extra_fields']) && $cf['extra_fields']) {
                 $extra_fields = stripslashes_deep(maybe_unserialize($cf['extra_fields']));
-                if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
-                    if(!ceil($value) > 0){return '';}// dont output blank prices
-                    $value = geodir_currency_format_number($value,$cf);
+                if (isset($extra_fields['is_price']) && $extra_fields['is_price']) {
+                    if (!ceil($value) > 0) {return ''; }// dont output blank prices
+                    $value = geodir_currency_format_number($value, $cf);
                 }
             }
 
@@ -709,7 +709,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_text','geodir_cf_text',10,3);
+add_filter('geodir_custom_field_output_text', 'geodir_cf_text', 10, 3);
 
 
 /**
@@ -722,21 +722,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_radio($html,$location,$cf,$p=''){
+function geodir_cf_radio($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_radio_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_radio_loc_{$location}")) {
         /**
          * Filter the radio html by location.
          *
@@ -744,11 +744,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_radio_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_radio_var_{$html_var}")) {
         /**
          * Filter the radio html by individual custom field.
          *
@@ -757,11 +757,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_radio_key_{$cf['field_type_key']}")) {
         /**
          * Filter the radio html by field type key.
          *
@@ -770,11 +770,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_radio_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         $html_val = isset($post->{$cf['htmlvar_name']}) ? __($post->{$cf['htmlvar_name']}, 'geodirectory') : '';
         if (isset($post->{$cf['htmlvar_name']}) && $post->{$cf['htmlvar_name']} != ''):
@@ -808,16 +808,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-radio" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $html_val . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-radio" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$html_val.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_radio','geodir_cf_radio',10,3);
+add_filter('geodir_custom_field_output_radio', 'geodir_cf_radio', 10, 3);
 
 
 /**
@@ -830,21 +830,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_select($html,$location,$cf,$p=''){
+function geodir_cf_select($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_select_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_select_loc_{$location}")) {
         /**
          * Filter the select html by location.
          *
@@ -852,11 +852,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_select_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_select_var_{$html_var}")) {
         /**
          * Filter the select html by individual custom field.
          *
@@ -865,11 +865,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_select_key_{$cf['field_type_key']}")) {
         /**
          * Filter the select html by field type key.
          *
@@ -878,11 +878,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_select_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if ($post->{$cf['htmlvar_name']}):
             $field_value = __($post->{$cf['htmlvar_name']}, 'geodirectory');
@@ -910,16 +910,16 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . $field_value . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.$field_value.'</div>';
         endif;
 
     }
 
     return $html;
 }
-add_filter('geodir_custom_field_output_select','geodir_cf_select',10,3);
+add_filter('geodir_custom_field_output_select', 'geodir_cf_select', 10, 3);
 
 
 /**
@@ -932,21 +932,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_multiselect($html,$location,$cf,$p=''){
+function geodir_cf_multiselect($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_multiselect_loc_{$location}")) {
         /**
          * Filter the multiselect html by location.
          *
@@ -954,11 +954,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_multiselect_var_{$html_var}")) {
         /**
          * Filter the multiselect html by individual custom field.
          *
@@ -967,11 +967,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}")) {
         /**
          * Filter the multiselect html by field type key.
          *
@@ -980,11 +980,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_multiselect_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
 
         if (!empty($post->{$cf['htmlvar_name']})):
@@ -1005,7 +1005,7 @@ 
 
             $field_values = explode(',', trim($post->{$cf['htmlvar_name']}, ","));
 
-            if(is_array($field_values)){
+            if (is_array($field_values)) {
                 $field_values = array_map('trim', $field_values);
             }
 
@@ -1023,15 +1023,15 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
             $html .= '</span>';
 
             if (count($option_values) > 1) {
                 $html .= '<ul>';
 
                 foreach ($option_values as $val) {
-                    $html .= '<li>' . $val . '</li>';
+                    $html .= '<li>'.$val.'</li>';
                 }
 
                 $html .= '</ul>';
@@ -1046,7 +1046,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_multiselect','geodir_cf_multiselect',10,3);
+add_filter('geodir_custom_field_output_multiselect', 'geodir_cf_multiselect', 10, 3);
 
 
 /**
@@ -1059,21 +1059,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_email($html,$location,$cf,$p=''){
+function geodir_cf_email($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_email_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_email_loc_{$location}")) {
         /**
          * Filter the email html by location.
          *
@@ -1081,11 +1081,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_email_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_email_var_{$html_var}")) {
         /**
          * Filter the email html by individual custom field.
          *
@@ -1094,11 +1094,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_email_key_{$cf['field_type_key']}")) {
         /**
          * Filter the email html by field type key.
          *
@@ -1107,18 +1107,18 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_email_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $preview;
         if ($cf['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {
             return ''; // Remove Send Enquiry | Send To Friend from listings page
         }
 
-        $package_info = (array)geodir_post_package_info(array(), $post, $post->post_type);
+        $package_info = (array) geodir_post_package_info(array(), $post, $post->post_type);
 
         if ($cf['htmlvar_name'] == 'geodir_email' && ((isset($package_info['sendtofriend']) && $package_info['sendtofriend']) || $post->{$cf['htmlvar_name']})) {
             global $send_to_friend;
@@ -1130,7 +1130,7 @@ 
             if (!$preview) {
                 $b_send_inquiry = 'b_send_inquiry';
                 $b_sendtofriend = 'b_sendtofriend';
-                $html = '<input type="hidden" name="geodir_popup_post_id" value="' . $post->ID . '" /><div class="geodir_display_popup_forms"></div>';
+                $html = '<input type="hidden" name="geodir_popup_post_id" value="'.$post->ID.'" /><div class="geodir_display_popup_forms"></div>';
             }
 
             $field_icon = geodir_field_icon_proccess($cf);
@@ -1143,26 +1143,26 @@ 
                 $field_icon = '';
             }
 
-            $html .= '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
+            $html .= '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;
             $seperator = '';
             if ($post->{$cf['htmlvar_name']}) {
-                $html .= '<a href="javascript:void(0);" class="' . $b_send_inquiry . '" >' . SEND_INQUIRY . '</a>';
+                $html .= '<a href="javascript:void(0);" class="'.$b_send_inquiry.'" >'.SEND_INQUIRY.'</a>';
                 $seperator = ' | ';
             }
 
             if (isset($package_info['sendtofriend']) && $package_info['sendtofriend']) {
-                $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';
+                $html .= $seperator.'<a href="javascript:void(0);" class="'.$b_sendtofriend.'">'.SEND_TO_FRIEND.'</a>';
             }
 
             $html .= '</span></div>';
 
 
             if (isset($_REQUEST['send_inquiry']) && $_REQUEST['send_inquiry'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_INQUIRY_SUCCESS . '</p>';
+                $html .= '<p class="sucess_msg">'.SEND_INQUIRY_SUCCESS.'</p>';
             } elseif (isset($_REQUEST['sendtofrnd']) && $_REQUEST['sendtofrnd'] == 'success') {
-                $html .= '<p class="sucess_msg">' . SEND_FRIEND_SUCCESS . '</p>';
+                $html .= '<p class="sucess_msg">'.SEND_FRIEND_SUCCESS.'</p>';
             } elseif (isset($_REQUEST['emsg']) && $_REQUEST['emsg'] == 'captch') {
-                $html .= '<p class="error_msg_fix">' . WRONG_CAPTCH_MSG . '</p>';
+                $html .= '<p class="error_msg_fix">'.WRONG_CAPTCH_MSG.'</p>';
             }
 
             /*if(!$preview){require_once (geodir_plugin_path().'/geodirectory-templates/popup-forms.php');}*/
@@ -1182,11 +1182,11 @@ 
                 }
 
 
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+                $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-email" style="'.$field_icon.'">'.$field_icon_af;
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
                 $html .= '</span><span class="geodir-email-address-output">';
                 $email = $post->{$cf['htmlvar_name']} ;
-                if($e_split = explode('@',$email)){
+                if ($e_split = explode('@', $email)) {
                     /**
                      * Filter email custom field name output.
                      *
@@ -1195,10 +1195,10 @@ 
                      * @param string $email The email string being output.
                      * @param array $cf Custom field variables array.
                      */
-                    $email_name = apply_filters('geodir_email_field_name_output',$email,$cf);
-                    $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
-                }else{
-                    $html .=  $email;
+                    $email_name = apply_filters('geodir_email_field_name_output', $email, $cf);
+                    $html .= "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";
+                } else {
+                    $html .= $email;
                 }
                 $html .= '</span></div>';
             }
@@ -1209,7 +1209,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_email','geodir_cf_email',10,3);
+add_filter('geodir_custom_field_output_email', 'geodir_cf_email', 10, 3);
 
 
 /**
@@ -1222,21 +1222,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_file($html,$location,$cf,$p=''){
+function geodir_cf_file($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_file_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_file_loc_{$location}")) {
         /**
          * Filter the file html by location.
          *
@@ -1244,11 +1244,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_file_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_file_var_{$html_var}")) {
         /**
          * Filter the file html by individual custom field.
          *
@@ -1257,11 +1257,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_file_key_{$cf['field_type_key']}")) {
         /**
          * Filter the file html by field type key.
          *
@@ -1270,11 +1270,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_file_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})):
 
@@ -1282,7 +1282,7 @@ 
             if (!empty($files)):
 
                 $extra_fields = !empty($cf['extra_fields']) ? stripslashes_deep(maybe_unserialize($cf['extra_fields'])) : NULL;
-                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';
+                $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';
 
                 $file_paths = '';
                 foreach ($files as $file) {
@@ -1319,9 +1319,9 @@ 
                             //$file_paths .= '<img src="'.$file.'"  />';	
                             $file_paths .= '</div>';
                         } else {
-                            $ext_path = '_' . $html_var . '_';
+                            $ext_path = '_'.$html_var.'_';
                             $filename = explode($ext_path, $filename);
-                            $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';
+                            $file_paths .= '<a href="'.$file.'" target="_blank">'.$filename[count($filename) - 1].'</a>';
                         }
                     }
                 }
@@ -1336,11 +1336,11 @@ 
                     $field_icon = '';
                 }
 
-                $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' geodir-custom-file-box ' . $cf['htmlvar_name'] . '"><div class="geodir-i-select" style="' . $field_icon . '">' . $field_icon_af;
+                $html = '<div class="geodir_more_info  '.$cf['css_class'].' geodir-custom-file-box '.$cf['htmlvar_name'].'"><div class="geodir-i-select" style="'.$field_icon.'">'.$field_icon_af;
                 $html .= '<span style="display: inline-block; vertical-align: top; padding-right: 14px;">';
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
                 $html .= '</span>';
-                $html .= $file_paths . '</div></div>';
+                $html .= $file_paths.'</div></div>';
 
             endif;
         endif;
@@ -1349,7 +1349,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_file','geodir_cf_file',10,3);
+add_filter('geodir_custom_field_output_file', 'geodir_cf_file', 10, 3);
 
 
 
@@ -1363,21 +1363,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_textarea($html,$location,$cf,$p=''){
+function geodir_cf_textarea($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_textarea_loc_{$location}")) {
         /**
          * Filter the textarea html by location.
          *
@@ -1385,11 +1385,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_textarea_var_{$html_var}")) {
         /**
          * Filter the textarea html by individual custom field.
          *
@@ -1398,11 +1398,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}")) {
         /**
          * Filter the textarea html by field type key.
          *
@@ -1411,11 +1411,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_textarea_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})) {
 
@@ -1430,9 +1430,9 @@ 
             }
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.wpautop($post->{$cf['htmlvar_name']}).'</div>';
 
         }
 
@@ -1440,7 +1440,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_textarea','geodir_cf_textarea',10,3);
+add_filter('geodir_custom_field_output_textarea', 'geodir_cf_textarea', 10, 3);
 
 
 
@@ -1454,21 +1454,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_html($html,$location,$cf,$p=''){
+function geodir_cf_html($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_html_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_html_loc_{$location}")) {
         /**
          * Filter the html html by location.
          *
@@ -1476,11 +1476,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_html_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_html_var_{$html_var}")) {
         /**
          * Filter the html html by individual custom field.
          *
@@ -1489,11 +1489,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_html_key_{$cf['field_type_key']}")) {
         /**
          * Filter the html html by field type key.
          *
@@ -1502,11 +1502,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_html_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         if (!empty($post->{$cf['htmlvar_name']})) {
 
@@ -1520,9 +1520,9 @@ 
                 $field_icon = '';
             }
 
-            $html = '<div class="geodir_more_info  ' . $cf['css_class'] . ' ' . $cf['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-text" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-            $html .= '</span>' . wpautop($post->{$cf['htmlvar_name']}) . '</div>';
+            $html = '<div class="geodir_more_info  '.$cf['css_class'].' '.$cf['htmlvar_name'].'" style="clear:both;"><span class="geodir-i-text" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+            $html .= '</span>'.wpautop($post->{$cf['htmlvar_name']}).'</div>';
 
         }
 
@@ -1530,7 +1530,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_html','geodir_cf_html',10,3);
+add_filter('geodir_custom_field_output_html', 'geodir_cf_html', 10, 3);
 
 
 
@@ -1544,21 +1544,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_taxonomy($html,$location,$cf,$p=''){
+function geodir_cf_taxonomy($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_loc_{$location}")) {
         /**
          * Filter the taxonomy html by location.
          *
@@ -1566,11 +1566,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_var_{$html_var}")) {
         /**
          * Filter the taxonomy html by individual custom field.
          *
@@ -1579,11 +1579,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}")) {
         /**
          * Filter the taxonomy html by field type key.
          *
@@ -1592,14 +1592,14 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_taxonomy_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
-        if ($html_var == $post->post_type . 'category' && !empty($post->{$html_var})) {
-            $post_taxonomy = $post->post_type . 'category';
+        if ($html_var == $post->post_type.'category' && !empty($post->{$html_var})) {
+            $post_taxonomy = $post->post_type.'category';
             $field_value = $post->{$html_var};
             $links = array();
             $terms = array();
@@ -1617,7 +1617,7 @@ 
                     if ($term != '') {
                         $term = get_term_by('id', $term, $html_var);
                         if (is_object($term)) {
-                            $links[] = "<a href='" . esc_attr(get_term_link($term, $post_taxonomy)) . "'>" . $term->name . "</a>";
+                            $links[] = "<a href='".esc_attr(get_term_link($term, $post_taxonomy))."'>".$term->name."</a>";
                             $terms[] = $term;
                         }
                     }
@@ -1631,7 +1631,7 @@ 
                     $terms = $termsOrdered;
                 }
             }
-            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object)$terms) : '';
+            $html_value = !empty($links) && !empty($terms) ? wp_sprintf('%l', $links, (object) $terms) : '';
 
             if ($html_value != '') {
                 $field_icon = geodir_field_icon_proccess($cf);
@@ -1644,9 +1644,9 @@ 
                     $field_icon = '';
                 }
 
-                $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="' . $field_icon . '">' . $field_icon_af;
-                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory') . ': ' : '';
-                $html .= '</span> ' . $html_value . '</div>';
+                $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$html_var.'" style="clear:both;"><span class="geodir-i-taxonomy geodir-i-category" style="'.$field_icon.'">'.$field_icon_af;
+                $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '';
+                $html .= '</span> '.$html_value.'</div>';
             }
         }
 
@@ -1654,7 +1654,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_taxonomy','geodir_cf_taxonomy',10,3);
+add_filter('geodir_custom_field_output_taxonomy', 'geodir_cf_taxonomy', 10, 3);
 
 
 /**
@@ -1667,21 +1667,21 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cf_address($html,$location,$cf,$p=''){
+function geodir_cf_address($html, $location, $cf, $p = '') {
 
     // check we have the post value
-    if(is_int($p)){$post = geodir_get_post_info($p);}
-    else{ global $post;}
+    if (is_int($p)) {$post = geodir_get_post_info($p); }
+    else { global $post; }
 
-    if(!is_array($cf) && $cf!=''){
+    if (!is_array($cf) && $cf != '') {
         $cf = geodir_get_field_infoby('htmlvar_name', $cf, $post->post_type);
-        if(!$cf){return NULL;}
+        if (!$cf) {return NULL; }
     }
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a location specific filter.
-    if(has_filter("geodir_custom_field_output_address_loc_{$location}")){
+    if (has_filter("geodir_custom_field_output_address_loc_{$location}")) {
         /**
          * Filter the address html by location.
          *
@@ -1689,11 +1689,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_loc_{$location}", $html, $cf);
     }
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_output_address_var_{$html_var}")){
+    if (has_filter("geodir_custom_field_output_address_var_{$html_var}")) {
         /**
          * Filter the address html by individual custom field.
          *
@@ -1702,11 +1702,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_var_{$html_var}", $html, $location, $cf);
     }
 
     // Check if there is a custom field key specific filter.
-    if(has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")){
+    if (has_filter("geodir_custom_field_output_address_key_{$cf['field_type_key']}")) {
         /**
          * Filter the address html by field type key.
          *
@@ -1715,14 +1715,14 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}",$html,$location,$cf);
+        $html = apply_filters("geodir_custom_field_output_address_key_{$cf['field_type_key']}", $html, $location, $cf);
     }
 
     // If not html then we run the standard output.
-    if(empty($html)){
+    if (empty($html)) {
 
         global $preview;
-        $html_var = $cf['htmlvar_name'] . '_address';
+        $html_var = $cf['htmlvar_name'].'_address';
 
         if ($cf['extra_fields']) {
 
@@ -1785,10 +1785,10 @@ 
 
         if ($post->{$html_var}) {
 
-            $field_icon = geodir_field_icon_proccess( $cf );
-            if ( strpos( $field_icon, 'http' ) !== false ) {
+            $field_icon = geodir_field_icon_proccess($cf);
+            if (strpos($field_icon, 'http') !== false) {
                 $field_icon_af = '';
-            } elseif ( $field_icon == '' ) {
+            } elseif ($field_icon == '') {
                 $field_icon_af = '<i class="fa fa-home"></i>';
             } else {
                 $field_icon_af = $field_icon;
@@ -1797,25 +1797,25 @@ 
             
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
-            $html .= '<span class="geodir-i-location" style="' . $field_icon . '">' . $field_icon_af;
-            $html .= ( trim( $cf['site_title'] ) ) ? __( $cf['site_title'], 'geodirectory' ) . ': ' : '&nbsp;';
+            $html = '<div class="geodir_more_info '.$cf['css_class'].' '.$html_var.'" style="clear:both;"  itemscope itemtype="https://schema.org/PostalAddress">';
+            $html .= '<span class="geodir-i-location" style="'.$field_icon.'">'.$field_icon_af;
+            $html .= (trim($cf['site_title'])) ? __($cf['site_title'], 'geodirectory').': ' : '&nbsp;';
             $html .= '</span>';
 
-            if ( isset($post->post_address) ) {
-                $html .= '<span itemprop="streetAddress">' . $post->post_address . '</span><br>';
+            if (isset($post->post_address)) {
+                $html .= '<span itemprop="streetAddress">'.$post->post_address.'</span><br>';
             }
-            if ($show_city_in_address && isset( $post->post_city ) && $post->post_city ) {
-                $html .= '<span itemprop="addressLocality">' . $post->post_city . '</span><br>';
+            if ($show_city_in_address && isset($post->post_city) && $post->post_city) {
+                $html .= '<span itemprop="addressLocality">'.$post->post_city.'</span><br>';
             }
-            if ($show_region_in_address && isset( $post->post_region ) && $post->post_region ) {
-                $html .= '<span itemprop="addressRegion">' . $post->post_region . '</span><br>';
+            if ($show_region_in_address && isset($post->post_region) && $post->post_region) {
+                $html .= '<span itemprop="addressRegion">'.$post->post_region.'</span><br>';
             }
-            if ($show_zip_in_address && isset( $post->post_zip ) && $post->post_zip ) {
-                $html .= '<span itemprop="postalCode">' . $post->post_zip . '</span><br>';
+            if ($show_zip_in_address && isset($post->post_zip) && $post->post_zip) {
+                $html .= '<span itemprop="postalCode">'.$post->post_zip.'</span><br>';
             }
-            if ($show_country_in_address && isset( $post->post_country ) && $post->post_country ) {
-                $html .= '<span itemprop="addressCountry">' . __( $post->post_country, 'geodirectory' ) . '</span><br>';
+            if ($show_country_in_address && isset($post->post_country) && $post->post_country) {
+                $html .= '<span itemprop="addressCountry">'.__($post->post_country, 'geodirectory').'</span><br>';
             }
             $html .= '</div>';
 
@@ -1826,4 +1826,4 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_output_address','geodir_cf_address',10,3);
\ No newline at end of file
+add_filter('geodir_custom_field_output_address', 'geodir_cf_address', 10, 3);
\ No newline at end of file

geodirectory-functions/custom_fields_input_functions.php

Braces +191 added lines, -68 removed lines

@@ -86,26 +86,31 @@ 
         $value = geodir_get_cf_value($cf);
         $type = $cf['type'];
         //number and float validation $validation_pattern
-        if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';}
-        elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
+        if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';} elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
 
         //validation
         if(isset($cf['validation_pattern']) && $cf['validation_pattern']){
             $validation = 'pattern="'.$cf['validation_pattern'].'"';
-        }else{$validation='';}
+        } else{$validation='';}
 
         // validation message
         if(isset($cf['validation_msg']) && $cf['validation_msg']){
             $validation_msg = 'title="'.$cf['validation_msg'].'"';
-        }else{$validation_msg='';}
+        } else{$validation_msg='';}
         ?>
 
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input field_type="<?php echo $type;?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
                    value="<?php echo esc_attr(stripslashes($value));?>" type="<?php echo $type;?>" class="geodir_textfield" <?php echo $validation;echo $validation_msg;?> />
@@ -160,11 +165,17 @@ 
         }?>
 
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php  $cf['name'];?>" id="<?php echo $cf['name'];?>"
                    value="<?php echo esc_attr(stripslashes($value));?>" type="email" class="geodir_textfield"/>
@@ -220,11 +231,17 @@ 
         }?>
 
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php  $cf['name'];?>" id="<?php echo $cf['name'];?>"
                    value="<?php echo esc_attr(stripslashes($value));?>" type="tel" class="geodir_textfield"/>
@@ -280,11 +297,17 @@ 
         }?>
 
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
                    value="<?php echo esc_attr(stripslashes($value));?>" type="url" class="geodir_textfield"
@@ -339,11 +362,17 @@ 
 
         ?>
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <?php if ($cf['option_values']) {
                 $option_values = geodir_string_values_to_options($cf['option_values'], true);
@@ -410,11 +439,17 @@ 
         }?>
 
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <?php if ($value != '1') {
                 $value = '0';
@@ -474,11 +509,17 @@ 
         ?>
 
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label><?php
 
 
@@ -546,11 +587,17 @@ 
 
         ?>
         <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <?php
             $option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
@@ -627,11 +674,17 @@ 
         }
         ?>
         <div id="<?php echo $cf['name']; ?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input type="hidden" name="gd_field_<?php echo $cf['name']; ?>" value="1"/>
             <?php if ($multi_display == 'select') { ?>
@@ -738,11 +791,17 @@ 
         ?>
 
         <div id="<?php echo $cf['name']; ?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
 
             <?php $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>
@@ -802,8 +861,9 @@ 
         $extra_fields = unserialize($cf['extra_fields']);
         $name = $cf['name'];
 
-        if ($extra_fields['date_format'] == '')
-            $extra_fields['date_format'] = 'yy-mm-dd';
+        if ($extra_fields['date_format'] == '') {
+                    $extra_fields['date_format'] = 'yy-mm-dd';
+        }
 
         $date_format = $extra_fields['date_format'];
         $jquery_date_format  = $date_format;
@@ -817,7 +877,7 @@ 
             $replace = array('d','j','l','m','n','F','Y');//PHP date format
 
             $date_format = str_replace($search, $replace, $date_format);
-        }else{
+        } else{
             $jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );
         }
 
@@ -851,12 +911,18 @@ 
 
         </script>
         <div id="<?php echo $name;?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
 
             <input field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>" id="<?php echo $name;?>"
@@ -910,8 +976,9 @@ 
 
         $name = $cf['name'];
 
-        if ($value != '')
-            $value = date('H:i', strtotime($value));
+        if ($value != '') {
+                    $value = date('H:i', strtotime($value));
+        }
         ?>
         <script type="text/javascript">
             jQuery(document).ready(function () {
@@ -924,12 +991,18 @@ 
             });
         </script>
         <div id="<?php echo $name;?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($cf['is_required']) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input readonly="readonly" field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>"
                    id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>
@@ -1021,17 +1094,27 @@ 
         }
 
         $location = geodir_get_default_location();
-        if (empty($city)) $city = isset($location->city) ? $location->city : '';
-        if (empty($region)) $region = isset($location->region) ? $location->region : '';
-        if (empty($country)) $country = isset($location->country) ? $location->country : '';
+        if (empty($city)) {
+        	$city = isset($location->city) ? $location->city : '';
+        }
+        if (empty($region)) {
+        	$region = isset($location->region) ? $location->region : '';
+        }
+        if (empty($country)) {
+        	$country = isset($location->country) ? $location->country : '';
+        }
 
         $lat_lng_blank = false;
         if (empty($lat) && empty($lng)) {
             $lat_lng_blank = true;
         }
 
-        if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';
-        if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';
+        if (empty($lat)) {
+        	$lat = isset($location->city_latitude) ? $location->city_latitude : '';
+        }
+        if (empty($lng)) {
+        	$lng = isset($location->city_longitude) ? $location->city_longitude : '';
+        }
 
         /**
          * Filter the default latitude.
@@ -1055,10 +1138,16 @@ 
         ?>
 
         <div id="geodir_<?php echo $prefix . 'address';?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php _e($address_title, 'geodirectory'); ?>
-                <?php if ($is_required) echo '<span>*</span>';?>
+                <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>
             </label>
             <input type="text" field_type="<?php echo $type;?>" name="<?php echo $prefix . 'address';?>"
                    id="<?php echo $prefix . 'address';?>" class="geodir_textfield"
@@ -1119,10 +1208,16 @@ 
             /* show lat lng */
             $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>
             <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"
-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
                     <?php echo PLACE_ADDRESS_LAT; ?>
-                    <?php if ($is_required) echo '<span>*</span>'; ?>
+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>
                 </label>
                 <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'latitude'; ?>"
                        id="<?php echo $prefix . 'latitude'; ?>" class="geodir_textfield"
@@ -1134,10 +1229,16 @@ 
             </div>
 
             <div id="geodir_<?php echo $prefix . 'longitude'; ?>_row"
-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
+                 class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
                     <?php echo PLACE_ADDRESS_LNG; ?>
-                    <?php if ($is_required) echo '<span>*</span>'; ?>
+                    <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>
                 </label>
                 <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'longitude'; ?>"
                        id="<?php echo $prefix . 'longitude'; ?>" class="geodir_textfield"
@@ -1241,11 +1342,17 @@ 
             $value = '';
         } ?>
         <div id="<?php echo $name;?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($site_title, 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($is_required) echo '<span>*</span>';?>
+                <?php if ($is_required) {
+	echo '<span>*</span>';
+}
+?>
             </label>
 
             <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">
@@ -1279,8 +1386,9 @@ 
                     $post_cat = implode(",", $post_cat[$name]);
 
                 } else {
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
-                        $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
+                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                                            $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
+                    }
                 }
 
 
@@ -1318,21 +1426,24 @@ 
 
                         $cat_display == '';
                         $multiple = '';
-                        if ($cat_display == 'multiselect')
-                            $multiple = 'multiple="multiple"';
+                        if ($cat_display == 'multiselect') {
+                                                    $multiple = 'multiple="multiple"';
+                        }
 
                         echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';
 
 
-                        if ($cat_display == 'select')
-                            echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+                        if ($cat_display == 'select') {
+                                                    echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+                        }
 
                     }
 
                     echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);
 
-                    if ($cat_display == 'select' || $cat_display == 'multiselect')
-                        echo '</select>';
+                    if ($cat_display == 'select' || $cat_display == 'multiselect') {
+                                            echo '</select>';
+                    }
 
                 } else {
 
@@ -1404,18 +1515,23 @@ 
 
             $file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.
 
-        } else
-            $file_value = '';
+        } else {
+                    $file_value = '';
+        }
 
-        if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])
-            $file_multiple = true; // allow multiple files upload
-        else
-            $file_multiple = false;
+        if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple']) {
+                    $file_multiple = true;
+        }
+        // allow multiple files upload
+        else {
+                    $file_multiple = false;
+        }
 
-        if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])
-            $file_image_limit = $extra_fields['image_limit'];
-        else
-            $file_image_limit = 1;
+        if (isset($extra_fields['image_limit']) && $extra_fields['image_limit']) {
+                    $file_image_limit = $extra_fields['image_limit'];
+        } else {
+                    $file_image_limit = 1;
+        }
 
         $file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)
 
@@ -1423,8 +1539,9 @@ 
 
         if (!empty($file_value)) {
             $curImages = explode(',', $file_value);
-            if (!empty($curImages))
-                $file_totImg = count($curImages);
+            if (!empty($curImages)) {
+                            $file_totImg = count($curImages);
+            }
         }
 
         $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';
@@ -1439,12 +1556,18 @@ 
         ?>
 
         <div id="<?php echo $name;?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+             class="<?php if ($is_required) {
+	echo 'required_field';
+}
+?> geodir_form_row clearfix gd-fieldset-details">
 
             <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">
                 <label
                     style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');
-                    echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>
+                    echo $site_title; ?><?php if ($is_required) {
+                    	echo '<span>*</span>';
+                    }
+                    ?></label>
                 <input class="geodir-custom-file-upload" field_type="file" type="hidden"
                        name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"
                        value="<?php echo esc_attr($file_value); ?>"/>

Spacing +234 added lines, -234 removed lines

@@ -17,12 +17,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_fieldset($html,$cf){
+function geodir_cfi_fieldset($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_fieldset_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_fieldset_{$html_var}")) {
         /**
          * Filter the fieldset html by individual custom field.
          *
@@ -30,18 +30,18 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_fieldset_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_fieldset_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         ?>
         <h5 id="geodir_fieldset_<?php echo (int) $cf['id']; ?>" class="geodir-fieldset-row"
-            gd-fieldset="<?php echo (int) $cf['id']; ?>"><?php echo __( $cf['site_title'], 'geodirectory' ); ?>
-            <?php if ( $cf['desc'] != '' ) {
-                echo '<small>( ' . __( $cf['desc'], 'geodirectory' ) . ' )</small>';
+            gd-fieldset="<?php echo (int) $cf['id']; ?>"><?php echo __($cf['site_title'], 'geodirectory'); ?>
+            <?php if ($cf['desc'] != '') {
+                echo '<small>( '.__($cf['desc'], 'geodirectory').' )</small>';
             } ?></h5>
         <?php
         $html = ob_get_clean();
@@ -49,7 +49,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_fieldset','geodir_cfi_fieldset',10,2);
+add_filter('geodir_custom_field_input_fieldset', 'geodir_cfi_fieldset', 10, 2);
 
 
 
@@ -62,12 +62,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_text($html,$cf){
+function geodir_cfi_text($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_text_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_text_{$html_var}")) {
         /**
          * Filter the text html by individual custom field.
          *
@@ -75,41 +75,41 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_text_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_text_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
 
         $value = geodir_get_cf_value($cf);
         $type = $cf['type'];
         //number and float validation $validation_pattern
-        if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';}
-        elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
+        if (isset($cf['data_type']) && $cf['data_type'] == 'INT') {$type = 'number'; }
+        elseif (isset($cf['data_type']) && $cf['data_type'] == 'FLOAT') {$type = 'float'; }
 
         //validation
-        if(isset($cf['validation_pattern']) && $cf['validation_pattern']){
+        if (isset($cf['validation_pattern']) && $cf['validation_pattern']) {
             $validation = 'pattern="'.$cf['validation_pattern'].'"';
-        }else{$validation='';}
+        } else {$validation = ''; }
 
         // validation message
-        if(isset($cf['validation_msg']) && $cf['validation_msg']){
+        if (isset($cf['validation_msg']) && $cf['validation_msg']) {
             $validation_msg = 'title="'.$cf['validation_msg'].'"';
-        }else{$validation_msg='';}
+        } else {$validation_msg = ''; }
         ?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input field_type="<?php echo $type;?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
-                   value="<?php echo esc_attr(stripslashes($value));?>" type="<?php echo $type;?>" class="geodir_textfield" <?php echo $validation;echo $validation_msg;?> />
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <input field_type="<?php echo $type; ?>" name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
+                   value="<?php echo esc_attr(stripslashes($value)); ?>" type="<?php echo $type; ?>" class="geodir_textfield" <?php echo $validation; echo $validation_msg; ?> />
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -121,7 +121,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_text','geodir_cfi_text',10,2);
+add_filter('geodir_custom_field_input_text', 'geodir_cfi_text', 10, 2);
 
 
 /**
@@ -133,12 +133,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_email($html,$cf){
+function geodir_cfi_email($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_email_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_email_{$html_var}")) {
         /**
          * Filter the email html by individual custom field.
          *
@@ -146,11 +146,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_email_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_email_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -159,16 +159,16 @@ 
             $value = '';
         }?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
-                   value="<?php echo esc_attr(stripslashes($value));?>" type="email" class="geodir_textfield"/>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <input field_type="<?php echo $cf['type']; ?>" name="<?php  echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
+                   value="<?php echo esc_attr(stripslashes($value)); ?>" type="email" class="geodir_textfield"/>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -180,7 +180,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_email','geodir_cfi_email',10,2);
+add_filter('geodir_custom_field_input_email', 'geodir_cfi_email', 10, 2);
 
 
 
@@ -193,12 +193,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_phone($html,$cf){
+function geodir_cfi_phone($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_phone_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_phone_{$html_var}")) {
         /**
          * Filter the phone html by individual custom field.
          *
@@ -206,11 +206,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_phone_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_phone_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -219,16 +219,16 @@ 
             $value = '';
         }?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
-                   value="<?php echo esc_attr(stripslashes($value));?>" type="tel" class="geodir_textfield"/>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <input field_type="<?php echo $cf['type']; ?>" name="<?php  echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
+                   value="<?php echo esc_attr(stripslashes($value)); ?>" type="tel" class="geodir_textfield"/>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -240,7 +240,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_phone','geodir_cfi_phone',10,2);
+add_filter('geodir_custom_field_input_phone', 'geodir_cfi_phone', 10, 2);
 
 
 
@@ -253,12 +253,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_url($html,$cf){
+function geodir_cfi_url($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_url_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_url_{$html_var}")) {
         /**
          * Filter the url html by individual custom field.
          *
@@ -266,11 +266,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_url_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_url_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -279,19 +279,19 @@ 
             $value = '';
         }?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
-                   value="<?php echo esc_attr(stripslashes($value));?>" type="url" class="geodir_textfield"
+            <input field_type="<?php echo $cf['type']; ?>" name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
+                   value="<?php echo esc_attr(stripslashes($value)); ?>" type="url" class="geodir_textfield"
                    oninvalid="setCustomValidity('<?php _e('Please enter a valid URL including http://', 'geodirectory'); ?>')"
                    onchange="try{setCustomValidity('')}catch(e){}"
             />
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -303,7 +303,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_url','geodir_cfi_url',10,2);
+add_filter('geodir_custom_field_input_url', 'geodir_cfi_url', 10, 2);
 
 
 /**
@@ -315,12 +315,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_radio($html,$cf){
+function geodir_cfi_radio($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_radio_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_radio_{$html_var}")) {
         /**
          * Filter the radio html by individual custom field.
          *
@@ -328,22 +328,22 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_radio_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_radio_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
 
         ?>
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
             <?php if ($cf['option_values']) {
                 $option_values = geodir_string_values_to_options($cf['option_values'], true);
@@ -352,14 +352,14 @@ 
                     foreach ($option_values as $option_value) {
                         if (empty($option_value['optgroup'])) {
                             ?>
-                            <span class="gd-radios"><input name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>" <?php checked($value, $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="radio" /><?php echo $option_value['label']; ?></span>
+                            <span class="gd-radios"><input name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>" <?php checked($value, $option_value['value']); ?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $cf['type']; ?>" type="radio" /><?php echo $option_value['label']; ?></span>
                             <?php
                         }
                     }
                 }
             }
             ?>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -371,7 +371,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_radio','geodir_cfi_radio',10,2);
+add_filter('geodir_custom_field_input_radio', 'geodir_cfi_radio', 10, 2);
 
 
 /**
@@ -383,12 +383,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_checkbox($html,$cf){
+function geodir_cfi_checkbox($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_checkbox_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_checkbox_{$html_var}")) {
         /**
          * Filter the checkbox html by individual custom field.
          *
@@ -396,11 +396,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_checkbox_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_checkbox_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -411,22 +411,22 @@ 
         }
         ?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
             <?php if ($value != '1') {
                 $value = '0';
             }?>
-            <input type="hidden" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>" value="<?php echo esc_attr($value);?>"/>
+            <input type="hidden" name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>" value="<?php echo esc_attr($value); ?>"/>
             <input  <?php if ($value == '1') {
                 echo 'checked="checked"';
-            }?>  value="1" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="checkbox"
-                 onchange="if(this.checked){jQuery('#<?php echo $cf['name'];?>').val('1');} else{ jQuery('#<?php echo $cf['name'];?>').val('0');}"/>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            }?>  value="1" class="gd-checkbox" field_type="<?php echo $cf['type']; ?>" type="checkbox"
+                 onchange="if(this.checked){jQuery('#<?php echo $cf['name']; ?>').val('1');} else{ jQuery('#<?php echo $cf['name']; ?>').val('0');}"/>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -438,7 +438,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_checkbox','geodir_cfi_checkbox',10,2);
+add_filter('geodir_custom_field_input_checkbox', 'geodir_cfi_checkbox', 10, 2);
 
 
 /**
@@ -450,12 +450,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_textarea($html,$cf){
+function geodir_cfi_textarea($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_textarea_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_textarea_{$html_var}")) {
         /**
          * Filter the textarea html by individual custom field.
          *
@@ -463,11 +463,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_textarea_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_textarea_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -475,32 +475,32 @@ 
         $extra_fields = unserialize($cf['extra_fields']);
         ?>
 
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label><?php
 
 
             if (is_array($extra_fields) && in_array('1', $extra_fields)) {
 
-                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>
+                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>
 
-            <div class="editor" field_id="<?php echo $cf['name'];?>" field_type="editor">
+            <div class="editor" field_id="<?php echo $cf['name']; ?>" field_type="editor">
                 <?php wp_editor(stripslashes($value), $cf['name'], $editor_settings); ?>
                 </div><?php
 
             } else {
 
-                ?><textarea field_type="<?php echo $cf['type'];?>" class="geodir_textarea" name="<?php echo $cf['name'];?>"
-                            id="<?php echo $cf['name'];?>"><?php echo stripslashes($value);?></textarea><?php
+                ?><textarea field_type="<?php echo $cf['type']; ?>" class="geodir_textarea" name="<?php echo $cf['name']; ?>"
+                            id="<?php echo $cf['name']; ?>"><?php echo stripslashes($value); ?></textarea><?php
 
             }?>
 
 
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -512,7 +512,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_textarea','geodir_cfi_textarea',10,2);
+add_filter('geodir_custom_field_input_textarea', 'geodir_cfi_textarea', 10, 2);
 
 
 /**
@@ -524,12 +524,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_select($html,$cf){
+function geodir_cfi_select($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_select_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_select_{$html_var}")) {
         /**
          * Filter the select html by individual custom field.
          *
@@ -537,22 +537,22 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_select_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_select_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
 
         ?>
-        <div id="<?php echo $cf['name'];?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
+        <div id="<?php echo $cf['name']; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
             <?php
             $option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
@@ -562,22 +562,22 @@ 
                     if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
                         $option_label = isset($option_row['label']) ? $option_row['label'] : '';
 
-                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="'.esc_attr($option_label).'">' : '</optgroup>';
                     } else {
                         $option_label = isset($option_row['label']) ? $option_row['label'] : '';
                         $option_value = isset($option_row['value']) ? $option_row['value'] : '';
                         $selected = $option_value == $value ? 'selected="selected"' : '';
 
-                        $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+                        $select_options .= '<option value="'.esc_attr($option_value).'" '.$selected.'>'.$option_label.'</option>';
                     }
                 }
             }
             ?>
-            <select field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
+            <select field_type="<?php echo $cf['type']; ?>" name="<?php echo $cf['name']; ?>" id="<?php echo $cf['name']; ?>"
                     class="geodir_textfield textfield_x chosen_select"
-                    data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;';?>"
-                    option-ajaxchosen="false"><?php echo $select_options;?></select>
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+                    data-placeholder="<?php echo __('Choose', 'geodirectory').' '.$site_title.'&hellip;'; ?>"
+                    option-ajaxchosen="false"><?php echo $select_options; ?></select>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -589,7 +589,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_select','geodir_cfi_select',10,2);
+add_filter('geodir_custom_field_input_select', 'geodir_cfi_select', 10, 2);
 
 
 /**
@@ -601,12 +601,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_multiselect($html,$cf){
+function geodir_cfi_multiselect($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_multiselect_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_multiselect_{$html_var}")) {
         /**
          * Filter the multiselect html by individual custom field.
          *
@@ -614,11 +614,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_multiselect_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_multiselect_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -655,9 +655,9 @@ 
                                 $option_label = isset($option_row['label']) ? $option_row['label'] : '';
 
                                 if ($multi_display == 'select') {
-                                    $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+                                    $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="'.esc_attr($option_label).'">' : '</optgroup>';
                                 } else {
-                                    $select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';
+                                    $select_options .= $option_row['optgroup'] == 'start' ? '<li>'.$option_label.'</li>' : '';
                                 }
                             } else {
                                 $option_label = isset($option_row['label']) ? $option_row['label'] : '';
@@ -682,9 +682,9 @@ 
                                 }
 
                                 if ($multi_display == 'select') {
-                                    $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+                                    $select_options .= '<option value="'.esc_attr($option_value).'" '.$selected.'>'.$option_label.'</option>';
                                 } else {
-                                    $select_options .= '<li><input name="' . $cf['name'] . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';
+                                    $select_options .= '<li><input name="'.$cf['name'].'[]" '.$checked.' value="'.esc_attr($option_value).'" class="gd-'.$multi_display.'" field_type="'.$multi_display.'" type="'.$multi_display.'" />&nbsp;'.$option_label.' </li>';
                                 }
                             }
                         }
@@ -704,7 +704,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_multiselect','geodir_cfi_multiselect',10,2);
+add_filter('geodir_custom_field_input_multiselect', 'geodir_cfi_multiselect', 10, 2);
 
 
 /**
@@ -716,12 +716,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_html($html,$cf){
+function geodir_cfi_html($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_html_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_html_{$html_var}")) {
         /**
          * Filter the html html by individual custom field.
          *
@@ -729,11 +729,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_html_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_html_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -766,7 +766,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_html','geodir_cfi_html',10,2);
+add_filter('geodir_custom_field_input_html', 'geodir_cfi_html', 10, 2);
 
 
 
@@ -779,12 +779,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_datepicker($html,$cf){
+function geodir_cfi_datepicker($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_datepicker_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_datepicker_{$html_var}")) {
         /**
          * Filter the datepicker html by individual custom field.
          *
@@ -792,11 +792,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_datepicker_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_datepicker_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -808,23 +808,23 @@ 
             $extra_fields['date_format'] = 'yy-mm-dd';
 
         $date_format = $extra_fields['date_format'];
-        $jquery_date_format  = $date_format;
+        $jquery_date_format = $date_format;
 
 
         // check if we need to change the format or not
         $date_format_len = strlen(str_replace(' ', '', $date_format));
-        if($date_format_len>5){// if greater then 5 then it's the old style format.
+        if ($date_format_len > 5) {// if greater then 5 then it's the old style format.
 
-            $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-            $replace = array('d','j','l','m','n','F','Y');//PHP date format
+            $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format
+            $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format
 
             $date_format = str_replace($search, $replace, $date_format);
-        }else{
-            $jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );
+        } else {
+            $jquery_date_format = geodir_date_format_php_to_jqueryui($jquery_date_format);
         }
 
-        if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty
-        if($value && !isset($_REQUEST['backandedit'])) {
+        if ($value == '0000-00-00') {$value = ''; }//if date not set, then mark it empty
+        if ($value && !isset($_REQUEST['backandedit'])) {
             //$time = strtotime($value);
             //$value = date_i18n($date_format, $time);
         }
@@ -835,37 +835,37 @@ 
 
             jQuery(function () {
 
-                jQuery("#<?php echo $cf['name'];?>").datepicker({changeMonth: true, changeYear: true <?php
+                jQuery("#<?php echo $cf['name']; ?>").datepicker({changeMonth: true, changeYear: true <?php
                     /**
                      * Used to add extra option to datepicker per custom field.
                      *
                      * @since 1.5.7
                      * @param string $name The custom field name.
                      */
-                    echo apply_filters("gd_datepicker_extra_{$name}",'');?>});
+                    echo apply_filters("gd_datepicker_extra_{$name}", ''); ?>});
 
-                jQuery("#<?php echo $name;?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format;?>');
+                jQuery("#<?php echo $name; ?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format; ?>');
 
-                <?php if(!empty($value)){?>
-                jQuery("#<?php echo $name;?>").datepicker("setDate", '<?php echo $value;?>');
+                <?php if (!empty($value)) {?>
+                jQuery("#<?php echo $name; ?>").datepicker("setDate", '<?php echo $value; ?>');
                 <?php } ?>
 
             });
 
         </script>
-        <div id="<?php echo $name;?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $name; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
 
-            <input field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>" id="<?php echo $name;?>"
-                   value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>
+            <input field_type="<?php echo $cf['type']; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"
+                   value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>
 
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -877,7 +877,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_datepicker','geodir_cfi_datepicker',10,2);
+add_filter('geodir_custom_field_input_datepicker', 'geodir_cfi_datepicker', 10, 2);
 
 
 /**
@@ -889,12 +889,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_time($html,$cf){
+function geodir_cfi_time($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_time_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_time_{$html_var}")) {
         /**
          * Filter the time html by individual custom field.
          *
@@ -902,11 +902,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_time_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_time_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -919,25 +919,25 @@ 
         <script type="text/javascript">
             jQuery(document).ready(function () {
 
-                jQuery('#<?php echo $name;?>').timepicker({
+                jQuery('#<?php echo $name; ?>').timepicker({
                     showPeriod: true,
                     showLeadingZero: true,
                     showPeriod: true,
                 });
             });
         </script>
-        <div id="<?php echo $name;?>_row"
-             class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $name; ?>_row"
+             class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($cf['is_required']) echo '<span>*</span>';?>
+                <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
-            <input readonly="readonly" field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>"
-                   id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>
+            <input readonly="readonly" field_type="<?php echo $cf['type']; ?>" name="<?php echo $name; ?>"
+                   id="<?php echo $name; ?>" value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>
 
-            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
             <?php } ?>
@@ -948,7 +948,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_time','geodir_cfi_time',10,2);
+add_filter('geodir_custom_field_input_time', 'geodir_cfi_time', 10, 2);
 
 
 /**
@@ -960,12 +960,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_address($html,$cf){
+function geodir_cfi_address($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_address_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_address_{$html_var}")) {
         /**
          * Filter the address html by individual custom field.
          *
@@ -973,11 +973,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_address_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_address_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         global $gd_session;
         ob_start(); // Start  buffering;
@@ -990,12 +990,12 @@ 
         $site_title = $cf['site_title'];
         $is_admin = $cf['is_admin'];
         $extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
-        $prefix = $name . '_';
+        $prefix = $name.'_';
 
-        ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');
-        ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');
+        ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix.' address');
+        ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix.' zip/post code ');
         ($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');
-        ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');
+        ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix.' mapview');
 
         $address = '';
         $zip = '';
@@ -1006,21 +1006,21 @@ 
 
         if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
             $post = $gd_ses_listing;
-            $address = $post[$prefix . 'address'];
-            $zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';
-            $lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';
-            $lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';
-            $mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';
-            $mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';
+            $address = $post[$prefix.'address'];
+            $zip = isset($post[$prefix.'zip']) ? $post[$prefix.'zip'] : '';
+            $lat = isset($post[$prefix.'latitude']) ? $post[$prefix.'latitude'] : '';
+            $lng = isset($post[$prefix.'longitude']) ? $post[$prefix.'longitude'] : '';
+            $mapview = isset($post[$prefix.'mapview']) ? $post[$prefix.'mapview'] : '';
+            $mapzoom = isset($post[$prefix.'mapzoom']) ? $post[$prefix.'mapzoom'] : '';
         } else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {
-            $post_info = (array)$post_info;
-
-            $address = $post_info[$prefix . 'address'];
-            $zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';
-            $lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';
-            $lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';
-            $mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';
-            $mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';
+            $post_info = (array) $post_info;
+
+            $address = $post_info[$prefix.'address'];
+            $zip = isset($post_info[$prefix.'zip']) ? $post_info[$prefix.'zip'] : '';
+            $lat = isset($post_info[$prefix.'latitude']) ? $post_info[$prefix.'latitude'] : '';
+            $lng = isset($post_info[$prefix.'longitude']) ? $post_info[$prefix.'longitude'] : '';
+            $mapview = isset($post_info[$prefix.'mapview']) ? $post_info[$prefix.'mapview'] : '';
+            $mapzoom = isset($post_info[$prefix.'mapzoom']) ? $post_info[$prefix.'mapzoom'] : '';
         }
 
         $location = geodir_get_default_location();
@@ -1057,16 +1057,16 @@ 
 
         ?>
 
-        <div id="geodir_<?php echo $prefix . 'address';?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="geodir_<?php echo $prefix.'address'; ?>_row"
+             class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php _e($address_title, 'geodirectory'); ?>
-                <?php if ($is_required) echo '<span>*</span>';?>
+                <?php if ($is_required) echo '<span>*</span>'; ?>
             </label>
-            <input type="text" field_type="<?php echo $type;?>" name="<?php echo $prefix . 'address';?>"
-                   id="<?php echo $prefix . 'address';?>" class="geodir_textfield"
+            <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'address'; ?>"
+                   id="<?php echo $prefix.'address'; ?>" class="geodir_textfield"
                    value="<?php echo esc_attr(stripslashes($address)); ?>"/>
-            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>
             <?php if ($is_required) { ?>
                 <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>
             <?php } ?>
@@ -1086,14 +1086,14 @@ 
 
         if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>
 
-            <div id="geodir_<?php echo $prefix . 'zip'; ?>_row"
+            <div id="geodir_<?php echo $prefix.'zip'; ?>_row"
                  class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix gd-fieldset-details">
                 <label>
                     <?php _e($zip_title, 'geodirectory'); ?>
                     <?php /*if($is_required) echo '<span>*</span>';*/ ?>
                 </label>
-                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'zip'; ?>"
-                       id="<?php echo $prefix . 'zip'; ?>" class="geodir_textfield autofill"
+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'zip'; ?>"
+                       id="<?php echo $prefix.'zip'; ?>" class="geodir_textfield autofill"
                        value="<?php echo esc_attr(stripslashes($zip)); ?>"/>
                 <?php /*if($is_required) {?>
 					<span class="geodir_message_error"><?php echo _e($required_msg,'geodirectory');?></span>
@@ -1103,14 +1103,14 @@ 
 
         <?php if (isset($extra_fields['show_map']) && $extra_fields['show_map']) { ?>
 
-            <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
+            <div id="geodir_<?php echo $prefix.'map'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
                 <?php
                 /**
                  * Contains add listing page map functions.
                  *
                  * @since 1.0.0
                  */
-                include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");
+                include(geodir_plugin_path()."/geodirectory-functions/map-functions/map_on_add_listing_page.php");
                 if ($lat_lng_blank) {
                     $lat = '';
                     $lng = '';
@@ -1121,14 +1121,14 @@ 
             <?php
             /* show lat lng */
             $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>
-            <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"
+            <div id="geodir_<?php echo $prefix.'latitude'; ?>_row"
                  class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
                     <?php echo PLACE_ADDRESS_LAT; ?>
                     <?php if ($is_required) echo '<span>*</span>'; ?>
                 </label>
-                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'latitude'; ?>"
-                       id="<?php echo $prefix . 'latitude'; ?>" class="geodir_textfield"
+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'latitude'; ?>"
+                       id="<?php echo $prefix.'latitude'; ?>" class="geodir_textfield"
                        value="<?php echo esc_attr(stripslashes($lat)); ?>" size="25"/>
                 <span class="geodir_message_note"><?php echo GET_LATITUDE_MSG; ?></span>
                 <?php if ($is_required) { ?>
@@ -1136,14 +1136,14 @@ 
                 <?php } ?>
             </div>
 
-            <div id="geodir_<?php echo $prefix . 'longitude'; ?>_row"
+            <div id="geodir_<?php echo $prefix.'longitude'; ?>_row"
                  class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
                     <?php echo PLACE_ADDRESS_LNG; ?>
                     <?php if ($is_required) echo '<span>*</span>'; ?>
                 </label>
-                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'longitude'; ?>"
-                       id="<?php echo $prefix . 'longitude'; ?>" class="geodir_textfield"
+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix.'longitude'; ?>"
+                       id="<?php echo $prefix.'longitude'; ?>" class="geodir_textfield"
                        value="<?php echo esc_attr(stripslashes($lng)); ?>" size="25"/>
                 <span class="geodir_message_note"><?php echo GET_LOGNGITUDE_MSG; ?></span>
                 <?php if ($is_required) { ?>
@@ -1153,32 +1153,32 @@ 
         <?php } ?>
 
         <?php if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) { ?>
-            <div id="geodir_<?php echo $prefix . 'mapview'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
+            <div id="geodir_<?php echo $prefix.'mapview'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
                 <label><?php _e($mapview_title, 'geodirectory'); ?></label>
 
 
                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
-                                                            name="<?php echo $prefix . 'mapview'; ?>"
-                                                            id="<?php echo $prefix . 'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {
+                                                            name="<?php echo $prefix.'mapview'; ?>"
+                                                            id="<?php echo $prefix.'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {
                             echo 'checked="checked"';
                         } ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>
                     <span class="geodir_user_define"> <input field_type="<?php echo $type; ?>" type="radio"
                                                              class="gd-checkbox"
-                                                             name="<?php echo $prefix . 'mapview'; ?>"
+                                                             name="<?php echo $prefix.'mapview'; ?>"
                                                              id="map_view1" <?php if ($mapview == 'SATELLITE') {
                             echo 'checked="checked"';
                         } ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>
 
                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
-                                                            name="<?php echo $prefix . 'mapview'; ?>"
+                                                            name="<?php echo $prefix.'mapview'; ?>"
                                                             id="map_view2" <?php if ($mapview == 'HYBRID') {
                             echo 'checked="checked"';
                         } ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>
 					<span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
-                                                            name="<?php echo $prefix . 'mapview'; ?>"
+                                                            name="<?php echo $prefix.'mapview'; ?>"
                                                             id="map_view3" <?php if ($mapview == 'TERRAIN') {
                             echo 'checked="checked"';
                         } ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>
@@ -1190,7 +1190,7 @@ 
         <?php if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) { ?>
             <input type="hidden" value="<?php if (isset($mapzoom)) {
                 echo esc_attr($mapzoom);
-            } ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>
+            } ?>" name="<?php echo $prefix.'mapzoom'; ?>" id="<?php echo $prefix.'mapzoom'; ?>"/>
         <?php }
 
         $html = ob_get_clean();
@@ -1198,7 +1198,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_address','geodir_cfi_address',10,2);
+add_filter('geodir_custom_field_input_address', 'geodir_cfi_address', 10, 2);
 
 
 
@@ -1211,12 +1211,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_taxonomy($html,$cf){
+function geodir_cfi_taxonomy($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_taxonomy_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_taxonomy_{$html_var}")) {
         /**
          * Filter the taxonomy html by individual custom field.
          *
@@ -1224,11 +1224,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_taxonomy_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_taxonomy_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -1243,15 +1243,15 @@ 
         if ($value == $cf['default']) {
             $value = '';
         } ?>
-        <div id="<?php echo $name;?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $name; ?>_row"
+             class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($site_title, 'geodirectory');
                 echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
-                <?php if ($is_required) echo '<span>*</span>';?>
+                <?php if ($is_required) echo '<span>*</span>'; ?>
             </label>
 
-            <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">
+            <div id="<?php echo $name; ?>" class="geodir_taxonomy_field" style="float:left; width:70%;">
                 <?php
                 global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;
 
@@ -1263,7 +1263,7 @@ 
 
                     $package_info = array();
 
-                    $package_info = (array)geodir_post_package_info($package_info, $post, $post_type);
+                    $package_info = (array) geodir_post_package_info($package_info, $post, $post_type);
 
                     if (!empty($package_info)) {
 
@@ -1292,7 +1292,7 @@ 
 
                     $catadd_limit = $wpdb->get_var(
                         $wpdb->prepare(
-                            "SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",
+                            "SELECT cat_limit FROM ".GEODIR_PRICE_TABLE." WHERE pid = %d",
                             array($package_id)
                         )
                     );
@@ -1308,13 +1308,13 @@ 
                     $required_limit_msg = '';
                     if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {
 
-                        $required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');
+                        $required_limit_msg = __('Only select', 'geodirectory').' '.$catadd_limit.__(' categories for this package.', 'geodirectory');
 
                     } else {
                         $required_limit_msg = $required_msg;
                     }
 
-                    echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';
+                    echo '<input type="hidden" cat_limit="'.$catadd_limit.'" id="cat_limit" value="'.esc_attr($required_limit_msg).'" name="cat_limit['.$name.']"  />';
 
 
                     if ($cat_display == 'select' || $cat_display == 'multiselect') {
@@ -1324,11 +1324,11 @@ 
                         if ($cat_display == 'multiselect')
                             $multiple = 'multiple="multiple"';
 
-                        echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';
+                        echo '<select id="'.$name.'" '.$multiple.' type="'.$name.'" name="post_category['.$name.'][]" alt="'.$name.'" field_type="'.$cat_display.'" class="geodir_textfield textfield_x chosen_select" data-placeholder="'.__('Select Category', 'geodirectory').'">';
 
 
                         if ($cat_display == 'select')
-                            echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+                            echo '<option value="">'.__('Select Category', 'geodirectory').'</option>';
 
                     }
 
@@ -1346,7 +1346,7 @@ 
                 ?>
             </div>
 
-            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>
+            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>
             <?php if ($is_required) { ?>
                 <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>
             <?php } ?>
@@ -1358,7 +1358,7 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_taxonomy','geodir_cfi_taxonomy',10,2);
+add_filter('geodir_custom_field_input_taxonomy', 'geodir_cfi_taxonomy', 10, 2);
 
 
 /**
@@ -1370,12 +1370,12 @@ 
  *
  * @return string The html to output for the custom field.
  */
-function geodir_cfi_file($html,$cf){
+function geodir_cfi_file($html, $cf) {
 
     $html_var = $cf['htmlvar_name'];
 
     // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_file_{$html_var}")){
+    if (has_filter("geodir_custom_field_input_file_{$html_var}")) {
         /**
          * Filter the file html by individual custom field.
          *
@@ -1383,11 +1383,11 @@ 
          * @param array $cf The custom field array.
          * @since 1.6.6
          */
-        $html = apply_filters("geodir_custom_field_input_file_{$html_var}",$html,$cf);
+        $html = apply_filters("geodir_custom_field_input_file_{$html_var}", $html, $cf);
     }
 
     // If no html then we run the standard output.
-    if(empty($html)) {
+    if (empty($html)) {
 
         ob_start(); // Start  buffering;
         $value = geodir_get_cf_value($cf);
@@ -1430,8 +1430,8 @@ 
                 $file_totImg = count($curImages);
         }
 
-        $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';
-        $display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';
+        $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? implode(",", $extra_fields['gd_file_types']) : '';
+        $display_file_types = $allowed_file_types != '' ? '.'.implode(", .", $extra_fields['gd_file_types']) : '';
 
         ?>
         <?php /*?> <h5 class="geodir-form_title"> <?php echo $site_title; ?>
@@ -1441,13 +1441,13 @@ 
 			</h5>   <?php */
         ?>
 
-        <div id="<?php echo $name;?>_row"
-             class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
+        <div id="<?php echo $name; ?>_row"
+             class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
 
             <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">
                 <label
                     style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');
-                    echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>
+                    echo $site_title; ?><?php if ($is_required) echo '<span>*</span>'; ?></label>
                 <input class="geodir-custom-file-upload" field_type="file" type="hidden"
                        name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"
                        value="<?php echo esc_attr($file_value); ?>"/>
@@ -1455,7 +1455,7 @@ 
                        id="<?php echo $file_id; ?>image_limit" value="<?php echo $file_image_limit; ?>"/>
                 <?php if ($allowed_file_types != '') { ?>
                     <input type="hidden" name="<?php echo $file_id; ?>_allowed_types"
-                           id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types);?>"/>
+                           id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types); ?>"/>
                 <?php } ?>
                 <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"
                        value="<?php if (isset($file_totImg)) {
@@ -1471,10 +1471,10 @@ 
                         <?php /*?><h4><?php _e('Drop files to upload');?></h4><br/><?php */
                         ?>
                         <input id="<?php echo $file_id; ?>plupload-browse-button" type="button"
-                               value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory') ); ?>"
+                               value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory')); ?>"
                                class="geodir_button" style="margin-top:10px;"/>
                             <span class="ajaxnonceplu"
-                                  id="ajaxnonceplu<?php echo wp_create_nonce($file_id . 'pluploadan'); ?>"></span>
+                                  id="ajaxnonceplu<?php echo wp_create_nonce($file_id.'pluploadan'); ?>"></span>
                         <?php if ($file_width && $file_height): ?>
                             <span class="plupload-resize"></span>
                             <span class="plupload-width" id="plupload-width<?php echo $file_width; ?>"></span>
@@ -1494,7 +1494,7 @@ 
 
                 </div>
             </div>
-            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?> <?php echo ( $display_file_types != '' ? __('Allowed file types:', 'geodirectory') . ' ' . $display_file_types : '' );?></span>
+            <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?> <?php echo ($display_file_types != '' ? __('Allowed file types:', 'geodirectory').' '.$display_file_types : ''); ?></span>
             <?php if ($is_required) { ?>
                 <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>
             <?php } ?>
@@ -1507,4 +1507,4 @@ 
 
     return $html;
 }
-add_filter('geodir_custom_field_input_file','geodir_cfi_file',10,2);
\ No newline at end of file
+add_filter('geodir_custom_field_input_file', 'geodir_cfi_file', 10, 2);
\ No newline at end of file

Indentation +709 added lines, -709 removed lines

@@ -19,35 +19,35 @@ 
  */
 function geodir_cfi_fieldset($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_fieldset_{$html_var}")){
-        /**
-         * Filter the fieldset html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_fieldset_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        ob_start(); // Start  buffering;
-        ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_fieldset_{$html_var}")){
+		/**
+		 * Filter the fieldset html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_fieldset_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		ob_start(); // Start  buffering;
+		?>
         <h5 id="geodir_fieldset_<?php echo (int) $cf['id']; ?>" class="geodir-fieldset-row"
             gd-fieldset="<?php echo (int) $cf['id']; ?>"><?php echo __( $cf['site_title'], 'geodirectory' ); ?>
             <?php if ( $cf['desc'] != '' ) {
-                echo '<small>( ' . __( $cf['desc'], 'geodirectory' ) . ' )</small>';
-            } ?></h5>
+				echo '<small>( ' . __( $cf['desc'], 'geodirectory' ) . ' )</small>';
+			} ?></h5>
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_fieldset','geodir_cfi_fieldset',10,2);
 
@@ -64,47 +64,47 @@ 
  */
 function geodir_cfi_text($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_text_{$html_var}")){
-        /**
-         * Filter the text html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_text_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        ob_start(); // Start  buffering;
-
-        $value = geodir_get_cf_value($cf);
-        $type = $cf['type'];
-        //number and float validation $validation_pattern
-        if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';}
-        elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
-
-        //validation
-        if(isset($cf['validation_pattern']) && $cf['validation_pattern']){
-            $validation = 'pattern="'.$cf['validation_pattern'].'"';
-        }else{$validation='';}
-
-        // validation message
-        if(isset($cf['validation_msg']) && $cf['validation_msg']){
-            $validation_msg = 'title="'.$cf['validation_msg'].'"';
-        }else{$validation_msg='';}
-        ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_text_{$html_var}")){
+		/**
+		 * Filter the text html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_text_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		ob_start(); // Start  buffering;
+
+		$value = geodir_get_cf_value($cf);
+		$type = $cf['type'];
+		//number and float validation $validation_pattern
+		if(isset($cf['data_type']) && $cf['data_type']=='INT'){$type = 'number';}
+		elseif(isset($cf['data_type']) && $cf['data_type']=='FLOAT'){$type = 'float';}
+
+		//validation
+		if(isset($cf['validation_pattern']) && $cf['validation_pattern']){
+			$validation = 'pattern="'.$cf['validation_pattern'].'"';
+		}else{$validation='';}
+
+		// validation message
+		if(isset($cf['validation_msg']) && $cf['validation_msg']){
+			$validation_msg = 'title="'.$cf['validation_msg'].'"';
+		}else{$validation_msg='';}
+		?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input field_type="<?php echo $type;?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
@@ -116,10 +116,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_text','geodir_cfi_text',10,2);
 
@@ -135,35 +135,35 @@ 
  */
 function geodir_cfi_email($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_email_{$html_var}")){
-        /**
-         * Filter the email html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_email_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_email_{$html_var}")){
+		/**
+		 * Filter the email html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_email_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        if ($value == $cf['default']) {
-            $value = '';
-        }?>
+		if ($value == $cf['default']) {
+			$value = '';
+		}?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
@@ -175,10 +175,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_email','geodir_cfi_email',10,2);
 
@@ -195,35 +195,35 @@ 
  */
 function geodir_cfi_phone($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_phone_{$html_var}")){
-        /**
-         * Filter the phone html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_phone_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_phone_{$html_var}")){
+		/**
+		 * Filter the phone html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_phone_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        if ($value == $cf['default']) {
-            $value = '';
-        }?>
+		if ($value == $cf['default']) {
+			$value = '';
+		}?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php  echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
@@ -235,10 +235,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_phone','geodir_cfi_phone',10,2);
 
@@ -255,35 +255,35 @@ 
  */
 function geodir_cfi_url($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_url_{$html_var}")){
-        /**
-         * Filter the url html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_url_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_url_{$html_var}")){
+		/**
+		 * Filter the url html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_url_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        if ($value == $cf['default']) {
-            $value = '';
-        }?>
+		if ($value == $cf['default']) {
+			$value = '';
+		}?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
@@ -298,10 +298,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_url','geodir_cfi_url',10,2);
 
@@ -317,48 +317,48 @@ 
  */
 function geodir_cfi_radio($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_radio_{$html_var}")){
-        /**
-         * Filter the radio html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_radio_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_radio_{$html_var}")){
+		/**
+		 * Filter the radio html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_radio_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        ?>
+		?>
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <?php if ($cf['option_values']) {
-                $option_values = geodir_string_values_to_options($cf['option_values'], true);
+				$option_values = geodir_string_values_to_options($cf['option_values'], true);
 
-                if (!empty($option_values)) {
-                    foreach ($option_values as $option_value) {
-                        if (empty($option_value['optgroup'])) {
-                            ?>
+				if (!empty($option_values)) {
+					foreach ($option_values as $option_value) {
+						if (empty($option_value['optgroup'])) {
+							?>
                             <span class="gd-radios"><input name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>" <?php checked($value, $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="radio" /><?php echo $option_value['label']; ?></span>
                             <?php
-                        }
-                    }
-                }
-            }
-            ?>
+						}
+					}
+				}
+			}
+			?>
             <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
             <?php if ($cf['is_required']) { ?>
                 <span class="geodir_message_error"><?php _e($cf['required_msg'], 'geodirectory'); ?></span>
@@ -366,10 +366,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_radio','geodir_cfi_radio',10,2);
 
@@ -385,46 +385,46 @@ 
  */
 function geodir_cfi_checkbox($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_checkbox_{$html_var}")){
-        /**
-         * Filter the checkbox html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_checkbox_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_checkbox_{$html_var}")){
+		/**
+		 * Filter the checkbox html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_checkbox_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
 
-        if ($value == '' && $cf['default']) {
-            $value = '1';
-        }
-        ?>
+		if ($value == '' && $cf['default']) {
+			$value = '1';
+		}
+		?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <?php if ($value != '1') {
-                $value = '0';
-            }?>
+				$value = '0';
+			}?>
             <input type="hidden" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>" value="<?php echo esc_attr($value);?>"/>
             <input  <?php if ($value == '1') {
-                echo 'checked="checked"';
-            }?>  value="1" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="checkbox"
+				echo 'checked="checked"';
+			}?>  value="1" class="gd-checkbox" field_type="<?php echo $cf['type'];?>" type="checkbox"
                  onchange="if(this.checked){jQuery('#<?php echo $cf['name'];?>').val('1');} else{ jQuery('#<?php echo $cf['name'];?>').val('0');}"/>
             <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
             <?php if ($cf['is_required']) { ?>
@@ -433,10 +433,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_checkbox','geodir_cfi_checkbox',10,2);
 
@@ -452,52 +452,52 @@ 
  */
 function geodir_cfi_textarea($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_textarea_{$html_var}")){
-        /**
-         * Filter the textarea html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_textarea_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_textarea_{$html_var}")){
+		/**
+		 * Filter the textarea html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_textarea_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        $extra_fields = unserialize($cf['extra_fields']);
-        ?>
+		$extra_fields = unserialize($cf['extra_fields']);
+		?>
 
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label><?php
 
 
-            if (is_array($extra_fields) && in_array('1', $extra_fields)) {
+			if (is_array($extra_fields) && in_array('1', $extra_fields)) {
 
-                $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>
+				$editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>
 
             <div class="editor" field_id="<?php echo $cf['name'];?>" field_type="editor">
                 <?php wp_editor(stripslashes($value), $cf['name'], $editor_settings); ?>
                 </div><?php
 
-            } else {
+			} else {
 
-                ?><textarea field_type="<?php echo $cf['type'];?>" class="geodir_textarea" name="<?php echo $cf['name'];?>"
+				?><textarea field_type="<?php echo $cf['type'];?>" class="geodir_textarea" name="<?php echo $cf['name'];?>"
                             id="<?php echo $cf['name'];?>"><?php echo stripslashes($value);?></textarea><?php
 
-            }?>
+			}?>
 
 
             <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory');?></span>
@@ -507,10 +507,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_textarea','geodir_cfi_textarea',10,2);
 
@@ -526,53 +526,53 @@ 
  */
 function geodir_cfi_select($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_select_{$html_var}")){
-        /**
-         * Filter the select html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_select_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_select_{$html_var}")){
+		/**
+		 * Filter the select html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_select_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        ?>
+		?>
         <div id="<?php echo $cf['name'];?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <?php
-            $option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
-            $select_options = '';
-            if (!empty($option_values_arr)) {
-                foreach ($option_values_arr as $option_row) {
-                    if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
-                        $option_label = isset($option_row['label']) ? $option_row['label'] : '';
-
-                        $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
-                    } else {
-                        $option_label = isset($option_row['label']) ? $option_row['label'] : '';
-                        $option_value = isset($option_row['value']) ? $option_row['value'] : '';
-                        $selected = $option_value == $value ? 'selected="selected"' : '';
-
-                        $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
-                    }
-                }
-            }
-            ?>
+			$option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
+			$select_options = '';
+			if (!empty($option_values_arr)) {
+				foreach ($option_values_arr as $option_row) {
+					if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
+						$option_label = isset($option_row['label']) ? $option_row['label'] : '';
+
+						$select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+					} else {
+						$option_label = isset($option_row['label']) ? $option_row['label'] : '';
+						$option_value = isset($option_row['value']) ? $option_row['value'] : '';
+						$selected = $option_value == $value ? 'selected="selected"' : '';
+
+						$select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+					}
+				}
+			}
+			?>
             <select field_type="<?php echo $cf['type'];?>" name="<?php echo $cf['name'];?>" id="<?php echo $cf['name'];?>"
                     class="geodir_textfield textfield_x chosen_select"
                     data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;';?>"
@@ -584,10 +584,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_select','geodir_cfi_select',10,2);
 
@@ -603,36 +603,36 @@ 
  */
 function geodir_cfi_multiselect($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_multiselect_{$html_var}")){
-        /**
-         * Filter the multiselect html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_multiselect_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
-
-        $multi_display = 'select';
-        if (!empty($cf['extra_fields'])) {
-            $multi_display = unserialize($cf['extra_fields']);
-        }
-        ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_multiselect_{$html_var}")){
+		/**
+		 * Filter the multiselect html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_multiselect_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
+
+		$multi_display = 'select';
+		if (!empty($cf['extra_fields'])) {
+			$multi_display = unserialize($cf['extra_fields']);
+		}
+		?>
         <div id="<?php echo $cf['name']; ?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
             <input type="hidden" name="gd_field_<?php echo $cf['name']; ?>" value="1"/>
@@ -643,61 +643,61 @@ 
                         data-placeholder="<?php _e('Select', 'geodirectory'); ?>"
                         option-ajaxchosen="false">
                     <?php
-                    } else {
-                        echo '<ul class="gd_multi_choice">';
-                    }
-
-                    $option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
-                    $select_options = '';
-                    if (!empty($option_values_arr)) {
-                        foreach ($option_values_arr as $option_row) {
-                            if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
-                                $option_label = isset($option_row['label']) ? $option_row['label'] : '';
-
-                                if ($multi_display == 'select') {
-                                    $select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
-                                } else {
-                                    $select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';
-                                }
-                            } else {
-                                if (!is_array($value) && $value != '') {
-                                    $value = trim($value);
-                                }
+					} else {
+						echo '<ul class="gd_multi_choice">';
+					}
+
+					$option_values_arr = geodir_string_values_to_options($cf['option_values'], true);
+					$select_options = '';
+					if (!empty($option_values_arr)) {
+						foreach ($option_values_arr as $option_row) {
+							if (isset($option_row['optgroup']) && ($option_row['optgroup'] == 'start' || $option_row['optgroup'] == 'end')) {
+								$option_label = isset($option_row['label']) ? $option_row['label'] : '';
+
+								if ($multi_display == 'select') {
+									$select_options .= $option_row['optgroup'] == 'start' ? '<optgroup label="' . esc_attr($option_label) . '">' : '</optgroup>';
+								} else {
+									$select_options .= $option_row['optgroup'] == 'start' ? '<li>' . $option_label . '</li>' : '';
+								}
+							} else {
+								if (!is_array($value) && $value != '') {
+									$value = trim($value);
+								}
                                 
-                                $option_label = isset($option_row['label']) ? $option_row['label'] : '';
-                                $option_value = isset($option_row['value']) ? $option_row['value'] : '';
-                                $selected = $option_value == $value ? 'selected="selected"' : '';
-                                $selected = '';
-                                $checked = '';
-
-                                if ((!is_array($value) && trim($value) != '') || (is_array($value) && !empty($value))) {
-                                    if (!is_array($value)) {
-                                        $value_array = explode(',', $value);
-                                    } else {
-                                        $value_array = $value;
-                                    }
-
-                                    if (is_array($value_array)) {
-                                        $value_array = array_map('trim', $value_array);
+								$option_label = isset($option_row['label']) ? $option_row['label'] : '';
+								$option_value = isset($option_row['value']) ? $option_row['value'] : '';
+								$selected = $option_value == $value ? 'selected="selected"' : '';
+								$selected = '';
+								$checked = '';
+
+								if ((!is_array($value) && trim($value) != '') || (is_array($value) && !empty($value))) {
+									if (!is_array($value)) {
+										$value_array = explode(',', $value);
+									} else {
+										$value_array = $value;
+									}
+
+									if (is_array($value_array)) {
+										$value_array = array_map('trim', $value_array);
                                         
-                                        if (in_array($option_value, $value_array)) {
-                                            $selected = 'selected="selected"';
-                                            $checked = 'checked="checked"';
-                                        }
-                                    }
-                                }
-
-                                if ($multi_display == 'select') {
-                                    $select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
-                                } else {
-                                    $select_options .= '<li><input name="' . $cf['name'] . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';
-                                }
-                            }
-                        }
-                    }
-                    echo $select_options;
-
-                    if ($multi_display == 'select') { ?></select></div>
+										if (in_array($option_value, $value_array)) {
+											$selected = 'selected="selected"';
+											$checked = 'checked="checked"';
+										}
+									}
+								}
+
+								if ($multi_display == 'select') {
+									$select_options .= '<option value="' . esc_attr($option_value) . '" ' . $selected . '>' . $option_label . '</option>';
+								} else {
+									$select_options .= '<li><input name="' . $cf['name'] . '[]" ' . $checked . ' value="' . esc_attr($option_value) . '" class="gd-' . $multi_display . '" field_type="' . $multi_display . '" type="' . $multi_display . '" />&nbsp;' . $option_label . ' </li>';
+								}
+							}
+						}
+					}
+					echo $select_options;
+
+					if ($multi_display == 'select') { ?></select></div>
         <?php } else { ?></ul><?php } ?>
             <span class="geodir_message_note"><?php _e($cf['desc'], 'geodirectory'); ?></span>
             <?php if ($cf['is_required']) { ?>
@@ -705,10 +705,10 @@ 
             <?php } ?>
         </div>
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_multiselect','geodir_cfi_multiselect',10,2);
 
@@ -724,32 +724,32 @@ 
  */
 function geodir_cfi_html($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_html_{$html_var}")){
-        /**
-         * Filter the html html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_html_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_html_{$html_var}")){
+		/**
+		 * Filter the html html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_html_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
-        ?>
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
+		?>
 
         <div id="<?php echo $cf['name']; ?>_row"
              class="<?php if ($cf['is_required']) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>'; ?>
             </label>
 
@@ -767,10 +767,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_html','geodir_cfi_html',10,2);
 
@@ -787,68 +787,68 @@ 
  */
 function geodir_cfi_datepicker($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_datepicker_{$html_var}")){
-        /**
-         * Filter the datepicker html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_datepicker_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_datepicker_{$html_var}")){
+		/**
+		 * Filter the datepicker html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_datepicker_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        $extra_fields = unserialize($cf['extra_fields']);
-        $name = $cf['name'];
+		$extra_fields = unserialize($cf['extra_fields']);
+		$name = $cf['name'];
 
-        if ($extra_fields['date_format'] == '')
-            $extra_fields['date_format'] = 'yy-mm-dd';
+		if ($extra_fields['date_format'] == '')
+			$extra_fields['date_format'] = 'yy-mm-dd';
 
-        $date_format = $extra_fields['date_format'];
-        $jquery_date_format  = $date_format;
+		$date_format = $extra_fields['date_format'];
+		$jquery_date_format  = $date_format;
 
 
-        // check if we need to change the format or not
-        $date_format_len = strlen(str_replace(' ', '', $date_format));
-        if($date_format_len>5){// if greater then 5 then it's the old style format.
+		// check if we need to change the format or not
+		$date_format_len = strlen(str_replace(' ', '', $date_format));
+		if($date_format_len>5){// if greater then 5 then it's the old style format.
 
-            $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
-            $replace = array('d','j','l','m','n','F','Y');//PHP date format
+			$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format
+			$replace = array('d','j','l','m','n','F','Y');//PHP date format
 
-            $date_format = str_replace($search, $replace, $date_format);
-        }else{
-            $jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );
-        }
+			$date_format = str_replace($search, $replace, $date_format);
+		}else{
+			$jquery_date_format = geodir_date_format_php_to_jqueryui( $jquery_date_format );
+		}
 
-        if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty
-        if($value && !isset($_REQUEST['backandedit'])) {
-            //$time = strtotime($value);
-            //$value = date_i18n($date_format, $time);
-        }
-        $value = geodir_date($value, 'Y-m-d', $date_format);
+		if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty
+		if($value && !isset($_REQUEST['backandedit'])) {
+			//$time = strtotime($value);
+			//$value = date_i18n($date_format, $time);
+		}
+		$value = geodir_date($value, 'Y-m-d', $date_format);
 
-        ?>
+		?>
         <script type="text/javascript">
 
             jQuery(function () {
 
                 jQuery("#<?php echo $cf['name'];?>").datepicker({changeMonth: true, changeYear: true <?php
-                    /**
-                     * Used to add extra option to datepicker per custom field.
-                     *
-                     * @since 1.5.7
-                     * @param string $name The custom field name.
-                     */
-                    echo apply_filters("gd_datepicker_extra_{$name}",'');?>});
+					/**
+					 * Used to add extra option to datepicker per custom field.
+					 *
+					 * @since 1.5.7
+					 * @param string $name The custom field name.
+					 */
+					echo apply_filters("gd_datepicker_extra_{$name}",'');?>});
 
                 jQuery("#<?php echo $name;?>").datepicker("option", "dateFormat", '<?php echo $jquery_date_format;?>');
 
@@ -864,7 +864,7 @@ 
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
 
@@ -878,10 +878,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_datepicker','geodir_cfi_datepicker',10,2);
 
@@ -897,31 +897,31 @@ 
  */
 function geodir_cfi_time($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_time_{$html_var}")){
-        /**
-         * Filter the time html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_time_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_time_{$html_var}")){
+		/**
+		 * Filter the time html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_time_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        $name = $cf['name'];
+		$name = $cf['name'];
 
-        if ($value != '')
-            $value = date('H:i', strtotime($value));
-        ?>
+		if ($value != '')
+			$value = date('H:i', strtotime($value));
+		?>
         <script type="text/javascript">
             jQuery(document).ready(function () {
 
@@ -937,7 +937,7 @@ 
             <label>
 
                 <?php $site_title = __($cf['site_title'], 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($cf['is_required']) echo '<span>*</span>';?>
             </label>
             <input readonly="readonly" field_type="<?php echo $cf['type'];?>" name="<?php echo $name;?>"
@@ -949,10 +949,10 @@ 
             <?php } ?>
         </div>
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_time','geodir_cfi_time',10,2);
 
@@ -968,100 +968,100 @@ 
  */
 function geodir_cfi_address($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_address_{$html_var}")){
-        /**
-         * Filter the address html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_address_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        global $gd_session;
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
-        $name = $cf['name'];
-        $type = $cf['type'];
-        $admin_desc = $cf['desc'];
-        $is_required = $cf['is_required'];
-        $required_msg = $cf['required_msg'];
-        $site_title = $cf['site_title'];
-        $is_admin = $cf['is_admin'];
-        $extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
-        $prefix = $name . '_';
-
-        ($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');
-        ($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');
-        ($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');
-        ($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');
-
-        $address = '';
-        $zip = '';
-        $mapview = '';
-        $mapzoom = '';
-        $lat = '';
-        $lng = '';
-
-        if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
-            $post = $gd_ses_listing;
-            $address = $post[$prefix . 'address'];
-            $zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';
-            $lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';
-            $lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';
-            $mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';
-            $mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';
-        } else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {
-            $post_info = (array)$post_info;
-
-            $address = $post_info[$prefix . 'address'];
-            $zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';
-            $lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';
-            $lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';
-            $mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';
-            $mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';
-        }
-
-        $location = geodir_get_default_location();
-        if (empty($city)) $city = isset($location->city) ? $location->city : '';
-        if (empty($region)) $region = isset($location->region) ? $location->region : '';
-        if (empty($country)) $country = isset($location->country) ? $location->country : '';
-
-        $lat_lng_blank = false;
-        if (empty($lat) && empty($lng)) {
-            $lat_lng_blank = true;
-        }
-
-        if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';
-        if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';
-
-        /**
-         * Filter the default latitude.
-         *
-         * @since 1.0.0
-         *
-         * @param float $lat Default latitude.
-         * @param bool $is_admin For admin use only?.
-         */
-        $lat = apply_filters('geodir_default_latitude', $lat, $is_admin);
-        /**
-         * Filter the default longitude.
-         *
-         * @since 1.0.0
-         *
-         * @param float $lat Default longitude.
-         * @param bool $is_admin For admin use only?.
-         */
-        $lng = apply_filters('geodir_default_longitude', $lng, $is_admin);
-
-        ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_address_{$html_var}")){
+		/**
+		 * Filter the address html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_address_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		global $gd_session;
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
+		$name = $cf['name'];
+		$type = $cf['type'];
+		$admin_desc = $cf['desc'];
+		$is_required = $cf['is_required'];
+		$required_msg = $cf['required_msg'];
+		$site_title = $cf['site_title'];
+		$is_admin = $cf['is_admin'];
+		$extra_fields = stripslashes_deep(unserialize($cf['extra_fields']));
+		$prefix = $name . '_';
+
+		($site_title != '') ? $address_title = $site_title : $address_title = geodir_ucwords($prefix . ' address');
+		($extra_fields['zip_lable'] != '') ? $zip_title = $extra_fields['zip_lable'] : $zip_title = geodir_ucwords($prefix . ' zip/post code ');
+		($extra_fields['map_lable'] != '') ? $map_title = $extra_fields['map_lable'] : $map_title = geodir_ucwords('set address on map');
+		($extra_fields['mapview_lable'] != '') ? $mapview_title = $extra_fields['mapview_lable'] : $mapview_title = geodir_ucwords($prefix . ' mapview');
+
+		$address = '';
+		$zip = '';
+		$mapview = '';
+		$mapzoom = '';
+		$lat = '';
+		$lng = '';
+
+		if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {
+			$post = $gd_ses_listing;
+			$address = $post[$prefix . 'address'];
+			$zip = isset($post[$prefix . 'zip']) ? $post[$prefix . 'zip'] : '';
+			$lat = isset($post[$prefix . 'latitude']) ? $post[$prefix . 'latitude'] : '';
+			$lng = isset($post[$prefix . 'longitude']) ? $post[$prefix . 'longitude'] : '';
+			$mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';
+			$mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';
+		} else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {
+			$post_info = (array)$post_info;
+
+			$address = $post_info[$prefix . 'address'];
+			$zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';
+			$lat = isset($post_info[$prefix . 'latitude']) ? $post_info[$prefix . 'latitude'] : '';
+			$lng = isset($post_info[$prefix . 'longitude']) ? $post_info[$prefix . 'longitude'] : '';
+			$mapview = isset($post_info[$prefix . 'mapview']) ? $post_info[$prefix . 'mapview'] : '';
+			$mapzoom = isset($post_info[$prefix . 'mapzoom']) ? $post_info[$prefix . 'mapzoom'] : '';
+		}
+
+		$location = geodir_get_default_location();
+		if (empty($city)) $city = isset($location->city) ? $location->city : '';
+		if (empty($region)) $region = isset($location->region) ? $location->region : '';
+		if (empty($country)) $country = isset($location->country) ? $location->country : '';
+
+		$lat_lng_blank = false;
+		if (empty($lat) && empty($lng)) {
+			$lat_lng_blank = true;
+		}
+
+		if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';
+		if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';
+
+		/**
+		 * Filter the default latitude.
+		 *
+		 * @since 1.0.0
+		 *
+		 * @param float $lat Default latitude.
+		 * @param bool $is_admin For admin use only?.
+		 */
+		$lat = apply_filters('geodir_default_latitude', $lat, $is_admin);
+		/**
+		 * Filter the default longitude.
+		 *
+		 * @since 1.0.0
+		 *
+		 * @param float $lat Default longitude.
+		 * @param bool $is_admin For admin use only?.
+		 */
+		$lng = apply_filters('geodir_default_longitude', $lng, $is_admin);
+
+		?>
 
         <div id="geodir_<?php echo $prefix . 'address';?>_row"
              class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
@@ -1080,17 +1080,17 @@ 
 
 
         <?php
-        /**
-         * Called after the address input on the add listings.
-         *
-         * This is used by the location manage to add further locations info etc.
-         *
-         * @since 1.0.0
-         * @param array $cf The array of setting for the custom field. {@see geodir_custom_field_save()}.
-         */
-        do_action('geodir_address_extra_listing_fields', $cf);
-
-        if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>
+		/**
+		 * Called after the address input on the add listings.
+		 *
+		 * This is used by the location manage to add further locations info etc.
+		 *
+		 * @since 1.0.0
+		 * @param array $cf The array of setting for the custom field. {@see geodir_custom_field_save()}.
+		 */
+		do_action('geodir_address_extra_listing_fields', $cf);
+
+		if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>
 
             <div id="geodir_<?php echo $prefix . 'zip'; ?>_row"
                  class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix gd-fieldset-details">
@@ -1111,22 +1111,22 @@ 
 
             <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix gd-fieldset-details">
                 <?php
-                /**
-                 * Contains add listing page map functions.
-                 *
-                 * @since 1.0.0
-                 */
-                include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");
-                if ($lat_lng_blank) {
-                    $lat = '';
-                    $lng = '';
-                }
-                ?>
+				/**
+				 * Contains add listing page map functions.
+				 *
+				 * @since 1.0.0
+				 */
+				include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");
+				if ($lat_lng_blank) {
+					$lat = '';
+					$lng = '';
+				}
+				?>
                 <span class="geodir_message_note"><?php echo GET_MAP_MSG; ?></span>
             </div>
             <?php
-            /* show lat lng */
-            $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>
+			/* show lat lng */
+			$style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>
             <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"
                  class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix gd-fieldset-details" <?php echo $style_latlng; ?>>
                 <label>
@@ -1167,27 +1167,27 @@ 
                                                             class="gd-checkbox"
                                                             name="<?php echo $prefix . 'mapview'; ?>"
                                                             id="<?php echo $prefix . 'mapview'; ?>" <?php if ($mapview == 'ROADMAP' || $mapview == '') {
-                            echo 'checked="checked"';
-                        } ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>
+							echo 'checked="checked"';
+						} ?>  value="ROADMAP" size="25"/> <?php _e('Default Map', 'geodirectory'); ?></span>
                     <span class="geodir_user_define"> <input field_type="<?php echo $type; ?>" type="radio"
                                                              class="gd-checkbox"
                                                              name="<?php echo $prefix . 'mapview'; ?>"
                                                              id="map_view1" <?php if ($mapview == 'SATELLITE') {
-                            echo 'checked="checked"';
-                        } ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>
+							echo 'checked="checked"';
+						} ?> value="SATELLITE" size="25"/> <?php _e('Satellite Map', 'geodirectory'); ?></span>
 
                     <span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
                                                             name="<?php echo $prefix . 'mapview'; ?>"
                                                             id="map_view2" <?php if ($mapview == 'HYBRID') {
-                            echo 'checked="checked"';
-                        } ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>
+							echo 'checked="checked"';
+						} ?>  value="HYBRID" size="25"/> <?php _e('Hybrid Map', 'geodirectory'); ?></span>
 					<span class="geodir_user_define"><input field_type="<?php echo $type; ?>" type="radio"
                                                             class="gd-checkbox"
                                                             name="<?php echo $prefix . 'mapview'; ?>"
                                                             id="map_view3" <?php if ($mapview == 'TERRAIN') {
-                            echo 'checked="checked"';
-                        } ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>
+							echo 'checked="checked"';
+						} ?>  value="TERRAIN" size="25"/> <?php _e('Terrain Map', 'geodirectory'); ?></span>
 
 
             </div>
@@ -1195,14 +1195,14 @@ 
 
         <?php if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) { ?>
             <input type="hidden" value="<?php if (isset($mapzoom)) {
-                echo esc_attr($mapzoom);
-            } ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>
+				echo esc_attr($mapzoom);
+			} ?>" name="<?php echo $prefix . 'mapzoom'; ?>" id="<?php echo $prefix . 'mapzoom'; ?>"/>
         <?php }
 
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_address','geodir_cfi_address',10,2);
 
@@ -1219,137 +1219,137 @@ 
  */
 function geodir_cfi_taxonomy($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
-
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_taxonomy_{$html_var}")){
-        /**
-         * Filter the taxonomy html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_taxonomy_{$html_var}",$html,$cf);
-    }
-
-    // If no html then we run the standard output.
-    if(empty($html)) {
-
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
-
-        $name = $cf['name'];
-        $site_title = $cf['site_title'];
-        $admin_desc = $cf['desc'];
-        $is_required = $cf['is_required'];
-        $is_admin = $cf['is_admin'];
-        $required_msg = $cf['required_msg'];
-
-        if ($value == $cf['default']) {
-            $value = '';
-        } ?>
+	$html_var = $cf['htmlvar_name'];
+
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_taxonomy_{$html_var}")){
+		/**
+		 * Filter the taxonomy html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_taxonomy_{$html_var}",$html,$cf);
+	}
+
+	// If no html then we run the standard output.
+	if(empty($html)) {
+
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
+
+		$name = $cf['name'];
+		$site_title = $cf['site_title'];
+		$admin_desc = $cf['desc'];
+		$is_required = $cf['is_required'];
+		$is_admin = $cf['is_admin'];
+		$required_msg = $cf['required_msg'];
+
+		if ($value == $cf['default']) {
+			$value = '';
+		} ?>
         <div id="<?php echo $name;?>_row"
              class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
             <label>
                 <?php $site_title = __($site_title, 'geodirectory');
-                echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
+				echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>
                 <?php if ($is_required) echo '<span>*</span>';?>
             </label>
 
             <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">
                 <?php
-                global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;
+				global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;
 
-                $exclude_cats = array();
+				$exclude_cats = array();
 
-                if ($is_admin == '1') {
+				if ($is_admin == '1') {
 
-                    $post_type = get_post_type();
+					$post_type = get_post_type();
 
-                    $package_info = array();
+					$package_info = array();
 
-                    $package_info = (array)geodir_post_package_info($package_info, $post, $post_type);
+					$package_info = (array)geodir_post_package_info($package_info, $post, $post_type);
 
-                    if (!empty($package_info)) {
+					if (!empty($package_info)) {
 
-                        if (isset($package_info['cat']) && $package_info['cat'] != '') {
+						if (isset($package_info['cat']) && $package_info['cat'] != '') {
 
-                            $exclude_cats = explode(',', $package_info['cat']);
+							$exclude_cats = explode(',', $package_info['cat']);
 
-                        }
-                    }
-                }
+						}
+					}
+				}
 
-                $cat_display = unserialize($cf['extra_fields']);
+				$cat_display = unserialize($cf['extra_fields']);
 
-                if (isset($_REQUEST['backandedit']) && (is_array($post_cat[$name]) && !empty($post_cat[$name]))) {
+				if (isset($_REQUEST['backandedit']) && (is_array($post_cat[$name]) && !empty($post_cat[$name]))) {
 
-                    $post_cat = implode(",", $post_cat[$name]);
+					$post_cat = implode(",", $post_cat[$name]);
 
-                } else {
-                    if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
-                        $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
-                }
+				} else {
+					if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '')
+						$post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
+				}
 
 
-                global $geodir_addon_list;
-                if (!empty($geodir_addon_list) && array_key_exists('geodir_payment_manager', $geodir_addon_list) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {
+				global $geodir_addon_list;
+				if (!empty($geodir_addon_list) && array_key_exists('geodir_payment_manager', $geodir_addon_list) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {
 
-                    $catadd_limit = $wpdb->get_var(
-                        $wpdb->prepare(
-                            "SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",
-                            array($package_id)
-                        )
-                    );
+					$catadd_limit = $wpdb->get_var(
+						$wpdb->prepare(
+							"SELECT cat_limit FROM " . GEODIR_PRICE_TABLE . " WHERE pid = %d",
+							array($package_id)
+						)
+					);
 
 
-                } else {
-                    $catadd_limit = 0;
-                }
+				} else {
+					$catadd_limit = 0;
+				}
 
 
-                if ($cat_display != '' && $cat_display != 'ajax_chained') {
+				if ($cat_display != '' && $cat_display != 'ajax_chained') {
 
-                    $required_limit_msg = '';
-                    if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {
+					$required_limit_msg = '';
+					if ($catadd_limit > 0 && $cat_display != 'select' && $cat_display != 'radio') {
 
-                        $required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');
+						$required_limit_msg = __('Only select', 'geodirectory') . ' ' . $catadd_limit . __(' categories for this package.', 'geodirectory');
 
-                    } else {
-                        $required_limit_msg = $required_msg;
-                    }
+					} else {
+						$required_limit_msg = $required_msg;
+					}
 
-                    echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';
+					echo '<input type="hidden" cat_limit="' . $catadd_limit . '" id="cat_limit" value="' . esc_attr($required_limit_msg) . '" name="cat_limit[' . $name . ']"  />';
 
 
-                    if ($cat_display == 'select' || $cat_display == 'multiselect') {
+					if ($cat_display == 'select' || $cat_display == 'multiselect') {
 
-                        $cat_display == '';
-                        $multiple = '';
-                        if ($cat_display == 'multiselect')
-                            $multiple = 'multiple="multiple"';
+						$cat_display == '';
+						$multiple = '';
+						if ($cat_display == 'multiselect')
+							$multiple = 'multiple="multiple"';
 
-                        echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';
+						echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';
 
 
-                        if ($cat_display == 'select')
-                            echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+						if ($cat_display == 'select')
+							echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
 
-                    }
+					}
 
-                    echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);
+					echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);
 
-                    if ($cat_display == 'select' || $cat_display == 'multiselect')
-                        echo '</select>';
+					if ($cat_display == 'select' || $cat_display == 'multiselect')
+						echo '</select>';
 
-                } else {
+				} else {
 
-                    echo geodir_custom_taxonomy_walker2($name, $catadd_limit);
+					echo geodir_custom_taxonomy_walker2($name, $catadd_limit);
 
-                }
+				}
 
-                ?>
+				?>
             </div>
 
             <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>
@@ -1359,10 +1359,10 @@ 
         </div>
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_taxonomy','geodir_cfi_taxonomy',10,2);
 
@@ -1378,74 +1378,74 @@ 
  */
 function geodir_cfi_file($html,$cf){
 
-    $html_var = $cf['htmlvar_name'];
+	$html_var = $cf['htmlvar_name'];
 
-    // Check if there is a custom field specific filter.
-    if(has_filter("geodir_custom_field_input_file_{$html_var}")){
-        /**
-         * Filter the file html by individual custom field.
-         *
-         * @param string $html The html to filter.
-         * @param array $cf The custom field array.
-         * @since 1.6.6
-         */
-        $html = apply_filters("geodir_custom_field_input_file_{$html_var}",$html,$cf);
-    }
+	// Check if there is a custom field specific filter.
+	if(has_filter("geodir_custom_field_input_file_{$html_var}")){
+		/**
+		 * Filter the file html by individual custom field.
+		 *
+		 * @param string $html The html to filter.
+		 * @param array $cf The custom field array.
+		 * @since 1.6.6
+		 */
+		$html = apply_filters("geodir_custom_field_input_file_{$html_var}",$html,$cf);
+	}
 
-    // If no html then we run the standard output.
-    if(empty($html)) {
+	// If no html then we run the standard output.
+	if(empty($html)) {
 
-        ob_start(); // Start  buffering;
-        $value = geodir_get_cf_value($cf);
+		ob_start(); // Start  buffering;
+		$value = geodir_get_cf_value($cf);
 
-        $name = $cf['name'];
-        $site_title = $cf['site_title'];
-        $admin_desc = $cf['desc'];
-        $is_required = $cf['is_required'];
-        $required_msg = $cf['required_msg'];
-        $extra_fields = unserialize($cf['extra_fields']);
+		$name = $cf['name'];
+		$site_title = $cf['site_title'];
+		$admin_desc = $cf['desc'];
+		$is_required = $cf['is_required'];
+		$required_msg = $cf['required_msg'];
+		$extra_fields = unserialize($cf['extra_fields']);
 
 
-        // adjust values here
-        $file_id = $name; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls
+		// adjust values here
+		$file_id = $name; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls
 
-        if ($value != '') {
+		if ($value != '') {
 
-            $file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.
+			$file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.
 
-        } else
-            $file_value = '';
+		} else
+			$file_value = '';
 
-        if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])
-            $file_multiple = true; // allow multiple files upload
-        else
-            $file_multiple = false;
+		if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])
+			$file_multiple = true; // allow multiple files upload
+		else
+			$file_multiple = false;
 
-        if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])
-            $file_image_limit = $extra_fields['image_limit'];
-        else
-            $file_image_limit = 1;
+		if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])
+			$file_image_limit = $extra_fields['image_limit'];
+		else
+			$file_image_limit = 1;
 
-        $file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)
+		$file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)
 
-        $file_height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)
+		$file_height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)
 
-        if (!empty($file_value)) {
-            $curImages = explode(',', $file_value);
-            if (!empty($curImages))
-                $file_totImg = count($curImages);
-        }
+		if (!empty($file_value)) {
+			$curImages = explode(',', $file_value);
+			if (!empty($curImages))
+				$file_totImg = count($curImages);
+		}
 
-        $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';
-        $display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';
+		$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';
+		$display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';
 
-        ?>
+		?>
         <?php /*?> <h5 class="geodir-form_title"> <?php echo $site_title; ?>
 				 <?php if($file_image_limit!=0 && $file_image_limit==1 ){echo '<br /><small>('.__('You can upload').' '.$file_image_limit.' '.__('image with this package').')</small>';} ?>
 				 <?php if($file_image_limit!=0 && $file_image_limit>1 ){echo '<br /><small>('.__('You can upload').' '.$file_image_limit.' '.__('images with this package').')</small>';} ?>
 				 <?php if($file_image_limit==0){echo '<br /><small>('.__('You can upload unlimited images with this package').')</small>';} ?>
 			</h5>   <?php */
-        ?>
+		?>
 
         <div id="<?php echo $name;?>_row"
              class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix gd-fieldset-details">
@@ -1453,7 +1453,7 @@ 
             <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">
                 <label
                     style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');
-                    echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>
+					echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>
                 <input class="geodir-custom-file-upload" field_type="file" type="hidden"
                        name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"
                        value="<?php echo esc_attr($file_value); ?>"/>
@@ -1465,17 +1465,17 @@ 
                 <?php } ?>
                 <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"
                        value="<?php if (isset($file_totImg)) {
-                           echo esc_attr($file_totImg);
-                       } else {
-                           echo '0';
-                       } ?>"/>
+						   echo esc_attr($file_totImg);
+					   } else {
+						   echo '0';
+					   } ?>"/>
 
                 <div style="float:left; width:55%;">
                     <div
                         class="plupload-upload-uic hide-if-no-js <?php if ($file_multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"
                         id="<?php echo $file_id; ?>plupload-upload-ui" style="float:left; width:30%;">
                         <?php /*?><h4><?php _e('Drop files to upload');?></h4><br/><?php */
-                        ?>
+						?>
                         <input id="<?php echo $file_id; ?>plupload-browse-button" type="button"
                                value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory') ); ?>"
                                class="geodir_button" style="margin-top:10px;"/>
@@ -1494,7 +1494,7 @@ 
                         style=" clear:inherit; margin-top:0; margin-left:15px; padding-top:10px; float:left; width:50%;">
                     </div>
                     <?php /*?><span id="upload-msg" ><?php _e('Please drag &amp; drop the images to rearrange the order');?></span><?php */
-                    ?>
+					?>
 
                     <span id="<?php echo $file_id; ?>upload-error" style="display:none"></span>
 
@@ -1508,9 +1508,9 @@ 
 
 
         <?php
-        $html = ob_get_clean();
-    }
+		$html = ob_get_clean();
+	}
 
-    return $html;
+	return $html;
 }
 add_filter('geodir_custom_field_input_file','geodir_cfi_file',10,2);
\ No newline at end of file

geodirectory-functions/custom_fields_functions.php

Doc Comments +6 added lines, -4 removed lines

@@ -1345,6 +1345,9 @@ 
 }

 

 

+/**
+ * @return string
+ */
 function geodir_field_icon_proccess($cf){

 

 

@@ -1738,7 +1741,7 @@ 
  * @global object $wpdb WordPress Database object.

  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @param int $post_id The post ID.

- * @return mixed Returns video.

+ * @return string Returns video.

  */

 function geodir_get_video($post_id)

 {

@@ -1764,7 +1767,7 @@ 
  * @global object $wpdb WordPress Database object.

  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @param int $post_id The post ID.

- * @return mixed Returns special offers.

+ * @return string Returns special offers.

  */

 function geodir_get_special_offers($post_id)

 {

@@ -1788,7 +1791,7 @@ 
      *

      * @since 1.0.0

      * @package GeoDirectory

-     * @return mixed|void Returns max upload file size.

+     * @return string|null Returns max upload file size.

      */

     function geodir_max_upload_size()

     {

@@ -2157,7 +2160,6 @@ 
      * @param string $field_type The form field type.

      * @param object|int $result_str The custom field results object or row id.

      * @param string $field_ins_upd When set to "submit" displays form.

-     * @param bool $default when set to true field will be for admin use only.

      */

     function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')

     {

Braces +136 added lines, -94 removed lines

@@ -51,8 +51,9 @@ 
         global $wpdb;

         $result = 0;// no rows affected

         if (!geodir_column_exist($db, $column)) {

-            if (!empty($db) && !empty($column))

-                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

+            if (!empty($db) && !empty($column)) {
+                            $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
+            }
         }

         return $result;

     }

@@ -82,10 +83,11 @@ 
 

     $default_query = '';

 

-    if ($default == 'default')

-        $default_query .= " and is_admin IN ('1') ";

-    elseif ($default == 'custom')

-        $default_query .= " and is_admin = '0' ";

+    if ($default == 'default') {
+            $default_query .= " and is_admin IN ('1') ";
+    } elseif ($default == 'custom') {
+            $default_query .= " and is_admin = '0' ";
+    }
 

     if ($fields_location == 'none') {

     } else{

@@ -239,10 +241,12 @@ 
                 }

 

                 return $field_id;

-            } else

-                return 0;

-        } else

-            return 0;

+            } else {
+                            return 0;
+            }
+        } else {
+                    return 0;
+        }
     }

 }

 

@@ -349,7 +353,9 @@ 
 

 

 

-            if ($post_type == '') $post_type = 'gd_place';

+            if ($post_type == '') {
+            	$post_type = 'gd_place';
+            }
 

 

             $detail_table = $plugin_prefix . $post_type . '_detail';

@@ -389,16 +395,17 @@ 
             }

 

             $option_values = '';

-            if (isset($request_field['option_values']))

-                $option_values = $request_field['option_values'];

+            if (isset($request_field['option_values'])) {
+                            $option_values = $request_field['option_values'];
+            }
 

             $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0';

 

             $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0';

 

-            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))

-                $price_pkg = implode(",", $request_field['show_on_pkg']);

-            else {

+            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) {
+                            $price_pkg = implode(",", $request_field['show_on_pkg']);
+            } else {

                 $package_info = array();

 

                 $package_info = geodir_post_package_info($package_info, '', $post_type);

@@ -406,22 +413,29 @@ 
             }

 

 

-            if (isset($request_field['extra']) && !empty($request_field['extra']))

-                $extra_fields = $request_field['extra'];

+            if (isset($request_field['extra']) && !empty($request_field['extra'])) {
+                            $extra_fields = $request_field['extra'];
+            }
 

-            if (isset($request_field['is_default']) && $request_field['is_default'] != '')

-                $is_default = $request_field['is_default'];

-            else

-                $is_default = '0';

+            if (isset($request_field['is_default']) && $request_field['is_default'] != '') {
+                            $is_default = $request_field['is_default'];
+            } else {
+                            $is_default = '0';
+            }
 

-            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')

-                $is_admin = $request_field['is_admin'];

-            else

-                $is_admin = '0';

+            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') {
+                            $is_admin = $request_field['is_admin'];
+            } else {
+                            $is_admin = '0';
+            }
 

 

-            if ($is_active == '') $is_active = 1;

-            if ($is_required == '') $is_required = 0;

+            if ($is_active == '') {
+            	$is_active = 1;
+            }
+            if ($is_required == '') {
+            	$is_required = 0;
+            }
 

 

             if ($sort_order == '') {

@@ -690,7 +704,7 @@ 
                                 }

                                 if($op_max){$op_size =$op_max; }

                             }

-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

+                        } elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

                             if(strlen($option_values)){

                                 $op_size =  strlen($option_values);

                             }

@@ -707,11 +721,13 @@ 
                             return __('Column change failed, you may have too many columns.','geodirectory');

                         }

 

-                        if (isset($request_field['cat_display_type']))

-                            $extra_fields = $request_field['cat_display_type'];

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

-                        if (isset($request_field['multi_display_type']))

-                            $extra_fields = $request_field['multi_display_type'];

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

 

                         break;

@@ -725,8 +741,9 @@ 
                         if($alter_result===false){

                             return __('Column change failed, you may have too many columns.','geodirectory');

                         }

-                        if (isset($request_field['advanced_editor']))

-                            $extra_fields = $request_field['advanced_editor'];

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

                         break;

 

@@ -822,8 +839,9 @@ 
                 );

 

 

-                if ($cat_sort == '')

-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

+                if ($cat_sort == '') {
+                                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
+                }
 

 

                 /**

@@ -1193,8 +1211,10 @@ 
         }

 

         return $post_meta_info;

-    else:

-        return false;

+    else {
+    	:

+        return false;
+    }
     endif;

 }

 

@@ -1205,8 +1225,9 @@ 
     if (is_admin()) {

         global $post,$gd_session;

 

-        if (isset($_REQUEST['post']))

-            $_REQUEST['pid'] = $_REQUEST['post'];

+        if (isset($_REQUEST['post'])) {
+                    $_REQUEST['pid'] = $_REQUEST['post'];
+        }
     }

 

     if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

@@ -1259,8 +1280,9 @@ 
         if (is_admin()) {

             global $post;

 

-            if (isset($_REQUEST['post']))

-                $_REQUEST['pid'] = $_REQUEST['post'];

+            if (isset($_REQUEST['post'])) {
+                            $_REQUEST['pid'] = $_REQUEST['post'];
+            }
         }

 

         

@@ -1352,7 +1374,7 @@ 
         $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

     } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {

         $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';

-    }else{

+    } else{

         $field_icon = $cf['field_icon'];

     }

 

@@ -1425,8 +1447,9 @@ 
                     $variables_array['post_id'] = $post->ID;

                     $variables_array['label'] = __($type['site_title'], 'geodirectory');

                     $variables_array['value'] = '';

-                    if (isset($post->{$type['htmlvar_name']}))

-                        $variables_array['value'] = $post->{$type['htmlvar_name']};

+                    if (isset($post->{$type['htmlvar_name']})) {
+                                            $variables_array['value'] = $post->{$type['htmlvar_name']};
+                    }
                 endif;

 

 

@@ -1448,7 +1471,9 @@ 
                      * @param string $html Custom field unfiltered HTML.

                      * @param array $variables_array Custom field variables array.

                      */

-                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);

+                    if ($html) {
+                    	echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
+                    }
 

                     /**

                      * Called after a custom fields is output on the frontend.

@@ -1491,10 +1516,11 @@ 
      */

     function geodir_default_date_format()

     {

-        if ($format = get_option('date_format'))

-            return $format;

-        else

-            return 'dd-mm-yy';

+        if ($format = get_option('date_format')) {
+                    return $format;
+        } else {
+                    return 'dd-mm-yy';
+        }
     }

 }

 

@@ -1601,11 +1627,13 @@ 
                     // Set an array containing a list of acceptable formats

                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

-                    if (!function_exists('wp_handle_upload'))

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

+                    if (!function_exists('wp_handle_upload')) {
+                                            require_once(ABSPATH . 'wp-admin/includes/file.php');
+                    }
 

-                    if (!is_dir($geodir_uploadpath))

-                        mkdir($geodir_uploadpath);

+                    if (!is_dir($geodir_uploadpath)) {
+                                            mkdir($geodir_uploadpath);
+                    }
 

                     $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

                     $explode_sub_dir = explode("/", $sub_dir);

@@ -1618,16 +1646,19 @@ 
                     }

 

                     $uploaded_file = '';

-                    if (file_exists($img_path))

-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+                    if (file_exists($img_path)) {
+                                            $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
+                    }
 

                     if ($curr_img_dir != $geodir_uploaddir) {

-                        if (file_exists($img_path))

-                            unlink($img_path);

+                        if (file_exists($img_path)) {
+                                                    unlink($img_path);
+                        }
                     }

 

-                    if (!empty($uploaded_file))

-                        $file_urls = $geodir_uploadurl . '/' . $new_name;

+                    if (!empty($uploaded_file)) {
+                                            $file_urls = $geodir_uploadurl . '/' . $new_name;
+                    }
 

                 } else {

                     $file_urls = $post_image[$m];

@@ -1648,8 +1679,9 @@ 
 

         geodir_save_post_meta($post_id, $field_id, $file_urls);

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

+        if (!empty($invalid_files)) {
+                    geodir_remove_attachments($invalid_files);
+        }
 

     }

 }

@@ -1875,8 +1907,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

-        if (!in_array($post_type, $all_postypes))

-            return false;

+        if (!in_array($post_type, $all_postypes)) {
+                    return false;
+        }
 

         $fields = array();

 

@@ -1974,8 +2007,10 @@ 
         }

 

         return $field_ids;

-    else:

-        return false;

+    else {
+    	:

+        return false;
+    }
     endif;

 }

 

@@ -2148,8 +2183,9 @@ 
 

             return $field_id;

 

-        } else

-            return 0;

+        } else {
+                    return 0;
+        }
 

     }

 }

@@ -2190,8 +2226,9 @@ 
         $htmlvar_name = isset($field_type_key) ? $field_type_key : '';

 

         $site_title = '';

-        if ($site_title == '')

-            $site_title = isset($field_info->site_title) ? $field_info->site_title : '';

+        if ($site_title == '') {
+                    $site_title = isset($field_info->site_title) ? $field_info->site_title : '';
+        }
 

         if ($site_title == '') {

             $fields = geodir_get_custom_sort_options($post_type);

@@ -2205,8 +2242,9 @@ 
             }

         }

 

-        if ($htmlvar_name == '')

-            $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

+        if ($htmlvar_name == '') {
+                    $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
+        }
 

         $nonce = wp_create_nonce('custom_fields_' . $result_str);

 

@@ -2219,7 +2257,7 @@ 
 

                 if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {

                     $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';

-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){

+                } elseif(isset($cso['field_icon']) && $cso['field_icon']){

                     $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';

                 }

 

@@ -2654,7 +2692,7 @@ 
     $dt_value = '';

     if (isset($field_info->data_type)) {

         $dt_value  = esc_attr($field_info->data_type);

-    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

+    } elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

         $dt_value  = $cf['defaults']['data_type'];

     }

     ?>

@@ -2686,7 +2724,7 @@ 
     $value = '';

     if (isset($field_info->decimal_point)) {

         $value = esc_attr($field_info->decimal_point);

-    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){

+    } elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){

         $value = $cf['defaults']['decimal_point'];

     }

     ?>

@@ -2760,11 +2798,13 @@ 
 

             <?php

             $selected = '';

-            if (isset($field_info->extra_fields))

-                $advanced_editor = unserialize($field_info->extra_fields);

+            if (isset($field_info->extra_fields)) {
+                            $advanced_editor = unserialize($field_info->extra_fields);
+            }
 

-            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))

-                $selected = 'checked="checked"';

+            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor)) {
+                            $selected = 'checked="checked"';
+            }
             ?>

 

             <input type="checkbox" name="advanced_editor[]" id="advanced_editor"

@@ -2786,7 +2826,7 @@ 
     $value = '';

     if (isset($field_info->validation_pattern)) {

         $value = esc_attr($field_info->validation_pattern);

-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){

+    } elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){

         $value = esc_attr($cf['defaults']['validation_pattern']);

     }

     ?>

@@ -2806,7 +2846,7 @@ 
     $value = '';

     if (isset($field_info->validation_msg)) {

         $value = esc_attr($field_info->validation_msg);

-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){

+    } elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){

         $value = esc_attr($cf['defaults']['validation_msg']);

     }

     ?>

@@ -2836,8 +2876,9 @@ 
 

     if (!isset($field_info->post_type)) {

         $post_type = sanitize_text_field($_REQUEST['listing_type']);

-    } else

-        $post_type = $field_info->post_type;

+    } else {
+            $post_type = $field_info->post_type;
+    }
     ?>

     <li style="display: none;">

         <label for="htmlvar_name" class="gd-cf-tooltip-wrap">

@@ -3111,7 +3152,7 @@ 
     $value = '';

     if (isset($field_info->option_values)) {

         $value = esc_attr($field_info->option_values);

-    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){

+    } elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){

         $value = esc_attr($cf['defaults']['option_values']);

     }

 

@@ -3254,7 +3295,7 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['is_price'])) {

     $value = esc_attr($extra_fields['is_price']);

-    }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){

+    } elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){

     $value = esc_attr($cf['defaults']['extra_fields']['is_price']);

     }

 

@@ -3289,7 +3330,7 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['thousand_separator'])) {

         $value = esc_attr($extra_fields['thousand_separator']);

-    }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){

+    } elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){

         $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']);

     }

     ?>

@@ -3316,7 +3357,7 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['decimal_separator'])) {

         $value = esc_attr($extra_fields['decimal_separator']);

-    }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){

+    } elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){

         $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']);

     }

     ?>

@@ -3339,7 +3380,7 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['decimal_display'])) {

         $value = esc_attr($extra_fields['decimal_display']);

-    }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){

+    } elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){

         $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']);

     }

     ?>

@@ -3362,7 +3403,7 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['currency_symbol'])) {

         $value = esc_attr($extra_fields['currency_symbol']);

-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){

+    } elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){

         $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']);

     }

     ?>

@@ -3383,7 +3424,7 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {

         $value = esc_attr($extra_fields['currency_symbol_placement']);

-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){

+    } elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){

         $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']);

     }

     ?>

@@ -3610,8 +3651,9 @@ 
     $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';

 

     if($decimals>0 && $decimal_display=='if'){

-        if(is_int($number) || floor( $number ) == $number)

-            $decimals = 0;

+        if(is_int($number) || floor( $number ) == $number) {
+                    $decimals = 0;
+        }
     }

 

     $number = number_format($number,$decimals,$decimalpoint,$separator);

@@ -3620,7 +3662,7 @@ 
 

     if($currency_symbol_placement=='left'){

         $number = $symbol . $number;

-    }else{

+    } else{

         $number = $number . $symbol;

     }

 

Indentation +2258 added lines, -2258 removed lines

@@ -10,52 +10,52 @@ 
 global $wpdb, $table_prefix;

 

 if (!function_exists('geodir_column_exist')) {

-    /**

-     * Check table column exist or not.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $db The table name.

-     * @param string $column The column name.

-     * @return bool If column exists returns true. Otherwise false.

-     */

-    function geodir_column_exist($db, $column)

-    {

-        global $wpdb;

-        $exists = false;

-        $columns = $wpdb->get_col("show columns from $db");

-        foreach ($columns as $c) {

-            if ($c == $column) {

-                $exists = true;

-                break;

-            }

-        }

-        return $exists;

-    }

+	/**

+	 * Check table column exist or not.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $db The table name.

+	 * @param string $column The column name.

+	 * @return bool If column exists returns true. Otherwise false.

+	 */

+	function geodir_column_exist($db, $column)

+	{

+		global $wpdb;

+		$exists = false;

+		$columns = $wpdb->get_col("show columns from $db");

+		foreach ($columns as $c) {

+			if ($c == $column) {

+				$exists = true;

+				break;

+			}

+		}

+		return $exists;

+	}

 }

 

 if (!function_exists('geodir_add_column_if_not_exist')) {

-    /**

-     * Add column if table column not exist.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $db The table name.

-     * @param string $column The column name.

-     * @param string $column_attr The column attributes.

-     */

-    function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

-    {

-        global $wpdb;

-        $result = 0;// no rows affected

-        if (!geodir_column_exist($db, $column)) {

-            if (!empty($db) && !empty($column))

-                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

-        }

-        return $result;

-    }

+	/**

+	 * Add column if table column not exist.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $db The table name.

+	 * @param string $column The column name.

+	 * @param string $column_attr The column attributes.

+	 */

+	function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

+	{

+		global $wpdb;

+		$result = 0;// no rows affected

+		if (!geodir_column_exist($db, $column)) {

+			if (!empty($db) && !empty($column))

+				$result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

+		}

+		return $result;

+	}

 }

 

 /**

@@ -72,706 +72,706 @@ 
  */

 function geodir_post_custom_fields($package_id = '', $default = 'all', $post_type = 'gd_place', $fields_location = 'none')

 {

-    global $wpdb, $geodir_post_custom_fields_cache;

-

-    $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;

-

-    if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {

-        return $geodir_post_custom_fields_cache[$cache_stored];

-    }

-

-    $default_query = '';

-

-    if ($default == 'default')

-        $default_query .= " and is_admin IN ('1') ";

-    elseif ($default == 'custom')

-        $default_query .= " and is_admin = '0' ";

-

-    if ($fields_location == 'none') {

-    } else{

-        $fields_location = esc_sql( $fields_location );

-        $default_query .= " and show_in LIKE '%%[$fields_location]%%' ";

-    }

-

-    $post_meta_info = $wpdb->get_results(

-        $wpdb->prepare(

-            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

-            array($post_type)

-        )

-    );

-

-

-    $return_arr = array();

-    if ($post_meta_info) {

-

-        foreach ($post_meta_info as $post_meta_info_obj) {

-

-            $custom_fields = array(

-                "name" => $post_meta_info_obj->htmlvar_name,

-                "label" => $post_meta_info_obj->clabels,

-                "default" => $post_meta_info_obj->default_value,

-                "type" => $post_meta_info_obj->field_type,

-                "desc" => $post_meta_info_obj->admin_desc);

-

-            if ($post_meta_info_obj->field_type) {

-                $options = explode(',', $post_meta_info_obj->option_values);

-                $custom_fields["options"] = $options;

-            }

-

-            foreach ($post_meta_info_obj as $key => $val) {

-                $custom_fields[$key] = $val;

-            }

-

-            $pricearr = array();

-            $pricearr = explode(',', $post_meta_info_obj->packages);

-

-            if ($package_id != '' && in_array($package_id, $pricearr)) {

-                $return_arr[$post_meta_info_obj->sort_order] = $custom_fields;

-            } elseif ($package_id == '') {

-                $return_arr[$post_meta_info_obj->sort_order] = $custom_fields;

-            }

-        }

-    }

-    $geodir_post_custom_fields_cache[$cache_stored] = $return_arr;

-

-    if (has_filter('geodir_filter_geodir_post_custom_fields')) {

-        /**

-         * Filter the post custom fields array.

-         *

-         * @since 1.0.0

-         *

-         * @param array $return_arr Post custom fields array.

-         * @param int|string $package_id The package ID.

-         * @param string $post_type Optional. The wordpress post type.

-         * @param string $fields_location Optional. Where exactly are you going to place this custom fields?.

-         */

-        $return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);

-    }

-

-    return $return_arr;

+	global $wpdb, $geodir_post_custom_fields_cache;

+

+	$cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;

+

+	if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {

+		return $geodir_post_custom_fields_cache[$cache_stored];

+	}

+

+	$default_query = '';

+

+	if ($default == 'default')

+		$default_query .= " and is_admin IN ('1') ";

+	elseif ($default == 'custom')

+		$default_query .= " and is_admin = '0' ";

+

+	if ($fields_location == 'none') {

+	} else{

+		$fields_location = esc_sql( $fields_location );

+		$default_query .= " and show_in LIKE '%%[$fields_location]%%' ";

+	}

+

+	$post_meta_info = $wpdb->get_results(

+		$wpdb->prepare(

+			"select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

+			array($post_type)

+		)

+	);

+

+

+	$return_arr = array();

+	if ($post_meta_info) {

+

+		foreach ($post_meta_info as $post_meta_info_obj) {

+

+			$custom_fields = array(

+				"name" => $post_meta_info_obj->htmlvar_name,

+				"label" => $post_meta_info_obj->clabels,

+				"default" => $post_meta_info_obj->default_value,

+				"type" => $post_meta_info_obj->field_type,

+				"desc" => $post_meta_info_obj->admin_desc);

+

+			if ($post_meta_info_obj->field_type) {

+				$options = explode(',', $post_meta_info_obj->option_values);

+				$custom_fields["options"] = $options;

+			}

+

+			foreach ($post_meta_info_obj as $key => $val) {

+				$custom_fields[$key] = $val;

+			}

+

+			$pricearr = array();

+			$pricearr = explode(',', $post_meta_info_obj->packages);

+

+			if ($package_id != '' && in_array($package_id, $pricearr)) {

+				$return_arr[$post_meta_info_obj->sort_order] = $custom_fields;

+			} elseif ($package_id == '') {

+				$return_arr[$post_meta_info_obj->sort_order] = $custom_fields;

+			}

+		}

+	}

+	$geodir_post_custom_fields_cache[$cache_stored] = $return_arr;

+

+	if (has_filter('geodir_filter_geodir_post_custom_fields')) {

+		/**

+		 * Filter the post custom fields array.

+		 *

+		 * @since 1.0.0

+		 *

+		 * @param array $return_arr Post custom fields array.

+		 * @param int|string $package_id The package ID.

+		 * @param string $post_type Optional. The wordpress post type.

+		 * @param string $fields_location Optional. Where exactly are you going to place this custom fields?.

+		 */

+		$return_arr = apply_filters('geodir_filter_geodir_post_custom_fields', $return_arr, $package_id, $post_type, $fields_location);

+	}

+

+	return $return_arr;

 }

 

-    /**

-     * Adds admin html for custom fields.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $field_type The form field type.

-     * @param object|int $result_str The custom field results object or row id.

-     * @param string $field_ins_upd When set to "submit" displays form.

-     * @param string $field_type_key The key of the custom field.

-     */

-    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')

-    {

-        global $wpdb;

-        $cf = $result_str;

-        if (!is_object($cf)) {

-

-            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));

-

-        } else {

-            $field_info = $cf;

-            $result_str = $cf->id;

-        }

-        /**

-         * Contains custom field html.

-         *

-         * @since 1.0.0

-         */

-        include('custom_field_html.php');

-

-    }

+	/**

+	 * Adds admin html for custom fields.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $field_type The form field type.

+	 * @param object|int $result_str The custom field results object or row id.

+	 * @param string $field_ins_upd When set to "submit" displays form.

+	 * @param string $field_type_key The key of the custom field.

+	 */

+	function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')

+	{

+		global $wpdb;

+		$cf = $result_str;

+		if (!is_object($cf)) {

+

+			$field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));

+

+		} else {

+			$field_info = $cf;

+			$result_str = $cf->id;

+		}

+		/**

+		 * Contains custom field html.

+		 *

+		 * @since 1.0.0

+		 */

+		include('custom_field_html.php');

+

+	}

 

 

 if (!function_exists('geodir_custom_field_delete')) {

-    /**

-     * Delete custom field using field id.

-     *

-     * @since 1.0.0

-     * @since 1.5.7 Delete field from sorting fields table when custom field deleted.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param string $field_id The custom field ID.

-     * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.

-     */

-    function geodir_custom_field_delete($field_id = '') {

-        global $wpdb, $plugin_prefix;

-

-        if ($field_id != '') {

-            $cf = trim($field_id, '_');

-

-            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

-                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

-

-                $post_type = $field->post_type;

-                $htmlvar_name = $field->htmlvar_name;

-

-                if ($post_type != '' && $htmlvar_name != '') {

-                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

-                }

-

-                /**

-                 * Called after a custom field is deleted.

-                 *

-                 * @since 1.0.0

-                 * @param string $cf The fields ID.

-                 * @param string $field->htmlvar_name The html variable name for the field.

-                 * @param string $post_type The post type the field belongs to.

-                 */

-                do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);

-

-                if ($field->field_type == 'address') {

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");

-                } else {

-                    if ($field->field_type != 'fieldset') {

-                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");

-                    }

-                }

-

-                return $field_id;

-            } else

-                return 0;

-        } else

-            return 0;

-    }

+	/**

+	 * Delete custom field using field id.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.7 Delete field from sorting fields table when custom field deleted.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param string $field_id The custom field ID.

+	 * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.

+	 */

+	function geodir_custom_field_delete($field_id = '') {

+		global $wpdb, $plugin_prefix;

+

+		if ($field_id != '') {

+			$cf = trim($field_id, '_');

+

+			if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

+				$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

+

+				$post_type = $field->post_type;

+				$htmlvar_name = $field->htmlvar_name;

+

+				if ($post_type != '' && $htmlvar_name != '') {

+					$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

+				}

+

+				/**

+				 * Called after a custom field is deleted.

+				 *

+				 * @since 1.0.0

+				 * @param string $cf The fields ID.

+				 * @param string $field->htmlvar_name The html variable name for the field.

+				 * @param string $post_type The post type the field belongs to.

+				 */

+				do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);

+

+				if ($field->field_type == 'address') {

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");

+					$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");

+				} else {

+					if ($field->field_type != 'fieldset') {

+						$wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");

+					}

+				}

+

+				return $field_id;

+			} else

+				return 0;

+		} else

+			return 0;

+	}

 }

 

 if (!function_exists('geodir_custom_field_save')) {

-    /**

-     * Save or Update custom fields into the database.

-     *

-     * @since 1.0.0

-     * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param array $request_field {

-     *    Attributes of the request field array.

-     *

-     *    @type string $action Ajax Action name. Default "geodir_ajax_action".

-     *    @type string $manage_field_type Field type Default "custom_fields".

-     *    @type string $create_field Create field Default "true".

-     *    @type string $field_ins_upd Field ins upd Default "submit".

-     *    @type string $_wpnonce WP nonce value.

-     *    @type string $listing_type Listing type Example "gd_place".

-     *    @type string $field_type Field type Example "radio".

-     *    @type string $field_id Field id Example "12".

-     *    @type string $data_type Data type Example "VARCHAR".

-     *    @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere.

-     *    @type array $show_on_pkg Package list to display this field.

-     *    @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings.

-     *    @type string $site_title Section title which you wish to display in frontend.

-     *    @type string $admin_desc Section description which will appear in frontend.

-     *    @type string $htmlvar_name Html variable name. This should be a unique name.

-     *    @type string $clabels Section Title which will appear in backend.

-     *    @type string $default_value The default value (for "link" this will be used as the link text).

-     *    @type string $sort_order The display order of this field in backend. e.g. 5.

-     *    @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field.

-     *    @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field.

-     *    @type string $is_required Use "1" to set field as required.

-     *    @type string $required_msg Enter text for error message if field required and have not full fill requirement.

-     *    @type string $show_on_listing Want to show this on listing page?.

-     *    @type string $show_in What locations to show the custom field in.

-     *    @type string $show_on_detail Want to show this in More Info tab on detail page?.

-     *    @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes.

-     *    @type string $option_values Option Values should be separated by comma.

-     *    @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class.

-     *    @type string $css_class Enter custom css class for field custom style.

-     *    @type array $extra_fields An array of extra fields to store.

-     *

-     * }

-     * @param bool $default Not yet implemented.

-     * @return int|string If field is unique returns inserted row id. Otherwise returns error string.

-     */

-    function geodir_custom_field_save($request_field = array(), $default = false)

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $old_html_variable = '';

-

-        $data_type = trim($request_field['data_type']);

-

-        $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

-

-        // some servers fail if a POST value is VARCHAR so we change it.

-        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){

-            $request_field['data_type'] = 'VARCHAR';

-        }

-

-        $cf = trim($result_str, '_');

-

-

-        /*-------- check duplicate validation --------*/

-

-        $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

-        $post_type = $request_field['listing_type'];

-

-        if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {

-            $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;

-        }

-

-        $check_html_variable = $wpdb->get_var(

-            $wpdb->prepare(

-                "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",

-                array($cf, $cehhtmlvar_name, $post_type)

-            )

-        );

-

-

-        if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {

-

-            if ($cf != '') {

-

-                $post_meta_info = $wpdb->get_row(

-                    $wpdb->prepare(

-                        "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",

-                        array($cf)

-                    )

-                );

-

-            }

-

-            if (!empty($post_meta_info)) {

-                $post_val = $post_meta_info;

-                $old_html_variable = $post_val->htmlvar_name;

-

-            }

-

-

-

-            if ($post_type == '') $post_type = 'gd_place';

-

-

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

-

-            $admin_title = $request_field['admin_title'];

-            $site_title = $request_field['site_title'];

-            $data_type = $request_field['data_type'];

-            $field_type = $request_field['field_type'];

-            $field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type;

-            $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

-            $admin_desc = $request_field['admin_desc'];

-            $clabels = isset($request_field['clabels']) ? $request_field['clabels'] : '';

-            $default_value = isset($request_field['default_value']) ? $request_field['default_value'] : '';

-            $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : '';

-            $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : '';

-            $is_required = isset($request_field['is_required']) ? $request_field['is_required'] : '';

-            $required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : '';

-            $css_class = isset($request_field['css_class']) ? $request_field['css_class'] : '';

-            $field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : '';

-            $show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : '';

-            $show_in = isset($request_field['show_in']) ? $request_field['show_in'] : '';

-            $show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : '';

-            $show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : '';

-            $decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type

-            $decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : '';

-            $validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : '';

-            $validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : '';

-            $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';

+	/**

+	 * Save or Update custom fields into the database.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param array $request_field {

+	 *    Attributes of the request field array.

+	 *

+	 *    @type string $action Ajax Action name. Default "geodir_ajax_action".

+	 *    @type string $manage_field_type Field type Default "custom_fields".

+	 *    @type string $create_field Create field Default "true".

+	 *    @type string $field_ins_upd Field ins upd Default "submit".

+	 *    @type string $_wpnonce WP nonce value.

+	 *    @type string $listing_type Listing type Example "gd_place".

+	 *    @type string $field_type Field type Example "radio".

+	 *    @type string $field_id Field id Example "12".

+	 *    @type string $data_type Data type Example "VARCHAR".

+	 *    @type string $is_active Either "1" or "0". If "0" is used then the field will not be displayed anywhere.

+	 *    @type array $show_on_pkg Package list to display this field.

+	 *    @type string $admin_title Personal comment, it would not be displayed anywhere except in custom field settings.

+	 *    @type string $site_title Section title which you wish to display in frontend.

+	 *    @type string $admin_desc Section description which will appear in frontend.

+	 *    @type string $htmlvar_name Html variable name. This should be a unique name.

+	 *    @type string $clabels Section Title which will appear in backend.

+	 *    @type string $default_value The default value (for "link" this will be used as the link text).

+	 *    @type string $sort_order The display order of this field in backend. e.g. 5.

+	 *    @type string $is_default Either "1" or "0". If "0" is used then the field will be displayed as main form field or additional field.

+	 *    @type string $for_admin_use Either "1" or "0". If "0" is used then only site admin can edit this field.

+	 *    @type string $is_required Use "1" to set field as required.

+	 *    @type string $required_msg Enter text for error message if field required and have not full fill requirement.

+	 *    @type string $show_on_listing Want to show this on listing page?.

+	 *    @type string $show_in What locations to show the custom field in.

+	 *    @type string $show_on_detail Want to show this in More Info tab on detail page?.

+	 *    @type string $show_as_tab Want to display this as a tab on detail page? If "1" then "Show on detail page?" must be Yes.

+	 *    @type string $option_values Option Values should be separated by comma.

+	 *    @type string $field_icon Upload icon using media and enter its url path, or enter font awesome class.

+	 *    @type string $css_class Enter custom css class for field custom style.

+	 *    @type array $extra_fields An array of extra fields to store.

+	 *

+	 * }

+	 * @param bool $default Not yet implemented.

+	 * @return int|string If field is unique returns inserted row id. Otherwise returns error string.

+	 */

+	function geodir_custom_field_save($request_field = array(), $default = false)

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$old_html_variable = '';

+

+		$data_type = trim($request_field['data_type']);

+

+		$result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

+

+		// some servers fail if a POST value is VARCHAR so we change it.

+		if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){

+			$request_field['data_type'] = 'VARCHAR';

+		}

+

+		$cf = trim($result_str, '_');

+

+

+		/*-------- check duplicate validation --------*/

+

+		$cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

+		$post_type = $request_field['listing_type'];

+

+		if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {

+			$cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;

+		}

+

+		$check_html_variable = $wpdb->get_var(

+			$wpdb->prepare(

+				"select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",

+				array($cf, $cehhtmlvar_name, $post_type)

+			)

+		);

+

+

+		if (!$check_html_variable || $request_field['field_type'] == 'fieldset') {

+

+			if ($cf != '') {

+

+				$post_meta_info = $wpdb->get_row(

+					$wpdb->prepare(

+						"select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",

+						array($cf)

+					)

+				);

+

+			}

+

+			if (!empty($post_meta_info)) {

+				$post_val = $post_meta_info;

+				$old_html_variable = $post_val->htmlvar_name;

+

+			}

+

+

+

+			if ($post_type == '') $post_type = 'gd_place';

+

+

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

+

+			$admin_title = $request_field['admin_title'];

+			$site_title = $request_field['site_title'];

+			$data_type = $request_field['data_type'];

+			$field_type = $request_field['field_type'];

+			$field_type_key = isset($request_field['field_type_key']) ? $request_field['field_type_key'] : $field_type;

+			$htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

+			$admin_desc = $request_field['admin_desc'];

+			$clabels = isset($request_field['clabels']) ? $request_field['clabels'] : '';

+			$default_value = isset($request_field['default_value']) ? $request_field['default_value'] : '';

+			$sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : '';

+			$is_active = isset($request_field['is_active']) ? $request_field['is_active'] : '';

+			$is_required = isset($request_field['is_required']) ? $request_field['is_required'] : '';

+			$required_msg = isset($request_field['required_msg']) ? $request_field['required_msg'] : '';

+			$css_class = isset($request_field['css_class']) ? $request_field['css_class'] : '';

+			$field_icon = isset($request_field['field_icon']) ? $request_field['field_icon'] : '';

+			$show_on_listing = isset($request_field['show_on_listing']) ? $request_field['show_on_listing'] : '';

+			$show_in = isset($request_field['show_in']) ? $request_field['show_in'] : '';

+			$show_on_detail = isset($request_field['show_on_detail']) ? $request_field['show_on_detail'] : '';

+			$show_as_tab = isset($request_field['show_as_tab']) ? $request_field['show_as_tab'] : '';

+			$decimal_point = isset($request_field['decimal_point']) ? trim($request_field['decimal_point']) : ''; // decimal point for DECIMAL data type

+			$decimal_point = $decimal_point > 0 ? ($decimal_point > 10 ? 10 : $decimal_point) : '';

+			$validation_pattern = isset($request_field['validation_pattern']) ? $request_field['validation_pattern'] : '';

+			$validation_msg = isset($request_field['validation_msg']) ? $request_field['validation_msg'] : '';

+			$for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';

 

             

-            if(is_array($show_in)){

-                $show_in = implode(",", $request_field['show_in']);

-            }

+			if(is_array($show_in)){

+				$show_in = implode(",", $request_field['show_in']);

+			}

             

-            if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {

-                $htmlvar_name = 'geodir_' . $htmlvar_name;

-            }

+			if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {

+				$htmlvar_name = 'geodir_' . $htmlvar_name;

+			}

 

-            $option_values = '';

-            if (isset($request_field['option_values']))

-                $option_values = $request_field['option_values'];

+			$option_values = '';

+			if (isset($request_field['option_values']))

+				$option_values = $request_field['option_values'];

 

-            $cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0';

+			$cat_sort = isset($request_field['cat_sort']) ? $request_field['cat_sort'] : '0';

 

-            $cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0';

+			$cat_filter = isset($request_field['cat_filter']) ? $request_field['cat_filter'] : '0';

 

-            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))

-                $price_pkg = implode(",", $request_field['show_on_pkg']);

-            else {

-                $package_info = array();

+			if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))

+				$price_pkg = implode(",", $request_field['show_on_pkg']);

+			else {

+				$package_info = array();

 

-                $package_info = geodir_post_package_info($package_info, '', $post_type);

-                $price_pkg = !empty($package_info->pid) ? $package_info->pid : '';

-            }

+				$package_info = geodir_post_package_info($package_info, '', $post_type);

+				$price_pkg = !empty($package_info->pid) ? $package_info->pid : '';

+			}

 

 

-            if (isset($request_field['extra']) && !empty($request_field['extra']))

-                $extra_fields = $request_field['extra'];

+			if (isset($request_field['extra']) && !empty($request_field['extra']))

+				$extra_fields = $request_field['extra'];

 

-            if (isset($request_field['is_default']) && $request_field['is_default'] != '')

-                $is_default = $request_field['is_default'];

-            else

-                $is_default = '0';

+			if (isset($request_field['is_default']) && $request_field['is_default'] != '')

+				$is_default = $request_field['is_default'];

+			else

+				$is_default = '0';

 

-            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')

-                $is_admin = $request_field['is_admin'];

-            else

-                $is_admin = '0';

+			if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')

+				$is_admin = $request_field['is_admin'];

+			else

+				$is_admin = '0';

 

 

-            if ($is_active == '') $is_active = 1;

-            if ($is_required == '') $is_required = 0;

+			if ($is_active == '') $is_active = 1;

+			if ($is_required == '') $is_required = 0;

 

 

-            if ($sort_order == '') {

+			if ($sort_order == '') {

 

-                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);

+				$last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);

 

-                $sort_order = (int)$last_order + 1;

-            }

+				$sort_order = (int)$last_order + 1;

+			}

 

-            $default_value_add = '';

+			$default_value_add = '';

 

 

-            if (!empty($post_meta_info)) {

-                switch ($field_type):

+			if (!empty($post_meta_info)) {

+				switch ($field_type):

 

-                    case 'address':

+					case 'address':

 

-                        if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

-                        }

-                        $old_prefix = $old_html_variable . '_';

+						if ($htmlvar_name != '') {

+							$prefix = $htmlvar_name . '_';

+						}

+						$old_prefix = $old_html_variable . '_';

 

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";

+						$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";

 

-                        if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                        }

+						if ($default_value != '') {

+							$meta_field_add .= " DEFAULT '" . $default_value . "'";

+						}

 

-                        $wpdb->query($meta_field_add);

+						$wpdb->query($meta_field_add);

 

-                        if ($extra_fields != '') {

+						if ($extra_fields != '') {

 

-                            if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

+							if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "VARCHAR( 50 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+									$meta_field_add = "VARCHAR( 50 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

+									geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

 

-                                }

+								}

 

 

-                            }

+							}

 

 

-                            if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

+							if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");

 

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

-                                    $meta_field_add = "VARCHAR( 50 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$wpdb->query($meta_field_add);

+								} else {

+									$meta_field_add = "VARCHAR( 50 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

-                                }

+									geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+								}

 

-                            }

-                            if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

+							}

+							if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");

 

-                                if ($is_column) {

+								if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "VARCHAR( 50 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "VARCHAR( 50 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+									geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

 

-                                }

+								}

 

-                            }

-                            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

+							}

+							if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");

 

-                                if ($is_column) {

+								if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "VARCHAR( 50 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "VARCHAR( 50 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+									geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

 

-                                }

+								}

 

-                            }

-                            if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

+							}

+							if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");

-                                if ($is_column) {

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");

+								if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

-                                    $meta_field_add = "VARCHAR( 20 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+									$meta_field_add = "VARCHAR( 20 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+									geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

 

-                                }

+								}

 

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");

 

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

-                                    $meta_field_add = "VARCHAR( 20 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+									$meta_field_add = "VARCHAR( 20 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

-                                }

+									geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+								}

 

-                            }

-                            if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

+							}

+							if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");

 

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

+									$wpdb->query($meta_field_add);

+								} else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

 

-                                    $meta_field_add = "VARCHAR( 15 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "VARCHAR( 15 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

-                                }

+									geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+								}

 

 

-                            }

-                            if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

+							}

+							if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

 

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    $wpdb->query($meta_field_add);

+									$wpdb->query($meta_field_add);

 

-                                } else {

+								} else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

 

-                                    $meta_field_add = "VARCHAR( 3 ) NULL";

-                                    if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                    }

+									$meta_field_add = "VARCHAR( 3 ) NULL";

+									if ($default_value != '') {

+										$meta_field_add .= " DEFAULT '" . $default_value . "'";

+									}

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

-                                }

+									geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+								}

 

-                            }

-                            // show lat lng

-                            if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");

+							}

+							// show lat lng

+							if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

+								$is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");

 

-                                if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

-                                    $meta_field_add .= " DEFAULT '1'";

+								if ($is_column) {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+									$meta_field_add .= " DEFAULT '1'";

 

-                                    $wpdb->query($meta_field_add);

-                                } else {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+									$wpdb->query($meta_field_add);

+								} else {

+									$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

 

-                                    $meta_field_add = "VARCHAR( 3 ) NULL";

-                                    $meta_field_add .= " DEFAULT '1'";

+									$meta_field_add = "VARCHAR( 3 ) NULL";

+									$meta_field_add .= " DEFAULT '1'";

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

-                                }

+									geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+								}

 

-                            }

-                        }// end extra

+							}

+						}// end extra

 

-                        break;

+						break;

 

-                    case 'checkbox':

-                    case 'multiselect':

-                    case 'select':

-                    case 'taxonomy':

+					case 'checkbox':

+					case 'multiselect':

+					case 'select':

+					case 'taxonomy':

 

-                        $op_size = '500';

+						$op_size = '500';

 

-                        // only make the field as big as it needs to be.

-                        if(isset($option_values) && $option_values && $field_type=='select'){

-                            $option_values_arr = explode(',',$option_values);

-                            if(is_array($option_values_arr)){

-                                $op_max = 0;

-                                foreach($option_values_arr as $op_val){

-                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}

-                                }

-                                if($op_max){$op_size =$op_max; }

-                            }

-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

-                            if(strlen($option_values)){

-                                $op_size =  strlen($option_values);

-                            }

-                        }

+						// only make the field as big as it needs to be.

+						if(isset($option_values) && $option_values && $field_type=='select'){

+							$option_values_arr = explode(',',$option_values);

+							if(is_array($option_values_arr)){

+								$op_max = 0;

+								foreach($option_values_arr as $op_val){

+									if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}

+								}

+								if($op_max){$op_size =$op_max; }

+							}

+						}elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

+							if(strlen($option_values)){

+								$op_size =  strlen($option_values);

+							}

+						}

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";

+						$meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";

 

-                        if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                        }

+						if ($default_value != '') {

+							$meta_field_add .= " DEFAULT '" . $default_value . "'";

+						}

 

-                        $alter_result = $wpdb->query($meta_field_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

-                        }

+						$alter_result = $wpdb->query($meta_field_add);

+						if($alter_result===false){

+							return __('Column change failed, you may have too many columns.','geodirectory');

+						}

 

-                        if (isset($request_field['cat_display_type']))

-                            $extra_fields = $request_field['cat_display_type'];

+						if (isset($request_field['cat_display_type']))

+							$extra_fields = $request_field['cat_display_type'];

 

-                        if (isset($request_field['multi_display_type']))

-                            $extra_fields = $request_field['multi_display_type'];

+						if (isset($request_field['multi_display_type']))

+							$extra_fields = $request_field['multi_display_type'];

 

 

-                        break;

+						break;

 

-                    case 'textarea':

-                    case 'html':

-                    case 'url':

-                    case 'file':

+					case 'textarea':

+					case 'html':

+					case 'url':

+					case 'file':

 

-                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

-                        }

-                        if (isset($request_field['advanced_editor']))

-                            $extra_fields = $request_field['advanced_editor'];

-

-                        break;

+						$alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");

+						if($alter_result===false){

+							return __('Column change failed, you may have too many columns.','geodirectory');

+						}

+						if (isset($request_field['advanced_editor']))

+							$extra_fields = $request_field['advanced_editor'];

+

+						break;

 

-                    case 'fieldset':

-                        // Nothing happened for fieldset

-                        break;

+					case 'fieldset':

+						// Nothing happened for fieldset

+						break;

 

-                    default:

-                        if ($data_type != 'VARCHAR' && $data_type != '') {

-                            if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";

-                            } else {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";

-                            }

-

-                            if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                            }

-                        } else {

-                            $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";

-                            if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                            }

-                        }

-

-                        $alter_result = $wpdb->query($default_value_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

-                        }

-                        break;

-                endswitch;

-

-                $extra_field_query = '';

-                if (!empty($extra_fields)) {

-                    $extra_field_query = serialize($extra_fields);

-                }

-

-                $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';

-

-                $wpdb->query(

-

-                    $wpdb->prepare(

-

-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+					default:

+						if ($data_type != 'VARCHAR' && $data_type != '') {

+							if ($data_type == 'FLOAT' && $decimal_point > 0) {

+								$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";

+							} else {

+								$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";

+							}

+

+							if (is_numeric($default_value) && $default_value != '') {

+								$default_value_add .= " DEFAULT '" . $default_value . "'";

+							}

+						} else {

+							$default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";

+							if ($default_value != '') {

+								$default_value_add .= " DEFAULT '" . $default_value . "'";

+							}

+						}

+

+						$alter_result = $wpdb->query($default_value_add);

+						if($alter_result===false){

+							return __('Column change failed, you may have too many columns.','geodirectory');

+						}

+						break;

+				endswitch;

+

+				$extra_field_query = '';

+				if (!empty($extra_fields)) {

+					$extra_field_query = serialize($extra_fields);

+				}

+

+				$decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';

+

+				$wpdb->query(

+

+					$wpdb->prepare(

+

+						"update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -805,308 +805,308 @@ 
 					for_admin_use = %s

 					where id = %d",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)

-                    )

+						array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)

+					)

 

-                );

+				);

 

-                $lastid = trim($cf);

+				$lastid = trim($cf);

 

 

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+				$wpdb->query(

+					$wpdb->prepare(

+						"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

 					 	site_title=%s

 					where post_type = %s and htmlvar_name = %s",

-                        array($site_title, $post_type, $htmlvar_name)

-                    )

-                );

-

-

-                if ($cat_sort == '')

-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

-

-

-                /**

-                 * Called after all custom fields are saved for a post.

-                 *

-                 * @since 1.0.0

-                 * @param int $lastid The post ID.

-                 */

-                do_action('geodir_after_custom_fields_updated', $lastid);

-

-            } else {

-

-                switch ($field_type):

-

-                    case 'address':

-

-                        $data_type = '';

-

-                        if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

-                        }

-                        $old_prefix = $old_html_variable;

-

-                        //$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL";

-

-                        $meta_field_add = "VARCHAR( 254 ) NULL";

-                        if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                        }

-

-                        geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);

-                        //$wpdb->query($meta_field_add);

-

-

-                        if (!empty($extra_fields)) {

+						array($site_title, $post_type, $htmlvar_name)

+					)

+				);

+

+

+				if ($cat_sort == '')

+					$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

+

+

+				/**

+				 * Called after all custom fields are saved for a post.

+				 *

+				 * @since 1.0.0

+				 * @param int $lastid The post ID.

+				 */

+				do_action('geodir_after_custom_fields_updated', $lastid);

+

+			} else {

+

+				switch ($field_type):

+

+					case 'address':

+

+						$data_type = '';

+

+						if ($htmlvar_name != '') {

+							$prefix = $htmlvar_name . '_';

+						}

+						$old_prefix = $old_html_variable;

+

+						//$meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."address` VARCHAR( 254 ) NULL";

+

+						$meta_field_add = "VARCHAR( 254 ) NULL";

+						if ($default_value != '') {

+							$meta_field_add .= " DEFAULT '" . $default_value . "'";

+						}

+

+						geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);

+						//$wpdb->query($meta_field_add);

+

+

+						if (!empty($extra_fields)) {

 

-                            if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";

-                                $meta_field_add = "VARCHAR( 30 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";

-                                $meta_field_add = "VARCHAR( 30 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 30 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";

-                                $meta_field_add = "VARCHAR( 15 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

-                                $meta_field_add = "VARCHAR( 20 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 20 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

-

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 15 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

-

-                                //$wpdb->query($meta_field_add);

-                            }

-                            if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 3 ) NULL";

-                                if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                                }

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

-

-                                //$wpdb->query($meta_field_add);

-                            }

-                            // show lat lng

-                            if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

-

-                                $meta_field_add = "VARCHAR( 3 ) NULL";

-                                $meta_field_add .= " DEFAULT '1'";

-

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

-                                //$wpdb->query($meta_field_add);

-                            }

-                        }

-

-                        break;

-

-                    case 'checkbox':

-                        $data_type = 'TINYINT';

-

-                        $meta_field_add = $data_type . "( 1 ) NOT NULL ";

-                        if ((int)$default_value === 1) {

-                            $meta_field_add .= " DEFAULT '1'";

-                        }

-

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

-                        }

-                        break;

-                    case 'multiselect':

-                    case 'select':

-                        $data_type = 'VARCHAR';

-                        $op_size = '500';

-

-                        // only make the field as big as it needs to be.

-                        if (isset($option_values) && $option_values && $field_type == 'select') {

-                            $option_values_arr = explode(',', $option_values);

-

-                            if (is_array($option_values_arr)) {

-                                $op_max = 0;

-

-                                foreach ($option_values_arr as $op_val) {

-                                    if (strlen($op_val) && strlen($op_val) > $op_max) {

-                                        $op_max = strlen($op_val);

-                                    }

-                                }

-

-                                if ($op_max) {

-                                    $op_size = $op_max;

-                                }

-                            }

-                        } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

-                            if (strlen($option_values)) {

-                                $op_size =  strlen($option_values);

-                            }

-

-                            if (isset($request_field['multi_display_type'])) {

-                                $extra_fields = $request_field['multi_display_type'];

-                            }

-                        }

-

-                        $meta_field_add = $data_type . "( $op_size ) NULL ";

-                        if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                        }

-

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

-                        }

-                        break;

-                    case 'textarea':

-                    case 'html':

-                    case 'url':

-                    case 'file':

-

-                        $data_type = 'TEXT';

-

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

-

-                        $meta_field_add = $data_type . " NULL ";

-                        /*if($default_value != '')

+							if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";

+								$meta_field_add = "VARCHAR( 30 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";

+								$meta_field_add = "VARCHAR( 30 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";

+

+								$meta_field_add = "VARCHAR( 30 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";

+								$meta_field_add = "VARCHAR( 15 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+								$meta_field_add = "VARCHAR( 20 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+

+								$meta_field_add = "VARCHAR( 20 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+

+								$meta_field_add = "VARCHAR( 15 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+

+								//$wpdb->query($meta_field_add);

+							}

+							if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+

+								$meta_field_add = "VARCHAR( 3 ) NULL";

+								if ($default_value != '') {

+									$meta_field_add .= " DEFAULT '" . $default_value . "'";

+								}

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+

+								//$wpdb->query($meta_field_add);

+							}

+							// show lat lng

+							if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

+								$meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+

+								$meta_field_add = "VARCHAR( 3 ) NULL";

+								$meta_field_add .= " DEFAULT '1'";

+

+								geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+								//$wpdb->query($meta_field_add);

+							}

+						}

+

+						break;

+

+					case 'checkbox':

+						$data_type = 'TINYINT';

+

+						$meta_field_add = $data_type . "( 1 ) NOT NULL ";

+						if ((int)$default_value === 1) {

+							$meta_field_add .= " DEFAULT '1'";

+						}

+

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

+						}

+						break;

+					case 'multiselect':

+					case 'select':

+						$data_type = 'VARCHAR';

+						$op_size = '500';

+

+						// only make the field as big as it needs to be.

+						if (isset($option_values) && $option_values && $field_type == 'select') {

+							$option_values_arr = explode(',', $option_values);

+

+							if (is_array($option_values_arr)) {

+								$op_max = 0;

+

+								foreach ($option_values_arr as $op_val) {

+									if (strlen($op_val) && strlen($op_val) > $op_max) {

+										$op_max = strlen($op_val);

+									}

+								}

+

+								if ($op_max) {

+									$op_size = $op_max;

+								}

+							}

+						} elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

+							if (strlen($option_values)) {

+								$op_size =  strlen($option_values);

+							}

+

+							if (isset($request_field['multi_display_type'])) {

+								$extra_fields = $request_field['multi_display_type'];

+							}

+						}

+

+						$meta_field_add = $data_type . "( $op_size ) NULL ";

+						if ($default_value != '') {

+							$meta_field_add .= " DEFAULT '" . $default_value . "'";

+						}

+

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

+						}

+						break;

+					case 'textarea':

+					case 'html':

+					case 'url':

+					case 'file':

+

+						$data_type = 'TEXT';

+

+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+

+						$meta_field_add = $data_type . " NULL ";

+						/*if($default_value != '')

 					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/

 

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

-                        }

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

+						}

 

-                        break;

+						break;

 

-                    case 'datepicker':

+					case 'datepicker':

 

-                        $data_type = 'DATE';

+						$data_type = 'DATE';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+						$meta_field_add = $data_type . " NULL ";

 

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value must have in valid date format.', 'geodirectory');

-                        }

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value must have in valid date format.', 'geodirectory');

+						}

 

-                        break;

+						break;

 

-                    case 'time':

+					case 'time':

 

-                        $data_type = 'TIME';

+						$data_type = 'TIME';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+						$default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+						$meta_field_add = $data_type . " NULL ";

 

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value must have in valid time format.', 'geodirectory');

-                        }

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value must have in valid time format.', 'geodirectory');

+						}

 

-                        break;

+						break;

 

-                    default:

+					default:

 

-                        if ($data_type != 'VARCHAR' && $data_type != '') {

-                            $meta_field_add = $data_type . " NULL ";

+						if ($data_type != 'VARCHAR' && $data_type != '') {

+							$meta_field_add = $data_type . " NULL ";

 

-                            if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";

-                            }

+							if ($data_type == 'FLOAT' && $decimal_point > 0) {

+								$meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";

+							}

 

-                            if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                            }

-                        } else {

-                            $meta_field_add = " VARCHAR( 254 ) NULL ";

+							if (is_numeric($default_value) && $default_value != '') {

+								$default_value_add .= " DEFAULT '" . $default_value . "'";

+								$meta_field_add .= " DEFAULT '" . $default_value . "'";

+							}

+						} else {

+							$meta_field_add = " VARCHAR( 254 ) NULL ";

 

-                            if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

-                            }

-                        }

+							if ($default_value != '') {

+								$default_value_add .= " DEFAULT '" . $default_value . "'";

+								$meta_field_add .= " DEFAULT '" . $default_value . "'";

+							}

+						}

 

-                        $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

-                        if ($add_result === false) {

-                            return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

-                        }

-                        break;

-                endswitch;

+						$add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

+						if ($add_result === false) {

+							return __('Column creation failed, you may have too many columns or the default value does not match with field data type.', 'geodirectory');

+						}

+						break;

+				endswitch;

 

-                $extra_field_query = '';

-                if (!empty($extra_fields)) {

-                    $extra_field_query = serialize($extra_fields);

-                }

+				$extra_field_query = '';

+				if (!empty($extra_fields)) {

+					$extra_field_query = serialize($extra_fields);

+				}

 

-                $decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';

+				$decimal_point = $field_type == 'text' && $data_type == 'FLOAT' ? $decimal_point : '';

 

-                $wpdb->query(

+				$wpdb->query(

 

-                    $wpdb->prepare(

+					$wpdb->prepare(

 

-                        "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+						"insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -1139,26 +1139,26 @@ 
 					validation_msg = %s,

 					for_admin_use = %s ",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)

+						array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)

 

-                    )

+					)

 

-                );

+				);

 

-                $lastid = $wpdb->insert_id;

+				$lastid = $wpdb->insert_id;

 

-                $lastid = trim($lastid);

+				$lastid = trim($lastid);

 

-            }

+			}

 

-            return (int)$lastid;

+			return (int)$lastid;

 

 

-        } else {

-            return 'HTML Variable Name should be a unique name';

-        }

+		} else {

+			return 'HTML Variable Name should be a unique name';

+		}

 

-    }

+	}

 }

 

 /**

@@ -1173,54 +1173,54 @@ 
 function godir_set_field_order($field_ids = array())

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    $count = 0;

-    if (!empty($field_ids)):

-        $post_meta_info = false;

-        foreach ($field_ids as $id) {

+	$count = 0;

+	if (!empty($field_ids)):

+		$post_meta_info = false;

+		foreach ($field_ids as $id) {

 

-            $cf = trim($id, '_');

+			$cf = trim($id, '_');

 

-            $post_meta_info = $wpdb->query(

-                $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+			$post_meta_info = $wpdb->query(

+				$wpdb->prepare(

+					"update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

 															sort_order=%d 

 															where id= %d",

-                    array($count, $cf)

-                )

-            );

-            $count++;

-        }

-

-        return $post_meta_info;

-    else:

-        return false;

-    endif;

+					array($count, $cf)

+				)

+			);

+			$count++;

+		}

+

+		return $post_meta_info;

+	else:

+		return false;

+	endif;

 }

 

 

 function geodir_get_cf_value($cf){

-    global $gd_session;

-    $value = '';

-    if (is_admin()) {

-        global $post,$gd_session;

-

-        if (isset($_REQUEST['post']))

-            $_REQUEST['pid'] = $_REQUEST['post'];

-    }

-

-    if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

-        $post = $gd_ses_listing;

-        $value = isset($post[$cf['name']]) ? $post[$cf['name']] : '';

-    } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

-        $value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true);

-    } else {

-        if ($value == '') {

-            $value = $cf['default'];

-        }

-    }

-    return $value;

+	global $gd_session;

+	$value = '';

+	if (is_admin()) {

+		global $post,$gd_session;

+

+		if (isset($_REQUEST['post']))

+			$_REQUEST['pid'] = $_REQUEST['post'];

+	}

+

+	if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

+		$post = $gd_ses_listing;

+		$value = isset($post[$cf['name']]) ? $post[$cf['name']] : '';

+	} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+		$value = geodir_get_post_meta($_REQUEST['pid'], $cf['name'], true);

+	} else {

+		if ($value == '') {

+			$value = $cf['default'];

+		}

+	}

+	return $value;

 }

 

 /**

@@ -1239,422 +1239,422 @@ 
  * @param string $post_type Optional. The wordpress post type.

  */

 function geodir_get_custom_fields_html($package_id = '', $default = 'custom', $post_type = 'gd_place') {

-    global $is_default, $mapzoom, $gd_session;

+	global $is_default, $mapzoom, $gd_session;

 

-    $listing_type = $post_type;

+	$listing_type = $post_type;

 

-    $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);

+	$custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);

 

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

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

-        $val = stripslashes_deep($val); // strip slashes from labels

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

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

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

+		$val = stripslashes_deep($val); // strip slashes from labels

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

 

-        $name = $val['name'];

-        $type = $val['type'];

-        $is_default = $val['is_default'];

+		$name = $val['name'];

+		$type = $val['type'];

+		$is_default = $val['is_default'];

 

-        /* field available to site admin only for edit */

-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;

-        if ($for_admin_use && !is_super_admin()) {

-            continue;

-        }

+		/* field available to site admin only for edit */

+		$for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;

+		if ($for_admin_use && !is_super_admin()) {

+			continue;

+		}

 

-        if (is_admin()) {

-            global $post;

+		if (is_admin()) {

+			global $post;

 

-            if (isset($_REQUEST['post']))

-                $_REQUEST['pid'] = $_REQUEST['post'];

-        }

+			if (isset($_REQUEST['post']))

+				$_REQUEST['pid'] = $_REQUEST['post'];

+		}

 

         

 

-        /**

-         * Called before the custom fields info is output for submitting a post.

-         *

-         * Used dynamic hook type geodir_before_custom_form_field_$name.

-         *

-         * @since 1.0.0

-         * @param string $listing_type The post post type.

-         * @param int $package_id The price package ID for the post.

-         * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

-         * @see 'geodir_after_custom_form_field_$name'

-         */

-        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);

-

-

-        $custom_field = $val;

-        $html ='';

-        /**

-         * Filter the output for custom fields.

-         *

-         * Here we can remove or add new functions depending on the field type.

-         *

-         * @param string $html The html to be filtered (blank).

-         * @param array $custom_field The custom field array values.

-         */

-        echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);

-

-

-

-        /**

-         * Called after the custom fields info is output for submitting a post.

-         *

-         * Used dynamic hook type geodir_after_custom_form_field_$name.

-         *

-         * @since 1.0.0

-         * @param string $listing_type The post post type.

-         * @param int $package_id The price package ID for the post.

-         * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

-         * @see 'geodir_before_custom_form_field_$name'

-         */

-        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);

-

-    }

+		/**

+		 * Called before the custom fields info is output for submitting a post.

+		 *

+		 * Used dynamic hook type geodir_before_custom_form_field_$name.

+		 *

+		 * @since 1.0.0

+		 * @param string $listing_type The post post type.

+		 * @param int $package_id The price package ID for the post.

+		 * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

+		 * @see 'geodir_after_custom_form_field_$name'

+		 */

+		do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);

+

+

+		$custom_field = $val;

+		$html ='';

+		/**

+		 * Filter the output for custom fields.

+		 *

+		 * Here we can remove or add new functions depending on the field type.

+		 *

+		 * @param string $html The html to be filtered (blank).

+		 * @param array $custom_field The custom field array values.

+		 */

+		echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);

+

+

+

+		/**

+		 * Called after the custom fields info is output for submitting a post.

+		 *

+		 * Used dynamic hook type geodir_after_custom_form_field_$name.

+		 *

+		 * @since 1.0.0

+		 * @param string $listing_type The post post type.

+		 * @param int $package_id The price package ID for the post.

+		 * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

+		 * @see 'geodir_before_custom_form_field_$name'

+		 */

+		do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);

+

+	}

 

 }

 

 

 if (!function_exists('geodir_get_field_infoby')) {

-    /**

-     * Get custom field using key and value.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $key The key you want to look for.

-     * @param string $value The value of the key you want to look for.

-     * @param string $geodir_post_type The post type.

-     * @return bool|mixed Returns field info when available. otherwise returns false.

-     */

-    function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')

-    {

-

-        global $wpdb;

-

-        $filter = $wpdb->get_row(

-            $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",

-                array($geodir_post_type)

-            )

-        );

-

-        if ($filter) {

-            return $filter;

-        } else {

-            return false;

-        }

-

-    }

+	/**

+	 * Get custom field using key and value.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $key The key you want to look for.

+	 * @param string $value The value of the key you want to look for.

+	 * @param string $geodir_post_type The post type.

+	 * @return bool|mixed Returns field info when available. otherwise returns false.

+	 */

+	function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')

+	{

+

+		global $wpdb;

+

+		$filter = $wpdb->get_row(

+			$wpdb->prepare(

+				"SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",

+				array($geodir_post_type)

+			)

+		);

+

+		if ($filter) {

+			return $filter;

+		} else {

+			return false;

+		}

+

+	}

 }

 

 

 function geodir_field_icon_proccess($cf){

 

 

-    if (strpos($cf['field_icon'], 'http') !== false) {

-        $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

-    } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {

-        $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';

-    }else{

-        $field_icon = $cf['field_icon'];

-    }

+	if (strpos($cf['field_icon'], 'http') !== false) {

+		$field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

+	} elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {

+		$field_icon = '<i class="' . $cf['field_icon'] . '"></i>';

+	}else{

+		$field_icon = $cf['field_icon'];

+	}

 

-    return $field_icon;

+	return $field_icon;

 }

 

 if (!function_exists('geodir_show_listing_info')) {

-    /**

-     * Show listing info depending on field location.

-     *

-     * @since 1.0.0

-     * @since 1.5.7 Custom fields option values added to db translation.

-     *              Changes to display url fields title.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post The current post object.

-     * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false.

-     *

-     * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.

-     * @return string Returns listing info html.

-     */

-    function geodir_show_listing_info($fields_location = '') {

-        global $post, $preview, $wpdb, $send_to_friend;

-

-        $package_info = array();

-

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

-        $post_package_id = !empty($package_info->pid) ? $package_info->pid : '';

-        $p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype();

-        $send_to_friend = false;

-

-        ob_start();

-        $fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location);

-

-        if (!empty($fields_info)) {

-            $post = stripslashes_deep($post); // strip slashes

+	/**

+	 * Show listing info depending on field location.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.7 Custom fields option values added to db translation.

+	 *              Changes to display url fields title.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post The current post object.

+	 * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false.

+	 *

+	 * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.

+	 * @return string Returns listing info html.

+	 */

+	function geodir_show_listing_info($fields_location = '') {

+		global $post, $preview, $wpdb, $send_to_friend;

+

+		$package_info = array();

+

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

+		$post_package_id = !empty($package_info->pid) ? $package_info->pid : '';

+		$p_type = !empty($post->post_type) ? $post->post_type : geodir_get_current_posttype();

+		$send_to_friend = false;

+

+		ob_start();

+		$fields_info = geodir_post_custom_fields($post_package_id, 'all', $p_type, $fields_location);

+

+		if (!empty($fields_info)) {

+			$post = stripslashes_deep($post); // strip slashes

             

-            //echo '<div class="geodir-company_info field-group">';

-            global $field_set_start;

-            $field_set_start = 0;

-

-

-

-            foreach ($fields_info as $type) {

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

-                $html = '';

-                $field_icon = geodir_field_icon_proccess($type);

-                $filed_type = $type['type'];

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

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

-

-                /**

-                 * Filter the output for custom fields.

-                 *

-                 * Here we can remove or add new functions depending on the field type.

-                 *

-                 * @param string $html The html to be filtered (blank).

-                 * @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);

-

-                $variables_array = array();

-

-

-                if ($type['type'] != 'fieldset'):

-                    $variables_array['post_id'] = $post->ID;

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

-                    $variables_array['value'] = '';

-                    if (isset($post->{$type['htmlvar_name']}))

-                        $variables_array['value'] = $post->{$type['htmlvar_name']};

-                endif;

-

-

-                if ($html):

-

-                    /**

-                     * Called before a custom fields is output on the frontend.

-                     *

-                     * @since 1.0.0

-                     * @param string $html_var The HTML variable name for the field.

-                     */

-                    do_action("geodir_before_show_{$html_var}");

-                    /**

-                     * Filter custom field output.

-                     *

-                     * @since 1.0.0

-                     *

-                     * @param string $html_var The HTML variable name for the field.

-                     * @param string $html Custom field unfiltered HTML.

-                     * @param array $variables_array Custom field variables array.

-                     */

-                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);

-

-                    /**

-                     * Called after a custom fields is output on the frontend.

-                     *

-                     * @since 1.0.0

-                     * @param string $html_var The HTML variable name for the field.

-                     */

-                    do_action("geodir_after_show_{$html_var}");

-

-                endif;

-

-            }

-

-            //echo '</div>';

-

-        }

-

-

-        $html = ob_get_clean();

-

-        /**

-         * Filter the custom fields over all output.

-         *

-         * @param string $html The html of the custom fields.

-         * @param string $fields_location The location the fields are being output.

-         * @since 1.6.9

-         */

-        return apply_filters('geodir_show_listing_info',$html,$fields_location);

-

-    }

+			//echo '<div class="geodir-company_info field-group">';

+			global $field_set_start;

+			$field_set_start = 0;

+

+

+

+			foreach ($fields_info as $type) {

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

+				$html = '';

+				$field_icon = geodir_field_icon_proccess($type);

+				$filed_type = $type['type'];

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

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

+

+				/**

+				 * Filter the output for custom fields.

+				 *

+				 * Here we can remove or add new functions depending on the field type.

+				 *

+				 * @param string $html The html to be filtered (blank).

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

+

+				$variables_array = array();

+

+

+				if ($type['type'] != 'fieldset'):

+					$variables_array['post_id'] = $post->ID;

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

+					$variables_array['value'] = '';

+					if (isset($post->{$type['htmlvar_name']}))

+						$variables_array['value'] = $post->{$type['htmlvar_name']};

+				endif;

+

+

+				if ($html):

+

+					/**

+					 * Called before a custom fields is output on the frontend.

+					 *

+					 * @since 1.0.0

+					 * @param string $html_var The HTML variable name for the field.

+					 */

+					do_action("geodir_before_show_{$html_var}");

+					/**

+					 * Filter custom field output.

+					 *

+					 * @since 1.0.0

+					 *

+					 * @param string $html_var The HTML variable name for the field.

+					 * @param string $html Custom field unfiltered HTML.

+					 * @param array $variables_array Custom field variables array.

+					 */

+					if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);

+

+					/**

+					 * Called after a custom fields is output on the frontend.

+					 *

+					 * @since 1.0.0

+					 * @param string $html_var The HTML variable name for the field.

+					 */

+					do_action("geodir_after_show_{$html_var}");

+

+				endif;

+

+			}

+

+			//echo '</div>';

+

+		}

+

+

+		$html = ob_get_clean();

+

+		/**

+		 * Filter the custom fields over all output.

+		 *

+		 * @param string $html The html of the custom fields.

+		 * @param string $fields_location The location the fields are being output.

+		 * @since 1.6.9

+		 */

+		return apply_filters('geodir_show_listing_info',$html,$fields_location);

+

+	}

 }

 

 if (!function_exists('geodir_default_date_format')) {

-    /**

-     * Returns default date format.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return mixed|string|void Returns default date format.

-     */

-    function geodir_default_date_format()

-    {

-        if ($format = get_option('date_format'))

-            return $format;

-        else

-            return 'dd-mm-yy';

-    }

+	/**

+	 * Returns default date format.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return mixed|string|void Returns default date format.

+	 */

+	function geodir_default_date_format()

+	{

+		if ($format = get_option('date_format'))

+			return $format;

+		else

+			return 'dd-mm-yy';

+	}

 }

 

 if (!function_exists('geodir_get_formated_date')) {

-    /**

-     * Returns formatted date.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $date Date string to convert.

-     * @return bool|int|string Returns formatted date.

-     */

-    function geodir_get_formated_date($date)

-    {

-        return mysql2date(get_option('date_format'), $date);

-    }

+	/**

+	 * Returns formatted date.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $date Date string to convert.

+	 * @return bool|int|string Returns formatted date.

+	 */

+	function geodir_get_formated_date($date)

+	{

+		return mysql2date(get_option('date_format'), $date);

+	}

 }

 

 if (!function_exists('geodir_get_formated_time')) {

-    /**

-     * Returns formatted time.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $time Time string to convert.

-     * @return bool|int|string Returns formatted time.

-     */

-    function geodir_get_formated_time($time)

-    {

-        return mysql2date(get_option('time_format'), $time, $translate = true);

-    }

+	/**

+	 * Returns formatted time.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $time Time string to convert.

+	 * @return bool|int|string Returns formatted time.

+	 */

+	function geodir_get_formated_time($time)

+	{

+		return mysql2date(get_option('time_format'), $time, $translate = true);

+	}

 }

 

 

 if (!function_exists('geodir_save_post_file_fields')) {

-    /**

-     * Save post file fields

-     *

-     * @since 1.0.0

-     * @since 1.4.7 Added `$extra_fields` parameter.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @global object $current_user Current user object.

-     * @param int $post_id

-     * @param string $field_id

-     * @param array $post_image

-     * @param array $extra_fields Array of extra fields.

-     */

-    function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())

-    {

+	/**

+	 * Save post file fields

+	 *

+	 * @since 1.0.0

+	 * @since 1.4.7 Added `$extra_fields` parameter.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @global object $current_user Current user object.

+	 * @param int $post_id

+	 * @param string $field_id

+	 * @param array $post_image

+	 * @param array $extra_fields Array of extra fields.

+	 */

+	function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())

+	{

 

-        global $wpdb, $plugin_prefix, $current_user;

+		global $wpdb, $plugin_prefix, $current_user;

 

-        $post_type = get_post_type($post_id);

-        //echo $field_id; exit;

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

+		$post_type = get_post_type($post_id);

+		//echo $field_id; exit;

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

 

-        $postcurr_images = array();

-        $postcurr_images = geodir_get_post_meta($post_id, $field_id, true);

-        $file_urls = '';

+		$postcurr_images = array();

+		$postcurr_images = geodir_get_post_meta($post_id, $field_id, true);

+		$file_urls = '';

 

-        if (!empty($post_image)) {

+		if (!empty($post_image)) {

 

-            $invalid_files = array();

+			$invalid_files = array();

 

-            //Get and remove all old images of post from database to set by new order

-            $geodir_uploaddir = '';

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

+			//Get and remove all old images of post from database to set by new order

+			$geodir_uploaddir = '';

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

 

-            $geodir_uploadpath = $uploads['path'];

-            $geodir_uploadurl = $uploads['url'];

-            $sub_dir = $uploads['subdir'];

+			$geodir_uploadpath = $uploads['path'];

+			$geodir_uploadurl = $uploads['url'];

+			$sub_dir = $uploads['subdir'];

 

-            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

 

-            for ($m = 0; $m < count($post_image); $m++) {

+			for ($m = 0; $m < count($post_image); $m++) {

 

-                /* --------- start ------- */

+				/* --------- start ------- */

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

+				if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

 

 

-                    $curr_img_url = $post_image[$m];

-                    $image_name_arr = explode('/', $curr_img_url);

-                    $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];

-                    $filename = end($image_name_arr);

-                    $img_name_arr = explode('.', $filename);

+					$curr_img_url = $post_image[$m];

+					$image_name_arr = explode('/', $curr_img_url);

+					$curr_img_dir = $image_name_arr[count($image_name_arr) - 2];

+					$filename = end($image_name_arr);

+					$img_name_arr = explode('.', $filename);

 

-                    $arr_file_type = wp_check_filetype($filename);

+					$arr_file_type = wp_check_filetype($filename);

 

-                    if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

-                        continue;

-                    }

+					if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

+						continue;

+					}

 

-                    $uploaded_file_type = $arr_file_type['type'];

-                    $uploaded_file_ext = $arr_file_type['ext'];

+					$uploaded_file_type = $arr_file_type['type'];

+					$uploaded_file_ext = $arr_file_type['ext'];

 

-                    if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

-                        continue; // Invalid file type.

-                    }

+					if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

+						continue; // Invalid file type.

+					}

 

-                    // Set an array containing a list of acceptable formats

-                    //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

+					// Set an array containing a list of acceptable formats

+					//$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

-                    if (!function_exists('wp_handle_upload'))

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

+					if (!function_exists('wp_handle_upload'))

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

 

-                    if (!is_dir($geodir_uploadpath))

-                        mkdir($geodir_uploadpath);

+					if (!is_dir($geodir_uploadpath))

+						mkdir($geodir_uploadpath);

 

-                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

-                    $explode_sub_dir = explode("/", $sub_dir);

-                    if ($curr_img_dir == end($explode_sub_dir)) {

-                        $img_path = $geodir_uploadpath . '/' . $filename;

-                        $img_url = $geodir_uploadurl . '/' . $filename;

-                    } else {

-                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

-                    }

+					$new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

+					$explode_sub_dir = explode("/", $sub_dir);

+					if ($curr_img_dir == end($explode_sub_dir)) {

+						$img_path = $geodir_uploadpath . '/' . $filename;

+						$img_url = $geodir_uploadurl . '/' . $filename;

+					} else {

+						$img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+						$img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+					}

 

-                    $uploaded_file = '';

-                    if (file_exists($img_path))

-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+					$uploaded_file = '';

+					if (file_exists($img_path))

+						$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

 

-                    if ($curr_img_dir != $geodir_uploaddir) {

-                        if (file_exists($img_path))

-                            unlink($img_path);

-                    }

+					if ($curr_img_dir != $geodir_uploaddir) {

+						if (file_exists($img_path))

+							unlink($img_path);

+					}

 

-                    if (!empty($uploaded_file))

-                        $file_urls = $geodir_uploadurl . '/' . $new_name;

+					if (!empty($uploaded_file))

+						$file_urls = $geodir_uploadurl . '/' . $new_name;

 

-                } else {

-                    $file_urls = $post_image[$m];

-                }

-            }

+				} else {

+					$file_urls = $post_image[$m];

+				}

+			}

 

 

-        }

+		}

 

-        //Remove all old attachments and temp images

-        if (!empty($postcurr_images)) {

+		//Remove all old attachments and temp images

+		if (!empty($postcurr_images)) {

 

-            if ($file_urls != $postcurr_images) {

-                $invalid_files[] = (object)array('src' => $postcurr_images);

-                $invalid_files = (object)$invalid_files;

-            }

-        }

+			if ($file_urls != $postcurr_images) {

+				$invalid_files[] = (object)array('src' => $postcurr_images);

+				$invalid_files = (object)$invalid_files;

+			}

+		}

 

-        geodir_save_post_meta($post_id, $field_id, $file_urls);

+		geodir_save_post_meta($post_id, $field_id, $file_urls);

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

+		if (!empty($invalid_files))

+			geodir_remove_attachments($invalid_files);

 

-    }

+	}

 }

 

 

@@ -1669,76 +1669,76 @@ 
  */

 function geodir_custom_upload_mimes($existing_mimes = array())

 {

-    $existing_mimes['wif'] = 'text/plain';

-    $existing_mimes['jpg|jpeg'] = 'image/jpeg';

-    $existing_mimes['gif'] = 'image/gif';

-    $existing_mimes['png'] = 'image/png';

-    $existing_mimes['pdf'] = 'application/pdf';

-    $existing_mimes['txt'] = 'text/text';

-    $existing_mimes['csv'] = 'application/octet-stream';

-    $existing_mimes['doc'] = 'application/msword';

-    $existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel';

-    $existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';

-    $existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';

-    return $existing_mimes;

+	$existing_mimes['wif'] = 'text/plain';

+	$existing_mimes['jpg|jpeg'] = 'image/jpeg';

+	$existing_mimes['gif'] = 'image/gif';

+	$existing_mimes['png'] = 'image/png';

+	$existing_mimes['pdf'] = 'application/pdf';

+	$existing_mimes['txt'] = 'text/text';

+	$existing_mimes['csv'] = 'application/octet-stream';

+	$existing_mimes['doc'] = 'application/msword';

+	$existing_mimes['xla|xls|xlt|xlw'] = 'application/vnd.ms-excel';

+	$existing_mimes['docx'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';

+	$existing_mimes['xlsx'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';

+	return $existing_mimes;

 }

 

 if (!function_exists('geodir_plupload_action')) {

 

-    /**

-     * Get upload directory path details

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $current_user Current user object.

-     * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.

-     * @return mixed Returns upload directory details as an array.

-     */

-    function geodir_upload_dir($upload)

-    {

-        global $current_user;

-        $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

-        $upload['path'] = $upload['basedir'] . $upload['subdir'];

-        $upload['url'] = $upload['baseurl'] . $upload['subdir'];

-        return $upload;

-    }

-

-    /**

-     * Handles place file and image upload.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_plupload_action()

-    {

-        // check ajax nonce

-        $imgid = $_POST["imgid"];

-

-        check_ajax_referer($imgid . 'pluploadan');

-

-        // handle custom file uploaddir

-        add_filter('upload_dir', 'geodir_upload_dir');

-

-        // change file orientation if needed

-        $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);

-

-        // handle file upload

-        $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));

-        // remove handle custom file uploaddir

-        remove_filter('upload_dir', 'geodir_upload_dir');

-

-        if(!isset($status['url']) && isset($status['error'])){

-            print_r($status);

-        }

-

-        // send the uploaded file url in response

-        if (isset($status['url'])) {

-            echo $status['url'];

-        } else {

-            echo 'x';

-        }

-        exit;

-    }

+	/**

+	 * Get upload directory path details

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $current_user Current user object.

+	 * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.

+	 * @return mixed Returns upload directory details as an array.

+	 */

+	function geodir_upload_dir($upload)

+	{

+		global $current_user;

+		$upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

+		$upload['path'] = $upload['basedir'] . $upload['subdir'];

+		$upload['url'] = $upload['baseurl'] . $upload['subdir'];

+		return $upload;

+	}

+

+	/**

+	 * Handles place file and image upload.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_plupload_action()

+	{

+		// check ajax nonce

+		$imgid = $_POST["imgid"];

+

+		check_ajax_referer($imgid . 'pluploadan');

+

+		// handle custom file uploaddir

+		add_filter('upload_dir', 'geodir_upload_dir');

+

+		// change file orientation if needed

+		$fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);

+

+		// handle file upload

+		$status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));

+		// remove handle custom file uploaddir

+		remove_filter('upload_dir', 'geodir_upload_dir');

+

+		if(!isset($status['url']) && isset($status['error'])){

+			print_r($status);

+		}

+

+		// send the uploaded file url in response

+		if (isset($status['url'])) {

+			echo $status['url'];

+		} else {

+			echo 'x';

+		}

+		exit;

+	}

 }

 

 /**

@@ -1753,17 +1753,17 @@ 
  */

 function geodir_get_video($post_id)

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

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

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

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));

+	$results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));

 

-    if ($results) {

-        return $results[0]->geodir_video;

-    }

+	if ($results) {

+		return $results[0]->geodir_video;

+	}

 

 }

 

@@ -1779,40 +1779,40 @@ 
  */

 function geodir_get_special_offers($post_id)

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

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

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

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));

+	$results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));

 

-    if ($results) {

-        return $results[0]->geodir_special_offers;

-    }

+	if ($results) {

+		return $results[0]->geodir_special_offers;

+	}

 

 }

 

 if (!function_exists('geodir_max_upload_size')) {

-    /**

-     * Get max upload file size

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return mixed|void Returns max upload file size.

-     */

-    function geodir_max_upload_size()

-    {

-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

-

-        if ($max_filesize > 0 && $max_filesize < 1) {

-            $max_filesize = (int)($max_filesize * 1024) . 'kb';

-        } else {

-            $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

-        }

-        /** Filter documented in geodirectory-functions/general_functions.php **/

-        return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

-    }

+	/**

+	 * Get max upload file size

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return mixed|void Returns max upload file size.

+	 */

+	function geodir_max_upload_size()

+	{

+		$max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

+

+		if ($max_filesize > 0 && $max_filesize < 1) {

+			$max_filesize = (int)($max_filesize * 1024) . 'kb';

+		} else {

+			$max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

+		}

+		/** Filter documented in geodirectory-functions/general_functions.php **/

+		return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

+	}

 }

 

 

@@ -1830,33 +1830,33 @@ 
  */

 function geodir_add_custom_sort_options($fields, $post_type)

 {

-    global $wpdb;

+	global $wpdb;

 

-    if ($post_type != '') {

+	if ($post_type != '') {

 

-        $all_postypes = geodir_get_posttypes();

+		$all_postypes = geodir_get_posttypes();

 

-        if (in_array($post_type, $all_postypes)) {

+		if (in_array($post_type, $all_postypes)) {

 

-            $custom_fields = $wpdb->get_results(

-                $wpdb->prepare(

-                    "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

-                    array($post_type)

-                ), 'ARRAY_A'

-            );

+			$custom_fields = $wpdb->get_results(

+				$wpdb->prepare(

+					"select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

+					array($post_type)

+				), 'ARRAY_A'

+			);

 

-            if (!empty($custom_fields)) {

+			if (!empty($custom_fields)) {

 

-                foreach ($custom_fields as $val) {

-                    $fields[] = $val;

-                }

-            }

+				foreach ($custom_fields as $val) {

+					$fields[] = $val;

+				}

+			}

 

-        }

+		}

 

-    }

+	}

 

-    return $fields;

+	return $fields;

 }

 

 

@@ -1872,76 +1872,76 @@ 
 function geodir_get_custom_sort_options($post_type = '')

 {

 

-    global $wpdb;

-

-    if ($post_type != '') {

-

-        $all_postypes = geodir_get_posttypes();

-

-        if (!in_array($post_type, $all_postypes))

-            return false;

-

-        $fields = array();

-

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'random',

-            'site_title' => 'Random',

-            'htmlvar_name' => 'post_title',

-            'field_icon' =>  'fa fa-random',

-            'description' =>  __('Random sort (not recommended for large sites)', 'geodirectory')

-        );

-

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'datetime',

-            'site_title' => __('Add date', 'geodirectory'),

-            'htmlvar_name' => 'post_date',

-            'field_icon' =>  'fa fa-calendar',

-            'description' =>  __('Sort by date added', 'geodirectory')

-        );

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'bigint',

-            'site_title' => __('Review', 'geodirectory'),

-            'htmlvar_name' => 'comment_count',

-            'field_icon' =>  'fa fa-commenting-o',

-            'description' =>  __('Sort by the number of reviews', 'geodirectory')

-        );

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'float',

-            'site_title' => __('Rating', 'geodirectory'),

-            'htmlvar_name' => 'overall_rating',

-            'field_icon' =>  'fa fa-star-o',

-            'description' =>  __('Sort by the overall rating value', 'geodirectory')

-        );

-        $fields[] = array(

-            'post_type' => $post_type,

-            'data_type' => '',

-            'field_type' => 'text',

-            'site_title' => __('Title', 'geodirectory'),

-            'htmlvar_name' => 'post_title',

-            'field_icon' =>  'fa fa-sort-alpha-desc',

-            'description' =>  __('Sort alphabetically by title', 'geodirectory')

-        );

-

-        /**

-         * Hook to add custom sort options.

-         *

-         * @since 1.0.0

-         * @param array $fields Unmodified sort options array.

-         * @param string $post_type Post type.

-         */

-        return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);

-

-    }

-

-    return false;

+	global $wpdb;

+

+	if ($post_type != '') {

+

+		$all_postypes = geodir_get_posttypes();

+

+		if (!in_array($post_type, $all_postypes))

+			return false;

+

+		$fields = array();

+

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'random',

+			'site_title' => 'Random',

+			'htmlvar_name' => 'post_title',

+			'field_icon' =>  'fa fa-random',

+			'description' =>  __('Random sort (not recommended for large sites)', 'geodirectory')

+		);

+

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'datetime',

+			'site_title' => __('Add date', 'geodirectory'),

+			'htmlvar_name' => 'post_date',

+			'field_icon' =>  'fa fa-calendar',

+			'description' =>  __('Sort by date added', 'geodirectory')

+		);

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'bigint',

+			'site_title' => __('Review', 'geodirectory'),

+			'htmlvar_name' => 'comment_count',

+			'field_icon' =>  'fa fa-commenting-o',

+			'description' =>  __('Sort by the number of reviews', 'geodirectory')

+		);

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'float',

+			'site_title' => __('Rating', 'geodirectory'),

+			'htmlvar_name' => 'overall_rating',

+			'field_icon' =>  'fa fa-star-o',

+			'description' =>  __('Sort by the overall rating value', 'geodirectory')

+		);

+		$fields[] = array(

+			'post_type' => $post_type,

+			'data_type' => '',

+			'field_type' => 'text',

+			'site_title' => __('Title', 'geodirectory'),

+			'htmlvar_name' => 'post_title',

+			'field_icon' =>  'fa fa-sort-alpha-desc',

+			'description' =>  __('Sort alphabetically by title', 'geodirectory')

+		);

+

+		/**

+		 * Hook to add custom sort options.

+		 *

+		 * @since 1.0.0

+		 * @param array $fields Unmodified sort options array.

+		 * @param string $post_type Post type.

+		 */

+		return $fields = apply_filters('geodir_add_custom_sort_options', $fields, $post_type);

+

+	}

+

+	return false;

 }

 

 

@@ -1957,117 +1957,117 @@ 
 function godir_set_sort_field_order($field_ids = array())

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    $count = 0;

-    if (!empty($field_ids)):

-        foreach ($field_ids as $id) {

+	$count = 0;

+	if (!empty($field_ids)):

+		foreach ($field_ids as $id) {

 

-            $cf = trim($id, '_');

+			$cf = trim($id, '_');

 

-            $post_meta_info = $wpdb->query(

-                $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+			$post_meta_info = $wpdb->query(

+				$wpdb->prepare(

+					"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

 															sort_order=%d 

 															where id= %d",

-                    array($count, $cf)

-                )

-            );

-            $count++;

-        }

-

-        return $field_ids;

-    else:

-        return false;

-    endif;

+					array($count, $cf)

+				)

+			);

+			$count++;

+		}

+

+		return $field_ids;

+	else:

+		return false;

+	endif;

 }

 

 

 if (!function_exists('geodir_custom_sort_field_save')) {

-    /**

-     * Save or Update custom sort fields into the database.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param array $request_field {

-     *    Attributes of the Request field.

-     *

-     *    @type string $action Ajax action name.

-     *    @type string $manage_field_type Manage field type Default "sorting_options".

-     *    @type string $create_field Do you want to create this field?.

-     *    @type string $field_ins_upd Field created or updated?.

-     *    @type string $_wpnonce Nonce value.

-     *    @type string $listing_type The Post type.

-     *    @type string $field_type Field Type.

-     *    @type string $field_id Field ID.

-     *    @type string $data_type Data Type.

-     *    @type string $htmlvar_name HTML variable name.

-     *    @type string $site_title Section title which you wish to display in frontend.

-     *    @type string $is_default Is this default sorting?.

-     *    @type string $is_active If not active then the field will not be displayed anywhere.

-     *    @type string $sort_order Sort Order.

-     *

-     * }

-     * @param bool $default Not yet implemented.

-     * @return int Returns the last affected db table row id.

-     */

-    function geodir_custom_sort_field_save($request_field = array(), $default = false)

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

-

-        $cf = trim($result_str, '_');

-

-        /*-------- check duplicate validation --------*/

-

-        $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';

-        $cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

-

-        $post_type = $request_field['listing_type'];

-        $data_type = isset($request_field['data_type']) ? $request_field['data_type'] : '';

-        $field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';

-        $site_title = isset($request_field['site_title']) ? $request_field['site_title'] : '';

-        $htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

-        $sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0;

-        $is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0;

-        $is_default = isset($request_field['is_default']) ? $request_field['is_default'] : '';

-        $asc = isset($request_field['asc']) ? $request_field['asc'] : 0;

-        $desc = isset($request_field['desc']) ? $request_field['desc'] : 0;

-        $asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : '';

-        $desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : '';

-

-        $default_order = '';

-        if ($is_default != '') {

-            $default_order = $is_default;

-            $is_default = '1';

-        }

-

-

-        $check_html_variable = $wpdb->get_var(

-            $wpdb->prepare(

-                "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",

-                array($cehhtmlvar_name, $post_type, $field_type)

-            )

-        );

-

-        if ($is_default == 1) {

-

-            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));

-

-        }

-

-

-        if (!$check_html_variable) {

-

-            $wpdb->query(

-

-                $wpdb->prepare(

-

-                    "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+	/**

+	 * Save or Update custom sort fields into the database.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param array $request_field {

+	 *    Attributes of the Request field.

+	 *

+	 *    @type string $action Ajax action name.

+	 *    @type string $manage_field_type Manage field type Default "sorting_options".

+	 *    @type string $create_field Do you want to create this field?.

+	 *    @type string $field_ins_upd Field created or updated?.

+	 *    @type string $_wpnonce Nonce value.

+	 *    @type string $listing_type The Post type.

+	 *    @type string $field_type Field Type.

+	 *    @type string $field_id Field ID.

+	 *    @type string $data_type Data Type.

+	 *    @type string $htmlvar_name HTML variable name.

+	 *    @type string $site_title Section title which you wish to display in frontend.

+	 *    @type string $is_default Is this default sorting?.

+	 *    @type string $is_active If not active then the field will not be displayed anywhere.

+	 *    @type string $sort_order Sort Order.

+	 *

+	 * }

+	 * @param bool $default Not yet implemented.

+	 * @return int Returns the last affected db table row id.

+	 */

+	function geodir_custom_sort_field_save($request_field = array(), $default = false)

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

+

+		$cf = trim($result_str, '_');

+

+		/*-------- check duplicate validation --------*/

+

+		$field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';

+		$cehhtmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

+

+		$post_type = $request_field['listing_type'];

+		$data_type = isset($request_field['data_type']) ? $request_field['data_type'] : '';

+		$field_type = isset($request_field['field_type']) ? $request_field['field_type'] : '';

+		$site_title = isset($request_field['site_title']) ? $request_field['site_title'] : '';

+		$htmlvar_name = isset($request_field['htmlvar_name']) ? $request_field['htmlvar_name'] : '';

+		$sort_order = isset($request_field['sort_order']) ? $request_field['sort_order'] : 0;

+		$is_active = isset($request_field['is_active']) ? $request_field['is_active'] : 0;

+		$is_default = isset($request_field['is_default']) ? $request_field['is_default'] : '';

+		$asc = isset($request_field['asc']) ? $request_field['asc'] : 0;

+		$desc = isset($request_field['desc']) ? $request_field['desc'] : 0;

+		$asc_title = isset($request_field['asc_title']) ? $request_field['asc_title'] : '';

+		$desc_title = isset($request_field['desc_title']) ? $request_field['desc_title'] : '';

+

+		$default_order = '';

+		if ($is_default != '') {

+			$default_order = $is_default;

+			$is_default = '1';

+		}

+

+

+		$check_html_variable = $wpdb->get_var(

+			$wpdb->prepare(

+				"select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",

+				array($cehhtmlvar_name, $post_type, $field_type)

+			)

+		);

+

+		if ($is_default == 1) {

+

+			$wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));

+

+		}

+

+

+		if (!$check_html_variable) {

+

+			$wpdb->query(

+

+				$wpdb->prepare(

+

+					"insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -2082,23 +2082,23 @@ 
 				asc_title = %s,

 				desc_title = %s",

 

-                    array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title)

-                )

+					array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title)

+				)

 

-            );

+			);

 

 

-            $lastid = $wpdb->insert_id;

+			$lastid = $wpdb->insert_id;

 

-            $lastid = trim($lastid);

+			$lastid = trim($lastid);

 

-        } else {

+		} else {

 

-            $wpdb->query(

+			$wpdb->query(

 

-                $wpdb->prepare(

+				$wpdb->prepare(

 

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+					"update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -2114,123 +2114,123 @@ 
 				desc_title = %s

 				where id = %d",

 

-                    array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf)

-                )

+					array($post_type, $data_type, $field_type, $site_title, $htmlvar_name, $sort_order, $is_active, $is_default, $default_order, $asc, $desc, $asc_title, $desc_title, $cf)

+				)

 

-            );

+			);

 

-            $lastid = trim($cf);

+			$lastid = trim($cf);

 

-        }

+		}

 

 

-        return (int)$lastid;

+		return (int)$lastid;

 

-    }

+	}

 }

 

 

 if (!function_exists('geodir_custom_sort_field_delete')) {

-    /**

-     * Delete a custom sort field using field id.

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param string $field_id The field ID.

-     * @return int|string Returns field id when successful deletion, else returns 0.

-     */

-    function geodir_custom_sort_field_delete($field_id = '')

-    {

-

-        global $wpdb, $plugin_prefix;

-        if ($field_id != '') {

-            $cf = trim($field_id, '_');

-

-            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));

-

-            return $field_id;

-

-        } else

-            return 0;

-

-    }

+	/**

+	 * Delete a custom sort field using field id.

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param string $field_id The field ID.

+	 * @return int|string Returns field id when successful deletion, else returns 0.

+	 */

+	function geodir_custom_sort_field_delete($field_id = '')

+	{

+

+		global $wpdb, $plugin_prefix;

+		if ($field_id != '') {

+			$cf = trim($field_id, '_');

+

+			$wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));

+

+			return $field_id;

+

+		} else

+			return 0;

+

+	}

 }

 

 

 if (!function_exists('geodir_custom_sort_field_adminhtml')) {

-    /**

-     * Custom sort field admin html.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param string $field_type The form field type.

-     * @param object|int $result_str The custom field results object or row id.

-     * @param string $field_ins_upd When set to "submit" displays form.

-     * @param bool $default when set to true field will be for admin use only.

-     */

-    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')

-    {

-        global $wpdb;

-        $cf = $result_str;

-        if (!is_object($cf)) {

-            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));

-        } else {

-            $field_info = $cf;

-            $result_str = $cf->id;

-        }

-

-        $field_info = stripslashes_deep($field_info); // strip slashes

-

-        if (!isset($field_info->post_type)) {

-            $post_type = sanitize_text_field($_REQUEST['listing_type']);

-        } else {

-            $post_type = $field_info->post_type;

-        }

-

-

-        $htmlvar_name = isset($field_type_key) ? $field_type_key : '';

-

-        $site_title = '';

-        if ($site_title == '')

-            $site_title = isset($field_info->site_title) ? $field_info->site_title : '';

-

-        if ($site_title == '') {

-            $fields = geodir_get_custom_sort_options($post_type);

-

-            foreach ($fields as $val) {

-                $val = stripslashes_deep($val); // strip slashes

-

-                if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {

-                    $site_title = isset($val['site_title']) ? $val['site_title'] : '';

-                }

-            }

-        }

-

-        if ($htmlvar_name == '')

-            $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

-

-        $nonce = wp_create_nonce('custom_fields_' . $result_str);

-

-        $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

-        $cso_arr = geodir_get_custom_sort_options($post_type);

-

-        $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);

-        foreach($cso_arr as $cso){

-            if($cur_field_type==$cso['field_type']){

-

-                if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {

-                    $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';

-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){

-                    $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';

-                }

-

-            }

-        }

-

-        $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);

-        ?>

+	/**

+	 * Custom sort field admin html.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param string $field_type The form field type.

+	 * @param object|int $result_str The custom field results object or row id.

+	 * @param string $field_ins_upd When set to "submit" displays form.

+	 * @param bool $default when set to true field will be for admin use only.

+	 */

+	function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')

+	{

+		global $wpdb;

+		$cf = $result_str;

+		if (!is_object($cf)) {

+			$field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));

+		} else {

+			$field_info = $cf;

+			$result_str = $cf->id;

+		}

+

+		$field_info = stripslashes_deep($field_info); // strip slashes

+

+		if (!isset($field_info->post_type)) {

+			$post_type = sanitize_text_field($_REQUEST['listing_type']);

+		} else {

+			$post_type = $field_info->post_type;

+		}

+

+

+		$htmlvar_name = isset($field_type_key) ? $field_type_key : '';

+

+		$site_title = '';

+		if ($site_title == '')

+			$site_title = isset($field_info->site_title) ? $field_info->site_title : '';

+

+		if ($site_title == '') {

+			$fields = geodir_get_custom_sort_options($post_type);

+

+			foreach ($fields as $val) {

+				$val = stripslashes_deep($val); // strip slashes

+

+				if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {

+					$site_title = isset($val['site_title']) ? $val['site_title'] : '';

+				}

+			}

+		}

+

+		if ($htmlvar_name == '')

+			$htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

+

+		$nonce = wp_create_nonce('custom_fields_' . $result_str);

+

+		$field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

+		$cso_arr = geodir_get_custom_sort_options($post_type);

+

+		$cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);

+		foreach($cso_arr as $cso){

+			if($cur_field_type==$cso['field_type']){

+

+				if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {

+					$field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';

+				}elseif(isset($cso['field_icon']) && $cso['field_icon']){

+					$field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';

+				}

+

+			}

+		}

+

+		$radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);

+		?>

 

         <li class="text" id="licontainer_<?php echo $result_str;?>">

             <form><!-- we need to wrap in a form so we can use radio buttons with same name -->

@@ -2239,7 +2239,7 @@ 
                  ondblclick="show_hide('field_frm<?php echo $result_str;?>')">

                 <?php

 

-                ?>

+				?>

 

                 <div title="<?php _e('Click to remove field', 'geodirectory');?>"

                      onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

@@ -2254,17 +2254,17 @@ 
 

             <div id="field_frm<?php echo $result_str;?>" class="field_frm"

                  style="display:<?php if ($field_ins_upd == 'submit') {

-                     echo 'block;';

-                 } else {

-                     echo 'none;';

-                 } ?>">

+					 echo 'block;';

+				 } else {

+					 echo 'none;';

+				 } ?>">

                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>

                 <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>

                 <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>

                 <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/>

                 <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {

-                    echo $field_info->data_type;

-                }?>"/>

+					echo $field_info->data_type;

+				}?>"/>

                 <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/>

 

 

@@ -2287,14 +2287,14 @@ 
 

                                 <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled"  value="1"

                                     <?php if ($value == '1') {

-                                        echo 'checked';

-                                    } ?>/>

+										echo 'checked';

+									} ?>/>

                                 <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                                 <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0"

                                     <?php if ($value == '0' || !$value) {

-                                        echo 'checked';

-                                    } ?>/>

+										echo 'checked';

+									} ?>/>

                                 <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                             </div>

@@ -2331,8 +2331,8 @@ 
 

                                 <input type="radio" name="is_default"

                                        value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {

-                                    echo 'checked="checked"';

-                                } ?>/>

+									echo 'checked="checked"';

+								} ?>/>

                             </div>

 

                         </li>

@@ -2352,14 +2352,14 @@ 
 

                                 <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled"  value="1"

                                     <?php if ($value == '1') {

-                                        echo 'checked';

-                                    } ?>/>

+										echo 'checked';

+									} ?>/>

                                 <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                                 <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0"

                                     <?php if ($value == '0' || !$value) {

-                                        echo 'checked';

-                                    } ?>/>

+										echo 'checked';

+									} ?>/>

                                 <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                             </div>

@@ -2395,8 +2395,8 @@ 
 

                                 <input type="radio" name="is_default"

                                        value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {

-                                    echo 'checked="checked"';

-                                } ?>/>

+									echo 'checked="checked"';

+								} ?>/>

                             </div>

 

                         </li>

@@ -2438,8 +2438,8 @@ 
 

                                 <input type="checkbox" name="is_default"

                                        value="<?php echo $field_type; ?>"  <?php if (isset($value) && $value == '1') {

-                                    echo 'checked="checked"';

-                                } ?>/>

+									echo 'checked="checked"';

+								} ?>/>

                             </div>

 

 

@@ -2462,14 +2462,14 @@ 
 

                             <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"

                                 <?php if ($value == '1') {

-                                    echo 'checked';

-                                } ?>/>

+									echo 'checked';

+								} ?>/>

                             <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

                             <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"

                                 <?php if ($value == '0' || !$value) {

-                                    echo 'checked';

-                                } ?>/>

+									echo 'checked';

+								} ?>/>

                             <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                         </div>

@@ -2479,8 +2479,8 @@ 
 

                     <input type="hidden" readonly="readonly" name="sort_order" id="sort_order"

                                                 value="<?php if (isset($field_info->sort_order)) {

-                                                    echo esc_attr($field_info->sort_order);

-                                                }?>" size="50"/>

+													echo esc_attr($field_info->sort_order);

+												}?>" size="50"/>

 

 

 

@@ -2504,38 +2504,38 @@ 
             </form>

         </li> <?php

 

-    }

+	}

 }

 

 if (!function_exists('check_field_visibility')) {

-    /**

-     * Check field visibility as per price package.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global array $geodir_addon_list List of active GeoDirectory extensions.

-     * @param int|string $package_id The package ID.

-     * @param string $field_name The field name.

-     * @param string $post_type Optional. The wordpress post type.

-     * @return bool Returns true when field visible, otherwise false.

-     */

-    function check_field_visibility($package_id, $field_name, $post_type)

-    {

-        global $wpdb, $geodir_addon_list;

-        if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {

-            return true;

-        }

-        if (!$package_id || !$field_name || !$post_type) {

-            return true;

-        }

-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));

-

-        if ($wpdb->get_var($sql)) {

-            return true;

-        }

-        return false;

-    }

+	/**

+	 * Check field visibility as per price package.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global array $geodir_addon_list List of active GeoDirectory extensions.

+	 * @param int|string $package_id The package ID.

+	 * @param string $field_name The field name.

+	 * @param string $post_type Optional. The wordpress post type.

+	 * @return bool Returns true when field visible, otherwise false.

+	 */

+	function check_field_visibility($package_id, $field_name, $post_type)

+	{

+		global $wpdb, $geodir_addon_list;

+		if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {

+			return true;

+		}

+		if (!$package_id || !$field_name || !$post_type) {

+			return true;

+		}

+		$sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));

+

+		if ($wpdb->get_var($sql)) {

+			return true;

+		}

+		return false;

+	}

 }

 

 /**

@@ -2551,43 +2551,43 @@ 
  */

 function geodir_string_to_options($input = '', $translated = false)

 {

-    $return = array();

-    if ($input != '') {

-        $input = trim($input);

-        $input = rtrim($input, ",");

-        $input = ltrim($input, ",");

-        $input = trim($input);

-    }

-

-    $input_arr = explode(',', $input);

-

-    if (!empty($input_arr)) {

-        foreach ($input_arr as $input_str) {

-            $input_str = trim($input_str);

-

-            if (strpos($input_str, "/") !== false) {

-                $input_str = explode("/", $input_str, 2);

-                $label = trim($input_str[0]);

-                if ($translated && $label != '') {

-                    $label = __($label, 'geodirectory');

-                }

-                $label = ucfirst($label);

-                $value = trim($input_str[1]);

-            } else {

-                $value = $input_str;

-                if ($translated && $input_str != '') {

-                    $input_str = __($input_str, 'geodirectory');

-                }

-                $label = ucfirst($input_str);

-            }

-

-            if ($label != '') {

-                $return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);

-            }

-        }

-    }

-

-    return $return;

+	$return = array();

+	if ($input != '') {

+		$input = trim($input);

+		$input = rtrim($input, ",");

+		$input = ltrim($input, ",");

+		$input = trim($input);

+	}

+

+	$input_arr = explode(',', $input);

+

+	if (!empty($input_arr)) {

+		foreach ($input_arr as $input_str) {

+			$input_str = trim($input_str);

+

+			if (strpos($input_str, "/") !== false) {

+				$input_str = explode("/", $input_str, 2);

+				$label = trim($input_str[0]);

+				if ($translated && $label != '') {

+					$label = __($label, 'geodirectory');

+				}

+				$label = ucfirst($label);

+				$value = trim($input_str[1]);

+			} else {

+				$value = $input_str;

+				if ($translated && $input_str != '') {

+					$input_str = __($input_str, 'geodirectory');

+				}

+				$label = ucfirst($input_str);

+			}

+

+			if ($label != '') {

+				$return[] = array('label' => $label, 'value' => $value, 'optgroup' => NULL);

+			}

+		}

+	}

+

+	return $return;

 }

 

 /**

@@ -2602,66 +2602,66 @@ 
  */

 function geodir_string_values_to_options($option_values = '', $translated = false)

 {

-    $options = array();

-    if ($option_values == '') {

-        return NULL;

-    }

-

-    if (strpos($option_values, "{/optgroup}") !== false) {

-        $option_values_arr = explode("{/optgroup}", $option_values);

-

-        foreach ($option_values_arr as $optgroup) {

-            if (strpos($optgroup, "{optgroup}") !== false) {

-                $optgroup_arr = explode("{optgroup}", $optgroup);

-

-                $count = 0;

-                foreach ($optgroup_arr as $optgroup_str) {

-                    $count++;

-                    $optgroup_str = trim($optgroup_str);

-

-                    $optgroup_label = '';

-                    if (strpos($optgroup_str, "|") !== false) {

-                        $optgroup_str_arr = explode("|", $optgroup_str, 2);

-                        $optgroup_label = trim($optgroup_str_arr[0]);

-                        if ($translated && $optgroup_label != '') {

-                            $optgroup_label = __($optgroup_label, 'geodirectory');

-                        }

-                        $optgroup_label = ucfirst($optgroup_label);

-                        $optgroup_str = $optgroup_str_arr[1];

-                    }

-

-                    $optgroup3 = geodir_string_to_options($optgroup_str, $translated);

-

-                    if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {

-                        $optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));

-                        $optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));

-                        $optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end);

-                    }

-                    $options = array_merge($options, $optgroup3);

-                }

-            } else {

-                $optgroup1 = geodir_string_to_options($optgroup, $translated);

-                $options = array_merge($options, $optgroup1);

-            }

-        }

-    } else {

-        $options = geodir_string_to_options($option_values, $translated);

-    }

-

-    return $options;

+	$options = array();

+	if ($option_values == '') {

+		return NULL;

+	}

+

+	if (strpos($option_values, "{/optgroup}") !== false) {

+		$option_values_arr = explode("{/optgroup}", $option_values);

+

+		foreach ($option_values_arr as $optgroup) {

+			if (strpos($optgroup, "{optgroup}") !== false) {

+				$optgroup_arr = explode("{optgroup}", $optgroup);

+

+				$count = 0;

+				foreach ($optgroup_arr as $optgroup_str) {

+					$count++;

+					$optgroup_str = trim($optgroup_str);

+

+					$optgroup_label = '';

+					if (strpos($optgroup_str, "|") !== false) {

+						$optgroup_str_arr = explode("|", $optgroup_str, 2);

+						$optgroup_label = trim($optgroup_str_arr[0]);

+						if ($translated && $optgroup_label != '') {

+							$optgroup_label = __($optgroup_label, 'geodirectory');

+						}

+						$optgroup_label = ucfirst($optgroup_label);

+						$optgroup_str = $optgroup_str_arr[1];

+					}

+

+					$optgroup3 = geodir_string_to_options($optgroup_str, $translated);

+

+					if ($count > 1 && $optgroup_label != '' && !empty($optgroup3)) {

+						$optgroup_start = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'start'));

+						$optgroup_end = array(array('label' => $optgroup_label, 'value' => NULL, 'optgroup' => 'end'));

+						$optgroup3 = array_merge($optgroup_start, $optgroup3, $optgroup_end);

+					}

+					$options = array_merge($options, $optgroup3);

+				}

+			} else {

+				$optgroup1 = geodir_string_to_options($optgroup, $translated);

+				$options = array_merge($options, $optgroup1);

+			}

+		}

+	} else {

+		$options = geodir_string_to_options($option_values, $translated);

+	}

+

+	return $options;

 }

 

 

 function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){

-    ob_start();

-

-    $dt_value = '';

-    if (isset($field_info->data_type)) {

-        $dt_value  = esc_attr($field_info->data_type);

-    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

-        $dt_value  = $cf['defaults']['data_type'];

-    }

-    ?>

+	ob_start();

+

+	$dt_value = '';

+	if (isset($field_info->data_type)) {

+		$dt_value  = esc_attr($field_info->data_type);

+	}elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

+		$dt_value  = $cf['defaults']['data_type'];

+	}

+	?>

     <li>

         <label for="data_type"><?php _e('Field Data Type ? :', 'geodirectory'); ?></label>

         <div class="gd-cf-input-wrap">

@@ -2670,16 +2670,16 @@ 
                     onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');">

                 <option

                     value="XVARCHAR" <?php if ($dt_value  == 'VARCHAR') {

-                    echo 'selected="selected"';

-                } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>

+					echo 'selected="selected"';

+				} ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>

                 <option

                     value="INT" <?php if ($dt_value   == 'INT') {

-                    echo 'selected="selected"';

-                } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>

+					echo 'selected="selected"';

+				} ?>><?php _e('NUMBER', 'geodirectory'); ?></option>

                 <option

                     value="FLOAT" <?php if ($dt_value   == 'FLOAT') {

-                    echo 'selected="selected"';

-                } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>

+					echo 'selected="selected"';

+				} ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>

             </select>

             <br/> <span><?php _e('Select Custom Field type', 'geodirectory'); ?></span>

 

@@ -2687,13 +2687,13 @@ 
     </li>

 

     <?php

-    $value = '';

-    if (isset($field_info->decimal_point)) {

-        $value = esc_attr($field_info->decimal_point);

-    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){

-        $value = $cf['defaults']['decimal_point'];

-    }

-    ?>

+	$value = '';

+	if (isset($field_info->decimal_point)) {

+		$value = esc_attr($field_info->decimal_point);

+	}elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){

+		$value = $cf['defaults']['decimal_point'];

+	}

+	?>

 

     <li class="decimal-point-wrapper"

         style="<?php echo ($dt_value  == 'FLOAT') ? '' : 'display:none' ?>">

@@ -2702,7 +2702,7 @@ 
             <select name="decimal_point" id="decimal_point">

                 <option value=""><?php echo _e('Select', 'geodirectory'); ?></option>

                 <?php for ($i = 1; $i <= 10; $i++) {

-                    $selected = $i == $value ? 'selected="selected"' : ''; ?>

+					$selected = $i == $value ? 'selected="selected"' : ''; ?>

                     <option value="<?php echo $i; ?>" <?php echo $selected; ?>><?php echo $i; ?></option>

                 <?php } ?>

             </select>

@@ -2711,8 +2711,8 @@ 
     </li>

 <?php

 

-    $output = ob_get_clean();

-    return $output;

+	$output = ob_get_clean();

+	return $output;

 }

 add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);

 

@@ -2750,9 +2750,9 @@ 
 

 

 function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){

-    if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}

-    ob_start();

-    ?>

+	if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}

+	ob_start();

+	?>

     <li>

         <label for="advanced_editor" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show advanced editor :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

@@ -2763,13 +2763,13 @@ 
         <div class="gd-cf-input-wrap">

 

             <?php

-            $selected = '';

-            if (isset($field_info->extra_fields))

-                $advanced_editor = unserialize($field_info->extra_fields);

+			$selected = '';

+			if (isset($field_info->extra_fields))

+				$advanced_editor = unserialize($field_info->extra_fields);

 

-            if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))

-                $selected = 'checked="checked"';

-            ?>

+			if (!empty($advanced_editor) && is_array($advanced_editor) && in_array('1', $advanced_editor))

+				$selected = 'checked="checked"';

+			?>

 

             <input type="checkbox" name="advanced_editor[]" id="advanced_editor"

                    value="1" <?php echo $selected; ?>/>

@@ -2778,22 +2778,22 @@ 
     </li>

     <?php

 

-    $output = ob_get_clean();

-    return $output;

+	$output = ob_get_clean();

+	return $output;

 }

 add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);

 

 

 function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){

-    ob_start();

-

-    $value = '';

-    if (isset($field_info->validation_pattern)) {

-        $value = esc_attr($field_info->validation_pattern);

-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){

-        $value = esc_attr($cf['defaults']['validation_pattern']);

-    }

-    ?>

+	ob_start();

+

+	$value = '';

+	if (isset($field_info->validation_pattern)) {

+		$value = esc_attr($field_info->validation_pattern);

+	}elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){

+		$value = esc_attr($cf['defaults']['validation_pattern']);

+	}

+	?>

     <li>

         <label for="validation_pattern" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Pattern:', 'geodirectory'); ?>

@@ -2807,13 +2807,13 @@ 
         </div>

     </li>

     <?php

-    $value = '';

-    if (isset($field_info->validation_msg)) {

-        $value = esc_attr($field_info->validation_msg);

-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){

-        $value = esc_attr($cf['defaults']['validation_msg']);

-    }

-    ?>

+	$value = '';

+	if (isset($field_info->validation_msg)) {

+		$value = esc_attr($field_info->validation_msg);

+	}elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){

+		$value = esc_attr($cf['defaults']['validation_msg']);

+	}

+	?>

     <li>

         <label for="validation_msg" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Validation Message:', 'geodirectory'); ?>

@@ -2828,21 +2828,21 @@ 
     </li>

     <?php

 

-    $output = ob_get_clean();

-    return $output;

+	$output = ob_get_clean();

+	return $output;

 }

 add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);

 

 

 function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){

-    ob_start();

-    global $post_type;

-

-    if (!isset($field_info->post_type)) {

-        $post_type = sanitize_text_field($_REQUEST['listing_type']);

-    } else

-        $post_type = $field_info->post_type;

-    ?>

+	ob_start();

+	global $post_type;

+

+	if (!isset($field_info->post_type)) {

+		$post_type = sanitize_text_field($_REQUEST['listing_type']);

+	} else

+		$post_type = $field_info->post_type;

+	?>

     <li style="display: none;">

         <label for="htmlvar_name" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Select taxonomy:', 'geodirectory'); ?>

@@ -2853,15 +2853,15 @@ 
         <div class="gd-cf-input-wrap">

             <select name="htmlvar_name" id="htmlvar_name">

                 <?php

-                $gd_taxonomy = geodir_get_taxonomies($post_type);

+				$gd_taxonomy = geodir_get_taxonomies($post_type);

 

-                foreach ($gd_taxonomy as $gd_tax) {

-                    ?>

+				foreach ($gd_taxonomy as $gd_tax) {

+					?>

                     <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {

-                        echo 'selected="selected"';

-                    }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php

-                }

-                ?>

+						echo 'selected="selected"';

+					}?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php

+				}

+				?>

             </select>

         </div>

     </li>

@@ -2877,49 +2877,49 @@ 
 

             <select name="cat_display_type" id="cat_display_type">

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {

-                    echo 'selected="selected"';

-                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {

-                    echo 'selected="selected"';

-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="select"><?php _e('Select', 'geodirectory');?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {

-                    echo 'selected="selected"';

-                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {

-                    echo 'selected="selected"';

-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {

-                    echo 'selected="selected"';

-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

             </select>

         </div>

     </li>

     <?php

 

-    $output = ob_get_clean();

-    return $output;

+	$output = ob_get_clean();

+	return $output;

 }

 add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);

 

 

 function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){

 

-    ob_start();

-    if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

-        $address = stripslashes_deep(unserialize($field_info->extra_fields));

-    }

+	ob_start();

+	if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

+		$address = stripslashes_deep(unserialize($field_info->extra_fields));

+	}

 

-    $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);

-    ?>

+	$radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);

+	?>

     <?php

-    /**

-     * Called on the add custom fields settings page before the address field is output.

-     *

-     * @since 1.0.0

-     * @param array $address The address settings array.

-     * @param object $field_info Extra fields info.

-     */

-    do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>

+	/**

+	 * Called on the add custom fields settings page before the address field is output.

+	 *

+	 * @since 1.0.0

+	 * @param array $address The address settings array.

+	 * @param object $field_info Extra fields info.

+	 */

+	do_action('geodir_address_extra_admin_fields', $address, $field_info); ?>

 

     <li>

         <label for="show_zip" class="gd-cf-tooltip-wrap">

@@ -2932,14 +2932,14 @@ 
 

             <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

             <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

 

@@ -2956,8 +2956,8 @@ 
         <div class="gd-cf-input-wrap">

             <input type="text" name="extra[zip_lable]" id="zip_lable"

                    value="<?php if (isset($address['zip_lable'])) {

-                       echo esc_attr($address['zip_lable']);

-                   }?>"/>

+					   echo esc_attr($address['zip_lable']);

+				   }?>"/>

         </div>

     </li>

 

@@ -2974,8 +2974,8 @@ 
         <div class="gd-cf-input-wrap">

             <input type="text" name="extra[map_lable]" id="map_lable"

                    value="<?php if (isset($address['map_lable'])) {

-                       echo esc_attr($address['map_lable']);

-                   }?>"/>

+					   echo esc_attr($address['map_lable']);

+				   }?>"/>

         </div>

     </li>

 

@@ -2990,14 +2990,14 @@ 
 

             <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

             <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

@@ -3014,14 +3014,14 @@ 
 

             <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

             <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

@@ -3038,8 +3038,8 @@ 
         <div class="gd-cf-input-wrap">

             <input type="text" name="extra[mapview_lable]" id="mapview_lable"

                    value="<?php if (isset($address['mapview_lable'])) {

-                       echo esc_attr($address['mapview_lable']);

-                   }?>"/>

+					   echo esc_attr($address['mapview_lable']);

+				   }?>"/>

         </div>

     </li>

     <li>

@@ -3053,29 +3053,29 @@ 
 

             <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

             <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

     <?php

 

-    $html = ob_get_clean();

-    return $output.$html;

+	$html = ob_get_clean();

+	return $output.$html;

 }

 add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);

 

 

 function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){

-    ob_start();

-    ?>

+	ob_start();

+	?>

     <li>

         <label for="multi_display_type" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>

@@ -3087,14 +3087,14 @@ 
 

             <select name="multi_display_type" id="multi_display_type">

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {

-                    echo 'selected="selected"';

-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="select"><?php _e('Select', 'geodirectory');?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {

-                    echo 'selected="selected"';

-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {

-                    echo 'selected="selected"';

-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

+					echo 'selected="selected"';

+				}?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

             </select>

 

             <br/>

@@ -3102,25 +3102,25 @@ 
     </li>

     <?php

 

-    $html = ob_get_clean();

-    return $output.$html;

+	$html = ob_get_clean();

+	return $output.$html;

 }

 add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);

 

 

 function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){

 

-    ob_start();

+	ob_start();

 

-    $value = '';

-    if (isset($field_info->option_values)) {

-        $value = esc_attr($field_info->option_values);

-    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){

-        $value = esc_attr($cf['defaults']['option_values']);

-    }

+	$value = '';

+	if (isset($field_info->option_values)) {

+		$value = esc_attr($field_info->option_values);

+	}elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){

+		$value = esc_attr($cf['defaults']['option_values']);

+	}

 

-    $field_type = isset($field_info->field_type) ? $field_info->field_type : '';

-    ?>

+	$field_type = isset($field_info->field_type) ? $field_info->field_type : '';

+	?>

     <li>

         <label for="option_values" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>

@@ -3147,8 +3147,8 @@ 
     </li>

     <?php

 

-    $html = ob_get_clean();

-    return $output.$html;

+	$html = ob_get_clean();

+	return $output.$html;

 }

 add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);

 add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);

@@ -3156,12 +3156,12 @@ 
 

 

 function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){

-    ob_start();

-    $extra = array();

-    if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

-        $extra = unserialize($field_info->extra_fields);

-    }

-    ?>

+	ob_start();

+	$extra = array();

+	if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

+		$extra = unserialize($field_info->extra_fields);

+	}

+	?>

     <li>

         <label for="date_format" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>

@@ -3171,52 +3171,52 @@ 
         </label>

         <div class="gd-cf-input-wrap" style="overflow:inherit;">

             <?php

-            $date_formats = array(

-                'm/d/Y',

-                'd/m/Y',

-                'Y/m/d',

-                'm-d-Y',

-                'd-m-Y',

-                'Y-m-d',

-                'F j, Y',

-            );

-            /**

-             * Filter the custom field date format options.

-             *

-             * @since 1.6.5

-             * @param array $date_formats The PHP date format array.

-             */

-            $date_formats = apply_filters('geodir_date_formats',$date_formats);

-            ?>

+			$date_formats = array(

+				'm/d/Y',

+				'd/m/Y',

+				'Y/m/d',

+				'm-d-Y',

+				'd-m-Y',

+				'Y-m-d',

+				'F j, Y',

+			);

+			/**

+			 * Filter the custom field date format options.

+			 *

+			 * @since 1.6.5

+			 * @param array $date_formats The PHP date format array.

+			 */

+			$date_formats = apply_filters('geodir_date_formats',$date_formats);

+			?>

             <select name="extra[date_format]" id="date_format">

                 <?php

-                foreach($date_formats as $format){

-                    $selected = '';

-                    if(!empty($extra) && esc_attr($extra['date_format'])==$format){

-                        $selected = "selected='selected'";

-                    }

-                    echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";

-                }

-                ?>

+				foreach($date_formats as $format){

+					$selected = '';

+					if(!empty($extra) && esc_attr($extra['date_format'])==$format){

+						$selected = "selected='selected'";

+					}

+					echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";

+				}

+				?>

             </select>

 

         </div>

     </li>

     <?php

 

-    $html = ob_get_clean();

-    return $output.$html;

+	$html = ob_get_clean();

+	return $output.$html;

 }

 add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);

 

 

 function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){

-    ob_start();

-    $allowed_file_types = geodir_allowed_mime_types();

+	ob_start();

+	$allowed_file_types = geodir_allowed_mime_types();

 

-    $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

-    $gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');

-    ?>

+	$extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

+	$gd_file_types = !empty($extra_fields) && !empty($extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : array('*');

+	?>

     <li>

         <label for="gd_file_types" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>

@@ -3239,33 +3239,33 @@ 
     </li>

     <?php

 

-    $html = ob_get_clean();

-    return $output.$html;

+	$html = ob_get_clean();

+	return $output.$html;

 }

 add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);

 

 function geodir_cfa_extra_fields_text($output,$result_str,$cf,$field_info){

-    ob_start();

+	ob_start();

 

-    $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

+	$extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

    // print_r($cf);echo '###';

 

 

 

-    $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);

+	$radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name : rand(5, 500);

 

 

-    $value = '';

-    if ($extra_fields && isset($extra_fields['is_price'])) {

-    $value = esc_attr($extra_fields['is_price']);

-    }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){

-    $value = esc_attr($cf['defaults']['extra_fields']['is_price']);

-    }

+	$value = '';

+	if ($extra_fields && isset($extra_fields['is_price'])) {

+	$value = esc_attr($extra_fields['is_price']);

+	}elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){

+	$value = esc_attr($cf['defaults']['extra_fields']['is_price']);

+	}

 

-    $show_price_extra = ($value==1) ? 1 : 0;

+	$show_price_extra = ($value==1) ? 1 : 0;

 

-    $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0;

-    ?>

+	$show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0;

+	?>

     <li class="gdcf-price-extra-set" <?php if(!$show_price){ echo "style='display:none;'";}?>>

         <label for="is_price" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display as price? :', 'geodirectory'); ?>

@@ -3277,14 +3277,14 @@ 
 

             <input type="radio" id="is_price_yes<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-enabled"  value="1"

                 <?php if ($value == '1') {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

             <input type="radio" id="is_price_no<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-disabled" value="0"

                 <?php if ($value == '0' || !$value) {

-                    echo 'checked';

-                } ?>/>

+					echo 'checked';

+				} ?>/>

             <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

@@ -3292,13 +3292,13 @@ 
 

     <?php

 

-    $value = '';

-    if ($extra_fields && isset($extra_fields['thousand_separator'])) {

-        $value = esc_attr($extra_fields['thousand_separator']);

-    }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){

-        $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']);

-    }

-    ?>

+	$value = '';

+	if ($extra_fields && isset($extra_fields['thousand_separator'])) {

+		$value = esc_attr($extra_fields['thousand_separator']);

+	}elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){

+		$value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']);

+	}

+	?>

     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

         <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory');?>

             <div class="gdcf-tooltip">

@@ -3319,13 +3319,13 @@ 
 

     <?php

 

-    $value = '';

-    if ($extra_fields && isset($extra_fields['decimal_separator'])) {

-        $value = esc_attr($extra_fields['decimal_separator']);

-    }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){

-        $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']);

-    }

-    ?>

+	$value = '';

+	if ($extra_fields && isset($extra_fields['decimal_separator'])) {

+		$value = esc_attr($extra_fields['decimal_separator']);

+	}elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){

+		$value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']);

+	}

+	?>

     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

         <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory');?>

             <div class="gdcf-tooltip">

@@ -3342,13 +3342,13 @@ 
 

     <?php

 

-    $value = '';

-    if ($extra_fields && isset($extra_fields['decimal_display'])) {

-        $value = esc_attr($extra_fields['decimal_display']);

-    }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){

-        $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']);

-    }

-    ?>

+	$value = '';

+	if ($extra_fields && isset($extra_fields['decimal_display'])) {

+		$value = esc_attr($extra_fields['decimal_display']);

+	}elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){

+		$value = esc_attr($cf['defaults']['extra_fields']['decimal_display']);

+	}

+	?>

     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

         <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory');?>

             <div class="gdcf-tooltip">

@@ -3365,13 +3365,13 @@ 
 

     <?php

 

-    $value = '';

-    if ($extra_fields && isset($extra_fields['currency_symbol'])) {

-        $value = esc_attr($extra_fields['currency_symbol']);

-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){

-        $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']);

-    }

-    ?>

+	$value = '';

+	if ($extra_fields && isset($extra_fields['currency_symbol'])) {

+		$value = esc_attr($extra_fields['currency_symbol']);

+	}elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){

+		$value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']);

+	}

+	?>

     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

         <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory');?>

             <div class="gdcf-tooltip">

@@ -3386,13 +3386,13 @@ 
 

     <?php

 

-    $value = '';

-    if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {

-        $value = esc_attr($extra_fields['currency_symbol_placement']);

-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){

-        $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']);

-    }

-    ?>

+	$value = '';

+	if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {

+		$value = esc_attr($extra_fields['currency_symbol_placement']);

+	}elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){

+		$value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']);

+	}

+	?>

     <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

         <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory');?>

             <div class="gdcf-tooltip">

@@ -3410,225 +3410,225 @@ 
 

     <?php

 

-    $html = ob_get_clean();

-    return $output.$html;

+	$html = ob_get_clean();

+	return $output.$html;

 }

 add_filter('geodir_cfa_extra_fields_text','geodir_cfa_extra_fields_text',10,4);

 

 function geodir_default_custom_fields($post_type='gd_place',$package_id=''){

-    $fields = array();

-    $package = ($package_id=='') ? '' : array($package_id);

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'taxonomy',

-                      'admin_title' => __('Category', 'geodirectory'),

-                      'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),

-                      'site_title' => __('Category', 'geodirectory'),

-                      'htmlvar_name' => $post_type.'category',

-                      'default_value' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'is_required' => '1',

-                      'show_in'   =>  '[detail]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Category', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'address',

-                      'admin_title' => __('Address', 'geodirectory'),

-                      'admin_desc' => ADDRESS_MSG,

-                      'site_title' => __('Address', 'geodirectory'),

-                      'htmlvar_name' => 'post',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'is_required' => '1',

-                      'show_in'   =>  '[detail],[mapbubble]',

-                      'show_on_pkg' => $package,

-                      'required_msg' => __('Address fields are required', 'geodirectory'),

-                      'clabels' => __('Address', 'geodirectory'),

-                      'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),

-                                       'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),

-                                       'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),

-                                       'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),

-                                       'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),

-                                       'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),

-                                       'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden',

-                                       'show_latlng' => 1));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'text',

-                      'admin_title' => __('Time', 'geodirectory'),

-                      'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),

-                      'site_title' => __('Time', 'geodirectory'),

-                      'htmlvar_name' => 'timing',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'show_in' =>  '[detail],[mapbubble]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Time', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'phone',

-                      'admin_title' => __('Phone', 'geodirectory'),

-                      'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),

-                      'site_title' => __('Phone', 'geodirectory'),

-                      'htmlvar_name' => 'contact',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'show_in' =>  '[detail],[mapbubble]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Phone', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'email',

-                      'admin_title' => __('Email', 'geodirectory'),

-                      'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),

-                      'site_title' => __('Email', 'geodirectory'),

-                      'htmlvar_name' => 'email',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'show_in' => '[detail]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Email', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'url',

-                      'admin_title' => __('Website', 'geodirectory'),

-                      'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),

-                      'site_title' => __('Website', 'geodirectory'),

-                      'htmlvar_name' => 'website',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'show_in' => '[detail]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Website', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'url',

-                      'admin_title' => __('Twitter', 'geodirectory'),

-                      'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),

-                      'site_title' => __('Twitter', 'geodirectory'),

-                      'htmlvar_name' => 'twitter',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'show_in' => '[detail]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Twitter', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'VARCHAR',

-                      'field_type' => 'url',

-                      'admin_title' => __('Facebook', 'geodirectory'),

-                      'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),

-                      'site_title' => __('Facebook', 'geodirectory'),

-                      'htmlvar_name' => 'facebook',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '1',

-                      'is_admin' => '1',

-                      'show_in' => '[detail]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Facebook', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'TEXT',

-                      'field_type' => 'textarea',

-                      'admin_title' => __('Video', 'geodirectory'),

-                      'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),

-                      'site_title' => __('Video', 'geodirectory'),

-                      'htmlvar_name' => 'video',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '0',

-                      'is_admin' => '1',

-                      'show_in' => '[owntab]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Video', 'geodirectory'));

-

-    $fields[] = array('listing_type' => $post_type,

-                      'data_type' => 'TEXT',

-                      'field_type' => 'textarea',

-                      'admin_title' => __('Special Offers', 'geodirectory'),

-                      'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),

-                      'site_title' => __('Special Offers', 'geodirectory'),

-                      'htmlvar_name' => 'special_offers',

-                      'default_value' => '',

-                      'option_values' => '',

-                      'is_default' => '0',

-                      'is_admin' => '1',

-                      'show_in' => '[owntab]',

-                      'show_on_pkg' => $package,

-                      'clabels' => __('Special Offers', 'geodirectory'));

-

-    /**

-     * Filter the array of default custom fields DB table data.

-     *

-     * @since 1.6.6

-     * @param string $fields The default custom fields as an array.

-     */

-    $fields = apply_filters('geodir_default_custom_fields', $fields);

-

-    return  $fields;

+	$fields = array();

+	$package = ($package_id=='') ? '' : array($package_id);

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'taxonomy',

+					  'admin_title' => __('Category', 'geodirectory'),

+					  'admin_desc' => __('SELECT listing category FROM here. SELECT at least one CATEGORY', 'geodirectory'),

+					  'site_title' => __('Category', 'geodirectory'),

+					  'htmlvar_name' => $post_type.'category',

+					  'default_value' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'is_required' => '1',

+					  'show_in'   =>  '[detail]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Category', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'address',

+					  'admin_title' => __('Address', 'geodirectory'),

+					  'admin_desc' => ADDRESS_MSG,

+					  'site_title' => __('Address', 'geodirectory'),

+					  'htmlvar_name' => 'post',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'is_required' => '1',

+					  'show_in'   =>  '[detail],[mapbubble]',

+					  'show_on_pkg' => $package,

+					  'required_msg' => __('Address fields are required', 'geodirectory'),

+					  'clabels' => __('Address', 'geodirectory'),

+					  'extra' => array('show_city' => 1, 'city_lable' => __('City', 'geodirectory'),

+									   'show_region' => 1, 'region_lable' => __('Region', 'geodirectory'),

+									   'show_country' => 1, 'country_lable' => __('Country', 'geodirectory'),

+									   'show_zip' => 1, 'zip_lable' => __('Zip/Post Code', 'geodirectory'),

+									   'show_map' => 1, 'map_lable' => __('Set Address On Map', 'geodirectory'),

+									   'show_mapview' => 1, 'mapview_lable' => __('Select Map View', 'geodirectory'),

+									   'show_mapzoom' => 1, 'mapzoom_lable' => 'hidden',

+									   'show_latlng' => 1));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'text',

+					  'admin_title' => __('Time', 'geodirectory'),

+					  'admin_desc' => __('Enter Business or Listing Timing Information.<br/>eg. : 10.00 am to 6 pm every day', 'geodirectory'),

+					  'site_title' => __('Time', 'geodirectory'),

+					  'htmlvar_name' => 'timing',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'show_in' =>  '[detail],[mapbubble]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Time', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'phone',

+					  'admin_title' => __('Phone', 'geodirectory'),

+					  'admin_desc' => __('You can enter phone number,cell phone number etc.', 'geodirectory'),

+					  'site_title' => __('Phone', 'geodirectory'),

+					  'htmlvar_name' => 'contact',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'show_in' =>  '[detail],[mapbubble]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Phone', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'email',

+					  'admin_title' => __('Email', 'geodirectory'),

+					  'admin_desc' => __('You can enter your business or listing email.', 'geodirectory'),

+					  'site_title' => __('Email', 'geodirectory'),

+					  'htmlvar_name' => 'email',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'show_in' => '[detail]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Email', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'url',

+					  'admin_title' => __('Website', 'geodirectory'),

+					  'admin_desc' => __('You can enter your business or listing website.', 'geodirectory'),

+					  'site_title' => __('Website', 'geodirectory'),

+					  'htmlvar_name' => 'website',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'show_in' => '[detail]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Website', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'url',

+					  'admin_title' => __('Twitter', 'geodirectory'),

+					  'admin_desc' => __('You can enter your business or listing twitter url.', 'geodirectory'),

+					  'site_title' => __('Twitter', 'geodirectory'),

+					  'htmlvar_name' => 'twitter',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'show_in' => '[detail]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Twitter', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'VARCHAR',

+					  'field_type' => 'url',

+					  'admin_title' => __('Facebook', 'geodirectory'),

+					  'admin_desc' => __('You can enter your business or listing facebook url.', 'geodirectory'),

+					  'site_title' => __('Facebook', 'geodirectory'),

+					  'htmlvar_name' => 'facebook',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '1',

+					  'is_admin' => '1',

+					  'show_in' => '[detail]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Facebook', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'TEXT',

+					  'field_type' => 'textarea',

+					  'admin_title' => __('Video', 'geodirectory'),

+					  'admin_desc' => __('Add video code here, YouTube etc.', 'geodirectory'),

+					  'site_title' => __('Video', 'geodirectory'),

+					  'htmlvar_name' => 'video',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '0',

+					  'is_admin' => '1',

+					  'show_in' => '[owntab]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Video', 'geodirectory'));

+

+	$fields[] = array('listing_type' => $post_type,

+					  'data_type' => 'TEXT',

+					  'field_type' => 'textarea',

+					  'admin_title' => __('Special Offers', 'geodirectory'),

+					  'admin_desc' => __('Note: List out any special offers (optional)', 'geodirectory'),

+					  'site_title' => __('Special Offers', 'geodirectory'),

+					  'htmlvar_name' => 'special_offers',

+					  'default_value' => '',

+					  'option_values' => '',

+					  'is_default' => '0',

+					  'is_admin' => '1',

+					  'show_in' => '[owntab]',

+					  'show_on_pkg' => $package,

+					  'clabels' => __('Special Offers', 'geodirectory'));

+

+	/**

+	 * Filter the array of default custom fields DB table data.

+	 *

+	 * @since 1.6.6

+	 * @param string $fields The default custom fields as an array.

+	 */

+	$fields = apply_filters('geodir_default_custom_fields', $fields);

+

+	return  $fields;

 }

 

 function geodir_currency_format_number($number='',$cf=''){

 

-    $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : '';

+	$cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : '';

 

-    $symbol = isset($cs['currency_symbol']) ? $cs['currency_symbol'] : '$';

-    $decimals = isset($cf['decimal_point']) && $cf['decimal_point'] ? $cf['decimal_point'] : 2;

-    $decimal_display = isset($cf['decimal_display']) && $cf['decimal_display'] ? $cf['decimal_display'] : 'if';

-    $decimalpoint = '.';

+	$symbol = isset($cs['currency_symbol']) ? $cs['currency_symbol'] : '$';

+	$decimals = isset($cf['decimal_point']) && $cf['decimal_point'] ? $cf['decimal_point'] : 2;

+	$decimal_display = isset($cf['decimal_display']) && $cf['decimal_display'] ? $cf['decimal_display'] : 'if';

+	$decimalpoint = '.';

 

-    if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){

-        $decimalpoint = ',';

-    }

+	if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){

+		$decimalpoint = ',';

+	}

 

-    $separator = ',';

+	$separator = ',';

 

-    if(isset($cs['thousand_separator'])){

-        if($cs['thousand_separator']=='comma'){$separator = ',';}

-        if($cs['thousand_separator']=='slash'){$separator = '\\';}

-        if($cs['thousand_separator']=='period'){$separator = '.';}

-        if($cs['thousand_separator']=='space'){$separator = ' ';}

-        if($cs['thousand_separator']=='none'){$separator = '';}

-    }

+	if(isset($cs['thousand_separator'])){

+		if($cs['thousand_separator']=='comma'){$separator = ',';}

+		if($cs['thousand_separator']=='slash'){$separator = '\\';}

+		if($cs['thousand_separator']=='period'){$separator = '.';}

+		if($cs['thousand_separator']=='space'){$separator = ' ';}

+		if($cs['thousand_separator']=='none'){$separator = '';}

+	}

 

-    $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';

+	$currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';

 

-    if($decimals>0 && $decimal_display=='if'){

-        if(is_int($number) || floor( $number ) == $number)

-            $decimals = 0;

-    }

+	if($decimals>0 && $decimal_display=='if'){

+		if(is_int($number) || floor( $number ) == $number)

+			$decimals = 0;

+	}

 

-    $number = number_format($number,$decimals,$decimalpoint,$separator);

+	$number = number_format($number,$decimals,$decimalpoint,$separator);

 

 

 

-    if($currency_symbol_placement=='left'){

-        $number = $symbol . $number;

-    }else{

-        $number = $number . $symbol;

-    }

+	if($currency_symbol_placement=='left'){

+		$number = $symbol . $number;

+	}else{

+		$number = $number . $symbol;

+	}

 

 

    return $number;

Spacing +412 added lines, -412 removed lines

@@ -49,7 +49,7 @@ 
     function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

     {

         global $wpdb;

-        $result = 0;// no rows affected

+        $result = 0; // no rows affected

         if (!geodir_column_exist($db, $column)) {

             if (!empty($db) && !empty($column))

                 $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

@@ -74,7 +74,7 @@ 
 {

     global $wpdb, $geodir_post_custom_fields_cache;

 

-    $cache_stored = $post_type . '_' . $package_id . '_' . $default . '_' . $fields_location;

+    $cache_stored = $post_type.'_'.$package_id.'_'.$default.'_'.$fields_location;

 

     if (array_key_exists($cache_stored, $geodir_post_custom_fields_cache)) {

         return $geodir_post_custom_fields_cache[$cache_stored];

@@ -88,14 +88,14 @@ 
         $default_query .= " and is_admin = '0' ";

 

     if ($fields_location == 'none') {

-    } else{

-        $fields_location = esc_sql( $fields_location );

+    } else {

+        $fields_location = esc_sql($fields_location);

         $default_query .= " and show_in LIKE '%%[$fields_location]%%' ";

     }

 

     $post_meta_info = $wpdb->get_results(

         $wpdb->prepare(

-            "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

+            "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where is_active = '1' and post_type = %s {$default_query} order by sort_order asc,admin_title asc",

             array($post_type)

         )

     );

@@ -162,13 +162,13 @@ 
      * @param string $field_ins_upd When set to "submit" displays form.

      * @param string $field_type_key The key of the custom field.

      */

-    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key ='')

+    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '')

     {

         global $wpdb;

         $cf = $result_str;

         if (!is_object($cf)) {

 

-            $field_info = $wpdb->get_row($wpdb->prepare("select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)));

+            $field_info = $wpdb->get_row($wpdb->prepare("select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)));

 

         } else {

             $field_info = $cf;

@@ -202,14 +202,14 @@ 
         if ($field_id != '') {

             $cf = trim($field_id, '_');

 

-            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

-                $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

+            if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d", array($cf)))) {

+                $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_FIELDS_TABLE." where id= %d ", array($cf)));

 

                 $post_type = $field->post_type;

                 $htmlvar_name = $field->htmlvar_name;

 

                 if ($post_type != '' && $htmlvar_name != '') {

-                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

+                    $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

                 }

 

                 /**

@@ -223,18 +223,18 @@ 
                 do_action('geodir_after_custom_field_deleted', $cf, $field->htmlvar_name, $post_type);

 

                 if ($field->field_type == 'address') {

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_address`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_city`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_region`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_country`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_zip`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_latitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_longitude`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapview`");

-                    $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "_mapzoom`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_address`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_city`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_region`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_country`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_zip`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_latitude`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_longitude`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapview`");

+                    $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."_mapzoom`");

                 } else {

                     if ($field->field_type != 'fieldset') {

-                        $wpdb->query("ALTER TABLE " . $plugin_prefix . $post_type . "_detail DROP `" . $field->htmlvar_name . "`");

+                        $wpdb->query("ALTER TABLE ".$plugin_prefix.$post_type."_detail DROP `".$field->htmlvar_name."`");

                     }

                 }

 

@@ -305,7 +305,7 @@ 
         $result_str = isset($request_field['field_id']) ? trim($request_field['field_id']) : '';

 

         // some servers fail if a POST value is VARCHAR so we change it.

-        if(isset($request_field['data_type']) && $request_field['data_type']=='XVARCHAR'){

+        if (isset($request_field['data_type']) && $request_field['data_type'] == 'XVARCHAR') {

             $request_field['data_type'] = 'VARCHAR';

         }

 

@@ -318,12 +318,12 @@ 
         $post_type = $request_field['listing_type'];

 

         if ($request_field['field_type'] != 'address' && $request_field['field_type'] != 'taxonomy' && $request_field['field_type'] != 'fieldset') {

-            $cehhtmlvar_name = 'geodir_' . $cehhtmlvar_name;

+            $cehhtmlvar_name = 'geodir_'.$cehhtmlvar_name;

         }

 

         $check_html_variable = $wpdb->get_var(

             $wpdb->prepare(

-                "select htmlvar_name from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id <> %d and htmlvar_name = %s and post_type = %s ",

+                "select htmlvar_name from ".GEODIR_CUSTOM_FIELDS_TABLE." where id <> %d and htmlvar_name = %s and post_type = %s ",

                 array($cf, $cehhtmlvar_name, $post_type)

             )

         );

@@ -335,7 +335,7 @@ 
 

                 $post_meta_info = $wpdb->get_row(

                     $wpdb->prepare(

-                        "select * from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id = %d",

+                        "select * from ".GEODIR_CUSTOM_FIELDS_TABLE." where id = %d",

                         array($cf)

                     )

                 );

@@ -353,7 +353,7 @@ 
             if ($post_type == '') $post_type = 'gd_place';

 

 

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

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

 

             $admin_title = $request_field['admin_title'];

             $site_title = $request_field['site_title'];

@@ -381,12 +381,12 @@ 
             $for_admin_use = isset($request_field['for_admin_use']) ? $request_field['for_admin_use'] : '';

 

             

-            if(is_array($show_in)){

+            if (is_array($show_in)) {

                 $show_in = implode(",", $request_field['show_in']);

             }

             

             if ($field_type != 'address' && $field_type != 'taxonomy' && $field_type != 'fieldset') {

-                $htmlvar_name = 'geodir_' . $htmlvar_name;

+                $htmlvar_name = 'geodir_'.$htmlvar_name;

             }

 

             $option_values = '';

@@ -427,9 +427,9 @@ 
 

             if ($sort_order == '') {

 

-                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);

+                $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM ".GEODIR_CUSTOM_FIELDS_TABLE);

 

-                $sort_order = (int)$last_order + 1;

+                $sort_order = (int) $last_order + 1;

             }

 

             $default_value_add = '';

@@ -441,15 +441,15 @@ 
                     case 'address':

 

                         if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

+                            $prefix = $htmlvar_name.'_';

                         }

-                        $old_prefix = $old_html_variable . '_';

+                        $old_prefix = $old_html_variable.'_';

 

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "address` `" . $prefix . "address` VARCHAR( 254 ) NULL";

+                        $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."address` `".$prefix."address` VARCHAR( 254 ) NULL";

 

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

                         $wpdb->query($meta_field_add);

@@ -458,12 +458,12 @@ 
 

                             if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "city'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."city'");

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "city` `" . $prefix . "city` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."city` `".$prefix."city` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

@@ -471,9 +471,9 @@ 
 

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add);

 

                                 }

 

@@ -483,36 +483,36 @@ 
 

                             if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "region'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."region'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "region` `" . $prefix . "region` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."region` `".$prefix."region` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add);

                                 }

 

                             }

                             if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "country'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."country'");

 

                                 if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "country` `" . $prefix . "country` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."country` `".$prefix."country` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

@@ -520,24 +520,24 @@ 
 

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add);

 

                                 }

 

                             }

                             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "zip'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."zip'");

 

                                 if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "zip` `" . $prefix . "zip` VARCHAR( 50 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."zip` `".$prefix."zip` VARCHAR( 50 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

@@ -545,128 +545,128 @@ 
 

                                     $meta_field_add = "VARCHAR( 50 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add);

 

                                 }

 

                             }

                             if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latitude'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latitude'");

                                 if ($is_column) {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latitude` `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latitude` `".$prefix."latitude` VARCHAR( 20 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL";

                                     $meta_field_add = "VARCHAR( 20 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add);

 

                                 }

 

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "longitude'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."longitude'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "longitude` `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."longitude` `".$prefix."longitude` VARCHAR( 20 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL";

                                     $meta_field_add = "VARCHAR( 20 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add);

                                 }

 

                             }

                             if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapview'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapview'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapview` `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapview` `".$prefix."mapview` VARCHAR( 15 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL";

 

                                     $meta_field_add = "VARCHAR( 15 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add);

                                 }

 

 

                             }

                             if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

 

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "mapzoom'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."mapzoom'");

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "mapzoom` `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."mapzoom` `".$prefix."mapzoom` VARCHAR( 3 ) NULL";

 

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

                                     $wpdb->query($meta_field_add);

 

                                 } else {

 

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL";

 

                                     $meta_field_add = "VARCHAR( 3 ) NULL";

                                     if ($default_value != '') {

-                                        $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                        $meta_field_add .= " DEFAULT '".$default_value."'";

                                     }

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add);

                                 }

 

                             }

                             // show lat lng

                             if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM " . $detail_table . " where field='" . $old_prefix . "latlng'");

+                                $is_column = $wpdb->get_var("SHOW COLUMNS FROM ".$detail_table." where field='".$old_prefix."latlng'");

 

                                 if ($is_column) {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_prefix . "latlng` `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_prefix."latlng` `".$prefix."latlng` VARCHAR( 3 ) NULL";

                                     $meta_field_add .= " DEFAULT '1'";

 

                                     $wpdb->query($meta_field_add);

                                 } else {

-                                    $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+                                    $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL";

 

                                     $meta_field_add = "VARCHAR( 3 ) NULL";

                                     $meta_field_add .= " DEFAULT '1'";

 

-                                    geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+                                    geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add);

                                 }

 

                             }

@@ -682,30 +682,30 @@ 
                         $op_size = '500';

 

                         // only make the field as big as it needs to be.

-                        if(isset($option_values) && $option_values && $field_type=='select'){

-                            $option_values_arr = explode(',',$option_values);

-                            if(is_array($option_values_arr)){

+                        if (isset($option_values) && $option_values && $field_type == 'select') {

+                            $option_values_arr = explode(',', $option_values);

+                            if (is_array($option_values_arr)) {

                                 $op_max = 0;

-                                foreach($option_values_arr as $op_val){

-                                    if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}

+                                foreach ($option_values_arr as $op_val) {

+                                    if (strlen($op_val) && strlen($op_val) > $op_max) {$op_max = strlen($op_val); }

                                 }

-                                if($op_max){$op_size =$op_max; }

+                                if ($op_max) {$op_size = $op_max; }

                             }

-                        }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

-                            if(strlen($option_values)){

-                                $op_size =  strlen($option_values);

+                        }elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

+                            if (strlen($option_values)) {

+                                $op_size = strlen($option_values);

                             }

                         }

 

-                        $meta_field_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "`VARCHAR( $op_size ) NULL";

+                        $meta_field_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."`VARCHAR( $op_size ) NULL";

 

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

                         $alter_result = $wpdb->query($meta_field_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

 

                         if (isset($request_field['cat_display_type']))

@@ -722,9 +722,9 @@ 
                     case 'url':

                     case 'file':

 

-                        $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        $alter_result = $wpdb->query("ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` TEXT NULL");

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

                         if (isset($request_field['advanced_editor']))

                             $extra_fields = $request_field['advanced_editor'];

@@ -738,24 +738,24 @@ 
                     default:

                         if ($data_type != 'VARCHAR' && $data_type != '') {

                             if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";

+                                $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` DECIMAL(11, ".(int) $decimal_point.") NULL";

                             } else {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";

+                                $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` ".$data_type." NULL";

                             }

 

                             if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

                             }

                         } else {

-                            $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` VARCHAR( 254 ) NULL";

+                            $default_value_add = "ALTER TABLE ".$detail_table." CHANGE `".$old_html_variable."` `".$htmlvar_name."` VARCHAR( 254 ) NULL";

                             if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

                             }

                         }

 

                         $alter_result = $wpdb->query($default_value_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

                         break;

                 endswitch;

@@ -771,7 +771,7 @@ 
 

                     $wpdb->prepare(

 

-                        "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                        "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -805,7 +805,7 @@ 
 					for_admin_use = %s

 					where id = %d",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)

+                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use, $cf)

                     )

 

                 );

@@ -815,7 +815,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                        "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 					 	site_title=%s

 					where post_type = %s and htmlvar_name = %s",

                         array($site_title, $post_type, $htmlvar_name)

@@ -824,7 +824,7 @@ 
 

 

                 if ($cat_sort == '')

-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

+                    $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

 

 

                 /**

@@ -844,7 +844,7 @@ 
                         $data_type = '';

 

                         if ($htmlvar_name != '') {

-                            $prefix = $htmlvar_name . '_';

+                            $prefix = $htmlvar_name.'_';

                         }

                         $old_prefix = $old_html_variable;

 

@@ -852,109 +852,109 @@ 
 

                         $meta_field_add = "VARCHAR( 254 ) NULL";

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

-                        geodir_add_column_if_not_exist($detail_table, $prefix . "address", $meta_field_add);

+                        geodir_add_column_if_not_exist($detail_table, $prefix."address", $meta_field_add);

                         //$wpdb->query($meta_field_add);

 

 

                         if (!empty($extra_fields)) {

 

                             if (isset($extra_fields['show_city']) && $extra_fields['show_city']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "city` VARCHAR( 30 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."city` VARCHAR( 30 ) NULL";

                                 $meta_field_add = "VARCHAR( 30 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "city", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."city", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_region']) && $extra_fields['show_region']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "region` VARCHAR( 30 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."region` VARCHAR( 30 ) NULL";

                                 $meta_field_add = "VARCHAR( 30 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "region", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."region", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_country']) && $extra_fields['show_country']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "country` VARCHAR( 30 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."country` VARCHAR( 30 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 30 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "country", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."country", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "zip` VARCHAR( 15 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."zip` VARCHAR( 15 ) NULL";

                                 $meta_field_add = "VARCHAR( 15 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "zip", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."zip", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_map']) && $extra_fields['show_map']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latitude` VARCHAR( 20 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latitude` VARCHAR( 20 ) NULL";

                                 $meta_field_add = "VARCHAR( 20 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latitude", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."latitude", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

 

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "longitude` VARCHAR( 20 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."longitude` VARCHAR( 20 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 20 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "longitude", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."longitude", $meta_field_add);

 

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapview` VARCHAR( 15 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapview` VARCHAR( 15 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 15 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapview", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."mapview", $meta_field_add);

 

                                 //$wpdb->query($meta_field_add);

                             }

                             if (isset($extra_fields['show_mapzoom']) && $extra_fields['show_mapzoom']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "mapzoom` VARCHAR( 3 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."mapzoom` VARCHAR( 3 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 3 ) NULL";

                                 if ($default_value != '') {

-                                    $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                    $meta_field_add .= " DEFAULT '".$default_value."'";

                                 }

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "mapzoom", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."mapzoom", $meta_field_add);

 

                                 //$wpdb->query($meta_field_add);

                             }

                             // show lat lng

                             if (isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) {

-                                $meta_field_add = "ALTER TABLE " . $detail_table . " ADD `" . $prefix . "latlng` VARCHAR( 3 ) NULL";

+                                $meta_field_add = "ALTER TABLE ".$detail_table." ADD `".$prefix."latlng` VARCHAR( 3 ) NULL";

 

                                 $meta_field_add = "VARCHAR( 3 ) NULL";

                                 $meta_field_add .= " DEFAULT '1'";

 

-                                geodir_add_column_if_not_exist($detail_table, $prefix . "latlng", $meta_field_add);

+                                geodir_add_column_if_not_exist($detail_table, $prefix."latlng", $meta_field_add);

                                 //$wpdb->query($meta_field_add);

                             }

                         }

@@ -964,8 +964,8 @@ 
                     case 'checkbox':

                         $data_type = 'TINYINT';

 

-                        $meta_field_add = $data_type . "( 1 ) NOT NULL ";

-                        if ((int)$default_value === 1) {

+                        $meta_field_add = $data_type."( 1 ) NOT NULL ";

+                        if ((int) $default_value === 1) {

                             $meta_field_add .= " DEFAULT '1'";

                         }

 

@@ -998,7 +998,7 @@ 
                             }

                         } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

                             if (strlen($option_values)) {

-                                $op_size =  strlen($option_values);

+                                $op_size = strlen($option_values);

                             }

 

                             if (isset($request_field['multi_display_type'])) {

@@ -1006,9 +1006,9 @@ 
                             }

                         }

 

-                        $meta_field_add = $data_type . "( $op_size ) NULL ";

+                        $meta_field_add = $data_type."( $op_size ) NULL ";

                         if ($default_value != '') {

-                            $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                            $meta_field_add .= " DEFAULT '".$default_value."'";

                         }

 

                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

@@ -1023,9 +1023,9 @@ 
 

                         $data_type = 'TEXT';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+                        $meta_field_add = $data_type." NULL ";

                         /*if($default_value != '')

 					{ $meta_field_add .= " DEFAULT '".$default_value."'"; }*/

 

@@ -1040,9 +1040,9 @@ 
 

                         $data_type = 'DATE';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+                        $meta_field_add = $data_type." NULL ";

 

                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

                         if ($add_result === false) {

@@ -1055,9 +1055,9 @@ 
 

                         $data_type = 'TIME';

 

-                        $default_value_add = " `" . $htmlvar_name . "` " . $data_type . " NULL ";

+                        $default_value_add = " `".$htmlvar_name."` ".$data_type." NULL ";

 

-                        $meta_field_add = $data_type . " NULL ";

+                        $meta_field_add = $data_type." NULL ";

 

                         $add_result = geodir_add_column_if_not_exist($detail_table, $htmlvar_name, $meta_field_add);

                         if ($add_result === false) {

@@ -1069,22 +1069,22 @@ 
                     default:

 

                         if ($data_type != 'VARCHAR' && $data_type != '') {

-                            $meta_field_add = $data_type . " NULL ";

+                            $meta_field_add = $data_type." NULL ";

 

                             if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";

+                                $meta_field_add = "DECIMAL(11, ".(int) $decimal_point.") NULL ";

                             }

 

                             if (is_numeric($default_value) && $default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

+                                $meta_field_add .= " DEFAULT '".$default_value."'";

                             }

                         } else {

                             $meta_field_add = " VARCHAR( 254 ) NULL ";

 

                             if ($default_value != '') {

-                                $default_value_add .= " DEFAULT '" . $default_value . "'";

-                                $meta_field_add .= " DEFAULT '" . $default_value . "'";

+                                $default_value_add .= " DEFAULT '".$default_value."'";

+                                $meta_field_add .= " DEFAULT '".$default_value."'";

                             }

                         }

 

@@ -1106,7 +1106,7 @@ 
 

                     $wpdb->prepare(

 

-                        "insert into " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                        "insert into ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 					post_type = %s,

 					admin_title = %s,

 					site_title = %s,

@@ -1139,7 +1139,7 @@ 
 					validation_msg = %s,

 					for_admin_use = %s ",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing,$show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)

+                        array($post_type, $admin_title, $site_title, $field_type, $field_type_key, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_in, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use)

 

                     )

 

@@ -1151,7 +1151,7 @@ 
 

             }

 

-            return (int)$lastid;

+            return (int) $lastid;

 

 

         } else {

@@ -1184,7 +1184,7 @@ 
 

             $post_meta_info = $wpdb->query(

                 $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_FIELDS_TABLE . " set 

+                    "update ".GEODIR_CUSTOM_FIELDS_TABLE." set 

 															sort_order=%d 

 															where id= %d",

                     array($count, $cf)

@@ -1200,11 +1200,11 @@ 
 }

 

 

-function geodir_get_cf_value($cf){

+function geodir_get_cf_value($cf) {

     global $gd_session;

     $value = '';

     if (is_admin()) {

-        global $post,$gd_session;

+        global $post, $gd_session;

 

         if (isset($_REQUEST['post']))

             $_REQUEST['pid'] = $_REQUEST['post'];

@@ -1246,16 +1246,16 @@ 
     $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);

 

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

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

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

         $val = stripslashes_deep($val); // strip slashes from labels

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

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

 

         $name = $val['name'];

         $type = $val['type'];

         $is_default = $val['is_default'];

 

         /* field available to site admin only for edit */

-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;

+        $for_admin_use = isset($val['for_admin_use']) && (int) $val['for_admin_use'] == 1 ? true : false;

         if ($for_admin_use && !is_super_admin()) {

             continue;

         }

@@ -1280,11 +1280,11 @@ 
          * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

          * @see 'geodir_after_custom_form_field_$name'

          */

-        do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);

+        do_action('geodir_before_custom_form_field_'.$name, $listing_type, $package_id, $val);

 

 

         $custom_field = $val;

-        $html ='';

+        $html = '';

         /**

          * Filter the output for custom fields.

          *

@@ -1293,7 +1293,7 @@ 
          * @param string $html The html to be filtered (blank).

          * @param array $custom_field The custom field array values.

          */

-        echo apply_filters("geodir_custom_field_input_{$type}",$html,$custom_field);

+        echo apply_filters("geodir_custom_field_input_{$type}", $html, $custom_field);

 

 

 

@@ -1308,7 +1308,7 @@ 
          * @param array $val The settings array for the field. {@see geodir_custom_field_save()}.

          * @see 'geodir_before_custom_form_field_$name'

          */

-        do_action('geodir_after_custom_form_field_' . $name, $listing_type, $package_id, $val);

+        do_action('geodir_after_custom_form_field_'.$name, $listing_type, $package_id, $val);

 

     }

 

@@ -1334,7 +1334,7 @@ 
 

         $filter = $wpdb->get_row(

             $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND " . $key . "='" . $value . "'",

+                "SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND ".$key."='".$value."'",

                 array($geodir_post_type)

             )

         );

@@ -1349,14 +1349,14 @@ 
 }

 

 

-function geodir_field_icon_proccess($cf){

+function geodir_field_icon_proccess($cf) {

 

 

     if (strpos($cf['field_icon'], 'http') !== false) {

-        $field_icon = ' background: url(' . $cf['field_icon'] . ') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

+        $field_icon = ' background: url('.$cf['field_icon'].') no-repeat left center;background-size:18px 18px;padding-left: 21px;';

     } elseif (strpos($cf['field_icon'], 'fa fa-') !== false) {

-        $field_icon = '<i class="' . $cf['field_icon'] . '"></i>';

-    }else{

+        $field_icon = '<i class="'.$cf['field_icon'].'"></i>';

+    } else {

         $field_icon = $cf['field_icon'];

     }

 

@@ -1401,14 +1401,14 @@ 
 

 

             foreach ($fields_info as $type) {

-                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 = '';

                 $field_icon = geodir_field_icon_proccess($type);

                 $filed_type = $type['type'];

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

 

                 /**

                  * Filter the output for custom fields.

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

 

                 $variables_array = array();

 

@@ -1479,7 +1479,7 @@ 
          * @param string $fields_location The location the fields are being output.

          * @since 1.6.9

          */

-        return apply_filters('geodir_show_listing_info',$html,$fields_location);

+        return apply_filters('geodir_show_listing_info', $html, $fields_location);

 

     }

 }

@@ -1554,7 +1554,7 @@ 
 

         $post_type = get_post_type($post_id);

         //echo $field_id; exit;

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

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

 

         $postcurr_images = array();

         $postcurr_images = geodir_get_post_meta($post_id, $field_id, true);

@@ -1573,13 +1573,13 @@ 
             $geodir_uploadurl = $uploads['url'];

             $sub_dir = $uploads['subdir'];

 

-            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';

 

             for ($m = 0; $m < count($post_image); $m++) {

 

                 /* --------- start ------- */

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM " . $table . " WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

+                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT post_id FROM ".$table." WHERE $field_id = %s AND post_id = %d", array($post_image[$m], $post_id)))) {

 

 

                     $curr_img_url = $post_image[$m];

@@ -1605,24 +1605,24 @@ 
                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

                     if (!function_exists('wp_handle_upload'))

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

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

 

                     if (!is_dir($geodir_uploadpath))

                         mkdir($geodir_uploadpath);

 

-                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

+                    $new_name = $post_id.'_'.$field_id.'_'.$img_name_arr[0].'.'.$img_name_arr[1];

                     $explode_sub_dir = explode("/", $sub_dir);

                     if ($curr_img_dir == end($explode_sub_dir)) {

-                        $img_path = $geodir_uploadpath . '/' . $filename;

-                        $img_url = $geodir_uploadurl . '/' . $filename;

+                        $img_path = $geodir_uploadpath.'/'.$filename;

+                        $img_url = $geodir_uploadurl.'/'.$filename;

                     } else {

-                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+                        $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;

+                        $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename;

                     }

 

                     $uploaded_file = '';

                     if (file_exists($img_path))

-                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+                        $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name);

 

                     if ($curr_img_dir != $geodir_uploaddir) {

                         if (file_exists($img_path))

@@ -1630,7 +1630,7 @@ 
                     }

 

                     if (!empty($uploaded_file))

-                        $file_urls = $geodir_uploadurl . '/' . $new_name;

+                        $file_urls = $geodir_uploadurl.'/'.$new_name;

 

                 } else {

                     $file_urls = $post_image[$m];

@@ -1644,8 +1644,8 @@ 
         if (!empty($postcurr_images)) {

 

             if ($file_urls != $postcurr_images) {

-                $invalid_files[] = (object)array('src' => $postcurr_images);

-                $invalid_files = (object)$invalid_files;

+                $invalid_files[] = (object) array('src' => $postcurr_images);

+                $invalid_files = (object) $invalid_files;

             }

         }

 

@@ -1697,9 +1697,9 @@ 
     function geodir_upload_dir($upload)

     {

         global $current_user;

-        $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

-        $upload['path'] = $upload['basedir'] . $upload['subdir'];

-        $upload['url'] = $upload['baseurl'] . $upload['subdir'];

+        $upload['subdir'] = $upload['subdir'].'/temp_'.$current_user->data->ID;

+        $upload['path'] = $upload['basedir'].$upload['subdir'];

+        $upload['url'] = $upload['baseurl'].$upload['subdir'];

         return $upload;

     }

 

@@ -1714,20 +1714,20 @@ 
         // check ajax nonce

         $imgid = $_POST["imgid"];

 

-        check_ajax_referer($imgid . 'pluploadan');

+        check_ajax_referer($imgid.'pluploadan');

 

         // handle custom file uploaddir

         add_filter('upload_dir', 'geodir_upload_dir');

 

         // change file orientation if needed

-        $fixed_file = geodir_exif($_FILES[$imgid . 'async-upload']);

+        $fixed_file = geodir_exif($_FILES[$imgid.'async-upload']);

 

         // handle file upload

         $status = wp_handle_upload($fixed_file, array('test_form' => true, 'action' => 'plupload_action'));

         // remove handle custom file uploaddir

         remove_filter('upload_dir', 'geodir_upload_dir');

 

-        if(!isset($status['url']) && isset($status['error'])){

+        if (!isset($status['url']) && isset($status['error'])) {

             print_r($status);

         }

 

@@ -1757,9 +1757,9 @@ 
 

     $post_type = get_post_type($post_id);

 

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

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

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM " . $table . " WHERE post_id=%d", array($post_id)));

+    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_video FROM ".$table." WHERE post_id=%d", array($post_id)));

 

     if ($results) {

         return $results[0]->geodir_video;

@@ -1783,9 +1783,9 @@ 
 

     $post_type = get_post_type($post_id);

 

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

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

 

-    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM " . $table . " WHERE post_id=%d", array($post_id)));

+    $results = $wpdb->get_results($wpdb->prepare("SELECT geodir_special_offers FROM ".$table." WHERE post_id=%d", array($post_id)));

 

     if ($results) {

         return $results[0]->geodir_special_offers;

@@ -1803,12 +1803,12 @@ 
      */

     function geodir_max_upload_size()

     {

-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

+        $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);

 

         if ($max_filesize > 0 && $max_filesize < 1) {

-            $max_filesize = (int)($max_filesize * 1024) . 'kb';

+            $max_filesize = (int) ($max_filesize * 1024).'kb';

         } else {

-            $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

+            $max_filesize = $max_filesize > 0 ? $max_filesize.'mb' : '2mb';

         }

         /** Filter documented in geodirectory-functions/general_functions.php **/

         return apply_filters('geodir_default_image_upload_size_limit', $max_filesize);

@@ -1840,7 +1840,7 @@ 
 

             $custom_fields = $wpdb->get_results(

                 $wpdb->prepare(

-                    "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from " . GEODIR_CUSTOM_FIELDS_TABLE . " where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

+                    "select post_type,data_type,field_type,site_title,htmlvar_name,field_icon from ".GEODIR_CUSTOM_FIELDS_TABLE." where post_type = %s and is_active='1' and cat_sort='1' AND field_type != 'address' order by sort_order asc",

                     array($post_type)

                 ), 'ARRAY_A'

             );

@@ -1967,7 +1967,7 @@ 
 

             $post_meta_info = $wpdb->query(

                 $wpdb->prepare(

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                    "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 															sort_order=%d 

 															where id= %d",

                     array($count, $cf)

@@ -2049,14 +2049,14 @@ 
 

         $check_html_variable = $wpdb->get_var(

             $wpdb->prepare(

-                "select htmlvar_name from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where htmlvar_name = %s and post_type = %s and field_type=%s ",

+                "select htmlvar_name from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where htmlvar_name = %s and post_type = %s and field_type=%s ",

                 array($cehhtmlvar_name, $post_type, $field_type)

             )

         );

 

         if ($is_default == 1) {

 

-            $wpdb->query($wpdb->prepare("update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set is_default='0', default_order='' where post_type = %s", array($post_type)));

+            $wpdb->query($wpdb->prepare("update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set is_default='0', default_order='' where post_type = %s", array($post_type)));

 

         }

 

@@ -2067,7 +2067,7 @@ 
 

                 $wpdb->prepare(

 

-                    "insert into " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                    "insert into ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -2098,7 +2098,7 @@ 
 

                 $wpdb->prepare(

 

-                    "update " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " set 

+                    "update ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." set 

 				post_type = %s,

 				data_type = %s,

 				field_type = %s,

@@ -2124,7 +2124,7 @@ 
         }

 

 

-        return (int)$lastid;

+        return (int) $lastid;

 

     }

 }

@@ -2147,7 +2147,7 @@ 
         if ($field_id != '') {

             $cf = trim($field_id, '_');

 

-            $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where id= %d ", array($cf)));

+            $wpdb->query($wpdb->prepare("delete from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where id= %d ", array($cf)));

 

             return $field_id;

 

@@ -2170,12 +2170,12 @@ 
      * @param string $field_ins_upd When set to "submit" displays form.

      * @param bool $default when set to true field will be for admin use only.

      */

-    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key='')

+    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $field_type_key = '')

     {

         global $wpdb;

         $cf = $result_str;

         if (!is_object($cf)) {

-            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE id = %d", array($cf)));

+            $field_info = $wpdb->get_row($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE id = %d", array($cf)));

         } else {

             $field_info = $cf;

             $result_str = $cf->id;

@@ -2211,18 +2211,18 @@ 
         if ($htmlvar_name == '')

             $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

 

-        $nonce = wp_create_nonce('custom_fields_' . $result_str);

+        $nonce = wp_create_nonce('custom_fields_'.$result_str);

 

         $field_icon = '<i class="fa fa-cog" aria-hidden="true"></i>';

         $cso_arr = geodir_get_custom_sort_options($post_type);

 

         $cur_field_type = (isset($cf->field_type)) ? $cf->field_type : esc_html($_REQUEST['field_type']);

-        foreach($cso_arr as $cso){

-            if($cur_field_type==$cso['field_type']){

+        foreach ($cso_arr as $cso) {

+            if ($cur_field_type == $cso['field_type']) {

 

                 if (isset($cso['field_icon']) && strpos($cso['field_icon'], 'fa fa-') !== false) {

                     $field_icon = '<i class="'.$cso['field_icon'].'" aria-hidden="true"></i>';

-                }elseif(isset($cso['field_icon']) && $cso['field_icon']){

+                }elseif (isset($cso['field_icon']) && $cso['field_icon']) {

                     $field_icon = '<b style="background-image: url("'.$cso['field_icon'].'")"></b>';

                 }

 

@@ -2232,40 +2232,40 @@ 
         $radio_id = (isset($field_info->htmlvar_name)) ? $field_info->htmlvar_name.$field_type : rand(5, 500);

         ?>

 

-        <li class="text" id="licontainer_<?php echo $result_str;?>">

+        <li class="text" id="licontainer_<?php echo $result_str; ?>">

             <form><!-- we need to wrap in a form so we can use radio buttons with same name -->

-            <div class="title title<?php echo $result_str;?> gt-fieldset"

-                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory');?>"

-                 ondblclick="show_hide('field_frm<?php echo $result_str;?>')">

+            <div class="title title<?php echo $result_str; ?> gt-fieldset"

+                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory'); ?>"

+                 ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">

                 <?php

 

                 ?>

 

-                <div title="<?php _e('Click to remove field', 'geodirectory');?>"

-                     onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

+                <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"

+                     onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                      class="handlediv close"><i class="fa fa-times" aria-hidden="true"></i></div>

 

 

-                <?php echo $field_icon;?>

+                <?php echo $field_icon; ?>

                 <b style="cursor:pointer;"

-                   onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' (' . $site_title . ')');?></b>

+                   onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory').' ('.$site_title.')'); ?></b>

 

             </div>

 

-            <div id="field_frm<?php echo $result_str;?>" class="field_frm"

+            <div id="field_frm<?php echo $result_str; ?>" class="field_frm"

                  style="display:<?php if ($field_ins_upd == 'submit') {

                      echo 'block;';

                  } else {

                      echo 'none;';

                  } ?>">

                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>

-                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>

-                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>

-                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/>

+                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/>

+                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/>

+                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str; ?>"/>

                 <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {

                     echo $field_info->data_type;

                 }?>"/>

-                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/>

+                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name; ?>"/>

 

 

                 <ul class="widefat post fixed" border="0" style="width:100%;">

@@ -2275,7 +2275,7 @@ 
                         <input type="hidden" name="site_title" id="site_title" value="<?php echo esc_attr($site_title); ?>"/>

 

                         <li>

-                            <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0;?>

+                            <?php $value = (isset($field_info->sort_asc) && $field_info->sort_asc) ? $field_info->sort_asc : 0; ?>

 

                             <label for="asc" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Ascending Sort (low to high)', 'geodirectory'); ?>

@@ -2285,24 +2285,24 @@ 
                             </label>

                             <div class="gd-cf-input-wrap gd-switch">

 

-                                <input type="radio" id="asc_yes<?php echo $radio_id;?>" name="asc" class="gdri-enabled"  value="1"

+                                <input type="radio" id="asc_yes<?php echo $radio_id; ?>" name="asc" class="gdri-enabled"  value="1"

                                     <?php if ($value == '1') {

                                         echo 'checked';

                                     } ?>/>

-                                <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                                <label onclick="show_hide_radio(this,'show','cfs-asc-title');" for="asc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                                <input type="radio" id="asc_no<?php echo $radio_id;?>" name="asc" class="gdri-disabled" value="0"

+                                <input type="radio" id="asc_no<?php echo $radio_id; ?>" name="asc" class="gdri-disabled" value="0"

                                     <?php if ($value == '0' || !$value) {

                                         echo 'checked';

                                     } ?>/>

-                                <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                                <label onclick="show_hide_radio(this,'hide','cfs-asc-title');" for="asc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                             </div>

 

                         </li>

 

-                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>

-                            <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : '';?>

+                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>

+                            <?php $value = (isset($field_info->asc_title) && $field_info->asc_title) ? esc_attr($field_info->asc_title) : ''; ?>

 

                             <label for="asc_title" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Ascending title', 'geodirectory'); ?>

@@ -2312,14 +2312,14 @@ 
                             </label>

                             <div class="gd-cf-input-wrap">

 

-                                <input type="text" name="asc_title" id="asc_title" value="<?php echo $value;?>" />

+                                <input type="text" name="asc_title" id="asc_title" value="<?php echo $value; ?>" />

                             </div>

 

 

                         </li>

 

 

-                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'";}?>>

+                        <li class="cfs-asc-title" <?php if ((isset($field_info->sort_asc) && $field_info->sort_asc == '0') || !isset($field_info->sort_asc)) {echo "style='display:none;'"; }?>>

 

                             <label for="is_default" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>

@@ -2330,7 +2330,7 @@ 
                             <div class="gd-cf-input-wrap">

 

                                 <input type="radio" name="is_default"

-                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {

+                                       value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_asc') {

                                     echo 'checked="checked"';

                                 } ?>/>

                             </div>

@@ -2340,7 +2340,7 @@ 
 

 

                         <li>

-                            <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0;?>

+                            <?php $value = (isset($field_info->sort_desc) && $field_info->sort_desc) ? $field_info->sort_desc : 0; ?>

 

                             <label for="desc" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show Descending Sort (high to low)', 'geodirectory'); ?>

@@ -2350,24 +2350,24 @@ 
                             </label>

                             <div class="gd-cf-input-wrap gd-switch">

 

-                                <input type="radio" id="desc_yes<?php echo $radio_id;?>" name="desc" class="gdri-enabled"  value="1"

+                                <input type="radio" id="desc_yes<?php echo $radio_id; ?>" name="desc" class="gdri-enabled"  value="1"

                                     <?php if ($value == '1') {

                                         echo 'checked';

                                     } ?>/>

-                                <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                                <label onclick="show_hide_radio(this,'show','cfs-desc-title');" for="desc_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                                <input type="radio" id="desc_no<?php echo $radio_id;?>" name="desc" class="gdri-disabled" value="0"

+                                <input type="radio" id="desc_no<?php echo $radio_id; ?>" name="desc" class="gdri-disabled" value="0"

                                     <?php if ($value == '0' || !$value) {

                                         echo 'checked';

                                     } ?>/>

-                                <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                                <label onclick="show_hide_radio(this,'hide','cfs-desc-title');" for="desc_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                             </div>

 

                         </li>

 

-                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>

-                            <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : '';?>

+                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>

+                            <?php $value = (isset($field_info->desc_title) && $field_info->desc_title) ? esc_attr($field_info->desc_title) : ''; ?>

 

                             <label for="desc_title" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Descending title', 'geodirectory'); ?>

@@ -2377,13 +2377,13 @@ 
                             </label>

                             <div class="gd-cf-input-wrap">

 

-                                <input type="text" name="desc_title" id="desc_title" value="<?php echo $value;?>" />

+                                <input type="text" name="desc_title" id="desc_title" value="<?php echo $value; ?>" />

                             </div>

 

 

                         </li>

 

-                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'";}?>>

+                        <li class="cfs-desc-title" <?php if ((isset($field_info->sort_desc) && $field_info->sort_desc == '0') || !isset($field_info->sort_desc)) {echo "style='display:none;'"; }?>>

 

                             <label for="is_default" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>

@@ -2394,7 +2394,7 @@ 
                             <div class="gd-cf-input-wrap">

 

                                 <input type="radio" name="is_default"

-                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {

+                                       value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name.'_desc') {

                                     echo 'checked="checked"';

                                 } ?>/>

                             </div>

@@ -2419,14 +2419,14 @@ 
                             </label>

                             <div class="gd-cf-input-wrap">

 

-                                <input type="text" name="site_title" id="site_title" value="<?php echo $value;?>" />

+                                <input type="text" name="site_title" id="site_title" value="<?php echo $value; ?>" />

                             </div>

 

 

                         </li>

 

                         <li>

-                            <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : '';?>

+                            <?php $value = (isset($field_info->is_default) && $field_info->is_default) ? esc_attr($field_info->is_default) : ''; ?>

 

                             <label for="is_default" class="gd-cf-tooltip-wrap">

                                 <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Default sort?', 'geodirectory'); ?>

@@ -2450,7 +2450,7 @@ 
 

 

                     <li>

-                        <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active: 0;?>

+                        <?php $value = (isset($field_info->is_active) && $field_info->is_active) ? $field_info->is_active : 0; ?>

 

                         <label for="is_active" class="gd-cf-tooltip-wrap">

                             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Is active', 'geodirectory'); ?>

@@ -2460,17 +2460,17 @@ 
                         </label>

                         <div class="gd-cf-input-wrap gd-switch">

 

-                            <input type="radio" id="is_active_yes<?php echo $radio_id;?>" name="is_active" class="gdri-enabled"  value="1"

+                            <input type="radio" id="is_active_yes<?php echo $radio_id; ?>" name="is_active" class="gdri-enabled"  value="1"

                                 <?php if ($value == '1') {

                                     echo 'checked';

                                 } ?>/>

-                            <label for="is_active_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+                            <label for="is_active_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-                            <input type="radio" id="is_active_no<?php echo $radio_id;?>" name="is_active" class="gdri-disabled" value="0"

+                            <input type="radio" id="is_active_no<?php echo $radio_id; ?>" name="is_active" class="gdri-disabled" value="0"

                                 <?php if ($value == '0' || !$value) {

                                     echo 'checked';

                                 } ?>/>

-                            <label for="is_active_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+                            <label for="is_active_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

                         </div>

 

@@ -2491,10 +2491,10 @@ 
                             <h3></h3>

                         </label>

                         <div class="gd-cf-input-wrap">

-                            <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save','geodirectory'));?>"

+                            <input type="button" class="button button-primary" name="save" id="save" value="<?php echo esc_attr(__('Save', 'geodirectory')); ?>"

                                    onclick="save_sort_field('<?php echo esc_attr($result_str); ?>')"/>

-                                <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete','geodirectory'));?>"

-                                                                    onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

+                                <a href="javascript:void(0)"><input type="button" name="delete" value="<?php echo esc_attr(__('Delete', 'geodirectory')); ?>"

+                                                                    onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                                                                     class="button"/></a>

                         </div>

                     </li>

@@ -2529,7 +2529,7 @@ 
         if (!$package_id || !$field_name || !$post_type) {

             return true;

         }

-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));

+        $sql = $wpdb->prepare("SELECT id FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int) $package_id));

 

         if ($wpdb->get_var($sql)) {

             return true;

@@ -2652,13 +2652,13 @@ 
 }

 

 

-function geodir_cfa_data_type_text($output,$result_str,$cf,$field_info){

+function geodir_cfa_data_type_text($output, $result_str, $cf, $field_info) {

     ob_start();

 

     $dt_value = '';

     if (isset($field_info->data_type)) {

         $dt_value  = esc_attr($field_info->data_type);

-    }elseif(isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']){

+    }elseif (isset($cf['defaults']['data_type']) && $cf['defaults']['data_type']) {

         $dt_value  = $cf['defaults']['data_type'];

     }

     ?>

@@ -2669,15 +2669,15 @@ 
             <select name="data_type" id="data_type"

                     onchange="javascript:gd_data_type_changed(this, '<?php echo $result_str; ?>');">

                 <option

-                    value="XVARCHAR" <?php if ($dt_value  == 'VARCHAR') {

+                    value="XVARCHAR" <?php if ($dt_value == 'VARCHAR') {

                     echo 'selected="selected"';

                 } ?>><?php _e('CHARACTER', 'geodirectory'); ?></option>

                 <option

-                    value="INT" <?php if ($dt_value   == 'INT') {

+                    value="INT" <?php if ($dt_value == 'INT') {

                     echo 'selected="selected"';

                 } ?>><?php _e('NUMBER', 'geodirectory'); ?></option>

                 <option

-                    value="FLOAT" <?php if ($dt_value   == 'FLOAT') {

+                    value="FLOAT" <?php if ($dt_value == 'FLOAT') {

                     echo 'selected="selected"';

                 } ?>><?php _e('DECIMAL', 'geodirectory'); ?></option>

             </select>

@@ -2690,13 +2690,13 @@ 
     $value = '';

     if (isset($field_info->decimal_point)) {

         $value = esc_attr($field_info->decimal_point);

-    }elseif(isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']){

+    }elseif (isset($cf['defaults']['decimal_point']) && $cf['defaults']['decimal_point']) {

         $value = $cf['defaults']['decimal_point'];

     }

     ?>

 

     <li class="decimal-point-wrapper"

-        style="<?php echo ($dt_value  == 'FLOAT') ? '' : 'display:none' ?>">

+        style="<?php echo ($dt_value == 'FLOAT') ? '' : 'display:none' ?>">

         <label for="decimal_point"><?php _e('Select decimal point :', 'geodirectory'); ?></label>

         <div class="gd-cf-input-wrap">

             <select name="decimal_point" id="decimal_point">

@@ -2714,41 +2714,41 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_data_type_text','geodir_cfa_data_type_text',10,4);

+add_filter('geodir_cfa_data_type_text', 'geodir_cfa_data_type_text', 10, 4);

 

 // htmlvar not needed for fieldset and taxonomy

-add_filter('geodir_cfa_htmlvar_name_fieldset','__return_empty_string',10,4);

-add_filter('geodir_cfa_htmlvar_name_taxonomy','__return_empty_string',10,4);

+add_filter('geodir_cfa_htmlvar_name_fieldset', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_htmlvar_name_taxonomy', '__return_empty_string', 10, 4);

 

 

 // default_value not needed for textarea, html, file, fieldset, taxonomy, address

-add_filter('geodir_cfa_default_value_file','__return_empty_string',10,4);

-add_filter('geodir_cfa_default_value_taxonomy','__return_empty_string',10,4);

-add_filter('geodir_cfa_default_value_address','__return_empty_string',10,4);

-add_filter('geodir_cfa_default_value_fieldset','__return_empty_string',10,4);

+add_filter('geodir_cfa_default_value_file', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_default_value_taxonomy', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_default_value_address', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_default_value_fieldset', '__return_empty_string', 10, 4);

 

 // is_required not needed for fieldset

-add_filter('geodir_cfa_is_required_fieldset','__return_empty_string',10,4);

-add_filter('geodir_cfa_required_msg_fieldset','__return_empty_string',10,4);

+add_filter('geodir_cfa_is_required_fieldset', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_required_msg_fieldset', '__return_empty_string', 10, 4);

 

 // field_icon not needed for fieldset

-add_filter('geodir_cfa_field_icon_fieldset','__return_empty_string',10,4);

-add_filter('geodir_cfa_css_class_fieldset','__return_empty_string',10,4);

+add_filter('geodir_cfa_field_icon_fieldset', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_css_class_fieldset', '__return_empty_string', 10, 4);

 

 // cat_sort not needed for some fields

-add_filter('geodir_cfa_cat_sort_html','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_file','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_url','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_fieldset','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_multiselect','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_textarea','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_taxonomy','__return_empty_string',10,4);

-add_filter('geodir_cfa_cat_sort_address','__return_empty_string',10,4);

+add_filter('geodir_cfa_cat_sort_html', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_file', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_url', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_fieldset', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_multiselect', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_textarea', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_taxonomy', '__return_empty_string', 10, 4);

+add_filter('geodir_cfa_cat_sort_address', '__return_empty_string', 10, 4);

 

 

 

-function geodir_cfa_advanced_editor_geodir_special_offers($output,$result_str,$cf,$field_info){

-    if($field_info->htmlvar_name != 'geodir_special_offers'){return '';}

+function geodir_cfa_advanced_editor_geodir_special_offers($output, $result_str, $cf, $field_info) {

+    if ($field_info->htmlvar_name != 'geodir_special_offers') {return ''; }

     ob_start();

     ?>

     <li>

@@ -2779,16 +2779,16 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_advanced_editor_textarea','geodir_cfa_advanced_editor_geodir_special_offers',10,4);

+add_filter('geodir_cfa_advanced_editor_textarea', 'geodir_cfa_advanced_editor_geodir_special_offers', 10, 4);

 

 

-function geodir_cfa_validation_pattern_text($output,$result_str,$cf,$field_info){

+function geodir_cfa_validation_pattern_text($output, $result_str, $cf, $field_info) {

     ob_start();

 

     $value = '';

     if (isset($field_info->validation_pattern)) {

         $value = esc_attr($field_info->validation_pattern);

-    }elseif(isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']){

+    }elseif (isset($cf['defaults']['validation_pattern']) && $cf['defaults']['validation_pattern']) {

         $value = esc_attr($cf['defaults']['validation_pattern']);

     }

     ?>

@@ -2808,7 +2808,7 @@ 
     $value = '';

     if (isset($field_info->validation_msg)) {

         $value = esc_attr($field_info->validation_msg);

-    }elseif(isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']){

+    }elseif (isset($cf['defaults']['validation_msg']) && $cf['defaults']['validation_msg']) {

         $value = esc_attr($cf['defaults']['validation_msg']);

     }

     ?>

@@ -2829,10 +2829,10 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_validation_pattern_text','geodir_cfa_validation_pattern_text',10,4);

+add_filter('geodir_cfa_validation_pattern_text', 'geodir_cfa_validation_pattern_text', 10, 4);

 

 

-function geodir_cfa_htmlvar_name_taxonomy($output,$result_str,$cf,$field_info){

+function geodir_cfa_htmlvar_name_taxonomy($output, $result_str, $cf, $field_info) {

     ob_start();

     global $post_type;

 

@@ -2857,7 +2857,7 @@ 
                     ?>

                     <option <?php if (isset($field_info->htmlvar_name) && $field_info->htmlvar_name == $gd_tax) {

                         echo 'selected="selected"';

-                    }?> id="<?php echo $gd_tax;?>"><?php echo $gd_tax;?></option><?php

+                    }?> id="<?php echo $gd_tax; ?>"><?php echo $gd_tax; ?></option><?php

                 }

                 ?>

             </select>

@@ -2868,7 +2868,7 @@ 
         <label for="cat_display_type" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Category display type :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory');?>

+                <?php _e('Show categories list as select, multiselect, checkbox or radio', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -2876,19 +2876,19 @@ 
             <select name="cat_display_type" id="cat_display_type">

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'ajax_chained') {

                     echo 'selected="selected"';

-                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory');?></option>

+                }?> value="ajax_chained"><?php _e('Ajax Chained', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {

                     echo 'selected="selected"';

-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>

+                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'multiselect') {

                     echo 'selected="selected"';

-                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory');?></option>

+                }?> value="multiselect"><?php _e('Multiselect', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {

                     echo 'selected="selected"';

-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

+                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {

                     echo 'selected="selected"';

-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

+                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>

             </select>

         </div>

     </li>

@@ -2897,10 +2897,10 @@ 
     $output = ob_get_clean();

     return $output;

 }

-add_filter('geodir_cfa_htmlvar_name_taxonomy','geodir_cfa_htmlvar_name_taxonomy',10,4);

+add_filter('geodir_cfa_htmlvar_name_taxonomy', 'geodir_cfa_htmlvar_name_taxonomy', 10, 4);

 

 

-function geodir_cfa_extra_fields_address($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_address($output, $result_str, $cf, $field_info) {

 

     ob_start();

     if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

@@ -2923,32 +2923,32 @@ 
         <label for="show_zip" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display zip/post code :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory');?>

+                <?php _e('Select if you want to show zip/post code field in address section.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="show_zip_yes<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-enabled"  value="1"

+            <input type="radio" id="show_zip_yes<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_zip']) && $address['show_zip'] == '1') {

                     echo 'checked';

                 } ?>/>

-            <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label onclick="show_hide_radio(this,'show','cf-zip-lable');" for="show_zip_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="show_zip_no<?php echo $radio_id;?>" name="extra[show_zip]" class="gdri-disabled" value="0"

+            <input type="radio" id="show_zip_no<?php echo $radio_id; ?>" name="extra[show_zip]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {

                     echo 'checked';

                 } ?>/>

-            <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label onclick="show_hide_radio(this,'hide','cf-zip-lable');" for="show_zip_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

 

         </div>

     </li>

 

-    <li class="cf-zip-lable"  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'";}?> >

+    <li class="cf-zip-lable"  <?php if ((isset($address['show_zip']) && !$address['show_zip']) || !isset($address['show_zip'])) {echo "style='display:none;'"; }?> >

         <label for="zip_lable" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Zip/Post code label :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Enter zip/post code field label in address section.', 'geodirectory');?>

+                <?php _e('Enter zip/post code field label in address section.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -2966,7 +2966,7 @@ 
         <label for="map_lable" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map button label :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory');?>

+                <?php _e('Enter text for `set address on map` button in address section.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -2981,22 +2981,22 @@ 
         <label for="show_mapzoom" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Use user zoom level:', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory');?>

+                <?php _e('Do you want to use the user defined map zoom level from the add listing page?', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="show_mapzoom_yes<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"

+            <input type="radio" id="show_mapzoom_yes<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_mapzoom']) && $address['show_mapzoom'] == '1') {

                     echo 'checked';

                 } ?>/>

-            <label for="show_mapzoom_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label for="show_mapzoom_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="show_mapzoom_no<?php echo $radio_id;?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"

+            <input type="radio" id="show_mapzoom_no<?php echo $radio_id; ?>" name="extra[show_mapzoom]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_mapzoom']) && !$address['show_mapzoom']) || !isset($address['show_mapzoom'])) {

                     echo 'checked';

                 } ?>/>

-            <label for="show_mapzoom_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label for="show_mapzoom_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

@@ -3005,22 +3005,22 @@ 
         <label for="show_mapview" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display map view:', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory');?>

+                <?php _e('Select if you want to `set default map` options in address section. ( Satellite Map, Hybrid Map, Terrain Map)', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="show_mapview_yes<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"

+            <input type="radio" id="show_mapview_yes<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_mapview']) && $address['show_mapview'] == '1') {

                     echo 'checked';

                 } ?>/>

-            <label for="show_mapview_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label for="show_mapview_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="show_mapview_no<?php echo $radio_id;?>" name="extra[show_mapview]" class="gdri-disabled" value="0"

+            <input type="radio" id="show_mapview_no<?php echo $radio_id; ?>" name="extra[show_mapview]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_mapview']) && !$address['show_mapview']) || !isset($address['show_mapview'])) {

                     echo 'checked';

                 } ?>/>

-            <label for="show_mapview_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label for="show_mapview_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

@@ -3030,7 +3030,7 @@ 
         <label for="mapview_lable" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Map view label:', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Enter mapview field label in address section.', 'geodirectory');?>

+                <?php _e('Enter mapview field label in address section.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -3044,22 +3044,22 @@ 
         <label for="show_latlng" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Show latitude and longitude', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory');?>

+                <?php _e('This will show/hide the longitude fields in the address section add listing form.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="show_latlng_yes<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"

+            <input type="radio" id="show_latlng_yes<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-enabled"  value="1"

                 <?php if (isset($address['show_latlng']) && $address['show_latlng'] == '1') {

                     echo 'checked';

                 } ?>/>

-            <label for="show_latlng_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label for="show_latlng_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="show_latlng_no<?php echo $radio_id;?>" name="extra[show_latlng]" class="gdri-disabled" value="0"

+            <input type="radio" id="show_latlng_no<?php echo $radio_id; ?>" name="extra[show_latlng]" class="gdri-disabled" value="0"

                 <?php if ((isset($address['show_latlng']) && !$address['show_latlng']) || !isset($address['show_latlng'])) {

                     echo 'checked';

                 } ?>/>

-            <label for="show_latlng_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label for="show_latlng_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

@@ -3068,17 +3068,17 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-add_filter('geodir_cfa_extra_fields_address','geodir_cfa_extra_fields_address',10,4);

+add_filter('geodir_cfa_extra_fields_address', 'geodir_cfa_extra_fields_address', 10, 4);

 

 

-function geodir_cfa_extra_fields_multiselect($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_multiselect($output, $result_str, $cf, $field_info) {

     ob_start();

     ?>

     <li>

         <label for="multi_display_type" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Multiselect display type :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory');?>

+                <?php _e('Show multiselect list as multiselect,checkbox or radio.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

@@ -3086,13 +3086,13 @@ 
             <select name="multi_display_type" id="multi_display_type">

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'select') {

                     echo 'selected="selected"';

-                }?> value="select"><?php _e('Select', 'geodirectory');?></option>

+                }?> value="select"><?php _e('Select', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'checkbox') {

                     echo 'selected="selected"';

-                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory');?></option>

+                }?> value="checkbox"><?php _e('Checkbox', 'geodirectory'); ?></option>

                 <option <?php if (isset($field_info->extra_fields) && unserialize($field_info->extra_fields) == 'radio') {

                     echo 'selected="selected"';

-                }?> value="radio"><?php _e('Radio', 'geodirectory');?></option>

+                }?> value="radio"><?php _e('Radio', 'geodirectory'); ?></option>

             </select>

 

             <br/>

@@ -3103,17 +3103,17 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_multiselect',10,4);

+add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_multiselect', 10, 4);

 

 

-function geodir_cfa_extra_fields_smr($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_smr($output, $result_str, $cf, $field_info) {

 

     ob_start();

 

     $value = '';

     if (isset($field_info->option_values)) {

         $value = esc_attr($field_info->option_values);

-    }elseif(isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']){

+    }elseif (isset($cf['defaults']['option_values']) && $cf['defaults']['option_values']) {

         $value = esc_attr($cf['defaults']['option_values']);

     }

 

@@ -3123,11 +3123,11 @@ 
         <label for="option_values" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Option Values :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <span><?php _e('Option Values should be separated by comma.', 'geodirectory');?></span>

+                <span><?php _e('Option Values should be separated by comma.', 'geodirectory'); ?></span>

                 <br/>

-                <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory');?></span>

+                <small><span><?php _e('If using for a "tick filter" place a / and then either a 1 for true or 0 for false', 'geodirectory'); ?></span>

                     <br/>

-                    <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory');?></span>

+                    <span><?php _e('eg: "No Dogs Allowed/0,Dogs Allowed/1" (Select only, not multiselect)', 'geodirectory'); ?></span>

                     <?php if ($field_type == 'multiselect' || $field_type == 'select') { ?>

                         <br/>

                         <span><?php _e('- If using OPTGROUP tag to grouping options, use "{optgroup}OPTGROUP-LABEL|OPTION-1,OPTION-2{/optgroup}"', 'geodirectory'); ?></span>

@@ -3138,7 +3138,7 @@ 
         </label>

         <div class="gd-cf-input-wrap">

             <input type="text" name="option_values" id="option_values"

-                   value="<?php echo $value;?>"/>

+                   value="<?php echo $value; ?>"/>

             <br/>

 

         </div>

@@ -3148,12 +3148,12 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-add_filter('geodir_cfa_extra_fields_multiselect','geodir_cfa_extra_fields_smr',10,4);

-add_filter('geodir_cfa_extra_fields_select','geodir_cfa_extra_fields_smr',10,4);

-add_filter('geodir_cfa_extra_fields_radio','geodir_cfa_extra_fields_smr',10,4);

+add_filter('geodir_cfa_extra_fields_multiselect', 'geodir_cfa_extra_fields_smr', 10, 4);

+add_filter('geodir_cfa_extra_fields_select', 'geodir_cfa_extra_fields_smr', 10, 4);

+add_filter('geodir_cfa_extra_fields_radio', 'geodir_cfa_extra_fields_smr', 10, 4);

 

 

-function geodir_cfa_extra_fields_datepicker($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_datepicker($output, $result_str, $cf, $field_info) {

     ob_start();

     $extra = array();

     if (isset($field_info->extra_fields) && $field_info->extra_fields != '') {

@@ -3164,7 +3164,7 @@ 
         <label for="date_format" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Date Format :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Select the date format.', 'geodirectory');?>

+                <?php _e('Select the date format.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap" style="overflow:inherit;">

@@ -3184,16 +3184,16 @@ 
              * @since 1.6.5

              * @param array $date_formats The PHP date format array.

              */

-            $date_formats = apply_filters('geodir_date_formats',$date_formats);

+            $date_formats = apply_filters('geodir_date_formats', $date_formats);

             ?>

             <select name="extra[date_format]" id="date_format">

                 <?php

-                foreach($date_formats as $format){

+                foreach ($date_formats as $format) {

                     $selected = '';

-                    if(!empty($extra) && esc_attr($extra['date_format'])==$format){

+                    if (!empty($extra) && esc_attr($extra['date_format']) == $format) {

                         $selected = "selected='selected'";

                     }

-                    echo "<option $selected value='$format'>$format       (".date_i18n( $format, time()).")</option>";

+                    echo "<option $selected value='$format'>$format       (".date_i18n($format, time()).")</option>";

                 }

                 ?>

             </select>

@@ -3205,10 +3205,10 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-add_filter('geodir_cfa_extra_fields_datepicker','geodir_cfa_extra_fields_datepicker',10,4);

+add_filter('geodir_cfa_extra_fields_datepicker', 'geodir_cfa_extra_fields_datepicker', 10, 4);

 

 

-function geodir_cfa_extra_fields_file($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_file($output, $result_str, $cf, $field_info) {

     ob_start();

     $allowed_file_types = geodir_allowed_mime_types();

 

@@ -3219,16 +3219,16 @@ 
         <label for="gd_file_types" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Allowed file types :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

-                <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory');?>

+                <?php _e('Select file types to allowed for file uploading. (Select multiple file types by holding down "Ctrl" key.)', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

             <select name="extra[gd_file_types][]" id="gd_file_types" multiple="multiple" style="height:100px;width:90%;">

-                <option value="*" <?php selected(true, in_array('*', $gd_file_types));?>><?php _e('All types', 'geodirectory') ;?></option>

-                <?php foreach ( $allowed_file_types as $format => $types ) { ?>

-                    <optgroup label="<?php echo esc_attr( wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory') ) ) ;?>">

-                        <?php foreach ( $types as $ext => $type ) { ?>

-                            <option value="<?php echo esc_attr($ext) ;?>" <?php selected(true, in_array($ext, $gd_file_types));?>><?php echo '.' . $ext ;?></option>

+                <option value="*" <?php selected(true, in_array('*', $gd_file_types)); ?>><?php _e('All types', 'geodirectory'); ?></option>

+                <?php foreach ($allowed_file_types as $format => $types) { ?>

+                    <optgroup label="<?php echo esc_attr(wp_sprintf(__('%s formats', 'geodirectory'), __($format, 'geodirectory'))); ?>">

+                        <?php foreach ($types as $ext => $type) { ?>

+                            <option value="<?php echo esc_attr($ext); ?>" <?php selected(true, in_array($ext, $gd_file_types)); ?>><?php echo '.'.$ext; ?></option>

                         <?php } ?>

                     </optgroup>

                 <?php } ?>

@@ -3240,9 +3240,9 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-add_filter('geodir_cfa_extra_fields_file','geodir_cfa_extra_fields_file',10,4);

+add_filter('geodir_cfa_extra_fields_file', 'geodir_cfa_extra_fields_file', 10, 4);

 

-function geodir_cfa_extra_fields_text($output,$result_str,$cf,$field_info){

+function geodir_cfa_extra_fields_text($output, $result_str, $cf, $field_info) {

     ob_start();

 

     $extra_fields = isset($field_info->extra_fields) && $field_info->extra_fields != '' ? maybe_unserialize($field_info->extra_fields) : '';

@@ -3256,15 +3256,15 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['is_price'])) {

     $value = esc_attr($extra_fields['is_price']);

-    }elseif(isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']){

+    }elseif (isset($cf['defaults']['extra_fields']['is_price']) && $cf['defaults']['extra_fields']['is_price']) {

     $value = esc_attr($cf['defaults']['extra_fields']['is_price']);

     }

 

-    $show_price_extra = ($value==1) ? 1 : 0;

+    $show_price_extra = ($value == 1) ? 1 : 0;

 

-    $show_price = (isset($field_info->data_type) && ($field_info->data_type=='INT' && $field_info->data_type=='FLOAT')) ? 1 : 0;

+    $show_price = (isset($field_info->data_type) && ($field_info->data_type == 'INT' && $field_info->data_type == 'FLOAT')) ? 1 : 0;

     ?>

-    <li class="gdcf-price-extra-set" <?php if(!$show_price){ echo "style='display:none;'";}?>>

+    <li class="gdcf-price-extra-set" <?php if (!$show_price) { echo "style='display:none;'"; }?>>

         <label for="is_price" class="gd-cf-tooltip-wrap">

             <i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Display as price? :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

@@ -3273,17 +3273,17 @@ 
         </label>

         <div class="gd-cf-input-wrap gd-switch">

 

-            <input type="radio" id="is_price_yes<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-enabled"  value="1"

+            <input type="radio" id="is_price_yes<?php echo $radio_id; ?>" name="extra[is_price]" class="gdri-enabled"  value="1"

                 <?php if ($value == '1') {

                     echo 'checked';

                 } ?>/>

-            <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id;?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

+            <label onclick="show_hide_radio(this,'show','gdcf-price-extra');" for="is_price_yes<?php echo $radio_id; ?>" class="gdcb-enable"><span><?php _e('Yes', 'geodirectory'); ?></span></label>

 

-            <input type="radio" id="is_price_no<?php echo $radio_id;?>" name="extra[is_price]" class="gdri-disabled" value="0"

+            <input type="radio" id="is_price_no<?php echo $radio_id; ?>" name="extra[is_price]" class="gdri-disabled" value="0"

                 <?php if ($value == '0' || !$value) {

                     echo 'checked';

                 } ?>/>

-            <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id;?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

+            <label onclick="show_hide_radio(this,'hide','gdcf-price-extra');" for="is_price_no<?php echo $radio_id; ?>" class="gdcb-disable"><span><?php _e('No', 'geodirectory'); ?></span></label>

 

         </div>

     </li>

@@ -3293,23 +3293,23 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['thousand_separator'])) {

         $value = esc_attr($extra_fields['thousand_separator']);

-    }elseif(isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']){

+    }elseif (isset($cf['defaults']['extra_fields']['thousand_separator']) && $cf['defaults']['extra_fields']['thousand_separator']) {

         $value = esc_attr($cf['defaults']['extra_fields']['thousand_separator']);

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="thousand_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Thousand separator :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select the thousand separator.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

                 <select name="extra[thousand_separator]" id="thousand_separator">

-                    <option value="comma" <?php selected(true, $value == 'comma');?>><?php _e(', (comma)', 'geodirectory'); ?></option>

-                    <option value="slash" <?php selected(true, $value == "slash");?>><?php _e('\ (slash)', 'geodirectory'); ?></option>

-                    <option value="period" <?php selected(true, $value == 'period');?>><?php _e('. (period)', 'geodirectory'); ?></option>

-                    <option value="space" <?php selected(true, $value == 'space');?>><?php _e(' (space)', 'geodirectory'); ?></option>

-                    <option value="none" <?php selected(true, $value == 'none');?>><?php _e('(none)', 'geodirectory'); ?></option>

+                    <option value="comma" <?php selected(true, $value == 'comma'); ?>><?php _e(', (comma)', 'geodirectory'); ?></option>

+                    <option value="slash" <?php selected(true, $value == "slash"); ?>><?php _e('\ (slash)', 'geodirectory'); ?></option>

+                    <option value="period" <?php selected(true, $value == 'period'); ?>><?php _e('. (period)', 'geodirectory'); ?></option>

+                    <option value="space" <?php selected(true, $value == 'space'); ?>><?php _e(' (space)', 'geodirectory'); ?></option>

+                    <option value="none" <?php selected(true, $value == 'none'); ?>><?php _e('(none)', 'geodirectory'); ?></option>

                 </select>

         </div>

     </li>

@@ -3320,20 +3320,20 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['decimal_separator'])) {

         $value = esc_attr($extra_fields['decimal_separator']);

-    }elseif(isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']){

+    }elseif (isset($cf['defaults']['extra_fields']['decimal_separator']) && $cf['defaults']['extra_fields']['decimal_separator']) {

         $value = esc_attr($cf['defaults']['extra_fields']['decimal_separator']);

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="decimal_separator" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal separator :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select the decimal separator.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

             <select name="extra[decimal_separator]" id="decimal_separator">

-                <option value="period" <?php selected(true, $value == 'period');?>><?php _e('. (period)', 'geodirectory'); ?></option>

-                <option value="comma" <?php selected(true, $value == "comma");?>><?php _e(', (comma)', 'geodirectory'); ?></option>

+                <option value="period" <?php selected(true, $value == 'period'); ?>><?php _e('. (period)', 'geodirectory'); ?></option>

+                <option value="comma" <?php selected(true, $value == "comma"); ?>><?php _e(', (comma)', 'geodirectory'); ?></option>

             </select>

         </div>

     </li>

@@ -3343,20 +3343,20 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['decimal_display'])) {

         $value = esc_attr($extra_fields['decimal_display']);

-    }elseif(isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']){

+    }elseif (isset($cf['defaults']['extra_fields']['decimal_display']) && $cf['defaults']['extra_fields']['decimal_display']) {

         $value = esc_attr($cf['defaults']['extra_fields']['decimal_display']);

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="decimal_display" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Decimal display :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select how the decimal is displayed', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

             <select name="extra[decimal_display]" id="decimal_display">

-                <option value="if" <?php selected(true, $value == 'if');?>><?php _e('If used (not .00)', 'geodirectory'); ?></option>

-                <option value="allways" <?php selected(true, $value == "allways");?>><?php _e('Always (.00)', 'geodirectory'); ?></option>

+                <option value="if" <?php selected(true, $value == 'if'); ?>><?php _e('If used (not .00)', 'geodirectory'); ?></option>

+                <option value="allways" <?php selected(true, $value == "allways"); ?>><?php _e('Always (.00)', 'geodirectory'); ?></option>

             </select>

         </div>

     </li>

@@ -3366,12 +3366,12 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['currency_symbol'])) {

         $value = esc_attr($extra_fields['currency_symbol']);

-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']){

+    }elseif (isset($cf['defaults']['extra_fields']['currency_symbol']) && $cf['defaults']['extra_fields']['currency_symbol']) {

         $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol']);

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="currency_symbol" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select the currency symbol.', 'geodirectory'); ?>

             </div>

@@ -3387,20 +3387,20 @@ 
     $value = '';

     if ($extra_fields && isset($extra_fields['currency_symbol_placement'])) {

         $value = esc_attr($extra_fields['currency_symbol_placement']);

-    }elseif(isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']){

+    }elseif (isset($cf['defaults']['extra_fields']['currency_symbol_placement']) && $cf['defaults']['extra_fields']['currency_symbol_placement']) {

         $value = esc_attr($cf['defaults']['extra_fields']['currency_symbol_placement']);

     }

     ?>

-    <li class="gdcf-price-extra" <?php if(!$show_price_extra){ echo "style='display:none;'";}?>>

-        <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory');?>

+    <li class="gdcf-price-extra" <?php if (!$show_price_extra) { echo "style='display:none;'"; }?>>

+        <label for="currency_symbol_placement" class="gd-cf-tooltip-wrap"><i class="fa fa-info-circle" aria-hidden="true"></i> <?php _e('Currency symbol placement :', 'geodirectory'); ?>

             <div class="gdcf-tooltip">

                 <?php _e('Select the currency symbol placement.', 'geodirectory'); ?>

             </div>

         </label>

         <div class="gd-cf-input-wrap">

             <select name="extra[currency_symbol_placement]" id="currency_symbol_placement">

-                <option value="left" <?php selected(true, $value == 'left');?>><?php _e('Left', 'geodirectory'); ?></option>

-                <option value="right" <?php selected(true, $value == "right");?>><?php _e('Right', 'geodirectory'); ?></option>

+                <option value="left" <?php selected(true, $value == 'left'); ?>><?php _e('Left', 'geodirectory'); ?></option>

+                <option value="right" <?php selected(true, $value == "right"); ?>><?php _e('Right', 'geodirectory'); ?></option>

             </select>

         </div>

     </li>

@@ -3411,11 +3411,11 @@ 
     $html = ob_get_clean();

     return $output.$html;

 }

-add_filter('geodir_cfa_extra_fields_text','geodir_cfa_extra_fields_text',10,4);

+add_filter('geodir_cfa_extra_fields_text', 'geodir_cfa_extra_fields_text', 10, 4);

 

-function geodir_default_custom_fields($post_type='gd_place',$package_id=''){

+function geodir_default_custom_fields($post_type = 'gd_place', $package_id = '') {

     $fields = array();

-    $package = ($package_id=='') ? '' : array($package_id);

+    $package = ($package_id == '') ? '' : array($package_id);

 

     $fields[] = array('listing_type' => $post_type,

                       'data_type' => 'VARCHAR',

@@ -3588,7 +3588,7 @@ 
     return  $fields;

 }

 

-function geodir_currency_format_number($number='',$cf=''){

+function geodir_currency_format_number($number = '', $cf = '') {

 

     $cs = isset($cf['extra_fields']) ? maybe_unserialize($cf['extra_fields']) : '';

 

@@ -3597,35 +3597,35 @@ 
     $decimal_display = isset($cf['decimal_display']) && $cf['decimal_display'] ? $cf['decimal_display'] : 'if';

     $decimalpoint = '.';

 

-    if(isset($cs['decimal_separator']) && $cs['decimal_separator']=='comma'){

+    if (isset($cs['decimal_separator']) && $cs['decimal_separator'] == 'comma') {

         $decimalpoint = ',';

     }

 

     $separator = ',';

 

-    if(isset($cs['thousand_separator'])){

-        if($cs['thousand_separator']=='comma'){$separator = ',';}

-        if($cs['thousand_separator']=='slash'){$separator = '\\';}

-        if($cs['thousand_separator']=='period'){$separator = '.';}

-        if($cs['thousand_separator']=='space'){$separator = ' ';}

-        if($cs['thousand_separator']=='none'){$separator = '';}

+    if (isset($cs['thousand_separator'])) {

+        if ($cs['thousand_separator'] == 'comma') {$separator = ','; }

+        if ($cs['thousand_separator'] == 'slash') {$separator = '\\'; }

+        if ($cs['thousand_separator'] == 'period') {$separator = '.'; }

+        if ($cs['thousand_separator'] == 'space') {$separator = ' '; }

+        if ($cs['thousand_separator'] == 'none') {$separator = ''; }

     }

 

     $currency_symbol_placement = isset($cs['currency_symbol_placement']) ? $cs['currency_symbol_placement'] : 'left';

 

-    if($decimals>0 && $decimal_display=='if'){

-        if(is_int($number) || floor( $number ) == $number)

+    if ($decimals > 0 && $decimal_display == 'if') {

+        if (is_int($number) || floor($number) == $number)

             $decimals = 0;

     }

 

-    $number = number_format($number,$decimals,$decimalpoint,$separator);

+    $number = number_format($number, $decimals, $decimalpoint, $separator);

 

 

 

-    if($currency_symbol_placement=='left'){

-        $number = $symbol . $number;

-    }else{

-        $number = $number . $symbol;

+    if ($currency_symbol_placement == 'left') {

+        $number = $symbol.$number;

+    } else {

+        $number = $number.$symbol;

     }

 

 

geodirectory-widgets/geodirectory_listing_slider_widget.php

Indentation +109 added lines, -109 removed lines

@@ -15,40 +15,40 @@ 
 class geodir_listing_slider_widget extends WP_Widget

 {

 

-    /**

+	/**

 	 * Register the listing slider widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

+	 * @since 1.5.1 Changed from PHP4 style constructors to PHP5 __construct.

 	 */

-    public function __construct() {

-        $widget_ops = array('classname' => 'geodir_listing_slider_view', 'description' => __('GD > Listing Slider', 'geodirectory'));

-        parent::__construct(

-            'listing_slider_view', // Base ID

-            __('GD > Listing Slider', 'geodirectory'), // Name

-            $widget_ops// Args

-        );

-    }

+	public function __construct() {

+		$widget_ops = array('classname' => 'geodir_listing_slider_view', 'description' => __('GD > Listing Slider', 'geodirectory'));

+		parent::__construct(

+			'listing_slider_view', // Base ID

+			__('GD > Listing Slider', 'geodirectory'), // Name

+			$widget_ops// Args

+		);

+	}

 	

 	/**

 	 * Front-end display content for listing slider widget.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $args     Widget arguments.

 	 * @param array $instance Saved values from database.

 	 */

-    public function widget($args, $instance)

-    {

-        geodir_listing_slider_widget_output($args, $instance);

-    }

+	public function widget($args, $instance)

+	{

+		geodir_listing_slider_widget_output($args, $instance);

+	}

 

 	/**

 	 * Sanitize listing slider widget form values as they are saved.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $new_instance Values just sent to be saved.

 	 * @param array $old_instance Previously saved values from database.

@@ -56,101 +56,101 @@ 
 	 * @return array Updated safe values to be saved.

 	 */

 	public function update($new_instance, $old_instance)

-    {

-        //save the widget

-        $instance = $old_instance;

-        $instance['title'] = strip_tags($new_instance['title']);

-        $instance['post_type'] = strip_tags($new_instance['post_type']);

-        $instance['category'] = strip_tags($new_instance['category']);

-        $instance['post_number'] = strip_tags($new_instance['post_number']);

-        $instance['max_show'] = strip_tags($new_instance['max_show']);

-        $instance['slide_width'] = strip_tags($new_instance['slide_width']);

-        $instance['show_title'] = isset($new_instance['show_title']) ? $new_instance['show_title'] : '';

-        $instance['slideshow'] = isset($new_instance['slideshow']) ? $new_instance['slideshow'] : '';

-        $instance['animationLoop'] = isset($new_instance['animationLoop']) ? $new_instance['animationLoop'] : '';

-        $instance['directionNav'] = isset($new_instance['directionNav']) ? $new_instance['directionNav'] : '';

-        $instance['slideshowSpeed'] = $new_instance['slideshowSpeed'];

-        $instance['animationSpeed'] = $new_instance['animationSpeed'];

-        $instance['animation'] = $new_instance['animation'];

-        $instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';

-        $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);

-        else

-            $instance['add_location_filter'] = '0';

-

-        return $instance;

-    }

+	{

+		//save the widget

+		$instance = $old_instance;

+		$instance['title'] = strip_tags($new_instance['title']);

+		$instance['post_type'] = strip_tags($new_instance['post_type']);

+		$instance['category'] = strip_tags($new_instance['category']);

+		$instance['post_number'] = strip_tags($new_instance['post_number']);

+		$instance['max_show'] = strip_tags($new_instance['max_show']);

+		$instance['slide_width'] = strip_tags($new_instance['slide_width']);

+		$instance['show_title'] = isset($new_instance['show_title']) ? $new_instance['show_title'] : '';

+		$instance['slideshow'] = isset($new_instance['slideshow']) ? $new_instance['slideshow'] : '';

+		$instance['animationLoop'] = isset($new_instance['animationLoop']) ? $new_instance['animationLoop'] : '';

+		$instance['directionNav'] = isset($new_instance['directionNav']) ? $new_instance['directionNav'] : '';

+		$instance['slideshowSpeed'] = $new_instance['slideshowSpeed'];

+		$instance['animationSpeed'] = $new_instance['animationSpeed'];

+		$instance['animation'] = $new_instance['animation'];

+		$instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';

+		$instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

+		if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

+			$instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);

+		else

+			$instance['add_location_filter'] = '0';

+

+		return $instance;

+	}

 

 	/**

 	 * Back-end listing slider widget settings form.

 	 *

 	 * @since 1.0.0

-     * @since 1.5.1 Declare function public.

+	 * @since 1.5.1 Declare function public.

 	 *

 	 * @param array $instance Previously saved values from database.

 	 */

 	public function form($instance)

-    {

+	{

 

-        //widgetform in backend

-        $instance = wp_parse_args((array)$instance,

-            array('title' => '',

-                'post_type' => '',

-                'category' => '',

-                'post_number' => '5',

-                'max_show' => '1',

-                'slide_width' => '',

-                'show_title' => '',

-                'slideshow' => '',

-                'animationLoop' => '',

-                'directionNav' => '',

-                'slideshowSpeed' => 5000,

-                'animationSpeed' => 600,

-                'animation' => '',

-                'list_sort' => 'latest',

-                'show_featured_only' => '',

-                'add_location_filter' => '0',

-            )

-        );

+		//widgetform in backend

+		$instance = wp_parse_args((array)$instance,

+			array('title' => '',

+				'post_type' => '',

+				'category' => '',

+				'post_number' => '5',

+				'max_show' => '1',

+				'slide_width' => '',

+				'show_title' => '',

+				'slideshow' => '',

+				'animationLoop' => '',

+				'directionNav' => '',

+				'slideshowSpeed' => 5000,

+				'animationSpeed' => 600,

+				'animation' => '',

+				'list_sort' => 'latest',

+				'show_featured_only' => '',

+				'add_location_filter' => '0',

+			)

+		);

 

-        $title = strip_tags($instance['title']);

+		$title = strip_tags($instance['title']);

 

-        $post_type = strip_tags($instance['post_type']);

+		$post_type = strip_tags($instance['post_type']);

 

-        $category = strip_tags($instance['category']);

+		$category = strip_tags($instance['category']);

 

-        $post_number = strip_tags($instance['post_number']);

+		$post_number = strip_tags($instance['post_number']);

 

-        $max_show = strip_tags($instance['max_show']);

+		$max_show = strip_tags($instance['max_show']);

 

-        $slide_width = strip_tags($instance['slide_width']);

+		$slide_width = strip_tags($instance['slide_width']);

 

-        $show_title = $instance['show_title'];

+		$show_title = $instance['show_title'];

 

-        $slideshow = $instance['slideshow'];

+		$slideshow = $instance['slideshow'];

 

-        $animationLoop = $instance['animationLoop'];

+		$animationLoop = $instance['animationLoop'];

 

-        $directionNav = $instance['directionNav'];

+		$directionNav = $instance['directionNav'];

 

-        $slideshowSpeed = $instance['slideshowSpeed'];

+		$slideshowSpeed = $instance['slideshowSpeed'];

 

-        $animationSpeed = $instance['animationSpeed'];

+		$animationSpeed = $instance['animationSpeed'];

 

-        $add_location_filter = strip_tags($instance['add_location_filter']);

+		$add_location_filter = strip_tags($instance['add_location_filter']);

 

-        $animation = $instance['animation'];

-        $list_sort = $instance['list_sort'];

-        $show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;

+		$animation = $instance['animation'];

+		$list_sort = $instance['list_sort'];

+		$show_featured_only = isset($instance['show_featured_only']) && $instance['show_featured_only'] ? true : false;

 

-        $sort_fields = array();

-        $sort_fields[] = array('field' => 'latest', 'label' => __('Latest', 'geodirectory'));

-        $sort_fields[] = array('field' => 'featured', 'label' => __('Featured', 'geodirectory'));

-        $sort_fields[] = array('field' => 'high_review', 'label' => __('Review', 'geodirectory'));

-        $sort_fields[] = array('field' => 'high_rating', 'label' => __('Rating', 'geodirectory'));

-        $sort_fields[] = array('field' => 'random', 'label' => __('Random', 'geodirectory'));

-        ?>

+		$sort_fields = array();

+		$sort_fields[] = array('field' => 'latest', 'label' => __('Latest', 'geodirectory'));

+		$sort_fields[] = array('field' => 'featured', 'label' => __('Featured', 'geodirectory'));

+		$sort_fields[] = array('field' => 'high_review', 'label' => __('Review', 'geodirectory'));

+		$sort_fields[] = array('field' => 'high_rating', 'label' => __('Rating', 'geodirectory'));

+		$sort_fields[] = array('field' => 'random', 'label' => __('Random', 'geodirectory'));

+		?>

 

         <p>

             <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>

@@ -174,9 +174,9 @@ 
                     <?php foreach ($postypes as $postypes_obj) { ?>

 

                         <option <?php if ($post_type == $postypes_obj) {

-                            echo 'selected="selected"';

-                        } ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);

-                            echo ucfirst($extvalue[1]); ?></option>

+							echo 'selected="selected"';

+						} ?> value="<?php echo $postypes_obj; ?>"><?php $extvalue = explode('_', $postypes_obj);

+							echo ucfirst($extvalue[1]); ?></option>

 

                     <?php } ?>

 

@@ -190,20 +190,20 @@ 
                 for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory');?>

 

                 <?php

-                $category_taxonomy = geodir_get_taxonomies('gd_place');

-                $categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));

-                ?>

+				$category_taxonomy = geodir_get_taxonomies('gd_place');

+				$categories = get_terms($category_taxonomy, array('orderby' => 'count', 'order' => 'DESC'));

+				?>

 

                 <select class="widefat" id="<?php echo $this->get_field_id('category'); ?>"

                         name="<?php echo $this->get_field_name('category'); ?>">

                     <option <?php if ($category == '0') {

-                        echo 'selected="selected"';

-                    } ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

+						echo 'selected="selected"';

+					} ?> value="0"><?php _e('All', 'geodirectory'); ?></option>

                     <?php foreach ($categories as $category_obj) { ?>

 

                         <option <?php if ($category == $category_obj->term_id) {

-                            echo 'selected="selected"';

-                        } ?>

+							echo 'selected="selected"';

+						} ?>

                             value="<?php echo $category_obj->term_id; ?>"><?php echo ucfirst($category_obj->name); ?></option>

 

                     <?php } ?>

@@ -256,12 +256,12 @@ 
                 <select class="widefat" id="<?php echo $this->get_field_id('animation'); ?>"

                         name="<?php echo $this->get_field_name('animation'); ?>">

                     <option <?php if ($animation == 'slide') {

-                        echo 'selected="selected"';

-                    } ?> value="slide">Slide

+						echo 'selected="selected"';

+					} ?> value="slide">Slide

                     </option>

                     <option <?php if ($animation == 'fade') {

-                        echo 'selected="selected"';

-                    } ?> value="fade">Fade

+						echo 'selected="selected"';

+					} ?> value="fade">Fade

                     </option>

                 </select>

             </label>

@@ -292,8 +292,8 @@ 
                 for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($slideshow) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('slideshow'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('slideshow'); ?>" value="1"

                        name="<?php echo $this->get_field_name('slideshow'); ?>"/>

 

             </label>

@@ -304,8 +304,8 @@ 
                 for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($animationLoop) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('animationLoop'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('animationLoop'); ?>" value="1"

                        name="<?php echo $this->get_field_name('animationLoop'); ?>"/>

 

             </label>

@@ -316,8 +316,8 @@ 
                 for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($directionNav) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('directionNav'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('directionNav'); ?>" value="1"

                        name="<?php echo $this->get_field_name('directionNav'); ?>"/>

 

             </label>

@@ -329,8 +329,8 @@ 
                 for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory');?>

 

                 <input type="checkbox" <?php if ($show_title) {

-                    echo 'checked="checked"';

-                } ?> id="<?php echo $this->get_field_id('show_title'); ?>" value="1"

+					echo 'checked="checked"';

+				} ?> id="<?php echo $this->get_field_id('show_title'); ?>" value="1"

                        name="<?php echo $this->get_field_name('show_title'); ?>"/>

 

             </label>

@@ -378,7 +378,7 @@ 
 

 

     <?php

-    }

+	}

 } // class geodir_listing_slider_widget

 

 register_widget('geodir_listing_slider_widget');
\ No newline at end of file

Spacing +18 added lines, -18 removed lines

@@ -94,7 +94,7 @@ 
     {

 

         //widgetform in backend

-        $instance = wp_parse_args((array)$instance,

+        $instance = wp_parse_args((array) $instance,

             array('title' => '',

                 'post_type' => '',

                 'category' => '',

@@ -153,7 +153,7 @@ 
         ?>

 

         <p>

-            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory');?>

+            <label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title:', 'geodirectory'); ?>

 

                 <input class="widefat" id="<?php echo $this->get_field_id('title'); ?>"

                        name="<?php echo $this->get_field_name('title'); ?>" type="text"

@@ -163,7 +163,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('post_type'); ?>"><?php _e('Post Type:', 'geodirectory'); ?>

 

                 <?php $postypes = geodir_get_posttypes(); ?>

 

@@ -187,7 +187,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('category'); ?>"><?php _e('Post Category:', 'geodirectory'); ?>

 

                 <?php

                 $category_taxonomy = geodir_get_taxonomies('gd_place');

@@ -224,7 +224,7 @@ 
         </p>

         <p>

             <label

-                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts(total):', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('post_number'); ?>"><?php _e('Number of posts(total):', 'geodirectory'); ?>

                 <input class="widefat" id="<?php echo $this->get_field_id('post_number'); ?>"

                        name="<?php echo $this->get_field_name('post_number'); ?>" type="text"

                        value="<?php echo esc_attr($post_number); ?>"/>

@@ -233,7 +233,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('max_show'); ?>"><?php _e('Number of posts(shown at one time, requires a slide width to be set):', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('max_show'); ?>"><?php _e('Number of posts(shown at one time, requires a slide width to be set):', 'geodirectory'); ?>

                 <input class="widefat" id="<?php echo $this->get_field_id('max_show'); ?>"

                        name="<?php echo $this->get_field_name('max_show'); ?>" type="text"

                        value="<?php echo esc_attr($max_show); ?>"/>

@@ -242,7 +242,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('slide_width'); ?>"><?php _e('Slide width(leave blank unless showing more than one slide at a time, ex: 210):', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('slide_width'); ?>"><?php _e('Slide width(leave blank unless showing more than one slide at a time, ex: 210):', 'geodirectory'); ?>

                 <input class="widefat" id="<?php echo $this->get_field_id('slide_width'); ?>"

                        name="<?php echo $this->get_field_name('slide_width'); ?>" type="text"

                        value="<?php echo esc_attr($slide_width); ?>"/>

@@ -251,7 +251,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('animation'); ?>"><?php _e('Animation:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('animation'); ?>"><?php _e('Animation:', 'geodirectory'); ?>

 

                 <select class="widefat" id="<?php echo $this->get_field_id('animation'); ?>"

                         name="<?php echo $this->get_field_name('animation'); ?>">

@@ -269,7 +269,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('slideshowSpeed'); ?>"><?php _e('Slide Show Speed: (milliseconds)', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('slideshowSpeed'); ?>"><?php _e('Slide Show Speed: (milliseconds)', 'geodirectory'); ?>

 

                 <input class="widefat" id="<?php echo $this->get_field_id('slideshowSpeed'); ?>"

                        name="<?php echo $this->get_field_name('slideshowSpeed'); ?>" type="text"

@@ -279,7 +279,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('animationSpeed'); ?>"><?php _e('Animation Speed: (milliseconds)', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('animationSpeed'); ?>"><?php _e('Animation Speed: (milliseconds)', 'geodirectory'); ?>

 

                 <input class="widefat" id="<?php echo $this->get_field_id('animationSpeed'); ?>"

                        name="<?php echo $this->get_field_name('animationSpeed'); ?>" type="text"

@@ -289,7 +289,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('slideshow'); ?>"><?php _e('SlideShow:', 'geodirectory'); ?>

 

                 <input type="checkbox" <?php if ($slideshow) {

                     echo 'checked="checked"';

@@ -301,7 +301,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('animationLoop'); ?>"><?php _e('AnimationLoop:', 'geodirectory'); ?>

 

                 <input type="checkbox" <?php if ($animationLoop) {

                     echo 'checked="checked"';

@@ -313,7 +313,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('directionNav'); ?>"><?php _e('DirectionNav:', 'geodirectory'); ?>

 

                 <input type="checkbox" <?php if ($directionNav) {

                     echo 'checked="checked"';

@@ -326,7 +326,7 @@ 
 

         <p>

             <label

-                for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory');?>

+                for="<?php echo $this->get_field_id('show_title'); ?>"><?php _e('Show Title:', 'geodirectory'); ?>

 

                 <input type="checkbox" <?php if ($show_title) {

                     echo 'checked="checked"';

@@ -345,9 +345,9 @@ 
         </p>

         <p>

             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">

-                <?php _e('Enable Location Filter:', 'geodirectory');?>

+                <?php _e('Enable Location Filter:', 'geodirectory'); ?>

                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"

-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>

+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"'; ?>

                        value="1"/>

             </label>

         </p>

@@ -368,10 +368,10 @@ 
 

             }

 

-            <?php if(is_active_widget( false, false, $this->id_base, true )){ ?>

+            <?php if (is_active_widget(false, false, $this->id_base, true)) { ?>

             var post_type = jQuery('#<?php echo $this->get_field_id('post_type'); ?>').val();

 

-            geodir_change_category_list(post_type, '<?php echo $category;?>');

+            geodir_change_category_list(post_type, '<?php echo $category; ?>');

             <?php } ?>

 

         </script>

Braces +13 added lines, -6 removed lines

@@ -74,10 +74,11 @@ 
         $instance['animation'] = $new_instance['animation'];

         $instance['list_sort'] = isset($new_instance['list_sort']) ? $new_instance['list_sort'] : '';

         $instance['show_featured_only'] = isset($new_instance['show_featured_only']) && $new_instance['show_featured_only'] ? 1 : 0;

-        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '')

-            $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);

-        else

-            $instance['add_location_filter'] = '0';

+        if (isset($new_instance['add_location_filter']) && $new_instance['add_location_filter'] != '') {
+                    $instance['add_location_filter'] = strip_tags($new_instance['add_location_filter']);
+        } else {
+                    $instance['add_location_filter'] = '0';
+        }
 

         return $instance;

     }

@@ -339,7 +340,10 @@ 
             <label

                 for="<?php echo $this->get_field_id('show_featured_only'); ?>"><?php _e('Show only featured listings:', 'geodirectory'); ?>

                 <input type="checkbox" id="<?php echo $this->get_field_id('show_featured_only'); ?>"

-                       name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) echo 'checked="checked"'; ?>

+                       name="<?php echo $this->get_field_name('show_featured_only'); ?>" <?php if ($show_featured_only) {
+	echo 'checked="checked"';
+}
+?>

                        value="1"/>

             </label>

         </p>

@@ -347,7 +351,10 @@ 
             <label for="<?php echo $this->get_field_id('add_location_filter'); ?>">

                 <?php _e('Enable Location Filter:', 'geodirectory');?>

                 <input type="checkbox" id="<?php echo $this->get_field_id('add_location_filter'); ?>"

-                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) echo 'checked="checked"';?>

+                       name="<?php echo $this->get_field_name('add_location_filter'); ?>" <?php if ($add_location_filter) {
+	echo 'checked="checked"';
+}
+?>

                        value="1"/>

             </label>

         </p>