GeoDirectory / geodirectory

geodirectory_template_tags.php

Spacing +68 added lines, -68 removed lines

@@ -38,21 +38,21 @@ 
     $is_detail_page = false;

     $geodir_map_name = geodir_map_name();

 

-    if((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview') )) {

+    if ((is_single() && geodir_is_geodir_page()) || (is_page() && geodir_is_page('preview'))) {

         $is_detail_page = true;

     }

 

     wp_enqueue_script('jquery');

 

-    wp_register_script('geodirectory-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory.min.js#asyncload', array(), GEODIRECTORY_VERSION);

+    wp_register_script('geodirectory-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory.min.js#asyncload', array(), GEODIRECTORY_VERSION);

     wp_enqueue_script('geodirectory-script');

 

     $geodir_vars_data = array(

         'siteurl' => get_option('siteurl'),

         'geodir_plugin_url' => geodir_plugin_url(),

-        'geodir_lazy_load' => get_option('geodir_lazy_load',1),

+        'geodir_lazy_load' => get_option('geodir_lazy_load', 1),

         'geodir_ajax_url' => geodir_get_ajax_url(),

-        'geodir_gd_modal' => (int)get_option('geodir_disable_gb_modal'),

+        'geodir_gd_modal' => (int) get_option('geodir_disable_gb_modal'),

         'is_rtl' => is_rtl() ? 1 : 0 // fix rtl issue

     );

 

@@ -73,24 +73,24 @@ 
      *

      * }

      */

-    $geodir_vars_data = apply_filters('geodir_vars_data',$geodir_vars_data);

+    $geodir_vars_data = apply_filters('geodir_vars_data', $geodir_vars_data);

 

     wp_localize_script('geodirectory-script', 'geodir_var', $geodir_vars_data);

 

-    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION,true);

-    if($is_detail_page){wp_enqueue_script('geodirectory-jquery-flexslider-js');}

+    wp_register_script('geodirectory-jquery-flexslider-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.flexslider.min.js', array(), GEODIRECTORY_VERSION, true);

+    if ($is_detail_page) {wp_enqueue_script('geodirectory-jquery-flexslider-js'); }

 

-    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url() . '/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-lightbox-jquery', geodir_plugin_url().'/geodirectory-assets/js/jquery.lightbox-0.5.min.js', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodirectory-lightbox-jquery');

 

-    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url() . '/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-jquery-simplemodal', geodir_plugin_url().'/geodirectory-assets/js/jquery.simplemodal.min.js', array(), GEODIRECTORY_VERSION, true);

     if ($is_detail_page) {

         wp_enqueue_script('geodirectory-jquery-simplemodal');

     }

 

     if (in_array($geodir_map_name, array('auto', 'google'))) {

-        $map_lang = "&language=" . geodir_get_map_default_language();

-        $map_key = "&key=" . geodir_get_map_api_key();

+        $map_lang = "&language=".geodir_get_map_default_language();

+        $map_key = "&key=".geodir_get_map_api_key();

         /**

          * Filter the variables that are added to the end of the google maps script call.

          *

@@ -100,48 +100,48 @@ 
          * @param string $var The string to filter, default is empty string.

          */

         $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-        wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra , '', NULL);

+        wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);

     }

     

     if ($geodir_map_name == 'osm') {

         // Leaflet OpenStreetMap

-        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-leaflet-style');

             

-        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-leaflet-script');

         

-        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-leaflet-geo-script');

         

         if ($is_detail_page) {

-            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

+            wp_register_style('geodirectory-leaflet-routing-style', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.css', array(), GEODIRECTORY_VERSION);

             wp_enqueue_style('geodirectory-leaflet-routing-style');

                 

-            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-routing-script', geodir_plugin_url().'/geodirectory-assets/leaflet/routing/leaflet-routing-machine.js', array(), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-routing-script');

         }

     }

-    wp_enqueue_script( 'jquery-ui-autocomplete' );

+    wp_enqueue_script('jquery-ui-autocomplete');

     

-    wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

+    wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodirectory-goMap-script');

 

 

-    wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

+    wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.min.js', array(), GEODIRECTORY_VERSION);

     wp_enqueue_script('chosen');

 

-    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

+    wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.min.js', array(), GEODIRECTORY_VERSION);

     wp_enqueue_script('geodirectory-choose-ajax');

 

-    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

+    wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.min.js', array('jquery-ui-datepicker', 'jquery-ui-slider', 'jquery-effects-core', 'jquery-effects-slide'), '', true);

 

     if (is_page() && geodir_is_page('add-listing')) {

         // SCRIPT FOR UPLOAD

         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION,true);

+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

         wp_enqueue_script('geodirectory-plupload-script');

         // SCRIPT FOR UPLOAD END

 

@@ -188,27 +188,27 @@ 
 

         wp_localize_script('geodirectory-plupload-script', 'gd_plupload', $gd_plupload_init);

 

-        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation.min.js#asyncload');

+        wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation.min.js#asyncload');

     } // End if for add place page

 

-    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url() . '/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('geodirectory-post-custom-js', geodir_plugin_url().'/geodirectory-assets/js/post.custom.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     if ($is_detail_page) {

 		wp_enqueue_script('geodirectory-post-custom-js');

 	}

 

     // font awesome rating script

 	if (get_option('geodir_reviewrating_enable_font_awesome')) {

-		wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

+		wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION, true);

 		wp_enqueue_script('geodir-barrating-js');

 	} else { // default rating script

-		wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);

+		wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.min.js', array(), GEODIRECTORY_VERSION, true);

 		wp_enqueue_script('geodir-jRating-js');

 	}

 

-    wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('geodir-on-document-load');

 

-    wp_register_script('google-geometa', geodir_plugin_url() . '/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

+    wp_register_script('google-geometa', geodir_plugin_url().'/geodirectory-assets/js/geometa.min.js#asyncload', array(), GEODIRECTORY_VERSION, true);

     wp_enqueue_script('google-geometa');

 }

 

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

 function geodir_header_scripts()

 {

-    echo '<style>' . stripslashes(get_option('geodir_coustem_css')) . '</style>';

+    echo '<style>'.stripslashes(get_option('geodir_coustem_css')).'</style>';

     echo stripslashes(get_option('geodir_header_scripts'));

 }

 

@@ -247,7 +247,7 @@ 
      *

      * Flexbox wont wrap on ios for search form items

      */

-    if (preg_match( '/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'] ) ) {

+    if (preg_match('/iPad|iPod|iPhone|Safari/', $_SERVER['HTTP_USER_AGENT'])) {

         echo "<style>body .geodir-listing-search.gd-search-bar-style .geodir-loc-bar .clearfix.geodir-loc-bar-in .geodir-search .gd-search-input-wrapper{flex:50 1 auto !important;min-width: initial !important;width:auto !important;}</style>";

     }

 }

@@ -263,7 +263,7 @@ 
  */

 function geodir_add_async_forscript($url)

 {

-    if (strpos($url, '#asyncload')===false)

+    if (strpos($url, '#asyncload') === false)

         return $url;

     else if (is_admin())

         return str_replace('#asyncload', '', $url);

@@ -281,12 +281,12 @@ 
 function geodir_templates_styles()

 {

 

-    wp_register_style('geodir-core-scss', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

+    wp_register_style('geodir-core-scss', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend.css', array(), GEODIRECTORY_VERSION);

     wp_enqueue_style('geodir-core-scss');

-    wp_register_style('geodir-core-scss-footer', geodir_plugin_url() . '/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

+    wp_register_style('geodir-core-scss-footer', geodir_plugin_url().'/geodirectory-assets/css/gd_core_frontend_footer.css', array(), GEODIRECTORY_VERSION);

 

-    if(is_rtl()){

-    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

+    if (is_rtl()) {

+    wp_register_style('geodirectory-frontend-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl-frontend.css', array(), GEODIRECTORY_VERSION);

     wp_enqueue_style('geodirectory-frontend-rtl-style');

     }

 

@@ -360,18 +360,18 @@ 
                 $term_id = get_queried_object_id();

                 $taxonomy = get_query_var('taxonomy');

 

-                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type . 'category' ) {

-                    $term = get_term($term_id, $post_type . 'category');

+                if ($term_id && $post_type && get_query_var('taxonomy') == $post_type.'category') {

+                    $term = get_term($term_id, $post_type.'category');

                 }

             }

             

-            if (geodir_is_page('search') && !empty($_REQUEST['s' . $post_type . 'category'])) {

-                $taxonomy_search = $_REQUEST['s' . $post_type . 'category'];

+            if (geodir_is_page('search') && !empty($_REQUEST['s'.$post_type.'category'])) {

+                $taxonomy_search = $_REQUEST['s'.$post_type.'category'];

                 

                 if (!is_array($taxonomy_search)) {

-                    $term = get_term((int)$taxonomy_search, $post_type . 'category');

-                } else if(is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

-                    $term = get_term((int)$taxonomy_search[0], $post_type . 'category');

+                    $term = get_term((int) $taxonomy_search, $post_type.'category');

+                } else if (is_array($taxonomy_search) && count($taxonomy_search) == 1) { // single category search

+                    $term = get_term((int) $taxonomy_search[0], $post_type.'category');

                 }

             }

             

@@ -383,7 +383,7 @@ 
         if ($max_page > 1 || $always_show) {            

             // Extra pagination info

             $geodir_pagination_more_info = get_option('geodir_pagination_advance_info');

-            $start_no = ( $paged - 1 ) * $posts_per_page + 1;

+            $start_no = ($paged - 1) * $posts_per_page + 1;

             $end_no = min($paged * $posts_per_page, $numposts);

 

             if ($geodir_pagination_more_info != '') {

@@ -393,7 +393,7 @@ 
                 } else {

                     $pegination_desc = wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts);

                 }

-                $pagination_info = '<div class="gd-pagination-details">' . $pegination_desc . '</div>';

+                $pagination_info = '<div class="gd-pagination-details">'.$pegination_desc.'</div>';

                 /**

                  * Adds an extra pagination info above/under pagination.

                  *

@@ -409,15 +409,15 @@ 
                 $pagination_info = apply_filters('geodir_pagination_advance_info', $pagination_info, $listing_type_name, $start_no, $end_no, $numposts, $post_type);

                 

                 if ($geodir_pagination_more_info == 'before') {

-                    $before = $before . $pagination_info;

+                    $before = $before.$pagination_info;

                 } else if ($geodir_pagination_more_info == 'after') {

-                    $after = $pagination_info . $after;

+                    $after = $pagination_info.$after;

                 }

             }

             

             echo "$before <div class='Navi gd-navi'>";

             if ($paged >= ($pages_to_show - 1)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link()) . '">&laquo;</a>';

+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link()).'">&laquo;</a>';

             }

             previous_posts_link($prelabel);

             for ($i = $paged - $half_pages_to_show; $i <= $paged + $half_pages_to_show; $i++) {

@@ -425,13 +425,13 @@ 
                     if ($i == $paged) {

                         echo "<strong class='on'>$i</strong>";

                     } else {

-                        echo ' <a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($i)) . '">' . $i . '</a> ';

+                        echo ' <a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($i)).'">'.$i.'</a> ';

                     }

                 }

             }

             next_posts_link($nxtlabel, $max_page);

             if (($paged + $half_pages_to_show) < ($max_page)) {

-                echo '<a href="' . str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)) . '">&raquo;</a>';

+                echo '<a href="'.str_replace('&paged', '&amp;paged', get_pagenum_link($max_page)).'">&raquo;</a>';

             }

             echo "</div> $after";

         }

@@ -469,7 +469,7 @@ 
         jQuery(function ($) {

             $("#distance_slider").slider({

                 range: true,

-                values: [0, <?php echo ($_REQUEST['sdist']!='') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],

+                values: [0, <?php echo ($_REQUEST['sdist'] != '') ? sanitize_text_field($_REQUEST['sdist']) : "0"; ?>],

                 min: 0,

                 max: <?php echo $dist; ?>,

                 step: <?php echo $dist_dif; ?>,

@@ -534,7 +534,7 @@ 
 

 

     <script type="text/javascript">

-        var default_location = '<?php if($search_location = geodir_get_default_location())  echo $search_location->city ;?>';

+        var default_location = '<?php if ($search_location = geodir_get_default_location())  echo $search_location->city; ?>';

         var latlng;

         var address;

         var dist = 0;

@@ -547,7 +547,7 @@ 
 				var $form = jQuery(this).closest('form');

 				

 				if (jQuery("#sdist input[type='radio']:checked").length != 0) dist = jQuery("#sdist input[type='radio']:checked").val();

-				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text;?>') jQuery('.search_text', $form).val(s);

+				if (jQuery('.search_text', $form).val() == '' || jQuery('.search_text', $form).val() == '<?php echo $default_search_for_text; ?>') jQuery('.search_text', $form).val(s);

 				

 				// Disable location based search for disabled location post type.

 				if (jQuery('.search_by_post', $form).val() != '' && typeof gd_cpt_no_location == 'function') {

@@ -561,7 +561,7 @@ 
 					}

 				}

 				

-				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text;?>')) {

+				if (dist > 0 || (jQuery('select[name="sort_by"]').val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest') || (jQuery(".snear", $form).val() != '' && jQuery(".snear", $form).val() != '<?php echo $default_near_text; ?>')) {

 					geodir_setsearch($form);

 				} else {

 					jQuery(".snear", $form).val('');

@@ -580,7 +580,7 @@ 
         });

         

 		function geodir_setsearch($form) {

-			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text;?>')) jQuery(".snear", $form).val(default_location);

+			if ((dist > 0 || (jQuery('select[name="sort_by"]', $form).val() == 'nearest' || jQuery('select[name="sort_by"]', $form).val() == 'farthest')) && (jQuery(".snear", $form).val() == '' || jQuery(".snear", $form).val() == '<?php echo $default_near_text; ?>')) jQuery(".snear", $form).val(default_location);

 			geocodeAddress($form);

 		}

 

@@ -599,15 +599,15 @@ 
             // Call the geocode function

             Sgeocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;

 

-            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

-                if (jQuery('.snear', $form).val().match("^<?php _e('In:','geodirectory');?>")) {

+            if (jQuery('.snear', $form).val() == '' || ( jQuery('.sgeo_lat').val() != '' && jQuery('.sgeo_lon').val() != ''  ) || jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

+                if (jQuery('.snear', $form).val().match("^<?php _e('In:', 'geodirectory'); ?>")) {

                     jQuery(".snear", $form).val('');

                 }

                 jQuery($form).submit();

             } else {

                 var address = jQuery(".snear", $form).val();

 

-                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text;?>') {

+                if (jQuery('.snear', $form).val() == '<?php echo $default_near_text; ?>') {

                     initialise2();

                 } else {

                     <?php

@@ -620,12 +620,12 @@ 
                     $near_add2 = apply_filters('geodir_search_near_addition', '');

                     ?>

                     if (window.gdMaps === 'google') {

-                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", ' . $near_add . '"' : '') . $near_add2;?>},

+                        Sgeocoder.geocode({'address': address<?php echo ($near_add ? '+", '.$near_add.'"' : '').$near_add2; ?>},

                             function (results, status) {

                                 if (status == google.maps.GeocoderStatus.OK) {

                                     updateSearchPosition(results[0].geometry.location, $form);

                                 } else {

-                                    alert("<?php esc_attr_e('Search was not successful for the following reason:', 'geodirectory');?>" + status);

+                                    alert("<?php esc_attr_e('Search was not successful for the following reason:', 'geodirectory'); ?>" + status);

                                 }

                             });

                     } else if (window.gdMaps === 'osm') {

@@ -634,7 +634,7 @@ 
                                 if (typeof geo !== 'undefined' && geo.lat && geo.lon) {

                                     updateSearchPosition(geo, $form);

                                 } else {

-                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory');?>");

+                                    alert("<?php esc_attr_e('Search was not successful for the requested address.', 'geodirectory'); ?>");

                                 }

                             });

                     } else {

@@ -680,19 +680,19 @@ 
             var msg;

             switch (err.code) {

                 case err.UNKNOWN_ERROR:

-                    msg = "<?php _e('Unable to find your location','geodirectory');?>";

+                    msg = "<?php _e('Unable to find your location', 'geodirectory'); ?>";

                     break;

                 case err.PERMISSION_DENINED:

-                    msg = "<?php _e('Permission denied in finding your location','geodirectory');?>";

+                    msg = "<?php _e('Permission denied in finding your location', 'geodirectory'); ?>";

                     break;

                 case err.POSITION_UNAVAILABLE:

-                    msg = "<?php _e('Your location is currently unknown','geodirectory');?>";

+                    msg = "<?php _e('Your location is currently unknown', 'geodirectory'); ?>";

                     break;

                 case err.BREAK:

-                    msg = "<?php _e('Attempt to find location took too long','geodirectory');?>";

+                    msg = "<?php _e('Attempt to find location took too long', 'geodirectory'); ?>";

                     break;

                 default:

-                    msg = "<?php _e('Location detection not supported in browser','geodirectory');?>";

+                    msg = "<?php _e('Location detection not supported in browser', 'geodirectory'); ?>";

             }

             jQuery('#info').html(msg);

         }

@@ -731,7 +731,7 @@ 
              * @param object $post The post object.

              * @param string $link The link to the post.

              */

-            $return = apply_filters('geodir_featured_badge_on_image', '<a href="' . $link . '"><span class="geodir_featured_img">&nbsp;</span></a>',$post,$link);

+            $return = apply_filters('geodir_featured_badge_on_image', '<a href="'.$link.'"><span class="geodir_featured_img">&nbsp;</span></a>', $post, $link);

             break;

         case 'new' :

             /**

@@ -741,7 +741,7 @@ 
              * @param object $post The post object.

              * @param string $link The link to the post.

              */

-            $return = apply_filters('geodir_new_badge_on_image', '<a href="' . $link . '"><span class="geodir_new_listing">&nbsp;</span></a>',$post,$link);

+            $return = apply_filters('geodir_new_badge_on_image', '<a href="'.$link.'"><span class="geodir_new_listing">&nbsp;</span></a>', $post, $link);

             break;

 

     }

geodirectory-functions/custom_fields_output_functions.php

Spacing +301 added lines, -301 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,15 +686,15 @@ 
             }
 
 
-            $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 = maybe_unserialize($cf['extra_fields']);
-                if(isset($extra_fields['is_price']) && $extra_fields['is_price']){
-                    $value = geodir_currency_format_number($value,$cf);
+                if (isset($extra_fields['is_price']) && $extra_fields['is_price']) {
+                    $value = geodir_currency_format_number($value, $cf);
                 }
             }
 
@@ -708,7 +708,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);
 
 
 /**
@@ -721,21 +721,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.
          *
@@ -743,11 +743,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.
          *
@@ -756,11 +756,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.
          *
@@ -769,11 +769,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']} != ''):
@@ -807,16 +807,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);
 
 
 /**
@@ -829,21 +829,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.
          *
@@ -851,11 +851,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.
          *
@@ -864,11 +864,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.
          *
@@ -877,11 +877,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');
@@ -909,16 +909,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);
 
 
 /**
@@ -931,21 +931,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.
          *
@@ -953,11 +953,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.
          *
@@ -966,11 +966,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.
          *
@@ -979,11 +979,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']})):
@@ -1004,7 +1004,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);
             }
 
@@ -1022,15 +1022,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>';
@@ -1045,7 +1045,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);
 
 
 /**
@@ -1058,21 +1058,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.
          *
@@ -1080,11 +1080,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.
          *
@@ -1093,11 +1093,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.
          *
@@ -1106,18 +1106,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']})) {
             $send_to_friend = true;
@@ -1128,7 +1128,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);
@@ -1141,26 +1141,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');}*/
@@ -1180,11 +1180,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.
                      *
@@ -1193,10 +1193,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>';
             }
@@ -1207,7 +1207,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);
 
 
 /**
@@ -1220,21 +1220,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.
          *
@@ -1242,11 +1242,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.
          *
@@ -1255,11 +1255,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.
          *
@@ -1268,11 +1268,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']})):
 
@@ -1280,7 +1280,7 @@ 
             if (!empty($files)):
 
                 $extra_fields = !empty($cf['extra_fields']) ? 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) {
@@ -1317,9 +1317,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>';
                         }
                     }
                 }
@@ -1334,11 +1334,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;
@@ -1347,7 +1347,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);
 
 
 
@@ -1361,21 +1361,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.
          *
@@ -1383,11 +1383,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.
          *
@@ -1396,11 +1396,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.
          *
@@ -1409,11 +1409,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']})) {
 
@@ -1428,9 +1428,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>';
 
         }
 
@@ -1438,7 +1438,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);
 
 
 
@@ -1452,21 +1452,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.
          *
@@ -1474,11 +1474,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.
          *
@@ -1487,11 +1487,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.
          *
@@ -1500,11 +1500,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']})) {
 
@@ -1518,9 +1518,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>';
 
         }
 
@@ -1528,7 +1528,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);
 
 
 
@@ -1542,21 +1542,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.
          *
@@ -1564,11 +1564,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.
          *
@@ -1577,11 +1577,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.
          *
@@ -1590,14 +1590,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();
@@ -1615,7 +1615,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;
                         }
                     }
@@ -1629,7 +1629,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);
@@ -1642,9 +1642,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>';
             }
         }
 
@@ -1652,7 +1652,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);
 
 
 /**
@@ -1665,21 +1665,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.
          *
@@ -1687,11 +1687,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.
          *
@@ -1700,11 +1700,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.
          *
@@ -1713,14 +1713,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']) {
 
@@ -1783,10 +1783,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;
@@ -1795,25 +1795,25 @@ 
             
 
 
-            $html = '<div class="geodir_more_info ' . $cf['css_class'] . ' ' . $html_var . '" style="clear:both;"  itemscope itemtype="http://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="http://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>';
 
@@ -1824,4 +1824,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/taxonomy_functions.php

Spacing +132 added lines, -132 removed lines

@@ -60,16 +60,16 @@ 
                              * @since 1.0.0

                              * @param string $menu_class The menu HTML class.

                              */

-                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                            $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                             /**

                              * Filter the menu a class.

                              *

                              * @since 1.0.0

                              */

                             $a_class = apply_filters('geodir_menu_a_class', '');

-                            $items .= '<li class="' . $li_class . '">

-									<a href="' . get_post_type_archive_link($post_type) . '" class="' . $a_class . '">

-										' . __(ucfirst($args->labels->name)) . '

+                            $items .= '<li class="'.$li_class.'">

+									<a href="' . get_post_type_archive_link($post_type).'" class="'.$a_class.'">

+										' . __(ucfirst($args->labels->name)).'

 									</a>

 								</li>';

                         }

@@ -88,14 +88,14 @@ 
              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings ' . $menu_class);

+            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-listings '.$menu_class);

             /**

              * Filter the sub menu li class.

              *

              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);

             /**

              * Filter the sub menu ul class.

              *

@@ -114,9 +114,9 @@ 
              * @since 1.0.0

              */

             $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

-            $items .= '<li class="' . $li_class . '">

-					<a href="#" class="' . $a_class . '">' . __('Listing', 'geodirectory') . '</a>

-					<ul class="' . $sub_ul_class . '">';

+            $items .= '<li class="'.$li_class.'">

+					<a href="#" class="' . $a_class.'">'.__('Listing', 'geodirectory').'</a>

+					<ul class="' . $sub_ul_class.'">';

             $post_types = geodir_get_posttypes('object');

 

             $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

@@ -133,9 +133,9 @@ 
                                 if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

                                     $menu_class = 'current-menu-item';

 

-                                $items .= '<li class="' . $sub_li_class . '">

-														<a href="' . get_post_type_archive_link($post_type) . '" class="' . $sub_a_class . '">

-															' . __(ucfirst($args->labels->name),'geodirectory') . '

+                                $items .= '<li class="'.$sub_li_class.'">

+														<a href="' . get_post_type_archive_link($post_type).'" class="'.$sub_a_class.'">

+															' . __(ucfirst($args->labels->name), 'geodirectory').'

 														</a>

 													</li>';

                             }

@@ -151,7 +151,7 @@ 
              *

              * @since 1.5.9

              */

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

+            $items .= apply_filters('geodir_menu_after_sub_ul', '');

             $items .= '</li>';

         }

     }

@@ -184,7 +184,7 @@ 
                                      * @since 1.0.0

                                      * @param string $menu_class The menu HTML class.

                                      */

-                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                                    $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                                     /**

                                      * Filter the menu a class.

                                      *

@@ -192,9 +192,9 @@ 
                                      */

                                     $a_class = apply_filters('geodir_menu_a_class', '');

                                     $cpt_name = __($args->labels->singular_name, 'geodirectory');

-                                    $items .= '<li class="' . $li_class . '">

-											<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $a_class . '">

-												' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '

+                                    $items .= '<li class="'.$li_class.'">

+											<a href="' . geodir_get_addlisting_link($post_type).'" class="'.$a_class.'">

+												' . sprintf(__('Add %s', 'geodirectory'), $cpt_name).'

 											</a>

 										</li>';

                                 }

@@ -218,14 +218,14 @@ 
              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing ' . $menu_class);

+            $li_class = apply_filters('geodir_menu_li_class', 'menu-item menu-item-has-children menu-gd-add-listing '.$menu_class);

             /**

              * Filter the sub menu li class.

              *

              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

-            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item ' . $menu_class);

+            $sub_li_class = apply_filters('geodir_sub_menu_li_class', 'menu-item '.$menu_class);

             /**

              * Filter the sub menu ul class.

              *

@@ -244,9 +244,9 @@ 
              * @since 1.0.0

              */

             $sub_a_class = apply_filters('geodir_sub_menu_a_class', '');

-            $items .= '<li  class="' . $li_class . '">

-					<a href="#" class="' . $a_class . '">' . __('Add Listing', 'geodirectory') . '</a>

-					<ul class="' . $sub_ul_class . '">';

+            $items .= '<li  class="'.$li_class.'">

+					<a href="#" class="' . $a_class.'">'.__('Add Listing', 'geodirectory').'</a>

+					<ul class="' . $sub_ul_class.'">';

 

             $post_types = geodir_get_posttypes('object');

 

@@ -269,11 +269,11 @@ 
                                          * @since 1.0.0

                                          * @param string $menu_class The menu HTML class.

                                          */

-                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item ' . $menu_class);

+                                        $li_class = apply_filters('geodir_menu_li_class', 'menu-item '.$menu_class);

                                         $cpt_name = __($args->labels->singular_name, 'geodirectory');

-                                        $items .= '<li class="' . $li_class . '">

-														<a href="' . geodir_get_addlisting_link($post_type) . '" class="' . $sub_a_class . '">

-															' . sprintf( __('Add %s', 'geodirectory'), $cpt_name ) . '

+                                        $items .= '<li class="'.$li_class.'">

+														<a href="' . geodir_get_addlisting_link($post_type).'" class="'.$sub_a_class.'">

+															' . sprintf(__('Add %s', 'geodirectory'), $cpt_name).'

 														</a>

 													</li>';

                                     }

@@ -285,7 +285,7 @@ 
             }

 

             $items .= '	</ul> ';

-            $items .= apply_filters('geodir_menu_after_sub_ul','');

+            $items .= apply_filters('geodir_menu_after_sub_ul', '');

             $items .= '</li>';

 

         }

@@ -313,14 +313,14 @@ 
     $geodir_theme_location = get_option('geodir_theme_location_nav');

     $geodir_theme_location_nav = array();

     if (empty($locations) && empty($geodir_theme_location)) {

-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

+        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items()."</ul></div>", $menu);

         $geodir_theme_location_nav[] = $args['theme_location'];

         update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

     }

     //else if(empty($geodir_theme_location)) // It means 'Show geodirectory navigation in selected menu locations' is not set yet.

 //		$menu = str_replace("</ul></div>",geodir_add_nav_menu_items()."</ul></div>",$menu);

     else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location))

-        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);

+        $menu = str_replace("</ul></div>", geodir_add_nav_menu_items()."</ul></div>", $menu);

 

     return $menu;

 

@@ -348,7 +348,7 @@ 
 

     if (has_nav_menu($location) == '1' && is_array($geodir_theme_location) && in_array($location, $geodir_theme_location)) {

 

-        $items = $items . geodir_add_nav_menu_items();

+        $items = $items.geodir_add_nav_menu_items();

         return $items;

 

     } else {

@@ -373,12 +373,12 @@ 
 

     $taxonomies = geodir_get_taxonomies();

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

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

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

 

     $pn_categories = $wpdb->get_results(

         $wpdb->prepare(

             "SELECT $wpdb->terms.name as name, $wpdb->term_taxonomy.count as count, $wpdb->terms.term_id as cat_ID FROM $wpdb->term_taxonomy,  $wpdb->terms WHERE $wpdb->term_taxonomy.term_id = %d AND $wpdb->term_taxonomy.taxonomy in ( $taxonomies ) ORDER BY name",

-            array($wpdb->terms . term_id)

+            array($wpdb->terms.term_id)

         )

     );

 

@@ -407,7 +407,7 @@ 
 

     if (geodir_is_page('add-listing') || geodir_is_page('preview')) {

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

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

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

         elseif (isset($_REQUEST['listing_type']))

             $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);

     }

@@ -425,7 +425,7 @@ 
     if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

         $geodir_post_type = '';

 

-    if( defined( 'DOING_AJAX' ) && isset($_REQUEST['stype'])){

+    if (defined('DOING_AJAX') && isset($_REQUEST['stype'])) {

         $geodir_post_type = sanitize_text_field($_REQUEST['stype']);

     }

 

@@ -435,7 +435,7 @@ 
      *

      * @since 1.6.9

      */

-    return apply_filters('geodir_get_current_posttype',$geodir_post_type);

+    return apply_filters('geodir_get_current_posttype', $geodir_post_type);

 }

 

 /**

@@ -449,17 +449,17 @@ 
  */

 function geodir_get_default_posttype()

 {

-    $post_types = apply_filters( 'geodir_get_default_posttype', geodir_get_posttypes( 'object' ) );

+    $post_types = apply_filters('geodir_get_default_posttype', geodir_get_posttypes('object'));

 

-    foreach ( $post_types as $post_type => $info ) {

+    foreach ($post_types as $post_type => $info) {

         global $wpdb;

-        $has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-        if ( $has_posts ) {

+        $has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));

+        if ($has_posts) {

             $stype = $post_type; break;

         }

     }

 

-    if(!$stype){

+    if (!$stype) {

         $stype = 'gd_place';

     }

 

@@ -484,14 +484,14 @@ 
         switch ($output):

             case 'object':

             case 'Object':

-                $post_types = json_decode(json_encode($post_types), FALSE);//(object)$post_types;

+                $post_types = json_decode(json_encode($post_types), FALSE); //(object)$post_types;

                 break;

             case 'array':

             case 'Array':

-                $post_types = (array)$post_types;

+                $post_types = (array) $post_types;

                 break;

 			case 'options':

-                $post_types = (array)$post_types;

+                $post_types = (array) $post_types;

 				

 				$options = array();

 				if (!empty($post_types)) {

@@ -609,15 +609,15 @@ 
 

         $categories = get_terms($taxonomies);

 

-        $html .= '<option value="0">' . __('All', 'geodirectory') . '</option>';

+        $html .= '<option value="0">'.__('All', 'geodirectory').'</option>';

 

         foreach ($categories as $category_obj) {

             $select_opt = '';

             if ($selected == $category_obj->term_id) {

                 $select_opt = 'selected="selected"';

             }

-            $html .= '<option ' . $select_opt . ' value="' . $category_obj->term_id . '">'

-                . ucfirst($category_obj->name) . '</option>';

+            $html .= '<option '.$select_opt.' value="'.$category_obj->term_id.'">'

+                . ucfirst($category_obj->name).'</option>';

         }

 

         if ($echo)

@@ -685,7 +685,7 @@ 
     } elseif (isset($wp_query->tax_query->queries)) {

         $tax_arr = $wp_query->tax_query->queries;

         //if tax query has 'relation' set then it will break wp_list_pluck so we remove it

-        if(isset( $tax_arr['relation'])){unset( $tax_arr['relation']);}

+        if (isset($tax_arr['relation'])) {unset($tax_arr['relation']); }

         $taxonomies = wp_list_pluck($tax_arr, 'taxonomy');

     }

 

@@ -739,7 +739,7 @@ 
 

             if ((!geodir_is_page('listing')) || (is_search() && $_REQUEST['search_taxonomy'] == '')) {

                 if ($cat_parent == 0) {

-                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-' . $cat_display;

+                    $list_class = 'main_list gd-parent-cats-list gd-cats-display-'.$cat_display;

                     $main_list_class = 'class="main_list_selecter"';

                 } else {

                     //$display = 'display:none';

@@ -749,7 +749,7 @@ 
 

             if ($cat_display == 'checkbox' || $cat_display == 'radio') {

                 $p = 0;

-                $out = '<div class="' . $list_class . ' gd-cat-row-' . $cat_parent . '" style="margin-left:' . $p . 'px;' . $display . ';">';

+                $out = '<div class="'.$list_class.' gd-cat-row-'.$cat_parent.'" style="margin-left:'.$p.'px;'.$display.';">';

             }

 

             foreach ($cat_terms as $cat_term) {

@@ -764,12 +764,12 @@ 
                 }

 

                 if ($cat_display == 'radio')

-                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';

+                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category['.$cat_term->taxonomy.'][]" '.$main_list_class.' alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.ucfirst($cat_term->name).'</span>';

                 elseif ($cat_display == 'select' || $cat_display == 'multiselect')

-                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>';

+                    $out .= '<option '.$main_list_class.' style="margin-left:'.$p.'px;" alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' >'.$term_check.ucfirst($cat_term->name).'</option>';

 

                 else {

-                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';

+                    $out .= '<span style="display:block"><input style="display:inline-block" type="checkbox" field_type="checkbox" name="post_category['.$cat_term->taxonomy.'][]" '.$main_list_class.' alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" '.$checked.$onchange.' id="gd-cat-'.$cat_term->term_id.'" >'.$term_check.ucfirst($cat_term->name).'</span>';

                 }

 

                 // Call recurson to print sub cats

@@ -808,7 +808,7 @@ 
             $cat_exclude = serialize($exclude_cats);

 

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

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

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

 

             if (!is_array($post->post_category[$cat_taxonomy]))

                 $post_category = $post->post_category[$cat_taxonomy];

@@ -840,7 +840,7 @@ 
 

             if (!empty($post_category)) {

                 $cat1 = array_filter(explode(',', $post_category));

-                $post_category = ',' . implode(',', $cat1) . ',';

+                $post_category = ','.implode(',', $cat1).',';

 

             }

 

@@ -851,7 +851,7 @@ 
                 foreach ($post_category_upd as $cat) {

 

                     if (!in_array($cat, $exclude_cats) && $cat != '') {

-                        $post_category_change .= ',' . $cat;

+                        $post_category_change .= ','.$cat;

                     }

                 }

                 $post_category = $post_category_change;

@@ -863,11 +863,11 @@ 
             }

         }

 

-        echo '<input type="hidden" id="cat_limit" value="' . $cat_limit . '" name="cat_limit[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="cat_limit" value="'.$cat_limit.'" name="cat_limit['.$cat_taxonomy.']"  />';

 

-        echo '<input type="hidden" id="post_category" value="' . $post_category . '" name="post_category[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="post_category" value="'.$post_category.'" name="post_category['.$cat_taxonomy.']"  />';

 

-        echo '<input type="hidden" id="post_category_str" value="' . $post_category_str . '" name="post_category_str[' . $cat_taxonomy . ']"  />';

+        echo '<input type="hidden" id="post_category_str" value="'.$post_category_str.'" name="post_category_str['.$cat_taxonomy.']"  />';

 

 

         ?>

@@ -886,14 +886,14 @@ 
 

             function show_subcatlist(main_cat, catObj) {

                 if (main_cat != '') {

-					var url = '<?php echo geodir_get_ajax_url();?>';

-                    var cat_taxonomy = '<?php echo $cat_taxonomy;?>';

-                    var cat_exclude = '<?php echo base64_encode($cat_exclude);?>';

+					var url = '<?php echo geodir_get_ajax_url(); ?>';

+                    var cat_taxonomy = '<?php echo $cat_taxonomy; ?>';

+                    var cat_exclude = '<?php echo base64_encode($cat_exclude); ?>';

                     var cat_limit = jQuery('#' + cat_taxonomy).find('#cat_limit').val();

-					<?php if ((int)$cat_limit > 0) { ?>

+					<?php if ((int) $cat_limit > 0) { ?>

 					var selected = parseInt(jQuery('#' + cat_taxonomy).find('.cat_sublist > div.post_catlist_item').length);

 					if (cat_limit != '' && selected > 0 && selected >= cat_limit && cat_limit != 0) {

-						alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int)$cat_limit));?>");

+						alert("<?php echo esc_attr(wp_sprintf(__('You have reached category limit of %d categories.', 'geodirectory'), (int) $cat_limit)); ?>");

 						return false;

 					}

 					<?php } ?>

@@ -932,7 +932,7 @@ 
             }

 

             function update_listing_cat(el) {

-                var cat_taxonomy = '<?php echo $cat_taxonomy;?>';

+                var cat_taxonomy = '<?php echo $cat_taxonomy; ?>';

                 var cat_ids = '';

                 var main_cat = '';

                 var sub_cat = '';

@@ -1013,7 +1013,7 @@ 
         <div class="main_cat_list" style=" <?php if (isset($style)) {

             echo $style;

         }?> ">

-            <?php geodir_get_catlist($cat_taxonomy, 0);  // print main categories list

+            <?php geodir_get_catlist($cat_taxonomy, 0); // print main categories list

             ?>

         </div>

     <?php

@@ -1040,9 +1040,9 @@ 
     if ($exclude != '') {

         $exclude_cats = maybe_unserialize(base64_decode($exclude));

 

-        if(is_array( $exclude_cats)){

-            $exclude_cats = array_map( 'intval', $exclude_cats );

-        }else{

+        if (is_array($exclude_cats)) {

+            $exclude_cats = array_map('intval', $exclude_cats);

+        } else {

             $exclude_cats = intval($exclude_cats);

         }

 

@@ -1056,25 +1056,25 @@ 
         <?php $main_cat = get_term($parrent, $request_taxonomy); ?>

 

         <div class="post_catlist_item" style="border:1px solid #CCCCCC; margin:5px auto; padding:5px;">

-            <img alt="move icon" src="<?php echo geodir_plugin_url() . '/geodirectory-assets/images/move.png';?>"

+            <img alt="move icon" src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png'; ?>"

                  onclick="jQuery(this).closest('div').remove();update_listing_cat(this);" align="right"/>

             <?php /* ?>

 		<img src="<?php echo geodir_plugin_url().'/geodirectory-assets/images/move.png';?>" onclick="jQuery(this).closest('div').remove();show_subcatlist();" align="right" /> 

 		<?php */ ?>

 

-            <input type="checkbox" value="<?php echo $main_cat->term_id;?>" class="listing_main_cat"

+            <input type="checkbox" value="<?php echo $main_cat->term_id; ?>" class="listing_main_cat"

                    onchange="if(jQuery(this).is(':checked')){jQuery(this).closest('div').find('.post_default_category').prop('checked',false).show();}else{jQuery(this).closest('div').find('.post_default_category').prop('checked',false).hide();};update_listing_cat()"

                    checked="checked" disabled="disabled"/>

        <span> 

-        <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

+        <?php printf(__('Add listing in %s category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>

         </span>

             <br/>

 

             <div class="post_default_category">

-                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id;?>"

-                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" ';?>   />

+                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id; ?>"

+                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" '; ?>   />

         <span> 

-        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

+        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>

         </span>

             </div>

 

@@ -1107,7 +1107,7 @@ 
         $post_cat_str = $post_categories[$request_taxonomy];

         $post_cat_array = explode("#", $post_cat_str);

         if (is_array($post_cat_array)) {

-            $post_cat_array = array_unique( $post_cat_array );

+            $post_cat_array = array_unique($post_cat_array);

 

 			foreach ($post_cat_array as $post_cat_html) {

 

@@ -1122,7 +1122,7 @@ 
                 }

                 $post_sub_catid = '';

                 if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                    $post_sub_catid = (int)$post_cat_info[1];

+                    $post_sub_catid = (int) $post_cat_info[1];

                 }

 

                 geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1143,7 +1143,7 @@ 
             }

 

             if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                $post_sub_catid = (int)$post_cat_info[1];

+                $post_sub_catid = (int) $post_cat_info[1];

             }

 

             geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1175,9 +1175,9 @@ 
         if (!$selected)

             $option_slected = ' selected="selected" ';

 

-        echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';

+        echo '<select field_type="select" id="'.sanitize_text_field($cat_taxonomy).'" class="chosen_select" '.$onchange.' option-ajaxChosen="false" >';

 

-        echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

+        echo '<option value="" '.$option_selected.' >'.__('Select Category', 'geodirectory').'</option>';

 

         foreach ($cat_terms as $cat_term) {

             $option_selected = '';

@@ -1185,10 +1185,10 @@ 
                 $option_selected = ' selected="selected" ';

 

             // Count child terms

-            $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

-            $has_child = !empty( $child_terms ) ? 't' : 'f';

+            $child_terms = get_terms($cat_taxonomy, array('parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1));

+            $has_child = !empty($child_terms) ? 't' : 'f';

 

-            echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . ucfirst($cat_term->name) . '</option>';

+            echo '<option  '.$option_selected.' alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" _hc="'.$has_child.'" >'.ucfirst($cat_term->name).'</option>';

         }

         echo '</select>';

     }

@@ -1219,7 +1219,7 @@ 
             2 => __('Custom field updated.', 'geodirectory'),

             3 => __('Custom field deleted.', 'geodirectory'),

             4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),

-            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,

+            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int) $_GET['revision'], false)) : false,

             6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

             7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),

             8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

@@ -1245,7 +1245,7 @@ 
 

     global $wpdb;

 

-    $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';

+    $menu_icon = geodir_plugin_url().'/geodirectory-assets/images/favicon.ico';

 

     if (!$listing_slug = get_option('geodir_listing_prefix'))

         $listing_slug = 'places';

@@ -1258,11 +1258,11 @@ 
 

         $gd_placetags = array();

         $gd_placetags['object_type'] = 'gd_place';

-        $gd_placetags['listing_slug'] = $listing_slug . '/tags';

+        $gd_placetags['listing_slug'] = $listing_slug.'/tags';

         $gd_placetags['args'] = array(

             'public' => true,

             'hierarchical' => false,

-            'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),

+            'rewrite' => array('slug' => $listing_slug.'/tags', 'with_front' => false, 'hierarchical' => true),

             'query_var' => true,

 

             'labels' => array(

@@ -1356,7 +1356,7 @@ 
             'menu_icon' => $menu_icon,

             'public' => true,

             'query_var' => true,

-            'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

+            'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

             'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),

             'taxonomies' => array('gd_placecategory', 'gd_place_tags'));

 

@@ -1378,27 +1378,27 @@ 
 }

 

 $gd_wpml_get_languages = "";

-function gd_wpml_get_lang_from_url($url){

+function gd_wpml_get_lang_from_url($url) {

 

     global $gd_wpml_get_languages;

-    if(isset($_REQUEST['lang']) && $_REQUEST['lang']){return $_REQUEST['lang'];}

+    if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {return $_REQUEST['lang']; }

 

 

     //

-    $url = str_replace(array("http://","https://"),"",$url);

+    $url = str_replace(array("http://", "https://"), "", $url);

 

     // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

-    $site_url = str_replace(array("http://","https://"),"",site_url());

+    $site_url = str_replace(array("http://", "https://"), "", site_url());

 

-    $url = str_replace($site_url,"",$url);

+    $url = str_replace($site_url, "", $url);

 

 

     $segments = explode('/', trim($url, '/'));

 

     //print_r( $segments);

-    if($gd_wpml_get_languages){

+    if ($gd_wpml_get_languages) {

         $langs = $gd_wpml_get_languages;

-    }else{

+    } else {

         global $sitepress;

         $gd_wpml_get_languages = $sitepress->get_active_languages();

     }

@@ -1463,17 +1463,17 @@ 
         $slug = $post_types[$post->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->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

+        if (function_exists('icl_object_id')) {

+            if (gd_wpml_slug_translation_turned_on($post->post_type) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

 

                 $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

+                $slug = apply_filters('wpml_translate_single_string',

                     $slug,

                     'WordPress',

-                    'URL slug: ' . $slug,

+                    'URL slug: '.$slug,

                     $language_code);

 

-                if(!$slug){$slug = $org_slug;}

+                if (!$slug) {$slug = $org_slug; }

 

             }

         }

@@ -1495,11 +1495,11 @@ 
         }

 

         $post_link = trailingslashit(

-            preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )

+            preg_replace("/".preg_quote($slug, "/")."/", $slug."/%gd_taxonomy%", $post_link, 1)

         );

 

         if ($fix_url) {

-            $post_link = $site_url . $post_link;

+            $post_link = $site_url.$post_link;

         }

 

         if (isset($comment_post_cache[$post->ID])) {

@@ -1518,12 +1518,12 @@ 
             $ID = $post->ID;

             $post2 = $wpdb->get_row(

                 $wpdb->prepare(

-                    "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+                    "SELECT * from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",

                     array($post->ID)

                 )

             );

 

-            $post = (object)array_merge((array)$post, (array)$post2);

+            $post = (object) array_merge((array) $post, (array) $post2);

 

             $comment_post_cache[$post->ID] = $post;

         }

@@ -1532,7 +1532,7 @@ 
 

         if (false !== strpos($post_link, '%gd_taxonomy%')) {

 

-            if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {

+            if (apply_filters("geodir_add_location_url_to_url", get_option('geodir_add_location_url'), $post->post_type, $post)) {

                 $location_request = '';

 

 

@@ -1546,7 +1546,7 @@ 
                         $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

                         $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                        $post_location = (object)array('country_slug' => $post->country_slug,

+                        $post_location = (object) array('country_slug' => $post->country_slug,

                             'region_slug' => $post->region_slug,

                             'city_slug' => $post->city_slug

                         );

@@ -1559,7 +1559,7 @@ 
 

                     $post_location_sql = $wpdb->get_results(

                         $wpdb->prepare(

-                            "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+                            "SELECT post_locations from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",

                             array($post->ID)

                         )

                     );

@@ -1575,7 +1575,7 @@ 
                             $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

                             $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                            $post_location = (object)array('country_slug' => $post->country_slug,

+                            $post_location = (object) array('country_slug' => $post->country_slug,

                                 'region_slug' => $post->region_slug,

                                 'city_slug' => $post->city_slug

                             );

@@ -1604,7 +1604,7 @@ 
 					}

 					$location_slug[] = $city_slug;

 					

-					$location_request .= implode('/', $location_slug) . '/';

+					$location_request .= implode('/', $location_slug).'/';

                 }

             }

 

@@ -1662,9 +1662,9 @@ 
             }

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

             if (!empty($request_term))

-                $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+                $post_link = str_replace('%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);

             else

-                $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+                $post_link = str_replace('/%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);

             //echo $post_link ;

         }

         // temp cache the permalink

@@ -1715,7 +1715,7 @@ 
 			$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,

@@ -1734,12 +1734,12 @@ 
 

             if (!empty($location_terms)) {

 

-                $url_separator = '';//get_option('geodir_listingurl_separator');

+                $url_separator = ''; //get_option('geodir_listingurl_separator');

 

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

-                    $old_listing_slug = '/' . $listing_slug . '/';

+                    $old_listing_slug = '/'.$listing_slug.'/';

                     $request_term = implode("/", $location_terms);

-                    $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

+                    $new_listing_slug = '/'.$listing_slug.'/'.$request_term.'/';

 

                     $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

                 } else {

@@ -1757,31 +1757,31 @@ 
         }*/

 

         // Alter the CPT slug if WPML is set to do so

-        if(function_exists('icl_object_id')){

+        if (function_exists('icl_object_id')) {

             $post_types = get_option('geodir_post_types');

-            $post_type = str_replace("category","",$taxonomy);

-			$post_type = str_replace("_tags","",$post_type);

+            $post_type = str_replace("category", "", $taxonomy);

+			$post_type = str_replace("_tags", "", $post_type);

             $slug = $post_types[$post_type]['rewrite']['slug'];

-            if ( gd_wpml_slug_translation_turned_on( $post_type )) {

+            if (gd_wpml_slug_translation_turned_on($post_type)) {

 

                 global $sitepress;

                 $default_lang = $sitepress->get_default_language();

                 $language_code = gd_wpml_get_lang_from_url($termlink);

-                if(!$language_code ){$language_code  = $default_lang;}

+                if (!$language_code) {$language_code = $default_lang; }

 

                 $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

+                $slug = apply_filters('wpml_translate_single_string',

                     $slug,

                     'WordPress',

-                    'URL slug: ' . $slug,

+                    'URL slug: '.$slug,

                     $language_code);

 

 

-                if(!$slug){$slug = $org_slug;}

+                if (!$slug) {$slug = $org_slug; }

 

                 $termlink = trailingslashit(

 

-                    preg_replace(  "/" . preg_quote( $org_slug, "/" ) . "/", $slug  ,$termlink, 1 )

+                    preg_replace("/".preg_quote($org_slug, "/")."/", $slug, $termlink, 1)

                 );

 

             }

@@ -1814,7 +1814,7 @@ 
 	

 	if (in_array($post_type, geodir_get_posttypes())) {

 		if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {

-			if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

+			if (geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

@@ -1831,7 +1831,7 @@ 
 					$location_terms = implode("/", $location_terms);

 					$location_terms = rtrim($location_terms, '/');

 					

-					$link .= urldecode($location_terms) . '/';

+					$link .= urldecode($location_terms).'/';

 				} else {

 					$link = geodir_getlink($link, $location_terms);

 				}

@@ -1913,9 +1913,9 @@ 
             return 0;

         $where = 't.term_id = %d';

         if (!empty($taxonomy))

-            return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

+            return $wpdb->get_row($wpdb->prepare($tax_select.$where." AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

         else

-            return $wpdb->get_var($wpdb->prepare($select . $where, $term));

+            return $wpdb->get_var($wpdb->prepare($select.$where, $term));

     }

 

     $term = trim(wp_unslash($term));

@@ -1927,7 +1927,7 @@ 
 

     $where_fields = array($slug);

     if (!empty($taxonomy)) {

-        $parent = (int)$parent;

+        $parent = (int) $parent;

         if ($parent > 0) {

             $where_fields[] = $parent;

             $else_where_fields[] = $parent;

@@ -1990,13 +1990,13 @@ 
         $post_types = geodir_get_posttypes();

         $tax_arr = array();

         foreach ($post_types as $post_type) {

-            $tax_arr[] = "'" . $post_type . "category'";

+            $tax_arr[] = "'".$post_type."category'";

         }

         $tax_c = implode(',', $tax_arr);

         $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");

         //$terms = get_terms( $taxonomy );

 

-        if($terms) {

+        if ($terms) {

             foreach ($terms as $term) {

                 $post_type = str_replace("category", "", $term->taxonomy);

                 $a_terms[$post_type][] = $term;

@@ -2004,7 +2004,7 @@ 
             }

         }

 

-        if($a_terms) {

+        if ($a_terms) {

             foreach ($a_terms as $pt => $t2) {

 

                 foreach ($t2 as $term) {

@@ -2029,7 +2029,7 @@ 
     }

 

     if (is_ssl()) {

-        $terms_icons = str_replace("http:","https:",$terms_icons );

+        $terms_icons = str_replace("http:", "https:", $terms_icons);

     }

 

     return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

geodirectory-functions/custom_functions.php

Spacing +623 added lines, -623 removed lines

@@ -52,31 +52,31 @@ 
 				jQuery(listSel).children('li').switchClass('gridview_onehalf gridview_onethird gridview_onefourth', 'gridview_onefifth', 600);

 			}

 

-			jQuery.post("<?php echo geodir_get_ajax_url();?>&gd_listing_view=" + val, function (data) {

+			jQuery.post("<?php echo geodir_get_ajax_url(); ?>&gd_listing_view=" + val, function (data) {

 				//alert(data );

 			});

 		}

 	</script>

 	<div class="geodir-list-view-select">

 		<select name="gd_list_view" id="gd_list_view" onchange="geodir_list_view_select(this);">

-			<?php $listing_view = (int) $gd_session->get( 'gd_listing_view' ); ?>

-			<option value=""><?php _e( 'View:', 'geodirectory' ); ?></option>

+			<?php $listing_view = (int) $gd_session->get('gd_listing_view'); ?>

+			<option value=""><?php _e('View:', 'geodirectory'); ?></option>

 			<option

-				value="1" <?php selected( 1, $listing_view ); ?>><?php _e( 'View: List', 'geodirectory' ); ?></option>

+				value="1" <?php selected(1, $listing_view); ?>><?php _e('View: List', 'geodirectory'); ?></option>

 			<option

-				value="2" <?php selected( 2, $listing_view ); ?>><?php _e( 'View: Grid 2', 'geodirectory' ); ?></option>

+				value="2" <?php selected(2, $listing_view); ?>><?php _e('View: Grid 2', 'geodirectory'); ?></option>

 			<option

-				value="3" <?php selected( 3, $listing_view ); ?>><?php _e( 'View: Grid 3', 'geodirectory' ); ?></option>

+				value="3" <?php selected(3, $listing_view); ?>><?php _e('View: Grid 3', 'geodirectory'); ?></option>

 			<option

-				value="4" <?php selected( 4, $listing_view ); ?>><?php _e( 'View: Grid 4', 'geodirectory' ); ?></option>

+				value="4" <?php selected(4, $listing_view); ?>><?php _e('View: Grid 4', 'geodirectory'); ?></option>

 			<option

-				value="5" <?php selected( 5, $listing_view ); ?>><?php _e( 'View: Grid 5', 'geodirectory' ); ?></option>

+				value="5" <?php selected(5, $listing_view); ?>><?php _e('View: Grid 5', 'geodirectory'); ?></option>

 		</select>

 	</div>

 	<?php

 }

 

-add_action( 'geodir_before_listing', 'geodir_list_view_select', 100 );

+add_action('geodir_before_listing', 'geodir_list_view_select', 100);

 

 /**

  * Limit the listing excerpt.

@@ -91,9 +91,9 @@ 
  * @global object $post          The current post object.

  * @return string The modified excerpt.

  */

-function geodir_max_excerpt( $charlength ) {

+function geodir_max_excerpt($charlength) {

 	global $post;

-	if ( $charlength == '0' ) {

+	if ($charlength == '0') {

 		return;

 	}

 	$out = '';

@@ -101,46 +101,46 @@ 
 	$temp_post = $post;

 	$excerpt   = get_the_excerpt();

 

-	$charlength ++;

-	$excerpt_more = function_exists( 'geodirf_excerpt_more' ) ? geodirf_excerpt_more( '' ) : geodir_excerpt_more( '' );

-	if ( mb_strlen( $excerpt ) > $charlength ) {

-		if ( mb_strlen( $excerpt_more ) > 0 && mb_strpos( $excerpt, $excerpt_more ) !== false ) {

-			$excut = - ( mb_strlen( $excerpt_more ) );

-			$subex = mb_substr( $excerpt, 0, $excut );

-			if ( $charlength > 0 && mb_strlen( $subex ) > $charlength ) {

-				$subex = mb_substr( $subex, 0, $charlength );

+	$charlength++;

+	$excerpt_more = function_exists('geodirf_excerpt_more') ? geodirf_excerpt_more('') : geodir_excerpt_more('');

+	if (mb_strlen($excerpt) > $charlength) {

+		if (mb_strlen($excerpt_more) > 0 && mb_strpos($excerpt, $excerpt_more) !== false) {

+			$excut = - (mb_strlen($excerpt_more));

+			$subex = mb_substr($excerpt, 0, $excut);

+			if ($charlength > 0 && mb_strlen($subex) > $charlength) {

+				$subex = mb_substr($subex, 0, $charlength);

 			}

 			$out .= $subex;

 		} else {

-			$subex   = mb_substr( $excerpt, 0, $charlength - 5 );

-			$exwords = explode( ' ', $subex );

-			$excut   = - ( mb_strlen( $exwords[ count( $exwords ) - 1 ] ) );

-			if ( $excut < 0 ) {

-				$out .= mb_substr( $subex, 0, $excut );

+			$subex   = mb_substr($excerpt, 0, $charlength - 5);

+			$exwords = explode(' ', $subex);

+			$excut   = - (mb_strlen($exwords[count($exwords) - 1]));

+			if ($excut < 0) {

+				$out .= mb_substr($subex, 0, $excut);

 			} else {

 				$out .= $subex;

 			}

 		}

-		$out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">';

+		$out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">';

 		/**

 		 * Filter excerpt read more text.

 		 *

 		 * @since 1.0.0

 		 */

-		$out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );

+		$out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));

 		$out .= '</a>';

 

 	} else {

-		if ( mb_strlen( $excerpt_more ) > 0 && mb_strpos( $excerpt, $excerpt_more ) !== false ) {

-			$excut = - ( mb_strlen( $excerpt_more ) );

-			$out .= mb_substr( $excerpt, 0, $excut );

-			$out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">';

+		if (mb_strlen($excerpt_more) > 0 && mb_strpos($excerpt, $excerpt_more) !== false) {

+			$excut = - (mb_strlen($excerpt_more));

+			$out .= mb_substr($excerpt, 0, $excut);

+			$out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">';

 			/**

 			 * Filter excerpt read more text.

 			 *

 			 * @since 1.0.0

 			 */

-			$out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );

+			$out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));

 			$out .= '</a>';

 		} else {

 			$out .= $excerpt;

@@ -163,7 +163,7 @@ 
  *

  * @return object Returns filtered package info as an object.

  */

-function geodir_post_package_info( $package_info, $post = '', $post_type = '' ) {

+function geodir_post_package_info($package_info, $post = '', $post_type = '') {

 	$package_info['pid']              = 0;

 	$package_info['days']             = 0;

 	$package_info['amount']           = 0;

@@ -192,7 +192,7 @@ 
 	 * @param object|string $post  The post object.

 	 * @param string $post_type    The post type.

 	 */

-	return (object) apply_filters( 'geodir_post_package_info', $package_info, $post, $post_type );

+	return (object) apply_filters('geodir_post_package_info', $package_info, $post, $post_type);

 

 }

 

@@ -220,11 +220,11 @@ 
  *

  * }

  */

-function geodir_send_inquiry( $request ) {

+function geodir_send_inquiry($request) {

 	global $wpdb;

 

 	// strip slashes from text

-	$request = ! empty( $request ) ? stripslashes_deep( $request ) : $request;

+	$request = !empty($request) ? stripslashes_deep($request) : $request;

 

 	$yourname      = $request['inq_name'];

 	$youremail     = $request['inq_email'];

@@ -235,26 +235,26 @@ 
 	$author_id  = '';

 	$post_title = '';

 

-	if ( $request['pid'] ) {

+	if ($request['pid']) {

 

 		$productinfosql = $wpdb->prepare(

 			"select ID,post_author,post_title from $wpdb->posts where ID =%d",

-			array( $request['pid'] )

+			array($request['pid'])

 		);

-		$productinfo    = $wpdb->get_row( $productinfosql );

+		$productinfo = $wpdb->get_row($productinfosql);

 

 		$author_id  = $productinfo->post_author;

 		$post_title = $productinfo->post_title;

 	}

 

-	$post_title = '<a href="' . get_permalink( $pid ) . '">' . $post_title . '</a>';

+	$post_title = '<a href="'.get_permalink($pid).'">'.$post_title.'</a>';

 

-	$user_info = get_userdata( $author_id );

-	$to_email  = geodir_get_post_meta( $pid, 'geodir_email', true );

-	$to_name   = geodir_get_client_name( $author_id );

+	$user_info = get_userdata($author_id);

+	$to_email  = geodir_get_post_meta($pid, 'geodir_email', true);

+	$to_name   = geodir_get_client_name($author_id);

 

-	if ( $to_email == '' ) {

-		$to_email = get_option( 'admin_email' );

+	if ($to_email == '') {

+		$to_email = get_option('admin_email');

 	}

 

 	/**

@@ -275,10 +275,10 @@ 
 	 * }

 	 * @param string $type     The form type, default: `Enquiry`.

 	 */

-	do_action( 'geodir_after_send_enquiry', $request, 'Enquiry' );

+	do_action('geodir_after_send_enquiry', $request, 'Enquiry');

 

 	$client_message = $frnd_comments;

-	$client_message .= '<br>' . __( 'From :', 'geodirectory' ) . ' ' . $yourname . '<br>' . __( 'Phone :', 'geodirectory' ) . ' ' . $inq_phone . '<br>' . __( 'Email :', 'geodirectory' ) . ' ' . $youremail . '<br><br>' . __( 'Sent from', 'geodirectory' ) . ' - <b><a href="' . trailingslashit( home_url() ) . '">' . get_option( 'blogname' ) . '</a></b>.';

+	$client_message .= '<br>'.__('From :', 'geodirectory').' '.$yourname.'<br>'.__('Phone :', 'geodirectory').' '.$inq_phone.'<br>'.__('Email :', 'geodirectory').' '.$youremail.'<br><br>'.__('Sent from', 'geodirectory').' - <b><a href="'.trailingslashit(home_url()).'">'.get_option('blogname').'</a></b>.';

 	/**

 	 * Filter client message text.

 	 *

@@ -286,7 +286,7 @@ 
 	 *

 	 * @param string $client_message Client message text.

 	 */

-	$client_message = apply_filters( 'geodir_inquiry_email_msg', $client_message );

+	$client_message = apply_filters('geodir_inquiry_email_msg', $client_message);

 

 	/**

 	 * Called before the send enquiry email is sent.

@@ -305,12 +305,12 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_before_send_enquiry_email', $request );

-	if ( $to_email ) {

+	do_action('geodir_before_send_enquiry_email', $request);

+	if ($to_email) {

 		// strip slashes message

-		$client_message = stripslashes_deep( $client_message );

+		$client_message = stripslashes_deep($client_message);

 

-		geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid'] );//To client email

+		geodir_sendEmail($youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid']); //To client email

 	}

 

 	/**

@@ -330,12 +330,12 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_after_send_enquiry_email', $request );

-	$url = get_permalink( $pid );

-	if ( strstr( $url, '?' ) ) {

-		$url = $url . "&send_inquiry=success";

+	do_action('geodir_after_send_enquiry_email', $request);

+	$url = get_permalink($pid);

+	if (strstr($url, '?')) {

+		$url = $url."&send_inquiry=success";

 	} else {

-		$url = $url . "?send_inquiry=success";

+		$url = $url."?send_inquiry=success";

 	}

 	/**

 	 * Filter redirect url after the send enquiry email is sent.

@@ -344,8 +344,8 @@ 
 	 *

 	 * @param string $url Redirect url.

 	 */

-	$url = apply_filters( 'geodir_send_enquiry_after_submit_redirect', $url );

-	wp_redirect( $url );

+	$url = apply_filters('geodir_send_enquiry_after_submit_redirect', $url);

+	wp_redirect($url);

 	gd_die();

 

 }

@@ -374,11 +374,11 @@ 
  * }

  * @global object $wpdb        WordPress Database object.

  */

-function geodir_send_friend( $request ) {

+function geodir_send_friend($request) {

 	global $wpdb;

 

 	// strip slashes from text

-	$request = ! empty( $request ) ? stripslashes_deep( $request ) : $request;

+	$request = !empty($request) ? stripslashes_deep($request) : $request;

 

 	$yourname      = $request['yourname'];

 	$youremail     = $request['youremail'];

@@ -387,13 +387,13 @@ 
 	$pid           = $request['pid'];

 	$to_email      = $request['to_email'];

 	$to_name       = $request['to_name'];

-	if ( $request['pid'] ) {

+	if ($request['pid']) {

 		$productinfosql = $wpdb->prepare(

 			"select ID,post_title from $wpdb->posts where ID =%d",

-			array( $request['pid'] )

+			array($request['pid'])

 		);

-		$productinfo    = $wpdb->get_results( $productinfosql );

-		foreach ( $productinfo as $productinfoObj ) {

+		$productinfo = $wpdb->get_results($productinfosql);

+		foreach ($productinfo as $productinfoObj) {

 			$post_title = $productinfoObj->post_title;

 		}

 	}

@@ -417,8 +417,8 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_before_send_to_friend_email', $request );

-	geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid'] );//To client email

+	do_action('geodir_before_send_to_friend_email', $request);

+	geodir_sendEmail($youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid']); //To client email

 

 	/**

 	 * Called after the send to friend email is sent.

@@ -439,13 +439,13 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_after_send_to_friend_email', $request );

+	do_action('geodir_after_send_to_friend_email', $request);

 

-	$url = get_permalink( $pid );

-	if ( strstr( $url, '?' ) ) {

-		$url = $url . "&sendtofrnd=success";

+	$url = get_permalink($pid);

+	if (strstr($url, '?')) {

+		$url = $url."&sendtofrnd=success";

 	} else {

-		$url = $url . "?sendtofrnd=success";

+		$url = $url."?sendtofrnd=success";

 	}

 	/**

 	 * Filter redirect url after the send to friend email is sent.

@@ -454,8 +454,8 @@ 
 	 *

 	 * @param string $url Redirect url.

 	 */

-	$url = apply_filters( 'geodir_send_to_friend_after_submit_redirect', $url );

-	wp_redirect( $url );

+	$url = apply_filters('geodir_send_to_friend_after_submit_redirect', $url);

+	wp_redirect($url);

 	gd_die();

 }

 

@@ -469,8 +469,8 @@ 
  *

  * @param string $hash_key

  */

-function geodir_before_tab_content( $hash_key ) {

-	switch ( $hash_key ) {

+function geodir_before_tab_content($hash_key) {

+	switch ($hash_key) {

 		case 'post_info' :

 			echo '<div class="geodir-company_info field-group">';

 			break;

@@ -480,7 +480,7 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			echo ' <div id="' . apply_filters( 'geodir_post_gallery_id', 'geodir-post-gallery' ) . '" class="clearfix" >';

+			echo ' <div id="'.apply_filters('geodir_post_gallery_id', 'geodir-post-gallery').'" class="clearfix" >';

 			break;

 		case 'reviews' :

 			echo '<div id="reviews-wrap" class="clearfix"> ';

@@ -504,8 +504,8 @@ 
  *

  * @param string $hash_key

  */

-function geodir_after_tab_content( $hash_key ) {

-	switch ( $hash_key ) {

+function geodir_after_tab_content($hash_key) {

+	switch ($hash_key) {

 		case 'post_info' :

 			echo '</div>';

 			break;

@@ -536,25 +536,25 @@ 
  * @global object $wpdb     WordPress Database object.

  * @return bool|null|string Returns default sort results, when the post type is valid. Otherwise returns false.

  */

-function geodir_get_posts_default_sort( $post_type ) {

+function geodir_get_posts_default_sort($post_type) {

 

 	global $wpdb;

 

-	if ( $post_type != '' ) {

+	if ($post_type != '') {

 

 		$all_postypes = geodir_get_posttypes();

 

-		if ( ! in_array( $post_type, $all_postypes ) ) {

+		if (!in_array($post_type, $all_postypes)) {

 			return false;

 		}

 

-		$sort_field_info = $wpdb->get_var( $wpdb->prepare( "select default_order from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where	post_type= %s and is_active=%d and is_default=%d", array(

+		$sort_field_info = $wpdb->get_var($wpdb->prepare("select default_order from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where	post_type= %s and is_active=%d and is_default=%d", array(

 			$post_type,

 			1,

 			1

-		) ) );

+		)));

 

-		if ( ! empty( $sort_field_info ) ) {

+		if (!empty($sort_field_info)) {

 			return $sort_field_info;

 		}

 

@@ -574,20 +574,20 @@ 
  * @global object $wpdb     WordPress Database object.

  * @return bool|mixed|void Returns sort results, when the post type is valid. Otherwise returns false.

  */

-function geodir_get_sort_options( $post_type ) {

+function geodir_get_sort_options($post_type) {

 	global $wpdb;

 

-	if ( $post_type != '' ) {

+	if ($post_type != '') {

 		$all_postypes = geodir_get_posttypes();

 

-		if ( ! in_array( $post_type, $all_postypes ) ) {

+		if (!in_array($post_type, $all_postypes)) {

 			return false;

 		}

 

-		$sort_field_info = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array(

+		$sort_field_info = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array(

 			$post_type,

 			1

-		) ) );

+		)));

 

 		/**

 		 * Filter post sort options.

@@ -597,7 +597,7 @@ 
 		 * @param array $sort_field_info Unfiltered sort field array.

 		 * @param string $post_type      Post type.

 		 */

-		return apply_filters( 'geodir_get_sort_options', $sort_field_info, $post_type );

+		return apply_filters('geodir_get_sort_options', $sort_field_info, $post_type);

 	}

 

 }

@@ -618,63 +618,63 @@ 
 	 *

 	 * @since 1.4.4

 	 */

-	if ( is_search() ) {

+	if (is_search()) {

 		return;

 	}

 

 	$sort_by = '';

 

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

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

 		$sort_by = $_REQUEST['sort_by'];

 	}

 

 	$gd_post_type = geodir_get_current_posttype();

 

-	$sort_options = geodir_get_sort_options( $gd_post_type );

+	$sort_options = geodir_get_sort_options($gd_post_type);

 

 

 	$sort_field_options = '';

 

-	if ( ! empty( $sort_options ) ) {

-		foreach ( $sort_options as $sort ) {

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

+	if (!empty($sort_options)) {

+		foreach ($sort_options as $sort) {

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

 

-			$label = __( $sort->site_title, 'geodirectory' );

+			$label = __($sort->site_title, 'geodirectory');

 

-			if ( $sort->field_type == 'random' ) {

+			if ($sort->field_type == 'random') {

 				$key = $sort->field_type;

-				( $sort_by == $key || ( $sort->is_default == '1' && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';

-				$sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';

+				($sort_by == $key || ($sort->is_default == '1' && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';

+				$sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';

 			}

 

-			if ( $sort->htmlvar_name == 'comment_count' ) {

+			if ($sort->htmlvar_name == 'comment_count') {

 				$sort->htmlvar_name = 'rating_count';

 			}

 

-			if ( $sort->sort_asc ) {

-				$key   = $sort->htmlvar_name . '_asc';

+			if ($sort->sort_asc) {

+				$key   = $sort->htmlvar_name.'_asc';

 				$label = $sort->site_title;

-				if ( $sort->asc_title ) {

+				if ($sort->asc_title) {

 					$label = $sort->asc_title;

 				}

-				( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';

-				$sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';

+				($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';

+				$sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';

 			}

 

-			if ( $sort->sort_desc ) {

-				$key   = $sort->htmlvar_name . '_desc';

+			if ($sort->sort_desc) {

+				$key   = $sort->htmlvar_name.'_desc';

 				$label = $sort->site_title;

-				if ( $sort->desc_title ) {

+				if ($sort->desc_title) {

 					$label = $sort->desc_title;

 				}

-				( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';

-				$sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';

+				($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';

+				$sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';

 			}

 

 		}

 	}

 

-	if ( $sort_field_options != '' ) {

+	if ($sort_field_options != '') {

 

 		?>

 

@@ -683,9 +683,9 @@ 
 			<select name="sort_by" id="sort_by" onchange="javascript:window.location=this.value;">

 

 				<option

-					value="<?php echo esc_url( add_query_arg( 'sort_by', '' ) ); ?>" <?php if ( $sort_by == '' ) {

+					value="<?php echo esc_url(add_query_arg('sort_by', '')); ?>" <?php if ($sort_by == '') {

 					echo 'selected="selected"';

-				} ?>><?php _e( 'Sort By', 'geodirectory' ); ?></option><?php

+				} ?>><?php _e('Sort By', 'geodirectory'); ?></option><?php

 

 				echo $sort_field_options; ?>

 

@@ -713,9 +713,9 @@ 
  *

  * @return string Returns the section title.

  */

-function geodir_advance_customfields_heading( $title, $field_type ) {

+function geodir_advance_customfields_heading($title, $field_type) {

 

-	if ( in_array( $field_type, array( 'multiselect', 'textarea', 'taxonomy' ) ) ) {

+	if (in_array($field_type, array('multiselect', 'textarea', 'taxonomy'))) {

 		$title = '';

 	}

 

@@ -737,19 +737,19 @@ 
  * @global object $gd_session       GeoDirectory Session object.

  * @return string Returns related posts html.

  */

-function geodir_related_posts_display( $request ) {

-	if ( ! empty( $request ) ) {

-		$before_title = ( isset( $request['before_title'] ) && ! empty( $request['before_title'] ) ) ? $request['before_title'] : '';

-		$after_title  = ( isset( $request['after_title'] ) && ! empty( $request['after_title'] ) ) ? $request['after_title'] : '';

-

-		$title               = ( isset( $request['title'] ) && ! empty( $request['title'] ) ) ? $request['title'] : __( 'Related Listings', 'geodirectory' );

-		$post_number         = ( isset( $request['post_number'] ) && ! empty( $request['post_number'] ) ) ? $request['post_number'] : '5';

-		$relate_to           = ( isset( $request['relate_to'] ) && ! empty( $request['relate_to'] ) ) ? $request['relate_to'] : 'category';

-		$layout              = ( isset( $request['layout'] ) && ! empty( $request['layout'] ) ) ? $request['layout'] : 'gridview_onehalf';

-		$add_location_filter = ( isset( $request['add_location_filter'] ) && ! empty( $request['add_location_filter'] ) ) ? $request['add_location_filter'] : '0';

-		$listing_width       = ( isset( $request['listing_width'] ) && ! empty( $request['listing_width'] ) ) ? $request['listing_width'] : '';

-		$list_sort           = ( isset( $request['list_sort'] ) && ! empty( $request['list_sort'] ) ) ? $request['list_sort'] : 'latest';

-		$character_count     = ( isset( $request['character_count'] ) && ! empty( $request['character_count'] ) ) ? $request['character_count'] : '';

+function geodir_related_posts_display($request) {

+	if (!empty($request)) {

+		$before_title = (isset($request['before_title']) && !empty($request['before_title'])) ? $request['before_title'] : '';

+		$after_title  = (isset($request['after_title']) && !empty($request['after_title'])) ? $request['after_title'] : '';

+

+		$title               = (isset($request['title']) && !empty($request['title'])) ? $request['title'] : __('Related Listings', 'geodirectory');

+		$post_number         = (isset($request['post_number']) && !empty($request['post_number'])) ? $request['post_number'] : '5';

+		$relate_to           = (isset($request['relate_to']) && !empty($request['relate_to'])) ? $request['relate_to'] : 'category';

+		$layout              = (isset($request['layout']) && !empty($request['layout'])) ? $request['layout'] : 'gridview_onehalf';

+		$add_location_filter = (isset($request['add_location_filter']) && !empty($request['add_location_filter'])) ? $request['add_location_filter'] : '0';

+		$listing_width       = (isset($request['listing_width']) && !empty($request['listing_width'])) ? $request['listing_width'] : '';

+		$list_sort           = (isset($request['list_sort']) && !empty($request['list_sort'])) ? $request['list_sort'] : 'latest';

+		$character_count     = (isset($request['character_count']) && !empty($request['character_count'])) ? $request['character_count'] : '';

 

 		global $wpdb, $post, $gd_session, $related_nearest, $related_parent_lat, $related_parent_lon;

 		$related_parent_lat   = $post->post_latitude;

@@ -757,10 +757,10 @@ 
 		$arr_detail_page_tabs = geodir_detail_page_tabs_list();

 

 		$related_listing_array = array();

-		if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {

-			$related_listing_array = get_option( 'geodir_add_related_listing_posttypes' );

+		if (get_option('geodir_add_related_listing_posttypes')) {

+			$related_listing_array = get_option('geodir_add_related_listing_posttypes');

 		}

-		if ( in_array( $post->post_type, $related_listing_array ) ) {

+		if (in_array($post->post_type, $related_listing_array)) {

 			$arr_detail_page_tabs['related_listing']['is_display'] = true;

 		}

 

@@ -772,90 +772,90 @@ 
 		$tax_field         = 'id';

 		$category          = array();

 

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

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

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

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

 			$post_type = $post->listing_type;

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

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

 				$post_id = $_REQUEST['pid'];

 			}

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

-			$post      = geodir_get_post_info( $_REQUEST['pid'] );

+		} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			$post      = geodir_get_post_info($_REQUEST['pid']);

 			$post_type = $post->post_type;

 			$post_id   = $_REQUEST['pid'];

-		} elseif ( isset( $post->post_type ) && $post->post_type != '' ) {

+		} elseif (isset($post->post_type) && $post->post_type != '') {

 			$post_type = $post->post_type;

 			$post_id   = $post->ID;

 		}

 

-		if ( $relate_to == 'category' ) {

+		if ($relate_to == 'category') {

 

-			$category_taxonomy = $post_type . $relate_to;

-			if ( isset( $post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '' ) {

-				$category = explode( ',', trim( $post->{$category_taxonomy}, ',' ) );

+			$category_taxonomy = $post_type.$relate_to;

+			if (isset($post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '') {

+				$category = explode(',', trim($post->{$category_taxonomy}, ','));

 			}

 

-		} elseif ( $relate_to == 'tags' ) {

+		} elseif ($relate_to == 'tags') {

 

-			$category_taxonomy = $post_type . '_' . $relate_to;

-			if ( $post->post_tags != '' ) {

-				$category = explode( ',', trim( $post->post_tags, ',' ) );

+			$category_taxonomy = $post_type.'_'.$relate_to;

+			if ($post->post_tags != '') {

+				$category = explode(',', trim($post->post_tags, ','));

 			}

 			$tax_field = 'name';

 		}

 

 		/* --- return false in invalid request --- */

-		if ( empty( $category ) ) {

+		if (empty($category)) {

 			return false;

 		}

 

 		$all_postypes = geodir_get_posttypes();

 

-		if ( ! in_array( $post_type, $all_postypes ) ) {

+		if (!in_array($post_type, $all_postypes)) {

 			return false;

 		}

 

 		/* --- return false in invalid request --- */

 

 		$location_url = '';

-		if ( $add_location_filter != '0' ) {

+		if ($add_location_filter != '0') {

 			$location_url             = array();

-			$geodir_show_location_url = get_option( 'geodir_show_location_url' );

+			$geodir_show_location_url = get_option('geodir_show_location_url');

 

-			$gd_city = get_query_var( 'gd_city' );

+			$gd_city = get_query_var('gd_city');

 

-			if ( $gd_city ) {

-				$gd_country = get_query_var( 'gd_country' );

-				$gd_region  = get_query_var( 'gd_region' );

+			if ($gd_city) {

+				$gd_country = get_query_var('gd_country');

+				$gd_region  = get_query_var('gd_region');

 			} else {

 				$location = geodir_get_default_location();

 

-				$gd_country = isset( $location->country_slug ) ? $location->country_slug : '';

-				$gd_region  = isset( $location->region_slug ) ? $location->region_slug : '';

-				$gd_city    = isset( $location->city_slug ) ? $location->city_slug : '';

+				$gd_country = isset($location->country_slug) ? $location->country_slug : '';

+				$gd_region  = isset($location->region_slug) ? $location->region_slug : '';

+				$gd_city    = isset($location->city_slug) ? $location->city_slug : '';

 			}

 

-			if ( $geodir_show_location_url == 'all' ) {

+			if ($geodir_show_location_url == 'all') {

 				$location_url[] = $gd_country;

 				$location_url[] = $gd_region;

-			} else if ( $geodir_show_location_url == 'country_city' ) {

+			} else if ($geodir_show_location_url == 'country_city') {

 				$location_url[] = $gd_country;

-			} else if ( $geodir_show_location_url == 'region_city' ) {

+			} else if ($geodir_show_location_url == 'region_city') {

 				$location_url[] = $gd_region;

 			}

 

 			$location_url[] = $gd_city;

 

-			$location_url = implode( '/', $location_url );

+			$location_url = implode('/', $location_url);

 		}

 

 

-		if ( ! empty( $category ) ) {

+		if (!empty($category)) {

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

+			$viewall_url             = get_term_link((int) $category[0], $post_type.$category_taxonomy);

 			$geodir_add_location_url = null;

 		}

 		ob_start();

@@ -865,24 +865,24 @@ 
 		<div class="geodir_locations geodir_location_listing">

 

 			<?php

-			if ( isset( $request['is_widget'] ) && $request['is_widget'] == '1' ) {

+			if (isset($request['is_widget']) && $request['is_widget'] == '1') {

 				/** geodir_before_title filter Documented in geodirectory_widgets.php */

-				$before_title = isset( $before_title ) ? $before_title : apply_filters( 'geodir_before_title', '<h3 class="widget-title">' );

+				$before_title = isset($before_title) ? $before_title : apply_filters('geodir_before_title', '<h3 class="widget-title">');

 				/** geodir_after_title filter Documented in geodirectory_widgets.php */

-				$after_title = isset( $after_title ) ? $after_title : apply_filters( 'geodir_after_title', '</h3>' );

+				$after_title = isset($after_title) ? $after_title : apply_filters('geodir_after_title', '</h3>');

 				?>

 				<div class="location_list_heading clearfix">

-					<?php echo $before_title . $title . $after_title; ?>

+					<?php echo $before_title.$title.$after_title; ?>

 				</div>

 				<?php

 			}

 			$query_args = array(

 				'posts_per_page'   => $post_number,

 				'is_geodir_loop'   => true,

-				'gd_location'      => ( $add_location_filter ) ? true : false,

+				'gd_location'      => ($add_location_filter) ? true : false,

 				'post_type'        => $post_type,

 				'order_by'         => $list_sort,

-				'post__not_in'     => array( $post_id ),

+				'post__not_in'     => array($post_id),

 				'excerpt_length'   => $character_count,

 				'related_listings' => $is_display

 			);

@@ -893,24 +893,24 @@ 
 				'terms'    => $category

 			);

 

-			$query_args['tax_query'] = array( $tax_query );

+			$query_args['tax_query'] = array($tax_query);

 

 			global $gridview_columns, $post;

 

 

-			query_posts( $query_args );

+			query_posts($query_args);

 

-			if ( strstr( $layout, 'gridview' ) ) {

-				$listing_view_exp = explode( '_', $layout );

+			if (strstr($layout, 'gridview')) {

+				$listing_view_exp = explode('_', $layout);

 				$gridview_columns = $layout;

 				$layout           = $listing_view_exp[0];

-			} else if ( $layout == 'list' ) {

+			} else if ($layout == 'list') {

 				$gridview_columns = '';

 			}

 			$related_posts = true;

 

 			$related_nearest = false;

-			if ( $list_sort == 'nearest' ) {

+			if ($list_sort == 'nearest') {

 				$related_nearest = true;

 			}

 

@@ -920,14 +920,14 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			$template = apply_filters( "geodir_template_part-related-listing-listview", geodir_locate_template( 'listing-listview' ) );

+			$template = apply_filters("geodir_template_part-related-listing-listview", geodir_locate_template('listing-listview'));

 

 			/**

 			 * Includes related listing listview template.

 			 *

 			 * @since 1.0.0

 			 */

-			include( $template );

+			include($template);

 

 			wp_reset_query();

 			$post            = $origi_post;

@@ -955,12 +955,12 @@ 
 function geodir_category_count_script() {

 	global $geodir_post_category_str;

 

-	if ( ! empty( $geodir_post_category_str ) ) {

-		$geodir_post_category_str = serialize( $geodir_post_category_str );

+	if (!empty($geodir_post_category_str)) {

+		$geodir_post_category_str = serialize($geodir_post_category_str);

 	}

 

-	$all_var['post_category_array'] = html_entity_decode( (string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8' );

-	$script                         = "var post_category_array = " . json_encode( $all_var ) . ';';

+	$all_var['post_category_array'] = html_entity_decode((string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8');

+	$script                         = "var post_category_array = ".json_encode($all_var).';';

 	echo '<script>';

 	echo $script;

 	echo '</script>';

@@ -975,8 +975,8 @@ 
  * @return string Returns the default language.

  */

 function geodir_get_map_default_language() {

-	$geodir_default_map_language = get_option( 'geodir_default_map_language' );

-	if ( empty( $geodir_default_map_language ) ) {

+	$geodir_default_map_language = get_option('geodir_default_map_language');

+	if (empty($geodir_default_map_language)) {

 		$geodir_default_map_language = 'en';

 	}

 

@@ -987,7 +987,7 @@ 
 	 *

 	 * @param string $geodir_default_map_language Default map language.

 	 */

-	return apply_filters( 'geodir_default_map_language', $geodir_default_map_language );

+	return apply_filters('geodir_default_map_language', $geodir_default_map_language);

 }

 

 /**

@@ -998,7 +998,7 @@ 
  * @return string Returns the api key.

  */

 function geodir_get_map_api_key() {

-	$key = get_option( 'geodir_google_api_key' );

+	$key = get_option('geodir_google_api_key');

 

 	/**

 	 * Filter Google maps api key.

@@ -1007,7 +1007,7 @@ 
 	 *

 	 * @param string $key Google maps api key.

 	 */

-	return apply_filters( 'geodir_google_api_key', $key );

+	return apply_filters('geodir_google_api_key', $key);

 }

 

 

@@ -1026,20 +1026,20 @@ 
 	global $wp, $post, $wp_query, $wpdb, $geodir_addon_list;

 

 	$is_geodir_page = geodir_is_geodir_page();

-	if ( ! $is_geodir_page ) {

+	if (!$is_geodir_page) {

 		return;

 	}// if non GD page, bail

 

 	$use_gd_meta = true;

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

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

 		$use_gd_meta = false;

 

-		if ( geodir_is_page( 'search' ) ) {

+		if (geodir_is_page('search')) {

 			$use_gd_meta = true;

 		}

 	}

 

-	if ( ! $use_gd_meta ) {

+	if (!$use_gd_meta) {

 		return;

 	}// bail if Yoast Wordpress SEO or All_in_One_SEO_Pack active.

 

@@ -1047,170 +1047,170 @@ 
 

 	$all_postypes = geodir_get_posttypes();

 

-	$geodir_taxonomies = geodir_get_taxonomies( '', true );

+	$geodir_taxonomies = geodir_get_taxonomies('', true);

 

 	$meta_desc = '';

 	$meta_key  = '';

-	if ( isset( $current_term->ID ) && $current_term->ID == geodir_location_page_id() ) {

+	if (isset($current_term->ID) && $current_term->ID == geodir_location_page_id()) {

 		/**

 		 * Filter SEO meta location description.

 		 *

 		 * @since 1.0.0

 		 */

-		$meta_desc = apply_filters( 'geodir_seo_meta_location_description', '' );

+		$meta_desc = apply_filters('geodir_seo_meta_location_description', '');

 		$meta_desc .= '';

 	}

-	if ( have_posts() && is_single() OR is_page() ) {

-		while ( have_posts() ) {

+	if (have_posts() && is_single() OR is_page()) {

+		while (have_posts()) {

 			the_post();

 

-			if ( has_excerpt() ) {

-				$out_excerpt = strip_tags( strip_shortcodes( get_the_excerpt() ) );

-				if ( empty( $out_excerpt ) ) {

-					$out_excerpt = strip_tags( do_shortcode( get_the_excerpt() ) );

+			if (has_excerpt()) {

+				$out_excerpt = strip_tags(strip_shortcodes(get_the_excerpt()));

+				if (empty($out_excerpt)) {

+					$out_excerpt = strip_tags(do_shortcode(get_the_excerpt()));

 				}

-				$out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $out_excerpt );

+				$out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $out_excerpt);

 			} else {

-				$out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $post->post_content );

-				$out_excerpt = strip_tags( strip_shortcodes( $out_excerpt ) );

-				if ( empty( $out_excerpt ) ) {

-					$out_excerpt = strip_tags( do_shortcode( $out_excerpt ) ); // parse short code from content

+				$out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $post->post_content);

+				$out_excerpt = strip_tags(strip_shortcodes($out_excerpt));

+				if (empty($out_excerpt)) {

+					$out_excerpt = strip_tags(do_shortcode($out_excerpt)); // parse short code from content

 				}

-				$out_excerpt = trim( wp_trim_words( $out_excerpt, 35, '' ), '.!?,;:-' );

+				$out_excerpt = trim(wp_trim_words($out_excerpt, 35, ''), '.!?,;:-');

 			}

 

 			$meta_desc .= $out_excerpt;

 		}

-	} elseif ( ( is_category() || is_tag() ) && isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {

-		if ( is_category() ) {

-			$meta_desc .= __( "Posts related to Category:", 'geodirectory' ) . " " . ucfirst( single_cat_title( "", false ) );

-		} elseif ( is_tag() ) {

-			$meta_desc .= __( "Posts related to Tag:", 'geodirectory' ) . " " . ucfirst( single_tag_title( "", false ) );

+	} elseif ((is_category() || is_tag()) && isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {

+		if (is_category()) {

+			$meta_desc .= __("Posts related to Category:", 'geodirectory')." ".ucfirst(single_cat_title("", false));

+		} elseif (is_tag()) {

+			$meta_desc .= __("Posts related to Tag:", 'geodirectory')." ".ucfirst(single_tag_title("", false));

 		}

-	} elseif ( isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {

-		$meta_desc .= isset( $current_term->description ) ? $current_term->description : '';

+	} elseif (isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {

+		$meta_desc .= isset($current_term->description) ? $current_term->description : '';

 	}

 

 

 	$geodir_post_type       = geodir_get_current_posttype();

-	$geodir_post_type_info  = get_post_type_object( $geodir_post_type );

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

-

-	$category_taxonomy = geodir_get_taxonomies( $geodir_post_type );

-	$tag_taxonomy      = geodir_get_taxonomies( $geodir_post_type, true );

-

-	$geodir_is_category = isset( $category_taxonomy[0] ) && get_query_var( $category_taxonomy[0] ) ? get_query_var( $category_taxonomy[0] ) : false;

-	$geodir_is_tag      = isset( $tag_taxonomy[0] ) && get_query_var( $tag_taxonomy[0] ) ? true : false;

-

-	$geodir_is_search        = geodir_is_page( 'search' ) ? true : false;

-	$geodir_is_location      = geodir_is_page( 'location' ) ? true : false;

-	$geodir_location_manager = isset( $geodir_addon_list['geodir_location_manager'] ) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false;

-	$godir_location_terms    = geodir_get_current_location_terms( 'query_vars' );

-	$gd_city                 = $geodir_location_manager && isset( $godir_location_terms['gd_city'] ) ? $godir_location_terms['gd_city'] : null;

-	$gd_region               = $geodir_location_manager && isset( $godir_location_terms['gd_region'] ) ? $godir_location_terms['gd_region'] : null;

-	$gd_country              = $geodir_location_manager && isset( $godir_location_terms['gd_country'] ) ? $godir_location_terms['gd_country'] : null;

-	$replace_location        = __( 'Everywhere', 'geodirectory' );

+	$geodir_post_type_info  = get_post_type_object($geodir_post_type);

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

+

+	$category_taxonomy = geodir_get_taxonomies($geodir_post_type);

+	$tag_taxonomy      = geodir_get_taxonomies($geodir_post_type, true);

+

+	$geodir_is_category = isset($category_taxonomy[0]) && get_query_var($category_taxonomy[0]) ? get_query_var($category_taxonomy[0]) : false;

+	$geodir_is_tag      = isset($tag_taxonomy[0]) && get_query_var($tag_taxonomy[0]) ? true : false;

+

+	$geodir_is_search        = geodir_is_page('search') ? true : false;

+	$geodir_is_location      = geodir_is_page('location') ? true : false;

+	$geodir_location_manager = isset($geodir_addon_list['geodir_location_manager']) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false;

+	$godir_location_terms    = geodir_get_current_location_terms('query_vars');

+	$gd_city                 = $geodir_location_manager && isset($godir_location_terms['gd_city']) ? $godir_location_terms['gd_city'] : null;

+	$gd_region               = $geodir_location_manager && isset($godir_location_terms['gd_region']) ? $godir_location_terms['gd_region'] : null;

+	$gd_country              = $geodir_location_manager && isset($godir_location_terms['gd_country']) ? $godir_location_terms['gd_country'] : null;

+	$replace_location        = __('Everywhere', 'geodirectory');

 	$location_id             = null;

-	if ( $geodir_location_manager ) {

-		$sql           = $wpdb->prepare( "SELECT location_id FROM " . POST_LOCATION_TABLE . " WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array( $gd_city ) );

-		$location_id   = (int) $wpdb->get_var( $sql );

+	if ($geodir_location_manager) {

+		$sql           = $wpdb->prepare("SELECT location_id FROM ".POST_LOCATION_TABLE." WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array($gd_city));

+		$location_id   = (int) $wpdb->get_var($sql);

 		$location_type = geodir_what_is_current_location();

-		if ( $location_type == 'city' ) {

-			$replace_location = geodir_get_current_location( array( 'what' => 'city', 'echo' => false ) );

-		} elseif ( $location_type == 'region' ) {

-			$replace_location = geodir_get_current_location( array( 'what' => 'region', 'echo' => false ) );

-		} elseif ( $location_type == 'country' ) {

-			$replace_location = geodir_get_current_location( array( 'what' => 'country', 'echo' => false ) );

-			$replace_location = __( $replace_location, 'geodirectory' );

+		if ($location_type == 'city') {

+			$replace_location = geodir_get_current_location(array('what' => 'city', 'echo' => false));

+		} elseif ($location_type == 'region') {

+			$replace_location = geodir_get_current_location(array('what' => 'region', 'echo' => false));

+		} elseif ($location_type == 'country') {

+			$replace_location = geodir_get_current_location(array('what' => 'country', 'echo' => false));

+			$replace_location = __($replace_location, 'geodirectory');

 		}

-		$country          = get_query_var( 'gd_country' );

-		$region           = get_query_var( 'gd_region' );

-		$city             = get_query_var( 'gd_city' );

+		$country          = get_query_var('gd_country');

+		$region           = get_query_var('gd_region');

+		$city             = get_query_var('gd_city');

 		$current_location = '';

-		if ( $country != '' ) {

-			$current_location = get_actual_location_name( 'country', $country, true );

+		if ($country != '') {

+			$current_location = get_actual_location_name('country', $country, true);

 		}

-		if ( $region != '' ) {

-			$current_location = get_actual_location_name( 'region', $region );

+		if ($region != '') {

+			$current_location = get_actual_location_name('region', $region);

 		}

-		if ( $city != '' ) {

-			$current_location = get_actual_location_name( 'city', $city );

+		if ($city != '') {

+			$current_location = get_actual_location_name('city', $city);

 		}

 		$replace_location = $current_location != '' ? $current_location : $replace_location;

 	}

 

 	$geodir_meta_keys = '';

 	$geodir_meta_desc = '';

-	if ( $is_geodir_page && ! empty( $geodir_post_type_info ) ) {

-		if ( $geodir_is_page_listing || $geodir_is_search || geodir_is_page( 'add-listing' ) ) {

-			$geodir_meta_keys = isset( $geodir_post_type_info->seo['meta_keyword'] ) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys;

+	if ($is_geodir_page && !empty($geodir_post_type_info)) {

+		if ($geodir_is_page_listing || $geodir_is_search || geodir_is_page('add-listing')) {

+			$geodir_meta_keys = isset($geodir_post_type_info->seo['meta_keyword']) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys;

 

-			$geodir_meta_desc = isset( $geodir_post_type_info->description ) ? $geodir_post_type_info->description : $geodir_meta_desc;

-			$geodir_meta_desc = isset( $geodir_post_type_info->seo['meta_description'] ) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc;

+			$geodir_meta_desc = isset($geodir_post_type_info->description) ? $geodir_post_type_info->description : $geodir_meta_desc;

+			$geodir_meta_desc = isset($geodir_post_type_info->seo['meta_description']) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc;

 

-			if ( $geodir_is_category ) {

-				$category = $geodir_is_category ? get_term_by( 'slug', $geodir_is_category, $category_taxonomy[0] ) : null;

-				if ( isset( $category->term_id ) && ! empty( $category->term_id ) ) {

+			if ($geodir_is_category) {

+				$category = $geodir_is_category ? get_term_by('slug', $geodir_is_category, $category_taxonomy[0]) : null;

+				if (isset($category->term_id) && !empty($category->term_id)) {

 					$category_id   = $category->term_id;

-					$category_desc = trim( $category->description ) != '' ? trim( $category->description ) : get_tax_meta( $category_id, 'ct_cat_top_desc', false, $geodir_post_type );

-					if ( $location_id ) {

-						$option_name    = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id;

-						$cat_loc_option = get_option( $option_name );

-

-						$gd_cat_loc_default = ! empty( $cat_loc_option ) && isset( $cat_loc_option['gd_cat_loc_default'] ) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false;

-						if ( ! $gd_cat_loc_default ) {

-							$option_name   = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id . '_' . $location_id;

-							$option        = get_option( $option_name );

-							$category_desc = isset( $option['gd_cat_loc_desc'] ) && trim( $option['gd_cat_loc_desc'] ) != '' ? trim( $option['gd_cat_loc_desc'] ) : $category_desc;

+					$category_desc = trim($category->description) != '' ? trim($category->description) : get_tax_meta($category_id, 'ct_cat_top_desc', false, $geodir_post_type);

+					if ($location_id) {

+						$option_name    = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id;

+						$cat_loc_option = get_option($option_name);

+

+						$gd_cat_loc_default = !empty($cat_loc_option) && isset($cat_loc_option['gd_cat_loc_default']) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false;

+						if (!$gd_cat_loc_default) {

+							$option_name   = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id.'_'.$location_id;

+							$option        = get_option($option_name);

+							$category_desc = isset($option['gd_cat_loc_desc']) && trim($option['gd_cat_loc_desc']) != '' ? trim($option['gd_cat_loc_desc']) : $category_desc;

 						}

 					}

-					$geodir_meta_desc = __( "Posts related to Category:", 'geodirectory' ) . " " . ucfirst( single_cat_title( "", false ) ) . '. ' . $category_desc;

+					$geodir_meta_desc = __("Posts related to Category:", 'geodirectory')." ".ucfirst(single_cat_title("", false)).'. '.$category_desc;

 				}

-			} else if ( $geodir_is_tag ) {

-				$geodir_meta_desc = __( "Posts related to Tag:", 'geodirectory' ) . " " . ucfirst( single_tag_title( "", false ) ) . '. ' . $geodir_meta_desc;

+			} else if ($geodir_is_tag) {

+				$geodir_meta_desc = __("Posts related to Tag:", 'geodirectory')." ".ucfirst(single_tag_title("", false)).'. '.$geodir_meta_desc;

 			}

 		}

 	}

 

 

 	$gd_page = '';

-	if ( geodir_is_page( 'home' ) ) {

+	if (geodir_is_page('home')) {

 		$gd_page   = 'home';

-		$meta_desc = ( get_option( 'geodir_meta_desc_homepage' ) ) ? get_option( 'geodir_meta_desc_homepage' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'detail' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_homepage')) ? get_option('geodir_meta_desc_homepage') : $meta_desc;

+	} elseif (geodir_is_page('detail')) {

 		$gd_page   = 'detail';

-		$meta_desc = ( get_option( 'geodir_meta_desc_detail' ) ) ? get_option( 'geodir_meta_desc_detail' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'pt' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_detail')) ? get_option('geodir_meta_desc_detail') : $meta_desc;

+	} elseif (geodir_is_page('pt')) {

 		$gd_page   = 'pt';

-		$meta_desc = ( get_option( 'geodir_meta_desc_pt' ) ) ? get_option( 'geodir_meta_desc_pt' ) : $meta_desc;

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

+		$meta_desc = (get_option('geodir_meta_desc_pt')) ? get_option('geodir_meta_desc_pt') : $meta_desc;

+	} elseif (geodir_is_page('listing')) {

 		$gd_page   = 'listing';

-		$meta_desc = ( get_option( 'geodir_meta_desc_listing' ) ) ? get_option( 'geodir_meta_desc_listing' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'location' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_listing')) ? get_option('geodir_meta_desc_listing') : $meta_desc;

+	} elseif (geodir_is_page('location')) {

 		$gd_page   = 'location';

-		$meta_desc = ( get_option( 'geodir_meta_desc_location' ) ) ? get_option( 'geodir_meta_desc_location' ) : $meta_desc;

-		$meta_desc = apply_filters( 'geodir_seo_meta_location_description', $meta_desc );

+		$meta_desc = (get_option('geodir_meta_desc_location')) ? get_option('geodir_meta_desc_location') : $meta_desc;

+		$meta_desc = apply_filters('geodir_seo_meta_location_description', $meta_desc);

 

-	} elseif ( geodir_is_page( 'search' ) ) {

+	} elseif (geodir_is_page('search')) {

 		$gd_page   = 'search';

-		$meta_desc = ( get_option( 'geodir_meta_desc_search' ) ) ? get_option( 'geodir_meta_desc_search' ) : $meta_desc;

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

+		$meta_desc = (get_option('geodir_meta_desc_search')) ? get_option('geodir_meta_desc_search') : $meta_desc;

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

 		$gd_page   = 'add-listing';

-		$meta_desc = ( get_option( 'geodir_meta_desc_add-listing' ) ) ? get_option( 'geodir_meta_desc_add-listing' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'author' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_add-listing')) ? get_option('geodir_meta_desc_add-listing') : $meta_desc;

+	} elseif (geodir_is_page('author')) {

 		$gd_page   = 'author';

-		$meta_desc = ( get_option( 'geodir_meta_desc_author' ) ) ? get_option( 'geodir_meta_desc_author' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'login' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_author')) ? get_option('geodir_meta_desc_author') : $meta_desc;

+	} elseif (geodir_is_page('login')) {

 		$gd_page   = 'login';

-		$meta_desc = ( get_option( 'geodir_meta_desc_login' ) ) ? get_option( 'geodir_meta_desc_login' ) : $meta_desc;

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

+		$meta_desc = (get_option('geodir_meta_desc_login')) ? get_option('geodir_meta_desc_login') : $meta_desc;

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

 		$gd_page   = 'listing-success';

-		$meta_desc = ( get_option( 'geodir_meta_desc_listing-success' ) ) ? get_option( 'geodir_meta_desc_listing-success' ) : $meta_desc;

+		$meta_desc = (get_option('geodir_meta_desc_listing-success')) ? get_option('geodir_meta_desc_listing-success') : $meta_desc;

 	}

 

 

-	if ( $meta_desc ) {

-		$meta_desc = stripslashes_deep( $meta_desc );

+	if ($meta_desc) {

+		$meta_desc = stripslashes_deep($meta_desc);

 		/**

 		 * Filter page description to replace variables.

 		 *

@@ -1219,7 +1219,7 @@ 
 		 * @param string $title   The page description including variables.

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

 		 */

-		$meta_desc = apply_filters( 'geodir_seo_meta_description_pre', __( $meta_desc, 'geodirectory' ), $gd_page, '' );

+		$meta_desc = apply_filters('geodir_seo_meta_description_pre', __($meta_desc, 'geodirectory'), $gd_page, '');

 

 		/**

 		 * Filter SEO meta description.

@@ -1228,49 +1228,49 @@ 
 		 *

 		 * @param string $meta_desc Meta description content.

 		 */

-		echo apply_filters( 'geodir_seo_meta_description', '<meta name="description" content="' . $meta_desc . '" />', $meta_desc );

+		echo apply_filters('geodir_seo_meta_description', '<meta name="description" content="'.$meta_desc.'" />', $meta_desc);

 	}

 

 	// meta keywords

-	if ( isset( $post->post_type ) && in_array( $post->post_type, $all_postypes ) ) {

-		$place_tags = wp_get_post_terms( $post->ID, $post->post_type . '_tags', array( "fields" => "names" ) );

-		$place_cats = wp_get_post_terms( $post->ID, $post->post_type . 'category', array( "fields" => "names" ) );

+	if (isset($post->post_type) && in_array($post->post_type, $all_postypes)) {

+		$place_tags = wp_get_post_terms($post->ID, $post->post_type.'_tags', array("fields" => "names"));

+		$place_cats = wp_get_post_terms($post->ID, $post->post_type.'category', array("fields" => "names"));

 

-		$meta_key .= implode( ", ", array_merge( (array) $place_cats, (array) $place_tags ) );

+		$meta_key .= implode(", ", array_merge((array) $place_cats, (array) $place_tags));

 	} else {

 		$posttags = get_the_tags();

-		if ( $posttags ) {

-			foreach ( $posttags as $tag ) {

-				$meta_key .= $tag->name . ' ';

+		if ($posttags) {

+			foreach ($posttags as $tag) {

+				$meta_key .= $tag->name.' ';

 			}

 		} else {

-			$tags = get_tags( array( 'orderby' => 'count', 'order' => 'DESC' ) );

+			$tags = get_tags(array('orderby' => 'count', 'order' => 'DESC'));

 			$xt   = 1;

 

-			foreach ( $tags as $tag ) {

-				if ( $xt <= 20 ) {

-					$meta_key .= $tag->name . ", ";

+			foreach ($tags as $tag) {

+				if ($xt <= 20) {

+					$meta_key .= $tag->name.", ";

 				}

 

-				$xt ++;

+				$xt++;

 			}

 		}

 	}

 

-	$meta_key         = $meta_key != '' ? rtrim( trim( $meta_key ), "," ) : $meta_key;

-	$geodir_meta_keys = $geodir_meta_keys != '' ? ( $meta_key != '' ? $meta_key . ', ' . $geodir_meta_keys : $geodir_meta_keys ) : $meta_key;

-	if ( $geodir_meta_keys != '' ) {

-		$geodir_meta_keys = strip_tags( $geodir_meta_keys );

-		$geodir_meta_keys = esc_html( $geodir_meta_keys );

-		$geodir_meta_keys = geodir_strtolower( $geodir_meta_keys );

-		$geodir_meta_keys = wp_html_excerpt( $geodir_meta_keys, 1000, '' );

-		$geodir_meta_keys = str_replace( '%location%', $replace_location, $geodir_meta_keys );

+	$meta_key         = $meta_key != '' ? rtrim(trim($meta_key), ",") : $meta_key;

+	$geodir_meta_keys = $geodir_meta_keys != '' ? ($meta_key != '' ? $meta_key.', '.$geodir_meta_keys : $geodir_meta_keys) : $meta_key;

+	if ($geodir_meta_keys != '') {

+		$geodir_meta_keys = strip_tags($geodir_meta_keys);

+		$geodir_meta_keys = esc_html($geodir_meta_keys);

+		$geodir_meta_keys = geodir_strtolower($geodir_meta_keys);

+		$geodir_meta_keys = wp_html_excerpt($geodir_meta_keys, 1000, '');

+		$geodir_meta_keys = str_replace('%location%', $replace_location, $geodir_meta_keys);

 

-		$meta_key = rtrim( trim( $geodir_meta_keys ), "," );

+		$meta_key = rtrim(trim($geodir_meta_keys), ",");

 	}

 

-	if ( $meta_key ) {

-		$meta_key = stripslashes_deep( $meta_key );

+	if ($meta_key) {

+		$meta_key = stripslashes_deep($meta_key);

 		/**

 		 * Filter SEO meta keywords.

 		 *

@@ -1278,7 +1278,7 @@ 
 		 *

 		 * @param string $meta_desc Meta keywords.

 		 */

-		echo apply_filters( 'geodir_seo_meta_keywords', '<meta name="keywords" content="' . $meta_key . '" />', $meta_key );

+		echo apply_filters('geodir_seo_meta_keywords', '<meta name="keywords" content="'.$meta_key.'" />', $meta_key);

 	}

 

 }

@@ -1298,8 +1298,8 @@ 
 

 	$geodir_detail_page_tabs_array = geodir_detail_page_tabs_array();

 

-	foreach ( $geodir_detail_page_tabs_array as $key => $tabs_obj ) {

-		$geodir_detail_page_tabs_key_value_array[ $key ] = $tabs_obj['heading_text'];

+	foreach ($geodir_detail_page_tabs_array as $key => $tabs_obj) {

+		$geodir_detail_page_tabs_key_value_array[$key] = $tabs_obj['heading_text'];

 	}

 

 	return $geodir_detail_page_tabs_key_value_array;

@@ -1321,57 +1321,57 @@ 
 	 * @since 1.0.0

 	 */

 	$arr_tabs['post_profile'] = array(

-		'heading_text'  => __( 'Profile', 'geodirectory' ),

+		'heading_text'  => __('Profile', 'geodirectory'),

 		'is_active_tab' => true,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_profile' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_profile'),

 		'tab_content'   => ''

 	);

-	$arr_tabs['post_info']    = array(

-		'heading_text'  => __( 'More Info', 'geodirectory' ),

+	$arr_tabs['post_info'] = array(

+		'heading_text'  => __('More Info', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_info' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_info'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['post_images'] = array(

-		'heading_text'  => __( 'Photo', 'geodirectory' ),

+		'heading_text'  => __('Photo', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_images' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_images'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['post_video'] = array(

-		'heading_text'  => __( 'Video', 'geodirectory' ),

+		'heading_text'  => __('Video', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_video' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_video'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['special_offers'] = array(

-		'heading_text'  => __( 'Special Offers', 'geodirectory' ),

+		'heading_text'  => __('Special Offers', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'special_offers' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'special_offers'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['post_map'] = array(

-		'heading_text'  => __( 'Map', 'geodirectory' ),

+		'heading_text'  => __('Map', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_map' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_map'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['reviews'] = array(

-		'heading_text'  => __( 'Reviews', 'geodirectory' ),

+		'heading_text'  => __('Reviews', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'reviews' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'reviews'),

 		'tab_content'   => 'review display'

 	);

 

 	$arr_tabs['related_listing'] = array(

-		'heading_text'  => __( 'Related Listing', 'geodirectory' ),

+		'heading_text'  => __('Related Listing', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'related_listing' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'related_listing'),

 		'tab_content'   => ''

 	);

 

@@ -1380,7 +1380,7 @@ 
 	 *

 	 * @since 1.0.0

 	 */

-	return apply_filters( 'geodir_detail_page_tab_list_extend', $arr_tabs );

+	return apply_filters('geodir_detail_page_tab_list_extend', $arr_tabs);

 

 

 }

@@ -1394,13 +1394,13 @@ 
  * @return mixed|array Tabs array.

  */

 function geodir_detail_page_tabs_list() {

-	$tabs_excluded = get_option( 'geodir_detail_page_tabs_excluded' );

+	$tabs_excluded = get_option('geodir_detail_page_tabs_excluded');

 	$tabs_array    = geodir_detail_page_tabs_array();

 

-	if ( ! empty( $tabs_excluded ) ) {

-		foreach ( $tabs_excluded as $tab ) {

-			if ( array_key_exists( $tab, $tabs_array ) ) {

-				unset( $tabs_array[ $tab ] );

+	if (!empty($tabs_excluded)) {

+		foreach ($tabs_excluded as $tab) {

+			if (array_key_exists($tab, $tabs_array)) {

+				unset($tabs_array[$tab]);

 			}

 		}

 	}

@@ -1424,58 +1424,58 @@ 
 function geodir_show_detail_page_tabs() {

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

 

-	$post_id            = ! empty( $post ) && isset( $post->ID ) ? (int) $post->ID : 0;

-	$request_post_id    = ! empty( $_REQUEST['p'] ) ? (int) $_REQUEST['p'] : 0;

-	$is_backend_preview = ( is_single() && ! empty( $_REQUEST['post_type'] ) && ! empty( $_REQUEST['preview'] ) && ! empty( $_REQUEST['p'] ) ) && is_super_admin() ? true : false; // skip if preview from backend

+	$post_id            = !empty($post) && isset($post->ID) ? (int) $post->ID : 0;

+	$request_post_id    = !empty($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

 

-	if ( $is_backend_preview && ! $post_id > 0 && $request_post_id > 0 ) {

-		$post = geodir_get_post_info( $request_post_id );

-		setup_postdata( $post );

+	if ($is_backend_preview && !$post_id > 0 && $request_post_id > 0) {

+		$post = geodir_get_post_info($request_post_id);

+		setup_postdata($post);

 	}

 

-	$geodir_post_detail_fields = geodir_show_listing_info( 'moreinfo' );

+	$geodir_post_detail_fields = geodir_show_listing_info('moreinfo');

 

 

-	if ( geodir_is_page( 'detail' ) ) {

-		$video                 = geodir_get_video( $post->ID );

-		$special_offers        = geodir_get_special_offers( $post->ID );

+	if (geodir_is_page('detail')) {

+		$video                 = geodir_get_video($post->ID);

+		$special_offers        = geodir_get_special_offers($post->ID);

 		$related_listing_array = array();

-		if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {

-			$related_listing_array = get_option( 'geodir_add_related_listing_posttypes' );

+		if (get_option('geodir_add_related_listing_posttypes')) {

+			$related_listing_array = get_option('geodir_add_related_listing_posttypes');

 		}

 

 

-		$excluded_tabs = get_option( 'geodir_detail_page_tabs_excluded' );

-		if ( ! $excluded_tabs ) {

+		$excluded_tabs = get_option('geodir_detail_page_tabs_excluded');

+		if (!$excluded_tabs) {

 			$excluded_tabs = array();

 		}

 

 		$related_listing = '';

-		if ( in_array( $post->post_type, $related_listing_array ) && ! in_array( 'related_listing', $excluded_tabs ) ) {

+		if (in_array($post->post_type, $related_listing_array) && !in_array('related_listing', $excluded_tabs)) {

 			$request = array(

-				'post_number'         => get_option( 'geodir_related_post_count' ),

-				'relate_to'           => get_option( 'geodir_related_post_relate_to' ),

-				'layout'              => get_option( 'geodir_related_post_listing_view' ),

-				'add_location_filter' => get_option( 'geodir_related_post_location_filter' ),

-				'list_sort'           => get_option( 'geodir_related_post_sortby' ),

-				'character_count'     => get_option( 'geodir_related_post_excerpt' )

+				'post_number'         => get_option('geodir_related_post_count'),

+				'relate_to'           => get_option('geodir_related_post_relate_to'),

+				'layout'              => get_option('geodir_related_post_listing_view'),

+				'add_location_filter' => get_option('geodir_related_post_location_filter'),

+				'list_sort'           => get_option('geodir_related_post_sortby'),

+				'character_count'     => get_option('geodir_related_post_excerpt')

 			);

 

-			if ( $post->post_type == 'gd_event' && defined( 'GDEVENTS_VERSION' ) ) {

-				$related_listing = geodir_get_detail_page_related_events( $request );

+			if ($post->post_type == 'gd_event' && defined('GDEVENTS_VERSION')) {

+				$related_listing = geodir_get_detail_page_related_events($request);

 			} else {

-				$related_listing = geodir_related_posts_display( $request );

+				$related_listing = geodir_related_posts_display($request);

 			}

 

 		}

 

-		$post_images = geodir_get_images( $post->ID, 'thumbnail' );

+		$post_images = geodir_get_images($post->ID, 'thumbnail');

 		$thumb_image = '';

-		if ( ! empty( $post_images ) ) {

-			foreach ( $post_images as $image ) {

-				$caption = ( ! empty( $image->caption ) ) ? $image->caption : '';

-				$thumb_image .= '<a href="' . $image->src . '" title="' . $caption . '">';

-				$thumb_image .= geodir_show_image( $image, 'thumbnail', true, false );

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				$caption = (!empty($image->caption)) ? $image->caption : '';

+				$thumb_image .= '<a href="'.$image->src.'" title="'.$caption.'">';

+				$thumb_image .= geodir_show_image($image, 'thumbnail', true, false);

 				$thumb_image .= '</a>';

 			}

 		}

@@ -1484,11 +1484,11 @@ 
 		$map_args['map_canvas_name'] = 'detail_page_map_canvas';

 		$map_args['width']           = '600';

 		$map_args['height']          = '300';

-		if ( $post->post_mapzoom ) {

-			$map_args['zoom'] = '' . $post->post_mapzoom . '';

+		if ($post->post_mapzoom) {

+			$map_args['zoom'] = ''.$post->post_mapzoom.'';

 		}

 		$map_args['autozoom']                 = false;

-		$map_args['scrollwheel']              = ( get_option( 'geodir_add_listing_mouse_scroll' ) ) ? 0 : 1;

+		$map_args['scrollwheel']              = (get_option('geodir_add_listing_mouse_scroll')) ? 0 : 1;

 		$map_args['child_collapse']           = '0';

 		$map_args['enable_cat_filters']       = false;

 		$map_args['enable_text_search']       = false;

@@ -1497,43 +1497,43 @@ 
 		$map_args['enable_jason_on_load']     = true;

 		$map_args['enable_map_direction']     = true;

 		$map_args['map_class_name']           = 'geodir-map-detail-page';

-		$map_args['maptype']                  = ( ! empty( $post->post_mapview ) ) ? $post->post_mapview : 'ROADMAP';

-	} else if ( geodir_is_page( 'preview' ) ) {

-		$video          = isset( $post->geodir_video ) ? $post->geodir_video : '';

-		$special_offers = isset( $post->geodir_special_offers ) ? $post->geodir_special_offers : '';

+		$map_args['maptype']                  = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';

+	} else if (geodir_is_page('preview')) {

+		$video          = isset($post->geodir_video) ? $post->geodir_video : '';

+		$special_offers = isset($post->geodir_special_offers) ? $post->geodir_special_offers : '';

 

-		if ( isset( $post->post_images ) ) {

-			$post->post_images = trim( $post->post_images, "," );

+		if (isset($post->post_images)) {

+			$post->post_images = trim($post->post_images, ",");

 		}

 

-		if ( isset( $post->post_images ) && ! empty( $post->post_images ) ) {

-			$post_images = explode( ",", $post->post_images );

+		if (isset($post->post_images) && !empty($post->post_images)) {

+			$post_images = explode(",", $post->post_images);

 		}

 

 		$thumb_image = '';

-		if ( ! empty( $post_images ) ) {

-			foreach ( $post_images as $image ) {

-				if ( $image != '' ) {

-					$thumb_image .= '<a href="' . $image . '">';

-					$thumb_image .= geodir_show_image( array( 'src' => $image ), 'thumbnail', true, false );

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				if ($image != '') {

+					$thumb_image .= '<a href="'.$image.'">';

+					$thumb_image .= geodir_show_image(array('src' => $image), 'thumbnail', true, false);

 					$thumb_image .= '</a>';

 				}

 			}

 		}

 

 		global $map_jason;

-		$marker_json      = $post->marker_json != '' ? json_decode( $post->marker_json, true ) : array();

-		$marker_icon      = ( ! empty( $marker_json ) && ! empty( $marker_json['i'] ) ) ? $marker_json['i'] : '';

-		$icon_size        = geodir_get_marker_size( $marker_icon );

+		$marker_json      = $post->marker_json != '' ? json_decode($post->marker_json, true) : array();

+		$marker_icon      = (!empty($marker_json) && !empty($marker_json['i'])) ? $marker_json['i'] : '';

+		$icon_size        = geodir_get_marker_size($marker_icon);

 		$marker_json['w'] = $icon_size['w'];

 		$marker_json['h'] = $icon_size['h'];

-		$map_jason[]      = json_encode( $marker_json );

+		$map_jason[]      = json_encode($marker_json);

 

-		$address_latitude  = isset( $post->post_latitude ) ? $post->post_latitude : '';

-		$address_longitude = isset( $post->post_longitude ) ? $post->post_longitude : '';

-		$mapview           = isset( $post->post_mapview ) ? $post->post_mapview : '';

-		$mapzoom           = isset( $post->post_mapzoom ) ? $post->post_mapzoom : '';

-		if ( ! $mapzoom ) {

+		$address_latitude  = isset($post->post_latitude) ? $post->post_latitude : '';

+		$address_longitude = isset($post->post_longitude) ? $post->post_longitude : '';

+		$mapview           = isset($post->post_mapview) ? $post->post_mapview : '';

+		$mapzoom           = isset($post->post_mapzoom) ? $post->post_mapzoom : '';

+		if (!$mapzoom) {

 			$mapzoom = 12;

 		}

 

@@ -1556,37 +1556,37 @@ 
 		$map_args['map_class_name']           = 'geodir-map-preview-page';

 	}

 

-	$arr_detail_page_tabs = geodir_detail_page_tabs_list();// get this sooner so we can get the active tab for the user

+	$arr_detail_page_tabs = geodir_detail_page_tabs_list(); // get this sooner so we can get the active tab for the user

 

 	$active_tab       = '';

 	$active_tab_name  = '';

 	$default_tab      = '';

 	$default_tab_name = '';

-	foreach ( $arr_detail_page_tabs as $tab_index => $tabs ) {

-		if ( isset( $tabs['is_active_tab'] ) && $tabs['is_active_tab'] && ! empty( $tabs['is_display'] ) && isset( $tabs['heading_text'] ) && $tabs['heading_text'] ) {

+	foreach ($arr_detail_page_tabs as $tab_index => $tabs) {

+		if (isset($tabs['is_active_tab']) && $tabs['is_active_tab'] && !empty($tabs['is_display']) && isset($tabs['heading_text']) && $tabs['heading_text']) {

 			$active_tab      = $tab_index;

-			$active_tab_name = __( $tabs['heading_text'], 'geodirectory' );

+			$active_tab_name = __($tabs['heading_text'], 'geodirectory');

 		}

 

-		if ( $default_tab === '' && ! empty( $tabs['is_display'] ) && ! empty( $tabs['heading_text'] ) ) {

+		if ($default_tab === '' && !empty($tabs['is_display']) && !empty($tabs['heading_text'])) {

 			$default_tab      = $tab_index;

-			$default_tab_name = __( $tabs['heading_text'], 'geodirectory' );

+			$default_tab_name = __($tabs['heading_text'], 'geodirectory');

 		}

 	}

 

-	if ( $active_tab === '' && $default_tab !== '' ) { // Make first tab acs a active tab if not any tab is active.

-		if ( isset( $arr_detail_page_tabs[ $active_tab ] ) && isset( $arr_detail_page_tabs[ $active_tab ]['is_active_tab'] ) ) {

-			$arr_detail_page_tabs[ $active_tab ]['is_active_tab'] = false;

+	if ($active_tab === '' && $default_tab !== '') { // Make first tab acs a active tab if not any tab is active.

+		if (isset($arr_detail_page_tabs[$active_tab]) && isset($arr_detail_page_tabs[$active_tab]['is_active_tab'])) {

+			$arr_detail_page_tabs[$active_tab]['is_active_tab'] = false;

 		}

 

-		$arr_detail_page_tabs[ $default_tab ]['is_active_tab'] = true;

+		$arr_detail_page_tabs[$default_tab]['is_active_tab'] = true;

 		$active_tab                                            = $default_tab;

 		$active_tab_name                                       = $default_tab_name;

 	}

-	$tab_list = ( get_option( 'geodir_disable_tabs', false ) ) ? true : false;

+	$tab_list = (get_option('geodir_disable_tabs', false)) ? true : false;

 	?>

 	<div class="geodir-tabs" id="gd-tabs" style="position:relative;">

-		<?php if ( ! $tab_list ){ ?>

+		<?php if (!$tab_list) { ?>

 		<div id="geodir-tab-mobile-menu">

 			<i class="fa fa-bars"></i>

 			<span class="geodir-mobile-active-tab"><?php echo $active_tab_name; ?></span>

@@ -1601,26 +1601,26 @@ 
 			 * @since 1.0.0

 			 * @see   'geodir_after_tab_list'

 			 */

-			do_action( 'geodir_before_tab_list' ); ?>

+			do_action('geodir_before_tab_list'); ?>

 			<?php

 

-			foreach ( $arr_detail_page_tabs as $tab_index => $detail_page_tab ) {

-				if ( $detail_page_tab['is_display'] ) {

+			foreach ($arr_detail_page_tabs as $tab_index => $detail_page_tab) {

+				if ($detail_page_tab['is_display']) {

 

-					if ( ! $tab_list ) {

+					if (!$tab_list) {

 						?>

 						<dt></dt> <!-- added to comply with validation -->

-						<dd <?php if ( $detail_page_tab['is_active_tab'] ){ ?>class="geodir-tab-active"<?php } ?> ><a

+						<dd <?php if ($detail_page_tab['is_active_tab']) { ?>class="geodir-tab-active"<?php } ?> ><a

 								data-tab="#<?php echo $tab_index; ?>"

-								data-status="enable"><?php _e( $detail_page_tab['heading_text'], 'geodirectory' ); ?></a>

+								data-status="enable"><?php _e($detail_page_tab['heading_text'], 'geodirectory'); ?></a>

 						</dd>

 						<?php

 					}

 					ob_start() // start tab content buffering

 					?>

 					<li id="<?php echo $tab_index; ?>Tab">

-						<?php if ( $tab_list ) {

-							$tab_title = '<span class="gd-tab-list-title" ><a href="#' . $tab_index . '">' . __( $detail_page_tab['heading_text'], 'geodirectory' ) . '</a></span><hr />';

+						<?php if ($tab_list) {

+							$tab_title = '<span class="gd-tab-list-title" ><a href="#'.$tab_index.'">'.__($detail_page_tab['heading_text'], 'geodirectory').'</a></span><hr />';

 							/**

 							 * Filter the tab list title html.

 							 *

@@ -1630,7 +1630,7 @@ 
 							 * @param string $tab_index      The tab index type.

 							 * @param array $detail_page_tab The array of values including title text.

 							 */

-							echo apply_filters( 'geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab );

+							echo apply_filters('geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab);

 						} ?>

 						<div id="<?php echo $tab_index; ?>" class="hash-offset"></div>

 						<?php

@@ -1641,7 +1641,7 @@ 
 						 *

 						 * @param string $tab_index The tab name ID.

 						 */

-						do_action( 'geodir_before_tab_content', $tab_index );

+						do_action('geodir_before_tab_content', $tab_index);

 

 						/**

 						 * Called before the details tab content is output per tab.

@@ -1651,21 +1651,21 @@ 
 						 * @since 1.0.0

 						 * @todo  do we need this if we have the hook above? 'geodir_before_tab_content'

 						 */

-						do_action( 'geodir_before_' . $tab_index . '_tab_content' );

+						do_action('geodir_before_'.$tab_index.'_tab_content');

 						/// write a code to generate content of each tab

-						switch ( $tab_index ) {

+						switch ($tab_index) {

 							case 'post_profile':

 								/**

 								 * Called before the listing description content on the details page tab.

 								 *

 								 * @since 1.0.0

 								 */

-								do_action( 'geodir_before_description_on_listing_detail' );

-								if ( geodir_is_page( 'detail' ) ) {

+								do_action('geodir_before_description_on_listing_detail');

+								if (geodir_is_page('detail')) {

 									the_content();

 								} else {

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

-									echo apply_filters( 'the_content', stripslashes( $post->post_desc ) );

+									echo apply_filters('the_content', stripslashes($post->post_desc));

 								}

 

 								/**

@@ -1673,7 +1673,7 @@ 
 								 *

 								 * @since 1.0.0

 								 */

-								do_action( 'geodir_after_description_on_listing_detail' );

+								do_action('geodir_after_description_on_listing_detail');

 								break;

 							case 'post_info':

 								echo $geodir_post_detail_fields;

@@ -1683,21 +1683,21 @@ 
 								break;

 							case 'post_video':

 								// some browsers hide $_POST data if used for embeds so we repalce with a placeholder

-								if ( $preview ) {

-									if ( $video ) {

-										echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fa fa-video-camera\" aria-hidden=\"true\"></i><br />" . __( 'Video Preview Placeholder', 'geodirectory' ) . "</p></span>";

+								if ($preview) {

+									if ($video) {

+										echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fa fa-video-camera\" aria-hidden=\"true\"></i><br />".__('Video Preview Placeholder', 'geodirectory')."</p></span>";

 									}

 								} else {

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

-									echo apply_filters( 'the_content', stripslashes( $video ) );// we apply the_content filter so oembed works also;

+									echo apply_filters('the_content', stripslashes($video)); // we apply the_content filter so oembed works also;

 								}

 								break;

 							case 'special_offers':

-								echo apply_filters( 'gd_special_offers_content', wpautop( stripslashes( $special_offers ) ) );

+								echo apply_filters('gd_special_offers_content', wpautop(stripslashes($special_offers)));

 

 								break;

 							case 'post_map':

-								geodir_draw_map( $map_args );

+								geodir_draw_map($map_args);

 								break;

 							case 'reviews':

 								comments_template();

@@ -1706,7 +1706,7 @@ 
 								echo $related_listing;

 								break;

 							default: {

-								if ( ( isset( $post->{$tab_index} ) || ( ! isset( $post->{$tab_index} ) && ( strpos( $tab_index, 'gd_tab_' ) !== false || $tab_index == 'link_business' ) ) ) && ! empty( $detail_page_tab['tab_content'] ) ) {

+								if ((isset($post->{$tab_index} ) || (!isset($post->{$tab_index} ) && (strpos($tab_index, 'gd_tab_') !== false || $tab_index == 'link_business'))) && !empty($detail_page_tab['tab_content'])) {

 									echo $detail_page_tab['tab_content'];

 								}

 							}

@@ -1718,7 +1718,7 @@ 
 						 *

 						 * @since 1.0.0

 						 */

-						do_action( 'geodir_after_tab_content', $tab_index );

+						do_action('geodir_after_tab_content', $tab_index);

 

 						/**

 						 * Called after the details tab content is output per tab.

@@ -1728,7 +1728,7 @@ 
 						 * @since 1.0.0

 						 * @todo  do we need this if we have the hook above? 'geodir_after_tab_content'

 						 */

-						do_action( 'geodir_after_' . $tab_index . '_tab_content' );

+						do_action('geodir_after_'.$tab_index.'_tab_content');

 						?> </li>

 					<?php

 					/**

@@ -1736,7 +1736,7 @@ 
 					 *

 					 * @since 1.0.0

 					 */

-					$arr_detail_page_tabs[ $tab_index ]['tab_content'] = apply_filters( "geodir_modify_" . $detail_page_tab['tab_content'] . "_tab_content", ob_get_clean() );

+					$arr_detail_page_tabs[$tab_index]['tab_content'] = apply_filters("geodir_modify_".$detail_page_tab['tab_content']."_tab_content", ob_get_clean());

 				} // end of if for is_display

 			}// end of foreach

 

@@ -1746,14 +1746,14 @@ 
 			 * @since 1.0.0

 			 * @see   'geodir_before_tab_list'

 			 */

-			do_action( 'geodir_after_tab_list' );

+			do_action('geodir_after_tab_list');

 			?>

-			<?php if ( ! $tab_list ){ ?></dl><?php } ?>

-		<ul class="geodir-tabs-content entry-content <?php if ( $tab_list ) { ?>geodir-tabs-list<?php } ?>"

+			<?php if (!$tab_list) { ?></dl><?php } ?>

+		<ul class="geodir-tabs-content entry-content <?php if ($tab_list) { ?>geodir-tabs-list<?php } ?>"

 		    style="position:relative;">

 			<?php

-			foreach ( $arr_detail_page_tabs as $detail_page_tab ) {

-				if ( $detail_page_tab['is_display'] && ! empty( $detail_page_tab['tab_content'] ) ) {

+			foreach ($arr_detail_page_tabs as $detail_page_tab) {

+				if ($detail_page_tab['is_display'] && !empty($detail_page_tab['tab_content'])) {

 					echo $detail_page_tab['tab_content'];

 				}// end of if

 			}// end of foreach

@@ -1763,11 +1763,11 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			do_action( 'geodir_add_tab_content' ); ?>

+			do_action('geodir_add_tab_content'); ?>

 		</ul>

 		<!--gd-tabs-content ul end-->

 	</div>

-	<?php if ( ! $tab_list ) { ?>

+	<?php if (!$tab_list) { ?>

 		<script>

 			if (window.location.hash && window.location.hash.indexOf('&') === -1 && jQuery(window.location.hash + 'Tab').length) {

 				hashVal = window.location.hash;

@@ -1799,31 +1799,31 @@ 
  *

  * @return mixed Image file.

  */

-function geodir_exif( $file ) {

-	if ( empty( $file ) || ! is_array( $file ) ) {

+function geodir_exif($file) {

+	if (empty($file) || !is_array($file)) {

 		return $file;

 	}

 

-	$file_path = ! empty( $file['tmp_name'] ) ? sanitize_text_field( $file['tmp_name'] ) : '';

-	if ( ! ( $file_path && file_exists( $file_path ) ) ) {

+	$file_path = !empty($file['tmp_name']) ? sanitize_text_field($file['tmp_name']) : '';

+	if (!($file_path && file_exists($file_path))) {

 		return $file;

 	}

 	$file['file'] = $file_path;

 

-	if ( ! file_is_valid_image( $file_path ) ) {

+	if (!file_is_valid_image($file_path)) {

 		return $file; // Bail if file is not an image.

 	}

 

-	if ( ! function_exists( 'wp_get_image_editor' ) ) {

+	if (!function_exists('wp_get_image_editor')) {

 		return $file;

 	}

 

 	$mime_type = $file['type'];

 	$exif      = array();

-	if ( $mime_type == 'image/jpeg' && function_exists( 'exif_read_data' ) ) {

+	if ($mime_type == 'image/jpeg' && function_exists('exif_read_data')) {

 		try {

-			$exif = exif_read_data( $file_path );

-		} catch ( Exception $e ) {

+			$exif = exif_read_data($file_path);

+		} catch (Exception $e) {

 			$exif = array();

 		}

 	}

@@ -1832,13 +1832,13 @@ 
 	$flip        = false;

 	$modify      = false;

 	$orientation = 0;

-	if ( ! empty( $exif ) && isset( $exif['Orientation'] ) ) {

-		switch ( (int) $exif['Orientation'] ) {

+	if (!empty($exif) && isset($exif['Orientation'])) {

+		switch ((int) $exif['Orientation']) {

 			case 1:

 				// do nothing

 				break;

 			case 2:

-				$flip   = array( false, true );

+				$flip   = array(false, true);

 				$modify = true;

 				break;

 			case 3:

@@ -1847,13 +1847,13 @@ 
 				$modify      = true;

 				break;

 			case 4:

-				$flip   = array( true, false );

+				$flip   = array(true, false);

 				$modify = true;

 				break;

 			case 5:

 				$orientation = - 90;

 				$rotate      = true;

-				$flip        = array( false, true );

+				$flip        = array(false, true);

 				$modify      = true;

 				break;

 			case 6:

@@ -1864,7 +1864,7 @@ 
 			case 7:

 				$orientation = - 270;

 				$rotate      = true;

-				$flip        = array( false, true );

+				$flip        = array(false, true);

 				$modify      = true;

 				break;

 			case 8:

@@ -1890,31 +1890,31 @@ 
 	 * @param int|null $quality Image Compression quality between 1-100% scale. Default null.

 	 * @param string $quality   Image mime type.

 	 */

-	$quality = apply_filters( 'geodir_image_upload_set_quality', $quality, $mime_type );

-	if ( $quality !== null ) {

+	$quality = apply_filters('geodir_image_upload_set_quality', $quality, $mime_type);

+	if ($quality !== null) {

 		$modify = true;

 	}

 

-	if ( ! $modify ) {

+	if (!$modify) {

 		return $file; // no change

 	}

 

-	$image = wp_get_image_editor( $file_path );

-	if ( ! is_wp_error( $image ) ) {

-		if ( $rotate ) {

-			$image->rotate( $orientation );

+	$image = wp_get_image_editor($file_path);

+	if (!is_wp_error($image)) {

+		if ($rotate) {

+			$image->rotate($orientation);

 		}

 

-		if ( ! empty( $flip ) ) {

-			$image->flip( $flip[0], $flip[1] );

+		if (!empty($flip)) {

+			$image->flip($flip[0], $flip[1]);

 		}

 

-		if ( $quality !== null ) {

-			$image->set_quality( (int) $quality );

+		if ($quality !== null) {

+			$image->set_quality((int) $quality);

 		}

 

-		$result = $image->save( $file_path );

-		if ( ! is_wp_error( $result ) ) {

+		$result = $image->save($file_path);

+		if (!is_wp_error($result)) {

 			$file['file']     = $result['path'];

 			$file['tmp_name'] = $result['path'];

 		}

@@ -1941,7 +1941,7 @@ 
  *

  * @return string Returns the recent reviews html.

  */

-function geodir_get_recent_reviews( $g_size = 60, $no_comments = 10, $comment_lenth = 60, $show_pass_post = false ) {

+function geodir_get_recent_reviews($g_size = 60, $no_comments = 10, $comment_lenth = 60, $show_pass_post = false) {

 	global $wpdb, $tablecomments, $tableposts, $rating_table_name, $gd_session;

 	$tablecomments = $wpdb->comments;

 	$tableposts    = $wpdb->posts;

@@ -1951,28 +1951,28 @@ 
 	$region_filter  = '';

 	$country_filter = '';

 

-	if ( $gd_session->get( 'gd_multi_location' ) ) {

-		if ( $gd_ses_country = $gd_session->get( 'gd_country' ) ) {

-			$country_filter = $wpdb->prepare( " AND r.post_country=%s ", str_replace( "-", " ", $gd_ses_country ) );

+	if ($gd_session->get('gd_multi_location')) {

+		if ($gd_ses_country = $gd_session->get('gd_country')) {

+			$country_filter = $wpdb->prepare(" AND r.post_country=%s ", str_replace("-", " ", $gd_ses_country));

 		}

 

-		if ( $gd_ses_region = $gd_session->get( 'gd_region' ) ) {

-			$region_filter = $wpdb->prepare( " AND r.post_region=%s ", str_replace( "-", " ", $gd_ses_region ) );

+		if ($gd_ses_region = $gd_session->get('gd_region')) {

+			$region_filter = $wpdb->prepare(" AND r.post_region=%s ", str_replace("-", " ", $gd_ses_region));

 		}

 

-		if ( $gd_ses_city = $gd_session->get( 'gd_city' ) ) {

-			$city_filter = $wpdb->prepare( " AND r.post_city=%s ", str_replace( "-", " ", $gd_ses_city ) );

+		if ($gd_ses_city = $gd_session->get('gd_city')) {

+			$city_filter = $wpdb->prepare(" AND r.post_city=%s ", str_replace("-", " ", $gd_ses_city));

 		}

 	}

 

 	$review_table = GEODIR_REVIEW_TABLE;

 	$request      = "SELECT r.id as ID, r.post_type, r.comment_id as comment_ID, r.post_date as comment_date,r.overall_rating, r.user_id, r.post_id FROM $review_table as r WHERE r.post_status = 1 AND r.status =1 AND r.overall_rating>=1 $country_filter $region_filter $city_filter ORDER BY r.post_date DESC, r.id DESC LIMIT $no_comments";

 

-	$comments = $wpdb->get_results( $request );

+	$comments = $wpdb->get_results($request);

 

-	foreach ( $comments as $comment ) {

+	foreach ($comments as $comment) {

 		// Set the extra comment info needed.

-		$comment_extra = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID" );

+		$comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");

 		//echo "SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID";

 		$comment->comment_content      = $comment_extra->comment_content;

 		$comment->comment_author       = $comment_extra->comment_author;

@@ -1980,75 +1980,75 @@ 
 

 		$comment_id      = '';

 		$comment_id      = $comment->comment_ID;

-		$comment_content = strip_tags( $comment->comment_content );

+		$comment_content = strip_tags($comment->comment_content);

 

-		$comment_content = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content );

+		$comment_content = preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content);

 

-		$permalink            = get_permalink( $comment->ID ) . "#comment-" . $comment->comment_ID;

+		$permalink            = get_permalink($comment->ID)."#comment-".$comment->comment_ID;

 		$comment_author_email = $comment->comment_author_email;

 		$comment_post_ID      = $comment->post_id;

 

 		$na = true;

-		if ( function_exists( 'icl_object_id' ) && icl_object_id( $comment_post_ID, $comment->post_type, true ) ) {

-			$comment_post_ID2 = icl_object_id( $comment_post_ID, $comment->post_type, false );

-			if ( $comment_post_ID == $comment_post_ID2 ) {

+		if (function_exists('icl_object_id') && icl_object_id($comment_post_ID, $comment->post_type, true)) {

+			$comment_post_ID2 = icl_object_id($comment_post_ID, $comment->post_type, false);

+			if ($comment_post_ID == $comment_post_ID2) {

 			} else {

 				$na = false;

 			}

 		}

 

-		$post_title        = get_the_title( $comment_post_ID );

-		$permalink         = get_permalink( $comment_post_ID );

-		$comment_permalink = $permalink . "#comment-" . $comment->comment_ID;

-		$read_more         = '<a class="comment_excerpt" href="' . $comment_permalink . '">' . __( 'Read more', 'geodirectory' ) . '</a>';

+		$post_title        = get_the_title($comment_post_ID);

+		$permalink         = get_permalink($comment_post_ID);

+		$comment_permalink = $permalink."#comment-".$comment->comment_ID;

+		$read_more         = '<a class="comment_excerpt" href="'.$comment_permalink.'">'.__('Read more', 'geodirectory').'</a>';

 

-		$comment_content_length = strlen( $comment_content );

-		if ( $comment_content_length > $comment_lenth ) {

-			$comment_excerpt = mb_substr( $comment_content, 0, $comment_lenth ) . '... ' . $read_more;

+		$comment_content_length = strlen($comment_content);

+		if ($comment_content_length > $comment_lenth) {

+			$comment_excerpt = mb_substr($comment_content, 0, $comment_lenth).'... '.$read_more;

 		} else {

 			$comment_excerpt = $comment_content;

 		}

 

-		if ( $comment->user_id ) {

-			$user_profile_url = get_author_posts_url( $comment->user_id );

+		if ($comment->user_id) {

+			$user_profile_url = get_author_posts_url($comment->user_id);

 		} else {

 			$user_profile_url = '';

 		}

 

-		if ( $comment_id && $na ) {

+		if ($comment_id && $na) {

 			$comments_echo .= '<li class="clearfix">';

-			$comments_echo .= "<span class=\"li" . $comment_id . " geodir_reviewer_image\">";

-			if ( function_exists( 'get_avatar' ) ) {

-				if ( ! isset( $comment->comment_type ) ) {

-					if ( $user_profile_url ) {

-						$comments_echo .= '<a href="' . $user_profile_url . '">';

+			$comments_echo .= "<span class=\"li".$comment_id." geodir_reviewer_image\">";

+			if (function_exists('get_avatar')) {

+				if (!isset($comment->comment_type)) {

+					if ($user_profile_url) {

+						$comments_echo .= '<a href="'.$user_profile_url.'">';

 					}

-					$comments_echo .= get_avatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

-					if ( $user_profile_url ) {

+					$comments_echo .= get_avatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

+					if ($user_profile_url) {

 						$comments_echo .= '</a>';

 					}

-				} elseif ( ( isset( $comment->comment_type ) && $comment->comment_type == 'trackback' ) || ( isset( $comment->comment_type ) && $comment->comment_type == 'pingback' ) ) {

-					if ( $user_profile_url ) {

-						$comments_echo .= '<a href="' . $user_profile_url . '">';

+				} elseif ((isset($comment->comment_type) && $comment->comment_type == 'trackback') || (isset($comment->comment_type) && $comment->comment_type == 'pingback')) {

+					if ($user_profile_url) {

+						$comments_echo .= '<a href="'.$user_profile_url.'">';

 					}

-					$comments_echo .= get_avatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

+					$comments_echo .= get_avatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

 				}

-			} elseif ( function_exists( 'gravatar' ) ) {

-				if ( $user_profile_url ) {

-					$comments_echo .= '<a href="' . $user_profile_url . '">';

+			} elseif (function_exists('gravatar')) {

+				if ($user_profile_url) {

+					$comments_echo .= '<a href="'.$user_profile_url.'">';

 				}

 				$comments_echo .= "<img src=\"";

-				if ( '' == $comment->comment_type ) {

-					$comments_echo .= gravatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

-					if ( $user_profile_url ) {

+				if ('' == $comment->comment_type) {

+					$comments_echo .= gravatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

+					if ($user_profile_url) {

 						$comments_echo .= '</a>';

 					}

-				} elseif ( ( 'trackback' == $comment->comment_type ) || ( 'pingback' == $comment->comment_type ) ) {

-					if ( $user_profile_url ) {

-						$comments_echo .= '<a href="' . $user_profile_url . '">';

+				} elseif (('trackback' == $comment->comment_type) || ('pingback' == $comment->comment_type)) {

+					if ($user_profile_url) {

+						$comments_echo .= '<a href="'.$user_profile_url.'">';

 					}

-					$comments_echo .= gravatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

-					if ( $user_profile_url ) {

+					$comments_echo .= gravatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

+					if ($user_profile_url) {

 						$comments_echo .= '</a>';

 					}

 				}

@@ -2058,17 +2058,17 @@ 
 			$comments_echo .= "</span>\n";

 

 			$comments_echo .= '<span class="geodir_reviewer_content">';

-			if ( $comment->user_id ) {

-				$comments_echo .= '<a href="' . get_author_posts_url( $comment->user_id ) . '">';

+			if ($comment->user_id) {

+				$comments_echo .= '<a href="'.get_author_posts_url($comment->user_id).'">';

 			}

-			$comments_echo .= '<span class="geodir_reviewer_author">' . $comment->comment_author . '</span> ';

-			if ( $comment->user_id ) {

+			$comments_echo .= '<span class="geodir_reviewer_author">'.$comment->comment_author.'</span> ';

+			if ($comment->user_id) {

 				$comments_echo .= '</a>';

 			}

-			$comments_echo .= '<span class="geodir_reviewer_reviewed">' . __( 'reviewed', 'geodirectory' ) . '</span> ';

-			$comments_echo .= '<a href="' . $permalink . '" class="geodir_reviewer_title">' . $post_title . '</a>';

-			$comments_echo .= geodir_get_rating_stars( $comment->overall_rating, $comment_post_ID );

-			$comments_echo .= '<p class="geodir_reviewer_text">' . $comment_excerpt . '';

+			$comments_echo .= '<span class="geodir_reviewer_reviewed">'.__('reviewed', 'geodirectory').'</span> ';

+			$comments_echo .= '<a href="'.$permalink.'" class="geodir_reviewer_title">'.$post_title.'</a>';

+			$comments_echo .= geodir_get_rating_stars($comment->overall_rating, $comment_post_ID);

+			$comments_echo .= '<p class="geodir_reviewer_text">'.$comment_excerpt.'';

 			//echo preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_excerpt);

 			$comments_echo .= '</p>';

 

@@ -2088,25 +2088,25 @@ 
  * @return array Returns post categories as an array.

  */

 function geodir_home_map_cats_key_value_array() {

-	$post_types = geodir_get_posttypes( 'object' );

+	$post_types = geodir_get_posttypes('object');

 

 	$return = array();

-	if ( ! empty( $post_types ) ) {

-		foreach ( $post_types as $key => $post_type ) {

-			$cpt_name       = __( $post_type->labels->singular_name, 'geodirectory' );

-			$post_type_name = sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name );

-			$taxonomies     = geodir_get_taxonomies( $key );

-			$cat_taxonomy   = ! empty( $taxonomies[0] ) ? $taxonomies[0] : null;

-			$cat_terms      = $cat_taxonomy ? get_terms( $cat_taxonomy ) : null;

-

-			if ( ! empty( $cat_terms ) ) {

-				$return[ 'optgroup_start-' . $key ] = $post_type_name;

-

-				foreach ( $cat_terms as $cat_term ) {

-					$return[ $key . '_' . $cat_term->term_id ] = $cat_term->name;

+	if (!empty($post_types)) {

+		foreach ($post_types as $key => $post_type) {

+			$cpt_name       = __($post_type->labels->singular_name, 'geodirectory');

+			$post_type_name = sprintf(__('%s Categories', 'geodirectory'), $cpt_name);

+			$taxonomies     = geodir_get_taxonomies($key);

+			$cat_taxonomy   = !empty($taxonomies[0]) ? $taxonomies[0] : null;

+			$cat_terms      = $cat_taxonomy ? get_terms($cat_taxonomy) : null;

+

+			if (!empty($cat_terms)) {

+				$return['optgroup_start-'.$key] = $post_type_name;

+

+				foreach ($cat_terms as $cat_term) {

+					$return[$key.'_'.$cat_term->term_id] = $cat_term->name;

 				}

 

-				$return[ 'optgroup_end-' . $key ] = $post_type_name;

+				$return['optgroup_end-'.$key] = $post_type_name;

 			}

 		}

 	}

@@ -2122,14 +2122,14 @@ 
  * @package GeoDirectory

  */

 function geodir_twitter_tweet_button() {

-	if ( isset( $_GET['gde'] ) ) {

-		$link = '?url=' . urlencode( geodir_curPageURL() );

+	if (isset($_GET['gde'])) {

+		$link = '?url='.urlencode(geodir_curPageURL());

 	} else {

 		$link = '';

 	}

 	?>

 	<a href="http://twitter.com/share<?php echo $link; ?>"

-	   class="twitter-share-button"><?php _e( 'Tweet', 'geodirectory' ); ?></a>

+	   class="twitter-share-button"><?php _e('Tweet', 'geodirectory'); ?></a>

 	<script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>

 	<?php

 }

@@ -2146,10 +2146,10 @@ 
 function geodir_fb_like_button() {

 	global $post;

 	?>

-	<iframe <?php if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false ) ) {

+	<iframe <?php if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {

 		echo 'allowtransparency="true"';

 	} ?> class="facebook"

-	     src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode( get_permalink( $post->ID ) ); ?>&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light"

+	     src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode(get_permalink($post->ID)); ?>&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light"

 	     style="border:none; overflow:hidden; width:100px; height:20px"></iframe>

 	<?php

 }

@@ -2203,10 +2203,10 @@ 
 			stWidget.addEntry({

 				"service": "sharethis",

 				"element": document.getElementById('st_sharethis'),

-				"url": "<?php echo geodir_curPageURL();?>",

-				"title": "<?php echo $post->post_title;?>",

+				"url": "<?php echo geodir_curPageURL(); ?>",

+				"title": "<?php echo $post->post_title; ?>",

 				"type": "chicklet",

-				"text": "<?php _e( 'Share', 'geodirectory' );?>"

+				"text": "<?php _e('Share', 'geodirectory'); ?>"

 			});

 		</script>

 	</div>

@@ -2214,7 +2214,7 @@ 
 }

 

 function geodir_listing_bounce_map_pin_on_hover() {

-	if ( get_option( 'geodir_listing_hover_bounce_map_pin', true ) ) {

+	if (get_option('geodir_listing_hover_bounce_map_pin', true)) {

 		?>

 		<script>

 			jQuery(function ($) {

@@ -2237,44 +2237,44 @@ 
 	}

 }

 

-add_action( 'geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10 );

+add_action('geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10);

 

-add_action( 'geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1 );

-function geodir_output_favourite_html_listings( $post_id ) {

-	geodir_favourite_html( '', $post_id );

+add_action('geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1);

+function geodir_output_favourite_html_listings($post_id) {

+	geodir_favourite_html('', $post_id);

 }

 

-add_action( 'geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2 );

-function geodir_output_pinpoint_html_listings( $post_id, $post ) {

+add_action('geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2);

+function geodir_output_pinpoint_html_listings($post_id, $post) {

 	global $wp_query;

 

 	$show_pin_point = $wp_query->is_main_query();

 

-	if ( ! empty( $show_pin_point ) && is_active_widget( false, "", "geodir_map_v3_listing_map" ) ) {

-		$term_icon_url = get_tax_meta( $post->default_category, 'ct_cat_icon', false, $post->post_type );

-		$marker_icon   = isset( $term_icon_url['src'] ) ? $term_icon_url['src'] : get_option( 'geodir_default_marker_icon' );

+	if (!empty($show_pin_point) && is_active_widget(false, "", "geodir_map_v3_listing_map")) {

+		$term_icon_url = get_tax_meta($post->default_category, 'ct_cat_icon', false, $post->post_type);

+		$marker_icon   = isset($term_icon_url['src']) ? $term_icon_url['src'] : get_option('geodir_default_marker_icon');

 		?>

 		<span class="geodir-pinpoint"

-		      style="background:url('<?php echo $marker_icon; ?>') no-repeat scroll left top transparent;background-size:auto 100%; -webkit-background-size:auto 100%;-moz-background-size:auto 100%;height:9px;width:14px;"><?php echo apply_filters( 'geodir_listing_listview_pinpoint_inner_content', '', 'listing' ); ?></span>

+		      style="background:url('<?php echo $marker_icon; ?>') no-repeat scroll left top transparent;background-size:auto 100%; -webkit-background-size:auto 100%;-moz-background-size:auto 100%;height:9px;width:14px;"><?php echo apply_filters('geodir_listing_listview_pinpoint_inner_content', '', 'listing'); ?></span>

 		<a class="geodir-pinpoint-link" href="javascript:void(0)"

 		   onclick="openMarker('listing_map_canvas' ,'<?php echo $post->ID; ?>')"

 		   onmouseover="animate_marker('listing_map_canvas' ,'<?php echo $post->ID; ?>')"

-		   onmouseout="stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')"><?php _e( 'Pinpoint', 'geodirectory' ); ?></a>

+		   onmouseout="stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')"><?php _e('Pinpoint', 'geodirectory'); ?></a>

 		<?php

 	}

 }

 

 function geodir_search_form_submit_button() {

 

-	$new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true;

+	$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

 

-	if ( $new_style ) {

+	if ($new_style) {

 		$default_search_button_label = '<i class="fa fa-search" aria-hidden="true"></i>';

-	}else{

+	} else {

 		$default_search_button_label = 'Search';

 	}

-	if ( get_option( 'geodir_search_button_label' ) && get_option( 'geodir_search_button_label' ) != 'Search' ) {

-		$default_search_button_label = __( get_option( 'geodir_search_button_label' ), 'geodirectory' );

+	if (get_option('geodir_search_button_label') && get_option('geodir_search_button_label') != 'Search') {

+		$default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');

 	}

 

 	/**

@@ -2286,47 +2286,47 @@ 
 	 *

 	 * @param string $default_search_button_label The current search button text.

 	 */

-	$default_search_button_label = apply_filters( 'geodir_search_default_search_button_text', $default_search_button_label );

+	$default_search_button_label = apply_filters('geodir_search_default_search_button_text', $default_search_button_label);

 

 	$fa_class = '';

-	if ( strpos( $default_search_button_label, '&#' ) !== false ) {

+	if (strpos($default_search_button_label, '&#') !== false) {

 		$fa_class = 'fa';

 	}

 

 

-	if ( $new_style ) {

+	if ($new_style) {

 	?>

-		<button class="geodir_submit_search <?php echo $fa_class; ?>"><?php _e( $default_search_button_label ,'geodirectory'); ?></button>

-<?php }else{?>

-		<input type="button" value="<?php esc_attr_e( $default_search_button_label ); ?>"

+		<button class="geodir_submit_search <?php echo $fa_class; ?>"><?php _e($default_search_button_label, 'geodirectory'); ?></button>

+<?php } else {?>

+		<input type="button" value="<?php esc_attr_e($default_search_button_label); ?>"

 	       class="geodir_submit_search <?php echo $fa_class; ?>"/>

 	<?php }

 }

 

-add_action( 'geodir_before_search_button', 'geodir_search_form_submit_button', 5000 );

+add_action('geodir_before_search_button', 'geodir_search_form_submit_button', 5000);

 

 function geodir_search_form_post_type_input() {

-	$post_types     = apply_filters( 'geodir_search_form_post_types', geodir_get_posttypes( 'object' ) );

+	$post_types     = apply_filters('geodir_search_form_post_types', geodir_get_posttypes('object'));

 	$curr_post_type = geodir_get_current_posttype();

-	if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {

+	if (!empty($post_types) && count((array) $post_types) > 1) {

 

-		foreach ( $post_types as $post_type => $info ){

+		foreach ($post_types as $post_type => $info) {

 			global $wpdb;

-			$has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-			if ( ! $has_posts ) {

+			$has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));

+			if (!$has_posts) {

 				unset($post_types->{$post_type});

 			}

 		}

 

-		if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ) {

+		if (!empty($post_types) && count((array) $post_types) > 1) {

 

-			$new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true;

-			if ( $new_style ) {

+			$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

+			if ($new_style) {

 				echo "<div class='gd-search-input-wrapper gd-search-field-cpt'>";

 			}

 			?>

 			<select name="stype" class="search_by_post">

-				<?php foreach ( $post_types as $post_type => $info ):

+				<?php foreach ($post_types as $post_type => $info):

 					global $wpdb;

 //					$has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

 //					if ( ! $has_posts ) {

@@ -2334,58 +2334,58 @@ 
 //					}

 					?>

 

-					<option data-label="<?php echo get_post_type_archive_link( $post_type ); ?>"

-					        value="<?php echo $post_type; ?>" <?php if ( isset( $_REQUEST['stype'] ) ) {

-						if ( $post_type == $_REQUEST['stype'] ) {

+					<option data-label="<?php echo get_post_type_archive_link($post_type); ?>"

+					        value="<?php echo $post_type; ?>" <?php if (isset($_REQUEST['stype'])) {

+						if ($post_type == $_REQUEST['stype']) {

 							echo 'selected="selected"';

 						}

-					} elseif ( $curr_post_type == $post_type ) {

+					} elseif ($curr_post_type == $post_type) {

 						echo 'selected="selected"';

-					} ?>><?php _e( ucfirst( $info->labels->name ), 'geodirectory' ); ?></option>

+					} ?>><?php _e(ucfirst($info->labels->name), 'geodirectory'); ?></option>

 

 				<?php endforeach; ?>

 			</select>

 			<?php

-			if ( $new_style ) {

+			if ($new_style) {

 				echo "</div>";

 			}

-		}else{

-			if(! empty( $post_types )){

-				echo '<input type="hidden" name="stype" value="' . key( $post_types ) . '"  />';

-			}else{

+		} else {

+			if (!empty($post_types)) {

+				echo '<input type="hidden" name="stype" value="'.key($post_types).'"  />';

+			} else {

 				echo '<input type="hidden" name="stype" value="gd_place"  />';

 			}

 

 		}

 

-	}elseif ( ! empty( $post_types ) ) {

-		echo '<input type="hidden" name="stype" value="' . key( $post_types ) . '"  />';

+	}elseif (!empty($post_types)) {

+		echo '<input type="hidden" name="stype" value="'.key($post_types).'"  />';

 	}

 }

 

 function geodir_search_form_search_input() {

 

 	$default_search_for_text = SEARCH_FOR_TEXT;

-	if ( get_option( 'geodir_search_field_default_text' ) ) {

-		$default_search_for_text = __( get_option( 'geodir_search_field_default_text' ), 'geodirectory' );

+	if (get_option('geodir_search_field_default_text')) {

+		$default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

 	}

 

 	$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

-	if($new_style){

+	if ($new_style) {

 		echo "<div class='gd-search-input-wrapper gd-search-field-search'>";

 	}

 	?>

 	<input class="search_text" name="s"

-	       value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {

-		       echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) );

+	       value="<?php if (isset($_REQUEST['s']) && trim($_REQUEST['s']) != '') {

+		       echo esc_attr(stripslashes_deep($_REQUEST['s']));

 	       } else {

 		       echo $default_search_for_text;

 	       } ?>" type="text"

-	       onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"

-	       onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"

+	       onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql($default_search_for_text); ?>';}"

+	       onfocus="if (this.value == '<?php echo esc_sql($default_search_for_text); ?>') {this.value = '';}"

 	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);">

 	<?php

-	if($new_style){

+	if ($new_style) {

 		echo "</div>";

 	}

 }

@@ -2393,12 +2393,12 @@ 
 function geodir_search_form_near_input() {

 

 	$default_near_text = NEAR_TEXT;

-	if ( get_option( 'geodir_near_field_default_text' ) ) {

-		$default_near_text = __( get_option( 'geodir_near_field_default_text' ), 'geodirectory' );

+	if (get_option('geodir_near_field_default_text')) {

+		$default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

 	}

 

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

-		$near = esc_attr( stripslashes_deep( $_REQUEST['snear'] ) );

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

+		$near = esc_attr(stripslashes_deep($_REQUEST['snear']));

 	} else {

 		$near = $default_near_text;

 	}

@@ -2411,7 +2411,7 @@ 
 	 * @since 1.6.9

 	 * @param string $curr_post_type The current post type.

 	 */

-	$near_input_extra = apply_filters('geodir_near_input_extra','',$curr_post_type);

+	$near_input_extra = apply_filters('geodir_near_input_extra', '', $curr_post_type);

 

 

 	/**

@@ -2424,7 +2424,7 @@ 
 	 * @param string $near              The current near value.

 	 * @param string $default_near_text The default near value.

 	 */

-	$near = apply_filters( 'geodir_search_near_text', $near, $default_near_text );

+	$near = apply_filters('geodir_search_near_text', $near, $default_near_text);

 	/**

 	 * Filter the default "Near" text value for the search form.

 	 *

@@ -2435,7 +2435,7 @@ 
 	 * @param string $near              The current near value.

 	 * @param string $default_near_text The default near value.

 	 */

-	$default_near_text = apply_filters( 'geodir_search_default_near_text', $default_near_text, $near );

+	$default_near_text = apply_filters('geodir_search_default_near_text', $default_near_text, $near);

 	/**

 	 * Filter the class for the near search input.

 	 *

@@ -2443,10 +2443,10 @@ 
 	 *

 	 * @param string $class The class for the HTML near input, default is blank.

 	 */

-	$near_class = apply_filters( 'geodir_search_near_class', '' );

+	$near_class = apply_filters('geodir_search_near_class', '');

 

 	$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

-	if($new_style){

+	if ($new_style) {

 		echo "<div class='gd-search-input-wrapper gd-search-field-near' $near_input_extra>";

 		

 		do_action('geodir_before_near_input');

@@ -2454,20 +2454,20 @@ 
 

 	?>

 	<input name="snear" class="snear <?php echo $near_class; ?>" type="text" value="<?php echo $near; ?>"

-	       onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql( $near ); ?>' != '' ? '<?php echo esc_sql( $near ); ?>' : '<?php echo $default_near_text; ?>');}"

-	       onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql( $near ); ?>') {this.value = '';}"

-	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);" <?php echo $near_input_extra;?>/>

+	       onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql($near); ?>' != '' ? '<?php echo esc_sql($near); ?>' : '<?php echo $default_near_text; ?>');}"

+	       onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql($near); ?>') {this.value = '';}"

+	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);" <?php echo $near_input_extra; ?>/>

 	<?php

-	if($new_style){

+	if ($new_style) {

 		do_action('geodir_after_near_input');

 

 		echo "</div>";

 	}

 }

 

-add_action( 'geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10 );

-add_action( 'geodir_search_form_inputs', 'geodir_search_form_search_input', 20 );

-add_action( 'geodir_search_form_inputs', 'geodir_search_form_near_input', 30 );

+add_action('geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10);

+add_action('geodir_search_form_inputs', 'geodir_search_form_search_input', 20);

+add_action('geodir_search_form_inputs', 'geodir_search_form_near_input', 30);

 

 

 function geodir_search_form() {

@@ -2478,5 +2478,5 @@ 
 	die();

 }

 

-add_action( 'wp_ajax_geodir_search_form', 'geodir_search_form' );

-add_action( 'wp_ajax_nopriv_geodir_search_form', 'geodir_search_form' );
\ No newline at end of file
+add_action('wp_ajax_geodir_search_form', 'geodir_search_form');

+add_action('wp_ajax_nopriv_geodir_search_form', 'geodir_search_form');
\ No newline at end of file

geodirectory-admin/admin_functions.php

Spacing +917 added lines, -917 removed lines

@@ -28,31 +28,31 @@ 
      * @package GeoDirectory

      */

     function geodir_admin_styles() {

-        wp_register_style('geodirectory-admin-css', geodir_plugin_url() . '/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-admin-css', geodir_plugin_url().'/geodirectory-assets/css/admin.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-admin-css');

 

-        wp_register_style('geodirectory-frontend-style', geodir_plugin_url() . '/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-frontend-style', geodir_plugin_url().'/geodirectory-assets/css/style.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-frontend-style');

 

-        wp_register_style('geodir-chosen-style', geodir_plugin_url() . '/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-chosen-style', geodir_plugin_url().'/geodirectory-assets/css/chosen.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-chosen-style');

 

-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url().'/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

 

-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url().'/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-jquery-ui-css');

 

-        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url().'/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-custom-fields-css');

 

-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url().'/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-pluplodar-css');

 

-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-rating-style', geodir_plugin_url().'/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-rating-style');

 

-        wp_register_style('geodir-rtl-style', geodir_plugin_url() . '/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-rtl-style');

     }

 }

@@ -70,7 +70,7 @@ 
         wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('font-awesome');

 

-        wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-admin', geodir_plugin_url().'/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-admin');

 

     }

@@ -89,60 +89,60 @@ 
         

         wp_enqueue_script('jquery');

 

-        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

+        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

 

-        wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

+        wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

         wp_enqueue_script('chosen');

 

-        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-choose-ajax');

 

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

-            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url().'/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

         }

 

         wp_enqueue_script('geodirectory-custom-fields-script');

-        $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

+        $plugin_path = geodir_plugin_url().'/geodirectory-functions/cat-meta-functions';

 

-        wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

+        wp_enqueue_script('tax-meta-clss', $plugin_path.'/js/tax-meta-clss.js', array('jquery'), null, true);

 

         if (in_array($geodir_map_name, array('auto', 'google'))) {

-            $map_lang = "&language=" . geodir_get_map_default_language();

-            $map_key = "&key=" . geodir_get_map_api_key();

+            $map_lang = "&language=".geodir_get_map_default_language();

+            $map_key = "&key=".geodir_get_map_api_key();

             /** This filter is documented in geodirectory_template_tags.php */

             $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-            wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);

+            wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);

         }

         

         if ($geodir_map_name == 'osm') {

             // Leaflet OpenStreetMap

-            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

             wp_enqueue_style('geodirectory-leaflet-style');

                 

-            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-script');

             

-            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-geo-script');

         }

-        wp_enqueue_script( 'jquery-ui-autocomplete' );

+        wp_enqueue_script('jquery-ui-autocomplete');

         

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

+        wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

         wp_enqueue_script('geodirectory-goMap-script');

 

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-goMap-script');

 

 		// font awesome rating script

 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

-			wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);

+			wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);

 			wp_enqueue_script('geodir-barrating-js');

 		} else { // default rating script

-			wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);

+			wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);

 			wp_enqueue_script('geodir-jRating-js');

 		}

 

-        wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodir-on-document-load');

 

 

@@ -150,7 +150,7 @@ 
         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-plupload-script');

 

         // SCRIPT FOR UPLOAD END

@@ -204,7 +204,7 @@ 
         wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

 

 

-        wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-admin-script', geodir_plugin_url().'/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-admin-script');

 

         wp_enqueue_style('farbtastic');

@@ -212,10 +212,10 @@ 
 

         $screen = get_current_screen();

         if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

-            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

+            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation_admin.js');

         }

 

-        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));

+        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl').'?geodir_ajax=true')));

         wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

 

     }

@@ -238,7 +238,7 @@ 
 

         if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

 

-        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

+        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url().'/geodirectory-assets/images/favicon.ico', '55.1984');

 

 

     }

@@ -272,7 +272,7 @@ 
                 $geodir_menu_order[] = 'separator-geodirectory';

                 if (!empty($post_types)) {

                     foreach ($post_types as $post_type) {

-                        $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

+                        $geodir_menu_order[] = 'edit.php?post_type='.$post_type;

                     }

                 }

                 $geodir_menu_order[] = $item;

@@ -315,8 +315,8 @@ 
 {

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

         echo '<div id="message" class="updated fade">

-                        <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>

-                        <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>

+                        <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory').' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">'.__('Support us by leaving a rating!', 'geodirectory').'</a></p>

+                        <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory').'</strong></p>

                 </div>';

 

     }

@@ -324,7 +324,7 @@ 
     if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {

         switch ($_REQUEST['msg']) {

             case 'success':

-                echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

+                echo '<div id="message" class="updated fade"><p><strong>'.__('Your settings have been saved.', 'geodirectory').'</strong></p></div>';

                 flush_rewrite_rules(false);

 

                 break;

@@ -332,30 +332,30 @@ 
 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';

 				

 				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

+			    	echo '<div id="message" class="error fade"><p><strong>'.__('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory').'</strong></p></div>';

 				else

-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

+					echo '<div id="message" class="error fade"><p><strong>'.__('Error: Your settings have not been saved, please try again.', 'geodirectory').'</strong></p></div>';

                 break;

         }

     }

 

     $geodir_load_map = get_option('geodir_load_map');

     $need_map_key = false;

-    if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

+    if ($geodir_load_map == '' || $geodir_load_map == 'google' || $geodir_load_map == 'auto') {

         $need_map_key = true;

     }

 

     if (!geodir_get_map_api_key() && $need_map_key) {

-        echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

+        echo '<div class="error"><p><strong>'.sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings').'\'>', '</a>').'</strong></p></div>';

     }

 

     if (!geodir_is_default_location_set()) {

-        echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+        echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';

 

     }

 

     if (!function_exists('curl_init')) {

-        echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

+        echo '<div class="error"><p><strong>'.__('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory').'</strong></p></div>';

 

     }

 

@@ -375,18 +375,18 @@ 
 function geodir_handle_option_form_submit($current_tab)

 {

     global $geodir_settings;

-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

+    if (file_exists(dirname(__FILE__).'/option-pages/'.$current_tab.'_array.php')) {

         /**

          * Contains settings array for current tab.

          *

          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once('option-pages/' . $current_tab . '_array.php');

+        include_once('option-pages/'.$current_tab.'_array.php');

     }

     if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

         if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+        if (!wp_verify_nonce($_REQUEST['_wpnonce-'.$current_tab], 'geodir-settings-'.$current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -419,13 +419,13 @@ 
          * @param string $current_tab The current settings tab name.

          * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

          */

-        do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

+        do_action('geodir_update_options_'.$current_tab, $geodir_settings[$current_tab]);

 

         flush_rewrite_rules(false);

 

         $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

 

-        $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

+        $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$_REQUEST['active_tab'].'&msg=success');

 

         wp_redirect($redirect_url);

         exit();

@@ -435,7 +435,7 @@ 
 }

 

 

-if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {

+if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined('GD_TESTING_MODE'))) {

     /**

      * GeoDirectory dummy data installation.

      *

@@ -451,18 +451,18 @@ 
         global $wpdb, $plugin_prefix;

 

         if (!geodir_is_default_location_set()) {

-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+            echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';

         } else {

 

-            $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=';

+            $geodir_url = admin_url().'admin.php?page=geodirectory&tab=general_settings&active_tab=';

 

-            $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");

+            $post_counts = $wpdb->get_var("SELECT count(post_id) FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");

 

             if ($post_counts > 0) {

                 $nonce = wp_create_nonce('geodir_dummy_posts_delete_noncename');

 

-                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . SAMPLE_DATA_SHOW_MSG . '</b><br /><a id="geodir_dummy_delete" class="button_delete" onclick="geodir_autoinstall(this,\'geodir_dummy_delete\',\'' . $nonce . '\',\'' . $post_type . '\')" href="javascript:void(0);" redirect_to="' . $geodir_url . '"  >' . DELETE_BTN_SAMPLE_MSG . '</a></p></div>';

-                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_DELETE_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /></p></div>';

+                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>'.SAMPLE_DATA_SHOW_MSG.'</b><br /><a id="geodir_dummy_delete" class="button_delete" onclick="geodir_autoinstall(this,\'geodir_dummy_delete\',\''.$nonce.'\',\''.$post_type.'\')" href="javascript:void(0);" redirect_to="'.$geodir_url.'"  >'.DELETE_BTN_SAMPLE_MSG.'</a></p></div>';

+                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>'.GEODIR_SAMPLE_DATA_DELETE_MSG.'</b><br><img src="'.geodir_plugin_url().'/geodirectory-assets/images/loadingAnimation.gif" /></p></div>';

             } else {

                 $options_list = '';

                 for ($option = 1; $option <= 30; $option++) {

@@ -470,13 +470,13 @@ 
                     if ($option == 10)

                         $selected = 'selected="selected"';

 

-                    $options_list .= '<option ' . $selected . ' value="' . $option . '">' . $option . '</option>';

+                    $options_list .= '<option '.$selected.' value="'.$option.'">'.$option.'</option>';

                 }

 

                 $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');

 

-                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . AUTO_INSATALL_MSG . '</b><br /><select class="selected_sample_data">' . $options_list . '</select><a id="geodir_dummy_insert" class="button_insert" href="javascript:void(0);" onclick="geodir_autoinstall(this,\'geodir_dummy_insert\',\'' . $nonce . '\',\'' . $post_type . '\')"   redirect_to="' . $geodir_url . '" >' . INSERT_BTN_SAMPLE_MSG . '</a></p></div>';

-                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_IMPORT_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /><br><span class="dummy_post_inserted"></span></div>';

+                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>'.AUTO_INSATALL_MSG.'</b><br /><select class="selected_sample_data">'.$options_list.'</select><a id="geodir_dummy_insert" class="button_insert" href="javascript:void(0);" onclick="geodir_autoinstall(this,\'geodir_dummy_insert\',\''.$nonce.'\',\''.$post_type.'\')"   redirect_to="'.$geodir_url.'" >'.INSERT_BTN_SAMPLE_MSG.'</a></p></div>';

+                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>'.GEODIR_SAMPLE_DATA_IMPORT_MSG.'</b><br><img src="'.geodir_plugin_url().'/geodirectory-assets/images/loadingAnimation.gif" /><br><span class="dummy_post_inserted"></span></div>';

 

             }

             echo $dummy_msg;

@@ -490,7 +490,7 @@ 
             ?>

             <script type="text/javascript">

                 var geocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;

-                var CITY_ADDRESS = '<?php echo addslashes( $city . ',' . $region . ',' . $country );?>';

+                var CITY_ADDRESS = '<?php echo addslashes($city.','.$region.','.$country); ?>';

                 var bound_lat_lng;

                 var latlng = ['<?php echo $city_latitude; ?>', <?php echo $city_longitude; ?>];

                 var lat = <?php echo $city_latitude; ?>;

@@ -520,7 +520,7 @@ 
                                     return x.replace(" ", '');

                                 }); // remove spaces from lat/lon

                             } else {

-                                alert("<?php _e('Geocode was not successful for the following reason:','geodirectory');?> " + status);

+                                alert("<?php _e('Geocode was not successful for the following reason:', 'geodirectory'); ?> " + status);

                             }

                         });

                 } else if (window.gdMaps == 'osm') {

@@ -545,7 +545,7 @@ 
                     var total_dummy_post_count = jQuery('#sub_' + active_tab).find('.selected_sample_data').val();

 

                     if (id == 'geodir_dummy_delete') {

-                        if (confirm('<?php _e('Are you sure you want to delete dummy data?' , 'geodirectory'); ?>')) {

+                        if (confirm('<?php _e('Are you sure you want to delete dummy data?', 'geodirectory'); ?>')) {

                             jQuery('#sub_' + active_tab).find('.geodir_auto_install').hide();

                             jQuery('#sub_' + active_tab).find('.geodir_show_progress').show();

                             jQuery.post('<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=' + id + '&posttype=' + posttype + '&_wpnonce=' + nonce,

@@ -566,7 +566,7 @@ 
                         var post_url = '<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=' + id + '&posttype=' + posttype + '&insert_dummy_post_index=' + dummy_post_index + '&city_bound_lat1=' + bound_lat_lng[0] + '&city_bound_lng1=' + bound_lat_lng[1] + '&city_bound_lat2=' + bound_lat_lng[2] + '&city_bound_lng2=' + bound_lat_lng[3] + '&_wpnonce=' + nonce;

                         

                         jQuery.post( post_url, function (data) {

-                            jQuery(obj).closest('form').find('.dummy_post_inserted').html('<?php _e('Dummy post(s) inserted:','geodirectory');?> ' + dummy_post_index + ' <?php _e('of' ,'geodirectory'); ?> ' + total_dummy_post_count + '');

+                            jQuery(obj).closest('form').find('.dummy_post_inserted').html('<?php _e('Dummy post(s) inserted:', 'geodirectory'); ?> ' + dummy_post_index + ' <?php _e('of', 'geodirectory'); ?> ' + total_dummy_post_count + '');

                             

                             dummy_post_index++;

                             

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

      */

     include_once('place_dummy_post.php');

-    delete_transient( 'cached_dummy_images' );

+    delete_transient('cached_dummy_images');

 

 }

 

@@ -624,7 +624,7 @@ 
     global $wpdb, $plugin_prefix;

 

 

-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

+    $post_ids = $wpdb->get_results("SELECT post_id FROM ".$plugin_prefix."gd_place_detail WHERE post_dummy='1'");

 

 

     foreach ($post_ids as $post_ids_obj) {

@@ -632,7 +632,7 @@ 
     }

 

     //double check posts are deleted

-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

+    $wpdb->get_results("DELETE FROM ".$plugin_prefix."gd_place_detail WHERE post_dummy='1'");

 }

 

 /**

@@ -670,14 +670,14 @@ 
 

 

                     if (geodir_dummy_folder_exists())

-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

+                        $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";

                     else

                         $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

 

                     $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

 

                     $catname = str_replace(' ', '_', $catname);

-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

+                    $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");

 

                     if (empty($uploaded['error'])) {

                         $new_path = $uploaded['file'];

@@ -687,7 +687,7 @@ 
                     $wp_filetype = wp_check_filetype(basename($new_path), null);

 

                     $attachment = array(

-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),

+                        'guid' => $uploads['baseurl'].'/'.basename($new_path),

                         'post_mime_type' => $wp_filetype['type'],

                         'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

                         'post_content' => '',

@@ -697,7 +697,7 @@ 
 

                     // you must first include the image.php file

                     // for the function wp_generate_attachment_metadata() to work

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

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

                     $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

                     wp_update_attachment_metadata($attach_id, $attach_data);

 

@@ -714,14 +714,14 @@ 
                 $last_catid = wp_insert_term($catname, 'gd_placecategory');

 

                 if (geodir_dummy_folder_exists())

-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

+                    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";

                 else

                     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

 

                 $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

 

                 $catname = str_replace(' ', '_', $catname);

-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

+                $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");

 

                 if (empty($uploaded['error'])) {

                     $new_path = $uploaded['file'];

@@ -731,7 +731,7 @@ 
                 $wp_filetype = wp_check_filetype(basename($new_path), null);

 

                 $attachment = array(

-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),

+                    'guid' => $uploads['baseurl'].'/'.basename($new_path),

                     'post_mime_type' => $wp_filetype['type'],

                     'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

                     'post_content' => '',

@@ -743,7 +743,7 @@ 
 

                 // you must first include the image.php file

                 // for the function wp_generate_attachment_metadata() to work

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

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

                 $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

                 wp_update_attachment_metadata($attach_id, $attach_data);

 

@@ -785,18 +785,18 @@ 
 

         elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

-            if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

-                update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

-                update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

-                if (isset($_POST[$value['id'] . '_crop'])) :

-                    update_option($value['id'] . '_crop', 1);

+            if (isset($value['id']) && isset($_POST[$value['id'].'_width'])) {

+                update_option($value['id'].'_width', $_POST[$value['id'].'_width']);

+                update_option($value['id'].'_height', $_POST[$value['id'].'_height']);

+                if (isset($_POST[$value['id'].'_crop'])) :

+                    update_option($value['id'].'_crop', 1);

                 else :

-                    update_option($value['id'] . '_crop', 0);

+                    update_option($value['id'].'_crop', 0);

                 endif;

             } else {

-                update_option($value['id'] . '_width', $value['std']);

-                update_option($value['id'] . '_height', $value['std']);

-                update_option($value['id'] . '_crop', 1);

+                update_option($value['id'].'_width', $value['std']);

+                update_option($value['id'].'_height', $value['std']);

+                update_option($value['id'].'_crop', 1);

             }

 

         elseif (isset($value['type']) && $value['type'] == 'map') :

@@ -838,12 +838,12 @@ 
         elseif (isset($value['type']) && $value['type'] == 'file') :

 

 

-            if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

+            if (isset($_POST[$value['id'].'_remove']) && $_POST[$value['id'].'_remove']) {// if remove is set then remove the file

 

                 if (get_option($value['id'])) {

                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

+                    $img_path = $uploads['path'].'/'.$noimg_name;

                     if (file_exists($img_path))

                         unlink($img_path);

                 }

@@ -871,7 +871,7 @@ 
                 if (get_option($value['id'])) {

                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

+                    $img_path = $uploads['path'].'/'.$noimg_name;

                     if (file_exists($img_path))

                         unlink($img_path);

                 }

@@ -892,7 +892,7 @@ 
             // same menu setting per theme.

             if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

                 $theme = wp_get_theme();

-                update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

+                update_option('geodir_theme_location_nav_'.$theme->name, $_POST[$value['id']]);

             }

 

             if (isset($value['id']) && isset($_POST[$value['id']])) {

@@ -962,8 +962,8 @@ 
 

             $listing_slug = $geodir_posttype_info['labels']['singular_name'];

 

-            $tabs[$geodir_post_type . '_fields_settings'] = array(

-                'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

+            $tabs[$geodir_post_type.'_fields_settings'] = array(

+                'label' => __(ucfirst($listing_slug).' Settings', 'geodirectory'),

                 'subtabs' => array(

                     array('subtab' => 'custom_fields',

                         'label' => __('Custom Fields', 'geodirectory'),

@@ -996,7 +996,7 @@ 
  */

 function geodir_tools_setting_tab($tabs)

 {

-    wp_enqueue_script( 'jquery-ui-progressbar' );

+    wp_enqueue_script('jquery-ui-progressbar');

     $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

     return $tabs;

 }

@@ -1030,7 +1030,7 @@ 
  */

 function geodir_extend_geodirectory_setting_tab($tabs)

 {

-    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');

+    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory').' <i class="fa fa-plug"></i>', 'url' => 'https://wpgeodirectory.com', 'target' => '_blank');

     return $tabs;

 }

 

@@ -1090,8 +1090,8 @@ 
                     _e('Unknown', 'geodirectory');

                 } else {

                     /* If there is a city id, append 'city name' to the text string. */

-                    $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

-                    echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

+                    $add_location_id = $location_id > 0 ? ' ('.$location_id.')' : '';

+                    echo(__($location->country, 'geodirectory').'-'.$location->region.'-'.$location->city.$add_location_id);

                 }

                 break;

 

@@ -1109,14 +1109,14 @@ 
                         $expire_class = 'expire_over';

                     }

                     $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

-                    $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

+                    $date_diff_text = '<br /><span class="'.$expire_class.'">('.$date_diff.' '.$state.')</span>';

                 }

                 /* If no expire_date is found, output a default message. */

                 if (empty($expire_date))

                     echo __('Unknown', 'geodirectory');

                 /* If there is a expire_date, append 'days left' to the text string. */

                 else

-                    echo $expire_date . $date_diff_text;

+                    echo $expire_date.$date_diff_text;

                 break;

 

             /* If displaying the 'categorys' column. */

@@ -1183,7 +1183,7 @@ 
 function geodir_post_information_save($post_id, $post) {

     global $wpdb, $current_user;

 

-    if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

+    if (isset($post->post_type) && ($post->post_type == 'nav_menu_item' || $post->post_type == 'page' || $post->post_type == 'post')) {

         return;

     }

 

@@ -1251,7 +1251,7 @@ 
                     $tab_id = $value['id'];

 

                 if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+                    $desc = '<span style=" text-transform:none;">:- '.$value['desc'].'</span>';

 

                 if (isset($value['name']) && $value['name']) {

                     if ($first_title === true) {

@@ -1259,9 +1259,9 @@ 
                     } else {

                         echo '</div>';

                     }

-                    echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

+                    echo '<dd id="'.trim($tab_id).'" class="geodir_option_tabs" ><a href="javascript:void(0);">'.$value['name'].'</a></dd>';

 

-                    echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+                    echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';

                 }

 

                 /**

@@ -1271,21 +1271,21 @@ 
                  *

                  * @since 1.0.0

                  */

-                do_action('geodir_settings_' . sanitize_title($value['id']));

+                do_action('geodir_settings_'.sanitize_title($value['id']));

                 break;

 

             case 'no_tabs':

 

                 echo '<div class="inner_content_tab_main">';

-                echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+                echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';

 

                 break;

 

             case 'sectionstart':

                 if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

+                    $desc = '<span style=" text-transform:none;"> - '.$value['desc'].'</span>';

                 if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

+                    echo '<h3>'.$value['name'].$desc.'</h3>';

                 /**

                  * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

                  *

@@ -1293,8 +1293,8 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

-                echo '<table class="form-table">' . "\n\n";

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_start');

+                echo '<table class="form-table">'."\n\n";

 

                 break;

             case 'sectionend':

@@ -1305,7 +1305,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_end');

                 echo '</table>';

                 /**

                  * Called after a GeoDirectory settings sectionend is output in the GD settings page.

@@ -1314,7 +1314,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_after');

                 break;

             case 'text':

                 ?>

@@ -1323,7 +1323,7 @@ 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>"

                                            type="<?php echo esc_attr($value['type']); ?>"

-                                           <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                                           <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style=" <?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

                                                echo esc_attr(stripslashes(get_option($value['id'])));

@@ -1340,7 +1340,7 @@ 
                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

                                            id="<?php echo esc_attr($value['id']); ?>"

                                            type="<?php echo esc_attr($value['type']); ?>"

-                                           <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                                           <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                                            style="<?php echo esc_attr($value['css']); ?>"

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

                                                echo esc_attr(stripslashes(get_option($value['id'])));

@@ -1386,17 +1386,17 @@ 
                     <?php _e('Width', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_width"

                         id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'].'_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

 

                     <?php _e('Height', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_height"

                         id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'].'_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

 

                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input

                             name="<?php echo esc_attr($value['id']); ?>_crop"

                             id="<?php echo esc_attr($value['id']); ?>_crop"

-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>

+                            type="checkbox" <?php if (get_option($value['id'].'_crop') != '') checked(get_option($value['id'].'_crop'), 1); else checked(1); ?> /></label>

 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

@@ -1446,7 +1446,7 @@ 
                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"

-                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

+                                            data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text']; ?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

@@ -1457,7 +1457,7 @@ 
                             } else {

                                 ?>

                                 <option

-                                    value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>><?php echo ucfirst($val) ?></option>

+                                    value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values))); ?>><?php echo ucfirst($val) ?></option>

                             <?php

                             }

                         }

@@ -1492,7 +1492,7 @@ 
                 ?>

 

                 <tr valign="top">

-                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory');?></th>

+                    <th class="titledesc" width="40%"><?php _e('Default map language', 'geodirectory'); ?></th>

                     <td width="60%">

                         <select name="geodir_default_map_language" style="width:60%">

                             <?php

@@ -1574,7 +1574,7 @@ 
 

                 <tr valign="top">

                     <th class="titledesc"

-                        width="40%"><?php _e('Default post type search on map', 'geodirectory');?></th>

+                        width="40%"><?php _e('Default post type search on map', 'geodirectory'); ?></th>

                     <td width="60%">

                         <select name="geodir_default_map_search_pt" style="width:60%">

                             <?php

@@ -1615,7 +1615,7 @@ 
                         $cat_display = 'checkbox';

                         $gd_post_types = get_option('geodir_exclude_post_type_on_map');

                         $gd_cats = get_option('geodir_exclude_cat_on_map');

-                        $gd_cats_upgrade = (int)get_option('geodir_exclude_cat_on_map_upgrade');

+                        $gd_cats_upgrade = (int) get_option('geodir_exclude_cat_on_map_upgrade');

                         $count = 1;

                         ?>

                         <table width="70%" class="widefat">

@@ -1644,7 +1644,7 @@ 
                                                                                            name="home_map_post_types[]"

                                                                                            id="<?php echo esc_attr($value['id']); ?>"

                                                                                            value="<?php echo $key; ?>"

-                                                                                           class="map_post_type" <?php echo $checked;?> />

+                                                                                           class="map_post_type" <?php echo $checked; ?> />

                                         <?php echo $post_types_obj->labels->singular_name; ?></td>

                                     <td width="40%">

                                         <div class="home_map_category" style="overflow:auto;width:200px;height:100px;"

@@ -1702,12 +1702,12 @@ 
                 ?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

-                    <label for="<?php echo $value['id'];?>">

+                    <label for="<?php echo $value['id']; ?>">

                         <input name="<?php echo esc_attr($value['id']); ?>"

-                               id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

+                               id="<?php echo esc_attr($value['id'].$value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

                             echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+                        }elseif (get_option($value['id']) == '' && $value['std'] == $value['value']) {echo 'checked="checked"'; } ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

@@ -1727,9 +1727,9 @@ 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

                     <textarea

-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"

+                        <?php if (isset($value['args'])) echo $value['args'].' '; ?>name="<?php echo esc_attr($value['id']); ?>"

                         id="<?php echo esc_attr($value['id']); ?>"

-                        <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                        <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                         style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span

                         class="description"><?php echo $value['desc'] ?></span>

 

@@ -1774,7 +1774,7 @@ 
 					}

 				}

 				//

-				$page_setting = (int)get_option($value['id']);

+				$page_setting = (int) get_option($value['id']);

 

                 $args = array('name' => $value['id'],

                     'id' => $value['id'],

@@ -1791,7 +1791,7 @@ 
                 <tr valign="top" class="single_select_page">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

-                    <?php echo str_replace(' id=', " data-placeholder='" . __('Select a page...', 'geodirectory') . "' style='" . $value['css'] . "' class='" . $value['class'] . "' " . $disabled . " id=", wp_dropdown_pages($args)); ?>

+                    <?php echo str_replace(' id=', " data-placeholder='".__('Select a page...', 'geodirectory')."' style='".$value['css']."' class='".$value['class']."' ".$disabled." id=", wp_dropdown_pages($args)); ?>

                     <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

@@ -1800,7 +1800,7 @@ 
 				}

                 break;

             case 'single_select_country' :

-                $country_setting = (string)get_option($value['id']);

+                $country_setting = (string) get_option($value['id']);

                 if (strstr($country_setting, ':')) :

                     $country = current(explode(':', $country_setting));

                     $state = end(explode(':', $country_setting));

@@ -1823,7 +1823,7 @@ 
             case 'multi_select_countries' :

                 $countries = $geodirectory->countries->countries;

                 asort($countries);

-                $selections = (array)get_option($value['id']);

+                $selections = (array) get_option($value['id']);

                 ?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

@@ -1833,7 +1833,7 @@ 
                             title="Country" class="chosen_select">

                         <?php

                         if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+                            echo '<option value="'.$key.'" '.selected(in_array($key, $selections), true, false).'>'.$val.'</option>';

                         endforeach;

                         ?>

                     </select>

@@ -1845,8 +1845,8 @@ 
                 break;

 

             case 'google_analytics' :

-                $selections = (array)get_option($value['id']);

-                if(get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret') ) {

+                $selections = (array) get_option($value['id']);

+                if (get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret')) {

                     ?>

                     <tr valign="top">

                         <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

@@ -1857,20 +1857,20 @@ 
 

                             $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

                             $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

-                            $state = "&state=123";//any string

-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+                            $state = "&state=123"; //any string

+                            $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";

                             $response_type = "&response_type=code";

                             $client_id = "&client_id=".get_option('geodir_ga_client_id');

                             $access_type = "&access_type=offline";

                             $approval_prompt = "&approval_prompt=force";

 

-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

+                            $auth_url = $oAuthURL.$scope.$state.$redirect_uri.$response_type.$client_id.$access_type.$approval_prompt;

 

 

                             ?>

                             <script>

                                 function gd_ga_popup() {

-                                    var win = window.open("<?php echo $auth_url;?>", "Google Analytics", "");

+                                    var win = window.open("<?php echo $auth_url; ?>", "Google Analytics", "");

                                     var pollTimer = window.setInterval(function () {

                                         if (win.closed !== false) { // !== is required for compatibility with Opera

                                             window.clearInterval(pollTimer);

@@ -1892,7 +1892,7 @@ 
                             } else {

                                 ?>

                                 <span class="button-primary"

-                                      onclick="gd_ga_popup();"><?php _e('Authorize', 'geodirectory');?></span>

+                                      onclick="gd_ga_popup();"><?php _e('Authorize', 'geodirectory'); ?></span>

                             <?php

                             }

                             ?>

@@ -1963,9 +1963,9 @@ 
 

             <?php if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] != '') { ?>

             jQuery('.geodir_option_tabs').removeClass('gd-tab-active');

-            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').addClass('gd-tab-active');

+            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').addClass('gd-tab-active');

             jQuery('.gd-content-heading').hide();

-            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').show();

+            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').show();

             <?php } ?>

         });

     </script>

@@ -2051,7 +2051,7 @@ 
     wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

 

     if (geodir_get_featured_image($post_id, 'thumbnail')) {

-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

+        echo '<h4>'.__('Featured Image', 'geodirectory').'</h4>';

         geodir_show_featured_image($post_id, 'thumbnail');

     }

 

@@ -2062,13 +2062,13 @@ 
 

     <h5 class="form_title">

         <?php if ($image_limit != 0 && $image_limit == 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';

         } ?>

         <?php if ($image_limit != 0 && $image_limit > 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';

         } ?>

         <?php if ($image_limit == 0) {

-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';

         } ?>

     </h5>

 

@@ -2107,10 +2107,10 @@ 
         <div

             class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

             id="<?php echo $id; ?>plupload-upload-ui">

-            <h4><?php _e('Drop files to upload', 'geodirectory');?></h4>

+            <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4>

             <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                    value="<?php _e('Select Files', 'geodirectory'); ?>" class="button"/>

-            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span>

+            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span>

             <?php if ($width && $height): ?>

                 <span class="plupload-resize"></span>

                 <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span>

@@ -2122,7 +2122,7 @@ 
              id="<?php echo $id; ?>plupload-thumbs" style="border-top:1px solid #ccc; padding-top:10px;">

         </div>

         <span

-            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory');?></span>

+            id="upload-msg"><?php _e('Please drag &amp; drop the images to rearrange the order', 'geodirectory'); ?></span>

         <span id="<?php echo $id; ?>upload-error" style="display:none"></span>

     </div>

 

@@ -2332,9 +2332,9 @@ 
     $plugin = 'avada-nag';

     $timestamp = 'avada-nag1234';

     $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

-    echo '<div id="' . $timestamp . '"  class="error">';

-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

+    echo '<div id="'.$timestamp.'"  class="error">';

+    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\''.$plugin.'\',\''.$timestamp.'\');" ><i class="fa fa-times"></i></span>';

+    echo "<img class='gd-icon-noti' src='".plugin_dir_url('')."geodirectory/geodirectory-assets/images/favicon.ico' > ";

     echo "<p>$message</p>";

     echo "</div>";

 

@@ -2467,7 +2467,7 @@ 
 		

 		// Don't allow same slug url for listing and location

 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

-			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

+			$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab.'&msg=fail&gderr=21');

         	wp_redirect($redirect_url);

 			exit;

 		}

@@ -2479,7 +2479,7 @@ 
 			$default_language = $sitepress->get_default_language();

 			

 			if ($current_language != 'all' && $current_language != $default_language) {

-				$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab);

+				$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab);

 				wp_redirect($redirect_url);

 				exit;

 			}

@@ -2500,11 +2500,11 @@ 
 function geodir_hide_admin_preview_button() {

     global $post_type;

     $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

+    if (in_array($post_type, $post_types))

         echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

 }

-add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

-add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

+add_action('admin_head-post-new.php', 'geodir_hide_admin_preview_button');

+add_action('admin_head-post.php', 'geodir_hide_admin_preview_button');

 

 /**

  * Add the tab in left sidebar menu fro import & export page.

@@ -2514,8 +2514,8 @@ 
  *

  * @return array Array of tab data.

  */

-function geodir_import_export_tab( $tabs ) {

-	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

+function geodir_import_export_tab($tabs) {

+	$tabs['import_export'] = array('label' => __('Import & Export', 'geodirectory'));

     return $tabs;

 }

 

@@ -2529,8 +2529,8 @@ 
  * @return string Html content.

  */

 function geodir_import_export_page() {

-	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

-	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

+	$nonce = wp_create_nonce('geodir_import_export_nonce');

+	$gd_cats_sample_csv = geodir_plugin_url().'/geodirectory-assets/gd_sample_categories.csv';

     /**

      * Filter sample category data csv file url.

      *

@@ -2539,9 +2539,9 @@ 
      *

      * @param string $gd_cats_sample_csv Sample category data csv file url.

      */

-	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

+	$gd_cats_sample_csv = apply_filters('geodir_export_cats_sample_csv', $gd_cats_sample_csv);

 	

-	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

+	$gd_posts_sample_csv = geodir_plugin_url().'/geodirectory-assets/place_listing.csv';

     /**

      * Filter sample post data csv file url.

      *

@@ -2550,15 +2550,15 @@ 
      *

      * @param string $gd_posts_sample_csv Sample post data csv file url.

      */

-    $gd_posts_sample_csv = apply_filters( 'geodir_export_posts_sample_csv', $gd_posts_sample_csv );

+    $gd_posts_sample_csv = apply_filters('geodir_export_posts_sample_csv', $gd_posts_sample_csv);

 	

-	$gd_posttypes = geodir_get_posttypes( 'array' );

+	$gd_posttypes = geodir_get_posttypes('array');

 	

 	$gd_posttypes_option = '';

-	foreach ( $gd_posttypes as $gd_posttype => $row ) {

-		$gd_posttypes_option .= '<option value="' . $gd_posttype . '" data-cats="' . (int)geodir_get_terms_count( $gd_posttype ) . '" data-posts="' . (int)geodir_get_posts_count( $gd_posttype ) . '">' . __( $row['labels']['name'], 'geodirectory' ) . '</option>';

+	foreach ($gd_posttypes as $gd_posttype => $row) {

+		$gd_posttypes_option .= '<option value="'.$gd_posttype.'" data-cats="'.(int) geodir_get_terms_count($gd_posttype).'" data-posts="'.(int) geodir_get_posts_count($gd_posttype).'">'.__($row['labels']['name'], 'geodirectory').'</option>';

 	}

-	wp_enqueue_script( 'jquery-ui-progressbar' );

+	wp_enqueue_script('jquery-ui-progressbar');

 	

 	$gd_chunksize_options = array();

 	$gd_chunksize_options[100] = 100;

@@ -2580,49 +2580,49 @@ 
      *

      * @param string $gd_chunksize_options Entries options.

      */

-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

+    $gd_chunksize_options = apply_filters('geodir_export_csv_chunksize_options', $gd_chunksize_options);

 	

 	$gd_chunksize_option = '';

 	foreach ($gd_chunksize_options as $value => $title) {

-		$gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>';

+		$gd_chunksize_option .= '<option value="'.$value.'" '.selected($value, 5000, false).'>'.$title.'</option>';

 	}

 	

 	$uploads = wp_upload_dir();

 ?>

 </form>

 <div class="inner_content_tab_main gd-import-export">

-  <h3><?php _e( 'GD Import & Export CSV', 'geodirectory' ) ;?></h3>

-  <span class="description"><?php _e( 'Import & export csv for GD listings & categories.', 'geodirectory' ) ;?></span>

+  <h3><?php _e('GD Import & Export CSV', 'geodirectory'); ?></h3>

+  <span class="description"><?php _e('Import & export csv for GD listings & categories.', 'geodirectory'); ?></span>

   <div class="gd-content-heading">

 

   <?php

     ini_set('max_execution_time', 999999);

-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );

+    $ini_max_execution_time_check = @ini_get('max_execution_time');

     ini_restore('max_execution_time');

 

-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

+    if ($ini_max_execution_time_check != 999999) { // only show these setting to the user if we can't change the ini setting

         ?>

 	<div id="gd_ie_reqs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div class="postbox">

-          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'PHP Requirements for GD Import & Export CSV', 'geodirectory' );?></span></h3>

+          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __('PHP Requirements for GD Import & Export CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

-            <span class="description"><?php echo __( 'Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory' );?></span>

+            <span class="description"><?php echo __('Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory'); ?></span>

 			<table class="form-table">

 				<thead>

 				  <tr>

-				  	<th><?php _e( 'PHP Settings', 'geodirectory' );?></th><th><?php _e( 'Current Value', 'geodirectory' );?></th><th><?php _e( 'Recommended Value', 'geodirectory' );?></th>

+				  	<th><?php _e('PHP Settings', 'geodirectory'); ?></th><th><?php _e('Current Value', 'geodirectory'); ?></th><th><?php _e('Recommended Value', 'geodirectory'); ?></th>

 				  </tr>

 				</thead>

 				<tbody>

 				  <tr>

-				  	<td>max_input_time</td><td><?php echo @ini_get( 'max_input_time' );?></td><td>3000</td>

+				  	<td>max_input_time</td><td><?php echo @ini_get('max_input_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>max_execution_time</td><td><?php  echo @ini_get( 'max_execution_time' );?></td><td>3000</td>

+				  	<td>max_execution_time</td><td><?php  echo @ini_get('max_execution_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>memory_limit</td><td><?php echo @ini_get( 'memory_limit' );?></td><td>256M</td>

+				  	<td>memory_limit</td><td><?php echo @ini_get('memory_limit'); ?></td><td>256M</td>

 				  </tr>

 				</tbody>

 		    </table>

@@ -2634,21 +2634,21 @@ 
 	<div id="gd_ie_imposts" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_im_posts" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Listings: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Import CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Listings: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Import CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e( 'Update listing if post with post_id already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e( 'Ignore listing if post with post_id already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e('Update listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e('Ignore listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_postplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_post_file" class="gd-imex-file gd_im_post_file" id="gd_im_post" onclick="jQuery('#gd_im_postplupload-browse-button').trigger('click');" />

-							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

-						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" />

+							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

+						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv; ?>" />

 							<?php

 							/**

 							 * Called just after the sample CSV download link.

@@ -2657,7 +2657,7 @@ 
 							 */

 							do_action('geodir_sample_csv_download_link');

 							?>

-							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_postpluploadan' ); ?>"></span>

+							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_postpluploadan'); ?>"></span>

 							<div class="filelist"></div>

 						</div>

 						<span id="gd_im_catupload-error" style="display:none"></span>

@@ -2675,7 +2675,7 @@ 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>

 						</div>

 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">

-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

 									id="gd-import-perc">0%</font> )

 								<div class="gd-fileprogress"></div>

@@ -2687,10 +2687,10 @@ 
                     	<div class="gd-imex-btns" style="display:none;">

                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>

                         	<input onclick="gd_imex_PrepareImport(this, 'post')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />

-                        	<input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>

-                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>

+                        	<input onclick="gd_imex_ContinueImport(this, 'post')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>

+                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'post')"/>

 							<div id="gd_process_data" style="display:none">

-								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>

+								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>

 							</div>

 						</div>

 					</td>

@@ -2704,30 +2704,30 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

 	  <div class="meta-box-sortables ui-sortable">

 		<div id="gd_ie_ex_posts" class="postbox gd-hndle-pbox">

-		  <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - Listings: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Export CSV', 'geodirectory' );?></span></h3>

+		  <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - Listings: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Export CSV', 'geodirectory'); ?></span></h3>

 		  <div class="inside">

 			<table class="form-table">

 			  <tbody>

 				<tr>

 				  <td class="fld"><label for="gd_post_type">

-					<?php _e( 'Post Type:', 'geodirectory' );?>

+					<?php _e('Post Type:', 'geodirectory'); ?>

 					</label></td>

 				  <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px">

-					  <?php echo $gd_posttypes_option;?>

+					  <?php echo $gd_posttypes_option; ?>

 					</select></td>

 				</tr>

 				<tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				</tr>

                 <tr class="gd-imex-dates">

-					<td class="fld"><label><?php _e( 'Published Date:', 'geodirectory' );?></label></td>

-					<td><label><span class="label-responsive"><?php _e( 'Start date:', 'geodirectory' );?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e( 'End date:', 'geodirectory' );?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>

+					<td class="fld"><label><?php _e('Published Date:', 'geodirectory'); ?></label></td>

+					<td><label><span class="label-responsive"><?php _e('Start date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e('End date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>

 				</tr>

 				<tr>

 				  <td class="fld" style="vertical-align:top"><label>

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

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

 					</label></td>

 				  <td><div id='gd_progressbar_box'>

 					  <div id="gd_progressbar" class="gd_progressbar">

@@ -2735,13 +2735,13 @@ 
 					  </div>

 					</div>

 					<p style="display:inline-block">

-					  <?php _e( 'Elapsed Time:', 'geodirectory' );?>

+					  <?php _e('Elapsed Time:', 'geodirectory'); ?>

 					</p>

 					  

 					<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				</tr>

 				<tr class="gd-ie-actions">

-				  <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">

+				  <td style="vertical-align:top"><input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_exposts_submit" id="gd_ie_exposts_submit">

 				  </td>

 				  <td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				</tr>

@@ -2754,21 +2754,21 @@ 
 	<div id="gd_ie_imcategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_imcats" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Import CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Import CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e( 'Update item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e( 'Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e('Update item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e('Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_catplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_cat_file" class="gd-imex-file gd_im_cat_file" id="gd_im_cat" onclick="jQuery('#gd_im_catplupload-browse-button').trigger('click');" />

-							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

-						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" />

+							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

+						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv; ?>" />

 						<?php

 						/**

 						 * Called just after the sample CSV download link.

@@ -2778,7 +2778,7 @@ 
 						 */

 						do_action('geodir_sample_cats_csv_download_link');

 						?>

-							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_catpluploadan' ); ?>"></span>

+							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce('gd_im_catpluploadan'); ?>"></span>

 							<div class="filelist"></div>

 						</div>

 						<span id="gd_im_catupload-error" style="display:none"></span>

@@ -2795,7 +2795,7 @@ 
 							<input type="hidden" id="gd_terminateaction" value="continue"/>

 						</div>

 						<div class="gd-import-progress" id="gd-import-progress" style="display:none">

-							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory');?> </b><font

+							<div class="gd-import-file"><b><?php _e("Import Data Status :", 'geodirectory'); ?> </b><font

 									id="gd-import-done">0</font> / <font id="gd-import-total">0</font>&nbsp;( <font

 									id="gd-import-perc">0%</font> )

 								<div class="gd-fileprogress"></div>

@@ -2807,10 +2807,10 @@ 
                     	<div class="gd-imex-btns" style="display:none;">

                         	<input type="hidden" class="geodir_import_file" name="geodir_import_file" value="save"/>

                         	<input onclick="gd_imex_PrepareImport(this, 'cat')" type="button" value="<?php echo CSV_IMPORT_DATA; ?>" id="gd_import_data" class="button-primary" />

-                        	<input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e( "Continue Import Data", 'geodirectory' );?>" id="gd_continue_data" class="button-primary" style="display:none"/>

-                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>

+                        	<input onclick="gd_imex_ContinueImport(this, 'cat')" type="button" value="<?php _e("Continue Import Data", 'geodirectory'); ?>" id="gd_continue_data" class="button-primary" style="display:none"/>

+                        	<input type="button" value="<?php _e("Terminate Import Data", 'geodirectory'); ?>" id="gd_stop_import" class="button-primary" name="gd_stop_import" style="display:none" onclick="gd_imex_TerminateImport(this, 'cat')"/>

 							<div id="gd_process_data" style="display:none">

-								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>

+								<span class="spinner is-active" style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>

 							</div>

 						</div>

 					</td>

@@ -2824,26 +2824,26 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_ex_cats" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Export CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Export CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

-					<td class="fld"><label for="gd_post_type"><?php _e( 'Post Type:', 'geodirectory' );?></label></td>

-					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option;?></select></td>

+					<td class="fld"><label for="gd_post_type"><?php _e('Post Type:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option; ?></select></td>

 				  </tr>

 				   <tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				  </tr>

 				  <tr>

-					<td class="fld" style="vertical-align:top"><label><?php _e( 'Progress:', 'geodirectory' );?></label></td>

-					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e( 'Elapsed Time:', 'geodirectory' );?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

+					<td class="fld" style="vertical-align:top"><label><?php _e('Progress:', 'geodirectory'); ?></label></td>

+					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e('Elapsed Time:', 'geodirectory'); ?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				  </tr>

 				  <tr class="gd-ie-actions">

 					<td style="vertical-align:top">

-						<input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

+						<input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

 					</td>

 					<td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				  </tr>

@@ -2865,7 +2865,7 @@ 
      * @param array $gd_chunksize_options File chunk size options.

      * @param string $nonce Wordpress security token for GD import & export.

 	 */

-	do_action( 'geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce );

+	do_action('geodir_import_export', $gd_posttypes, $gd_chunksize_options, $nonce);

 	?>

   </div>

 </div>

@@ -2884,7 +2884,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce;?>',

+            data: 'action=geodir_import_export&task=prepare_import&_pt=' + type + '&_file=' + uploadedFile + '&_nonce=<?php echo $nonce; ?>',

             dataType: 'json',

             cache: false,

             success: function(data) {

@@ -2936,7 +2936,7 @@ 
 

         jQuery(cont).find('.filelist .file').remove();

         

-        jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr( PLZ_SELECT_CSV_FILE );?></p>");

+        jQuery('#gd-import-msg', cont).find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr(PLZ_SELECT_CSV_FILE); ?></p>");

         jQuery('#gd-import-msg', cont).show();

         

         return false;

@@ -2995,7 +2995,7 @@ 
     jQuery.ajax({

         url: ajaxurl,

         type: "POST",

-        data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce;?>',

+        data: 'action=geodir_import_export&task=import_' + type + '&_pt=' + type + '&_file=' + uploadedFile + gddata + '&_ch=' + choice + '&_nonce=<?php echo $nonce; ?>',

         dataType : 'json',

         cache: false,

         success: function (data) {

@@ -3184,27 +3184,27 @@ 
 

     var gdMsg = '<p></p>';

     if ( processed > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( 'Total %s item(s) found.', 'geodirectory' ), '%s' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('Total %s item(s) found.', 'geodirectory'), '%s')); ?></p>';

         msgParse = msgParse.replace("%s", processed);

         gdMsg += msgParse;

     }

 

     if ( updated > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) updated.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) updated.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", updated);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

     }

 

     if ( created > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) added.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) added.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", created);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

     }

 

     if ( skipped > 0 ) {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) ignored due to already exists.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) ignored due to already exists.', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", skipped);

         msgParse = msgParse.replace("%d", processed);

         gdMsg += msgParse;

@@ -3214,17 +3214,17 @@ 
         if (type=='loc') {

             invalid_addr = invalid;

         }

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", invalid_addr);

         msgParse = msgParse.replace("%d", total);

         gdMsg += msgParse;

     }

 

     if (invalid > 0 && type!='loc') {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory'), '%s', '%d')); ?></p>';

         

         if (type=='hood') {

-            msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ), '%s', '%d' ) );?></p>';

+            msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory'), '%s', '%d')); ?></p>';

         }

         msgParse = msgParse.replace("%s", invalid);

         msgParse = msgParse.replace("%d", total);

@@ -3232,7 +3232,7 @@ 
     }

 

     if (images > 0) {

-        gdMsg += '<p><?php echo addslashes( sprintf( CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'] ) );?></p>';

+        gdMsg += '<p><?php echo addslashes(sprintf(CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'])); ?></p>';

     }

     gdMsg += '<p></p>';

     jQuery('#gd-import-msg', cont).find('#message').removeClass('error').addClass('updated').html(gdMsg);

@@ -3396,9 +3396,9 @@ 
             if (typeof filters !== 'undefined' && filters && doFilter) {

                 getTotal = true;

                 attach += '&_c=1';

-                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Preparing...', 'geodirectory' ) );?>');

+                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Preparing...', 'geodirectory')); ?>');

             } else {

-                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

             }

             jQuery(el).find('#gd_timer').text('00:00:01');

             jQuery('#gd_ie_ex_files', el).html('');

@@ -3407,7 +3407,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page + attach,

+            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page + attach,

             dataType : 'json',

             cache: false,

             beforeSend: function (jqXHR, settings) {},

@@ -3432,11 +3432,11 @@ 
                         } else {

                             if (pages < page || pages == page) {

                                 window.clearInterval(timer_posts);

-                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

                             } else {

                                 var percentage = Math.round(((page * chunk_size) / total_posts) * 100);

                                 percentage = percentage > 100 ? 100 : percentage;

-                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

                             }

                             if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

                                 var obj_files = data.files;

@@ -3467,7 +3467,7 @@ 
 

     function gd_process_export_cats(el, post_type, total_cats, chunk_size, pages, page) {

         if (page < 2) {

-            gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+            gd_progressbar(el, 0, '0% (0 / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

             jQuery(el).find('#gd_timer').text('00:00:01');

             jQuery('#gd_ie_ex_files', el).html('');

         }

@@ -3475,7 +3475,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page,

+            data: 'action=geodir_import_export&task=export_cats&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page,

             dataType : 'json',

             cache: false,

             beforeSend: function (jqXHR, settings) {},

@@ -3489,11 +3489,11 @@ 
                     } else {

                         if (pages < page || pages == page) {

                             window.clearInterval(timer_cats);

-                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

                         } else {

                             var percentage = Math.round(((page * chunk_size) / total_cats) * 100);

                             percentage = percentage > 100 ? 100 : percentage;

-                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e( 'Exporting...', 'geodirectory' );?>');

+                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e('Exporting...', 'geodirectory'); ?>');

                         }

                         if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

                             var obj_files = data.files;

@@ -3550,13 +3550,13 @@ 
 function geodir_init_filesystem()

 {

 

-    if(!function_exists('get_filesystem_method')){

+    if (!function_exists('get_filesystem_method')) {

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

     }

     $access_type = get_filesystem_method();

     if ($access_type === 'direct') {

         /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());

 

         /* initialize the API */

         if (!WP_Filesystem($creds)) {

@@ -3569,7 +3569,7 @@ 
         return $wp_filesystem;

         /* do our file manipulations below */

     } elseif (defined('FTP_USER')) {

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());

 

         /* initialize the API */

         if (!WP_Filesystem($creds)) {

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

  */

 function geodir_filesystem_notice()

-{   if ( defined( 'DOING_AJAX' ) ){return;}

+{   if (defined('DOING_AJAX')) {return; }

     $access_type = get_filesystem_method();

     if ($access_type === 'direct') {

     } elseif (!defined('FTP_USER')) {

@@ -3641,64 +3641,64 @@ 
     // try to set higher limits for import

     $max_input_time = ini_get('max_input_time');

     $max_execution_time = ini_get('max_execution_time');

-    $memory_limit= ini_get('memory_limit');

+    $memory_limit = ini_get('memory_limit');

 

-    if(!$max_input_time || $max_input_time<3000){

+    if (!$max_input_time || $max_input_time < 3000) {

         ini_set('max_input_time', 3000);

     }

 

-    if(!$max_execution_time || $max_execution_time<3000){

+    if (!$max_execution_time || $max_execution_time < 3000) {

         ini_set('max_execution_time', 3000);

     }

 

-    if($memory_limit && str_replace('M','',$memory_limit)){

-        if(str_replace('M','',$memory_limit)<256){

+    if ($memory_limit && str_replace('M', '', $memory_limit)) {

+        if (str_replace('M', '', $memory_limit) < 256) {

             ini_set('memory_limit', '256M');

         }

     }

 

     $json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

+    if (!current_user_can('manage_options')) {

+        wp_send_json($json);

     }

 

-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+    $task = isset($_REQUEST['task']) ? $_REQUEST['task'] : NULL;

+    $nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : NULL;

+    $stat = isset($_REQUEST['_st']) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

+    if (!wp_verify_nonce($nonce, 'geodir_import_export_nonce')) {

+        wp_send_json($json);

     }

 

-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+    $post_type = isset($_REQUEST['_pt']) ? $_REQUEST['_pt'] : NULL;

+    $chunk_per_page = isset($_REQUEST['_n']) ? absint($_REQUEST['_n']) : NULL;

     $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+    $chunk_page_no = isset($_REQUEST['_p']) ? absint($_REQUEST['_p']) : 1;

 

     $wp_filesystem = geodir_init_filesystem();

     if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: Could not access filesystem.', 'geodirectory');

+        wp_send_json($json);

     }

 

     if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: '.$wp_filesystem->errors->get_error_message(), 'geodirectory');

+        wp_send_json($json);

     }

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

+    $csv_file_dir = geodir_path_import_export(false);

+    if (!$wp_filesystem->is_dir($csv_file_dir)) {

+        if (!$wp_filesystem->mkdir($csv_file_dir, FS_CHMOD_DIR)) {

+            $json['error'] = __('ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory');

+            wp_send_json($json);

         }

     }

     

     $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

     $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

 

-    switch ( $task ) {

+    switch ($task) {

         case 'export_posts': {

             // WPML

             $is_wpml = geodir_is_wpml();

@@ -3709,36 +3709,36 @@ 
                 $sitepress->switch_lang('all', true);

             }

             // WPML

-            if ( $post_type == 'gd_event' ) {

-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+            if ($post_type == 'gd_event') {

+                add_filter('geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2);

             }

-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+            $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;

             

-            $file_name = $post_type . '_' . date( 'dmyHi' );

-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

+            $file_name = $post_type.'_'.date('dmyHi');

+            if ($filters && isset($filters['start_date']) && isset($filters['end_date'])) {

+                $file_name = $post_type.'_'.date_i18n('dmy', strtotime($filters['start_date'])).'_'.date_i18n('dmy', strtotime($filters['end_date']));

             }

-            $posts_count = geodir_get_posts_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

+            $posts_count = geodir_get_posts_count($post_type);

+            $file_url_base = geodir_path_import_export().'/';

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/'.$post_type.'_'.$nonce.'.csv';

             

             $chunk_file_paths = array();

 

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

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

                 $json['total'] = $posts_count;

                 // WPML

                 if ($is_wpml) {

                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 gd_die();

-            } else if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            } else if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($posts_count) > 0 && $line_count > 0 ? ceil($line_count / $posts_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

@@ -3746,45 +3746,45 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 gd_die();

             } else {

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$posts_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_posts = $posts_count;

                     if ($chunk_per_page > $total_posts) {

                         $chunk_per_page = $total_posts;

                     }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_posts / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+                    $chunk_save_posts = geodir_imex_get_posts($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_posts = array_slice($chunk_save_posts, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_posts, $clear);

                     }

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $posts_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

@@ -3792,7 +3792,7 @@ 
                             $json['total'] = $posts_count;

                             $json['files'] = array();

                         } else {

-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                            $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                         }

                     }

                 }

@@ -3801,7 +3801,7 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -3815,20 +3815,20 @@ 
                 $sitepress->switch_lang('all', true);

             }

             // WPML

-            $file_name = $post_type . 'category_' . date( 'dmyHi' );

+            $file_name = $post_type.'category_'.date('dmyHi');

             

-            $terms_count = geodir_get_terms_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

+            $terms_count = geodir_get_terms_count($post_type);

+            $file_url_base = geodir_path_import_export().'/';

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/'.$post_type.'category_'.$nonce.'.csv';

             

             $chunk_file_paths = array();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($terms_count) > 0 && $line_count > 0 ? ceil($line_count / $terms_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

@@ -3836,48 +3836,48 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$terms_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_terms = $terms_count;

                     if ($chunk_per_page > $terms_count) {

                         $chunk_per_page = $terms_count;

                     }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_terms / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+                    $chunk_save_terms = geodir_imex_get_terms($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_terms = array_slice($chunk_save_terms, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_terms, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $terms_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                        $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                     }

                 }

                 // WPML

@@ -3885,127 +3885,127 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_locations': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

+            $file_url_base = geodir_path_import_export().'/';

+            $file_name = 'gd_locations_'.date('dmyHi');

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/gd_locations_'.$nonce.'.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+            $items_count = (int) geodir_location_imex_count_locations();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_locations_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_hoods': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

+            $file_url_base = geodir_path_import_export().'/';

+            $file_name = 'gd_neighbourhoods_'.date('dmyHi');

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/gd_neighbourhoods_'.$nonce.'.csv';

             

-            $items_count = (int)geodir_location_imex_count_neighbourhoods();

+            $items_count = (int) geodir_location_imex_count_neighbourhoods();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_neighbourhoods_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -4022,25 +4022,25 @@ 
             }

             // WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+            ini_set('auto_detect_line_endings', true);

             

             $uploads = wp_upload_dir();

             $uploads_dir = $uploads['path'];

             $uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+            $csv_file = isset($_POST['_file']) ? $_POST['_file'] : NULL;

+            $import_choice = isset($_REQUEST['_ch']) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

+            $csv_file_arr = explode('/', $csv_file);

+            $csv_filename = end($csv_file_arr);

+            $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$csv_filename;

             

             $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+            $json['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

             $file = array();

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+            if ($csv_file && $wp_filesystem->is_file($target_path) && $wp_filesystem->exists($target_path)) {

+                $wp_filetype = wp_check_filetype_and_ext($target_path, $csv_filename);

                 

                 if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

                     $json['error'] = NULL;

@@ -4048,9 +4048,9 @@ 
                     

                     $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

                     setlocale(LC_ALL, 'en_US.UTF-8');

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

+                    if (($handle = fopen($target_path, "r")) !== FALSE) {

+                        while (($data = fgetcsv($handle, 100000, ",")) !== FALSE) {

+                            if (!empty($data)) {

                                 $file[] = $data;

                             }

                         }

@@ -4064,19 +4064,19 @@ 
                         $json['error'] = __('No data found in csv file.', 'geodirectory');

                     }

                 } else {

-                    wp_send_json( $json );

+                    wp_send_json($json);

                 }

             } else {

-                wp_send_json( $json );

+                wp_send_json($json);

             }

             

-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

-                wp_send_json( $json );

+            if ($task == 'prepare_import' || !empty($json['error'])) {

+                wp_send_json($json);

             }

             

             $total = $json['rows'];

-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

+            $limit = isset($_POST['limit']) ? (int) $_POST['limit'] : 1;

+            $processed = isset($_POST['processed']) ? (int) $_POST['processed'] : 0;

             

             $count = $limit;

             

@@ -4101,13 +4101,13 @@ 
             

             $post_types = geodir_get_posttypes();

 

-            if ( $task == 'import_cat' ) {

+            if ($task == 'import_cat') {

                 if (!empty($file)) {

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

                     

@@ -4118,7 +4118,7 @@ 
                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

                             

                             $cat_id = '';

@@ -4135,42 +4135,42 @@ 
                             $cat_id_original = '';

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

-                                } else if ( $column == 'cat_name' ) {

+                            foreach ($columns as $column) {

+                                if ($column == 'cat_id') {

+                                    $cat_id = (int) $row[$c];

+                                } else if ($column == 'cat_name') {

                                     $cat_name = $row[$c];

-                                } else if ( $column == 'cat_slug' ) {

+                                } else if ($column == 'cat_slug') {

                                     $cat_slug = $row[$c];

-                                } else if ( $column == 'cat_posttype' ) {

+                                } else if ($column == 'cat_posttype') {

                                     $cat_posttype = $row[$c];

-                                } else if ( $column == 'cat_parent' ) {

+                                } else if ($column == 'cat_parent') {

                                     $cat_parent = trim($row[$c]);

-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {

+                                } else if ($column == 'cat_schema' && $row[$c] != '') {

                                     $cat_schema = $row[$c];

-                                } else if ( $column == 'cat_description' ) {

+                                } else if ($column == 'cat_description') {

                                     $cat_description = $row[$c];

-                                } else if ( $column == 'cat_top_description' ) {

+                                } else if ($column == 'cat_top_description') {

                                     $cat_top_description = $row[$c];

-                                } else if ( $column == 'cat_image' ) {

+                                } else if ($column == 'cat_image') {

                                     $cat_image = $row[$c];

-                                } else if ( $column == 'cat_icon' ) {

+                                } else if ($column == 'cat_icon') {

                                     $cat_icon = $row[$c];

                                 }

                                 // WPML

-                                if ( $is_wpml ) {

-                                    if ( $column == 'cat_language' ) {

-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );

-                                    } else if ( $column == 'cat_id_original' ) {

-                                        $cat_id_original = (int)$row[$c];

+                                if ($is_wpml) {

+                                    if ($column == 'cat_language') {

+                                        $cat_language = geodir_strtolower(trim($row[$c]));

+                                    } else if ($column == 'cat_id_original') {

+                                        $cat_id_original = (int) $row[$c];

                                     }

                                 }

                                 // WPML

                                 $c++;

                             }

                             

-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+                            if ($cat_name == '' || !in_array($cat_posttype, $post_types)) {

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));

                                 

                                 $invalid++;

                                 continue;

@@ -4188,24 +4188,24 @@ 
                             $term_data['description'] = $cat_description;

                             $term_data['cat_schema'] = $cat_schema;

                             $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+                            $term_data['image'] = $cat_image != '' ? basename($cat_image) : '';

+                            $term_data['icon'] = $cat_icon != '' ? basename($cat_icon) : '';

                             

                             //$term_data = array_map( 'utf8_encode', $term_data );

                             

-                            $taxonomy = $cat_posttype . 'category';

+                            $taxonomy = $cat_posttype.'category';

                             

                             $term_data['taxonomy'] = $taxonomy;

 

                             $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

+                            if ($cat_parent != "" || (int) $cat_parent > 0) {

                                 $term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+                                if ($term_parent = get_term_by('name', $cat_parent, $taxonomy)) {

                                     //

-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+                                } else if ($term_parent = get_term_by('slug', $cat_parent, $taxonomy)) {

                                     //

-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+                                } else if ($term_parent = get_term_by('id', $cat_parent, $taxonomy)) {

                                     //

                                 } else {

                                     $term_parent_data = array();

@@ -4213,104 +4213,104 @@ 
                                     //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

                                     $term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+                                    $term_parent_id = (int) geodir_imex_insert_term($taxonomy, $term_parent_data);

                                 }

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

+                                if (!empty($term_parent) && !is_wp_error($term_parent)) {

+                                    $term_parent_id = (int) $term_parent->term_id;

                                 }

                             }

-                            $term_data['parent'] = (int)$term_parent_id;

+                            $term_data['parent'] = (int) $term_parent_id;

 

                             $term_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            if ($import_choice == 'update') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $skipped++;

                                 } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                             }

                             

-                            if ( $term_id ) {

+                            if ($term_id) {

                                 // WPML

                                 if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

-                                    $wpml_element_type = 'tax_' . $taxonomy;

-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

+                                    $wpml_element_type = 'tax_'.$taxonomy;

+                                    $source_language = geodir_get_language_for_element($cat_id_original, $wpml_element_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

+                                    $trid = $sitepress->get_element_trid($cat_id_original, $wpml_element_type);

                                     

-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

+                                    $sitepress->set_element_language_details($term_id, $wpml_element_type, $trid, $cat_language, $source_language);

                                 }

                                 // WPML

                                 

-                                if ( isset( $term_data['top_description'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

+                                if (isset($term_data['top_description'])) {

+                                    update_tax_meta($term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype);

                                 }

                                 

-                                if ( isset( $term_data['cat_schema'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+                                if (isset($term_data['cat_schema'])) {

+                                    update_tax_meta($term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype);

                                 }

             

                                 $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+                                if (isset($term_data['image']) && $term_data['image'] != '') {

+                                    $cat_image = geodir_get_default_catimage($term_id, $cat_posttype);

+                                    $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

+                                    if (basename($cat_image) != $term_data['image']) {

                                         $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+                                        update_tax_meta($term_id, 'ct_cat_default_img', array('id' => 'image', 'src' => $uploads['url'].'/'.$term_data['image']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+                                if (isset($term_data['icon']) && $term_data['icon'] != '') {

+                                    $cat_icon = get_tax_meta($term_id, 'ct_cat_icon', false, $cat_posttype);

+                                    $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

                                         

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

+                                    if (basename($cat_icon) != $term_data['icon']) {

                                         $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+                                        update_tax_meta($term_id, 'ct_cat_icon', array('id' => 'icon', 'src' => $uploads['url'].'/'.$term_data['icon']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( $attachment ) {

+                                if ($attachment) {

                                     $images++;

                                 }

                             }

@@ -4332,34 +4332,34 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_post' ) {

+            } else if ($task == 'import_post') {

                 //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

+                wp_defer_term_counting(true);

+                wp_defer_comment_counting(true);

+                $wpdb->query('SET autocommit = 0;');

 

                 //remove_all_actions('publish_post');

                 //remove_all_actions('transition_post_status');

                 //remove_all_actions('publish_future_post');

 

                 if (!empty($file)) {

-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+                    $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;

                     $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

                     $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+                    $current_date = date_i18n('Y-m-d', time());

                     

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

 

                     $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

+                    $wp_chars_error = __('(check & remove if any invalid characters used in data)', 'geodirectory');

                     $processed_actual = 0;

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

@@ -4368,9 +4368,9 @@ 
                         if (isset($file[$index])) {

                             $processed_actual++;

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+                            $row = array_map('addslashes_gpc', $row);

                             

                             $post_id = '';

                             $post_title = '';

@@ -4407,78 +4407,78 @@ 
                             $original_post_id = '';

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

+                            foreach ($columns as $column) {

                                 $gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

+                                if ($column == 'post_id') {

                                     $post_id = $row[$c];

-                                } else if ( $column == 'post_title' ) {

+                                } else if ($column == 'post_title') {

                                     $post_title = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_author' ) {

+                                } else if ($column == 'post_author') {

                                     $post_author = $row[$c];

-                                } else if ( $column == 'post_content' ) {

+                                } else if ($column == 'post_content') {

                                     $post_content = $row[$c];

-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {

-                                    $post_category_arr = explode( ',', $row[$c] );

-                                } else if ( $column == 'default_category' ) {

+                                } else if ($column == 'post_category' && $row[$c] != '') {

+                                    $post_category_arr = explode(',', $row[$c]);

+                                } else if ($column == 'default_category') {

                                     $default_category = wp_kses_normalize_entities($row[$c]);

-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {

-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );

-                                } else if ( $column == 'post_type' ) {

+                                } else if ($column == 'post_tags' && $row[$c] != '') {

+                                    $post_tags = explode(',', sanitize_text_field($row[$c]));

+                                } else if ($column == 'post_type') {

                                     $post_type = $row[$c];

-                                } else if ( $column == 'post_status' ) {

-                                    $post_status = sanitize_key( $row[$c] );

-                                } else if ( $column == 'is_featured' ) {

-                                    $is_featured = (int)$row[$c];

-                                } else if ( $column == 'geodir_video' ) {

+                                } else if ($column == 'post_status') {

+                                    $post_status = sanitize_key($row[$c]);

+                                } else if ($column == 'is_featured') {

+                                    $is_featured = (int) $row[$c];

+                                } else if ($column == 'geodir_video') {

                                     $geodir_video = $row[$c];

-                                } else if ( $column == 'post_address' ) {

+                                } else if ($column == 'post_address') {

                                     $post_address = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_city' ) {

+                                } else if ($column == 'post_city') {

                                     $post_city = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_region' ) {

+                                } else if ($column == 'post_region') {

                                     $post_region = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_country' ) {

+                                } else if ($column == 'post_country') {

                                     $post_country = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_zip' ) {

+                                } else if ($column == 'post_zip') {

                                     $post_zip = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_latitude' ) {

+                                } else if ($column == 'post_latitude') {

                                     $post_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_longitude' ) {

+                                } else if ($column == 'post_longitude') {

                                     $post_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_neighbourhood' ) {

+                                } else if ($column == 'post_neighbourhood') {

                                     $post_neighbourhood = sanitize_text_field($row[$c]);

                                     unset($gd_post[$column]);

-                                } else if ( $column == 'neighbourhood_latitude' ) {

+                                } else if ($column == 'neighbourhood_latitude') {

                                     $neighbourhood_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'neighbourhood_longitude' ) {

+                                } else if ($column == 'neighbourhood_longitude') {

                                     $neighbourhood_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_timing' ) {

+                                } else if ($column == 'geodir_timing') {

                                     $geodir_timing = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_contact' ) {

+                                } else if ($column == 'geodir_contact') {

                                     $geodir_contact = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_email' ) {

+                                } else if ($column == 'geodir_email') {

                                     $geodir_email = sanitize_email($row[$c]);

-                                } else if ( $column == 'geodir_website' ) {

+                                } else if ($column == 'geodir_website') {

                                     $geodir_website = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_twitter' ) {

+                                } else if ($column == 'geodir_twitter') {

                                     $geodir_twitter = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_facebook' ) {

+                                } else if ($column == 'geodir_facebook') {

                                     $geodir_facebook = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

+                                } else if ($column == 'IMAGE' && !empty($row[$c]) && $row[$c] != '') {

                                     $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

+                                } else if ($column == 'alive_days' && (int) $row[$c] > 0) {

+                                    $expire_date = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $row[$c].' days'));

+                                } else if ($column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never') {

                                     $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

+                                    $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));

                                 }

                                 // WPML

                                 if ($is_wpml) {

                                     if ($column == 'language') {

                                         $language = geodir_strtolower(trim($row[$c]));

                                     } else if ($column == 'original_post_id') {

-                                        $original_post_id = (int)$row[$c];

+                                        $original_post_id = (int) $row[$c];

                                     }

                                 }

                                 // WPML

@@ -4486,7 +4486,7 @@ 
                             }

                             // listing claimed or not

                             if ($is_claim_active && isset($gd_post['claimed'])) {

-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

+                                $gd_post['claimed'] = (int) $gd_post['claimed'] == 1 ? 1 : 0;

                             }

                             

                             // WPML

@@ -4497,43 +4497,43 @@ 
 

                             $gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+                            $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;

+                            $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;

                                                                                                                 

                             $valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+                            if ($post_title == '' || !in_array($post_type, $post_types)) {

                                 $invalid++;

                                 $valid = false;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));

                             }

                             

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

-                            if ( $location_allowed ) {

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

+                            if ($location_allowed) {

                                 $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+                                if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {

                                     $invalid_addr++;

                                     $valid = false;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));

+                                } else if (!empty($location_result) && $location_result->location_id == 0) {

+                                    if ((geodir_strtolower($post_city) != geodir_strtolower($location_result->city)) || (geodir_strtolower($post_region) != geodir_strtolower($location_result->region)) || (geodir_strtolower($post_country) != geodir_strtolower($location_result->country))) {

                                         $invalid_addr++;

                                         $valid = false;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));

                                     } else {

                                         if (!$location_manager) {

-                                            $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

+                                            $gd_post['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // Set the default location when location manager not activated.

                                         }

                                     }

                                 }

                             }

                             

-                            if ( !$valid ) {

+                            if (!$valid) {

                                 continue;

                             }

 

-                            $cat_taxonomy = $post_type . 'category';

-                            $tags_taxonomy = $post_type . '_tags';

+                            $cat_taxonomy = $post_type.'category';

+                            $tags_taxonomy = $post_type.'_tags';

                             

                             if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

                                 $post_category_arr = array_merge(array($default_category), $post_category_arr);

@@ -4541,29 +4541,29 @@ 
 

                             $post_category = array();

                             $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+                            if (!empty($post_category_arr)) {

+                                foreach ($post_category_arr as $value) {

+                                    $category_name = wp_kses_normalize_entities(trim($value));

                                     

-                                    if ( $category_name != '' ) {

+                                    if ($category_name != '') {

                                         $term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+                                        if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+                                        } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

                                         } else {

                                             $term_data = array();

                                             $term_data['name'] = $category_name;

                                             $term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

+                                            $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data);

+                                            if ($term_id) {

+                                                $term_category = get_term($term_id, $cat_taxonomy);

                                             }

                                         }

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+                                        if (!empty($term_category) && !is_wp_error($term_category)) {

                                             $post_category[] = intval($term_category->term_id);

                                             

                                             if ($category_name == $default_category) {

@@ -4584,15 +4584,15 @@ 
                             $save_post['post_tags'] = $post_tags;

 

                             $saved_post_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

+                            if ($import_choice == 'update') {

+                                $gd_wp_error = __('Unable to add listing, please check the listing data.', 'geodirectory');

                                 

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                                if ($post_id > 0 && get_post($post_id)) {

                                     $save_post['ID'] = $post_id;

                                     

-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+                                    if ($saved_post_id = wp_update_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;

                                             $saved_post_id = 0;

                                         } else {

                                             $saved_post_id = $post_id;

@@ -4600,9 +4600,9 @@ 
                                         }

                                     }

                                 } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;

                                             $saved_post_id = 0;

                                         } else {

                                             $created++;

@@ -4610,19 +4610,19 @@ 
                                     }

                                 }

                                 

-                                if ( !$saved_post_id > 0 ) {

+                                if (!$saved_post_id > 0) {

                                     $invalid++;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_wp_error);

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($post_id > 0 && get_post($post_id)) {

                                     $skipped++;	

                                 } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

                                             $invalid++;

                                             

-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

+                                            geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$saved_post_id->get_error_message().' '.$wp_chars_error);

                                             $saved_post_id = 0;

                                         } else {

                                             $created++;

@@ -4630,28 +4630,28 @@ 
                                     } else {

                                         $invalid++;

                                         

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);

                                     }

                                 }

                             } else {

                                 $invalid++;

                                 

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);

                             }

 

-                            if ( (int)$saved_post_id > 0 ) {

+                            if ((int) $saved_post_id > 0) {

                                 // WPML

                                 if ($is_wpml && $original_post_id > 0 && $language != '') {

-                                    $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+                                    $wpml_post_type = 'post_'.$post_type;

+                                    $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+                                    $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type);

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+                                    $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language);

                                 }

                                 // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+                                $gd_post_info = geodir_get_post_info($saved_post_id);

                                 

                                 $gd_post['post_id'] = $saved_post_id;

                                 $gd_post['ID'] = $saved_post_id;

@@ -4663,7 +4663,7 @@ 
                                                     

                                 // post location

                                 $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+                                if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {

                                     $gd_post['post_neighbourhood'] = '';

                                     

                                     $post_location_info = array(

@@ -4673,7 +4673,7 @@ 
                                                                 'geo_lat' => $post_latitude,

                                                                 'geo_lng' => $post_longitude

                                                             );

-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+                                    if ($location_id = (int) geodir_add_new_location($post_location_info)) {

                                         $post_location_id = $location_id;

                                     }

                                     

@@ -4711,14 +4711,14 @@ 
                                 $gd_post['post_location_id'] = $post_location_id;

                                 

                                 // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+                                $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0;

                                 if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

                                     $package_id = $gd_post_info->package_id;

                                 }

                                 

                                 $package_info = array();

                                 if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+                                    $package_info = (array) geodir_get_package_info_by_id($package_id);

                                     

                                     if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

                                         $package_info = array();

@@ -4726,18 +4726,18 @@ 
                                 }

                                 

                                 if (empty($package_info)) {

-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

+                                    $package_info = (array) geodir_post_package_info(array(), '', $post_type);

                                 }

                                  

-                                if (!empty($package_info))	 {

+                                if (!empty($package_info)) {

                                     $package_id = $package_info['pid'];

                                     

                                     if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

                                         $gd_post['expire_date'] = $expire_date;

                                     } else {

-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

-                                            $gd_post['alive_days'] = (int)$package_info['days'];

-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

+                                        if (isset($package_info['days']) && (int) $package_info['days'] > 0) {

+                                            $gd_post['alive_days'] = (int) $package_info['days'];

+                                            $gd_post['expire_date'] = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $package_info['days'].' days'));

                                         } else {

                                             $gd_post['expire_date'] = 'Never';

                                         }

@@ -4746,7 +4746,7 @@ 
                                     $gd_post['package_id'] = $package_id;

                                 }

 

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

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

                                 

                                 if ($post_type == 'gd_event') {

                                     $gd_post = geodir_imex_process_event_data($gd_post);

@@ -4757,28 +4757,28 @@ 
                                 }

 

                                 // Export franchise fields

-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+                                $is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;

                                 if ($is_franchise_active) {

-                                    if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

+                                    if (isset($gd_post['gd_is_franchise']) && (int) $gd_post['gd_is_franchise'] == 1) {

                                         $gd_franchise_lock = array();

                                         

-                                        if ( isset( $gd_post['gd_franchise_lock'] ) ) {

-                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

-                                            $gd_franchise_lock = trim( $gd_franchise_lock );

-                                            $gd_franchise_lock = explode( ",", $gd_franchise_lock );

+                                        if (isset($gd_post['gd_franchise_lock'])) {

+                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock']);

+                                            $gd_franchise_lock = trim($gd_franchise_lock);

+                                            $gd_franchise_lock = explode(",", $gd_franchise_lock);

                                         }

                                         

-                                        update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

-                                        update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

+                                        update_post_meta($saved_post_id, 'gd_is_franchise', 1);

+                                        update_post_meta($saved_post_id, 'gd_franchise_lock', $gd_franchise_lock);

                                     } else {

-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

+                                        if (isset($gd_post['franchise']) && (int) $gd_post['franchise'] > 0 && geodir_franchise_check((int) $gd_post['franchise'])) {

+                                            geodir_save_post_meta($saved_post_id, 'franchise', (int) $gd_post['franchise']);

                                         }

                                     }

                                 }

                                 

                                 if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

+                                    $save_post['post_category'] = array_unique(array_map('intval', $save_post['post_category']));

                                     if ($default_category_id) {

                                         $save_post['post_default_category'] = $default_category_id;

                                         $gd_post['default_category'] = $default_category_id;

@@ -4787,34 +4787,34 @@ 
                                 }

                                 

                                 // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

+                                geodir_save_post_info($saved_post_id, $gd_post);

                                 // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+                                if (!empty($save_post['post_category'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy);

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+                                    $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : '';

                                     if ($default_category_id) {

                                         $post_default_category = $default_category_id;

                                     }

                                     $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

                                     $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

+                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']).',y:' : '';

                                     

                                     if ($post_category_str != '' && $post_default_category) {

-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

+                                        $post_category_str = str_replace($post_default_category.',y:', $post_default_category.',y,d:', $post_category_str);

                                     }

                                     

                                     $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+                                    geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str);

                                 }

 

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+                                if (!empty($save_post['post_tags'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy);

                                 }

 

                                 // Post images

-                                if ( !empty( $post_images ) ) {

+                                if (!empty($post_images)) {

                                     $post_images = array_unique($post_images);

                                     

                                     $old_post_images_arr = array();

@@ -4822,61 +4822,61 @@ 
                                     

                                     $order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

+                                    $old_post_images = geodir_get_images($saved_post_id);

                                     if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

+                                        foreach ($old_post_images as $old_post_image) {

                                             if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

                                                 $old_post_images_arr[] = $old_post_image->file;

                                             }

                                         }

                                     }

 

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

+                                    foreach ($post_images as $post_image) {

+                                        $image_name = basename($post_image);

                                         $saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+                                        if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {

                                             continue; // Skip if image already exists.

                                         }

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

+                                        $image_name_parts = explode('.', $image_name);

+                                        array_pop($image_name_parts);

+                                        $proper_image_name = implode('.', $image_name_parts);

                                         

-                                        $arr_file_type = wp_check_filetype( $image_name );

+                                        $arr_file_type = wp_check_filetype($image_name);

                                         

-                                        if ( !empty( $arr_file_type ) ) {

+                                        if (!empty($arr_file_type)) {

                                             $uploaded_file_type = $arr_file_type['type'];

                                             

                                             $attachment = array();

                                             $attachment['post_id'] = $saved_post_id;

                                             $attachment['title'] = $proper_image_name;

                                             $attachment['content'] = '';

-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;

+                                            $attachment['file'] = $uploads_subdir.'/'.$image_name;

                                             $attachment['mime_type'] = $uploaded_file_type;

                                             $attachment['menu_order'] = $order;

                                             $attachment['is_featured'] = 0;

 

                                             $attachment_set = '';

-                                            foreach ( $attachment as $key => $val ) {

-                                                if ( $val != '' ) {

-                                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                            foreach ($attachment as $key => $val) {

+                                                if ($val != '') {

+                                                    $attachment_set .= $key." = '".$val."', ";

                                                 }

                                             }

-                                            $attachment_set = trim( $attachment_set, ", " );

+                                            $attachment_set = trim($attachment_set, ", ");

                                                                                         

                                             // Add new attachment

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+                                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

                                                                                         

                                             $order++;

                                         }

                                     }

 

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/".implode("' AND file NOT LIKE '%/", $saved_post_images_arr)."' )" : '';

                                     // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

+                                    $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = ".(int) $saved_post_id." ".$saved_post_images_sql);

                                     

-                                    if ( !empty( $saved_post_images_arr ) ) {

+                                    if (!empty($saved_post_images_arr)) {

                                         geodir_set_wp_featured_image($saved_post_id);

                                         /*

                                         $menu_order = 1;

@@ -4893,13 +4893,13 @@ 
                                         }*/

                                     }

                                     

-                                    if ( $order > 1 ) {

+                                    if ($order > 1) {

                                         $images++;

                                     }

                                 }

 

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

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

+                                do_action('geodir_after_save_listing', $saved_post_id, $gd_post);

                                 

                                 if (isset($is_featured)) {

                                     geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

@@ -4919,10 +4919,10 @@ 
                 }

 

                 //undo some stuff to make the import quicker

-                wp_defer_term_counting( false );

-                wp_defer_comment_counting( false );

-                $wpdb->query( 'COMMIT;' );

-                $wpdb->query( 'SET autocommit = 1;' );

+                wp_defer_term_counting(false);

+                wp_defer_comment_counting(false);

+                $wpdb->query('COMMIT;');

+                $wpdb->query('SET autocommit = 1;');

 

                 $json = array();

                 $json['processed'] = $processed_actual;

@@ -4933,9 +4933,9 @@ 
                 $json['invalid_addr'] = $invalid_addr;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_loc' ) {

+            } else if ($task == 'import_loc') {

                 global $gd_post_types;

                 $gd_post_types = $post_types;

                 

@@ -4944,82 +4944,82 @@ 
                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

                     $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

+                    $gd_error_location = __('Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory');

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

-                            foreach ($columns as $c => $column ) {

+                            foreach ($columns as $c => $column) {

                                 if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta', 'city_desc', 'region_meta', 'region_desc', 'country_meta', 'country_desc'))) {

                                     $data[$column] = $row[$c];

                                 }

                             }

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+                            if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                 continue;

                             }

                             

                             $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

-                            if ( $import_choice == 'update' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                            if ($import_choice == 'update') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

+                                    $data['location_id'] = (int) $location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

+                                    if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {

+                                        $data['location_id'] = (int) $location->location_id;

                                     }

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                    if ($location_id = geodir_location_insert_city($data, true)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

                                     $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

                                     $skipped++;

                                 } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                    if ($location_id = geodir_location_insert_city($data, true)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                             }

                         }

                     }

@@ -5033,24 +5033,24 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

-            } else if ( $task == 'import_hood' ) {               

+                wp_send_json($json);

+            } else if ($task == 'import_hood') {               

                 if (!empty($file)) {

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

                     $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

-                    $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

+                    $gd_error_hood = __('Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory');

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

                             foreach ($columns as $c => $column) {

@@ -5061,20 +5061,20 @@ 
 

                             if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                 continue;

                             }

                             

                             $location_info = array();

-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);

+                            if (!empty($data['location_id']) && (int) $data['location_id'] > 0) {

+                                $location_info = geodir_get_location_by_id('', (int) $data['location_id']);

                             } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

                                 $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

                             }

 

                             if (empty($location_info)) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                 continue;

                             }

                             

@@ -5089,35 +5089,35 @@ 
                             $hood_data['hood_longitude'] = $data['longitude'];

                             $hood_data['hood_location_id'] = $location_id;

                                     

-                            if ( $import_choice == 'update' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];

+                            if ($import_choice == 'update') {

+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {

+                                    $hood_data['hood_id'] = (int) $data['neighbourhood_id'];

                                     

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;

+                                    $hood_data['hood_id'] = (int) $neighbourhood->hood_id;

                                     

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 } else {

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {

                                     $skipped++;

                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

                                     $skipped++;

@@ -5127,12 +5127,12 @@ 
                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                             }

                         }

                     }

@@ -5146,7 +5146,7 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -5190,29 +5190,29 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_insert_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_insert_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

-	$term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

+	$term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : '';

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {

-		$term_args = array_merge( $term_data, $args );

-		$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

-		$term_args = wp_parse_args( $term_args, $defaults );

-		$term_args = sanitize_term( $term_args, $taxonomy, 'db' );

-		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

+	if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {

+		$term_args = array_merge($term_data, $args);

+		$defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

+		$term_args = wp_parse_args($term_args, $defaults);

+		$term_args = sanitize_term($term_args, $taxonomy, 'db');

+		$args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args);

 	}

 	

-    if( !empty( $term ) ) {

-		$result = wp_insert_term( $term, $taxonomy, $args );

-        if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+    if (!empty($term)) {

+		$result = wp_insert_term($term, $taxonomy, $args);

+        if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

     }

 	

@@ -5242,36 +5242,36 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_update_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_update_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

-	$term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0;

+	$term_id = isset($term_data['term_id']) && !empty($term_data['term_id']) ? $term_data['term_id'] : 0;

 	

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {

+	if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

-	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+	} else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

 	} else {

-		return geodir_imex_insert_term( $taxonomy, $term_data );

+		return geodir_imex_insert_term($taxonomy, $term_data);

 	}

 	

 	return false;

@@ -5290,20 +5290,20 @@ 
  * @param string $post_type Post type.

  * @return int Posts count.

  */

-function geodir_get_posts_count( $post_type ) {

+function geodir_get_posts_count($post_type) {

     global $wpdb, $plugin_prefix;

 

-    if ( !post_type_exists( $post_type ) ) {

+    if (!post_type_exists($post_type)) {

         return 0;

     }

         

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

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

 

     // Skip listing with statuses trash, auto-draft etc...

     $skip_statuses = geodir_imex_export_skip_statuses();

     $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+    if (!empty($skip_statuses) && is_array($skip_statuses)) {

+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

     }

     

     /**

@@ -5314,11 +5314,11 @@ 
      *

      * @param string $where SQL where clause part.

      */

-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

+    $where_statuses = apply_filters('geodir_get_posts_count', $where_statuses, $post_type);

 

-    $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

+    $query = $wpdb->prepare("SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses, $post_type);

 

-    $posts_count = (int)$wpdb->get_var( $query );

+    $posts_count = (int) $wpdb->get_var($query);

     

     /**

      * Modify returned post counts for the current post type.

@@ -5329,7 +5329,7 @@ 
      * @param int $posts_count Post counts.

      * @param string $post_type Post type.

      */

-    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

+    $posts_count = apply_filters('geodir_imex_count_posts', $posts_count, $post_type);

 

     return $posts_count;

 }

@@ -5350,19 +5350,19 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {	

+function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {	

 	global $wp_filesystem;

 

-	$posts = geodir_get_export_posts( $post_type, $per_page, $page_no );

+	$posts = geodir_get_export_posts($post_type, $per_page, $page_no);

 

 	$csv_rows = array();

 	

-	if ( !empty( $posts ) ) {

-		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

+	if (!empty($posts)) {

+		$is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');

         $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

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

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

         $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;

-        $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+        $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;

 		

 		$csv_row = array();

 		$csv_row[] = 'post_id';

@@ -5373,7 +5373,7 @@ 
 		$csv_row[] = 'default_category';

 		$csv_row[] = 'post_tags';

 		$csv_row[] = 'post_type';

-		if ( $post_type == 'gd_event' ) {

+		if ($post_type == 'gd_event') {

 			$csv_row[] = 'event_date';

 			$csv_row[] = 'event_enddate';

 			$csv_row[] = 'starttime';

@@ -5431,15 +5431,15 @@ 
 		}

 		// WPML

 

-		$custom_fields = geodir_imex_get_custom_fields( $post_type );

-		if ( !empty( $custom_fields ) ) {

-			foreach ( $custom_fields as $custom_field ) {

+		$custom_fields = geodir_imex_get_custom_fields($post_type);

+		if (!empty($custom_fields)) {

+			foreach ($custom_fields as $custom_field) {

 				$csv_row[] = $custom_field->htmlvar_name;

 			}

 		}

 

 		// Export franchise fields

-		$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+		$is_franchise_active = is_plugin_active('geodir_franchise/geodir_franchise.php') && geodir_franchise_enabled($post_type) ? true : false;

 		if ($is_franchise_active) {

 			$csv_row[] = 'gd_is_franchise';

 			$csv_row[] = 'gd_franchise_lock';

@@ -5460,28 +5460,28 @@ 
 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

-		foreach ( $posts as $post ) {$xx++;

+        $xx = 0;

+		foreach ($posts as $post) {$xx++;

 			$post_id = $post['ID'];

 			

-			$gd_post_info = geodir_get_post_info( $post_id );

-			$post_info = (array)$gd_post_info;

+			$gd_post_info = geodir_get_post_info($post_id);

+			$post_info = (array) $gd_post_info;

 						

-			$taxonomy_category = $post_type . 'category';

-			$taxonomy_tags = $post_type . '_tags';

+			$taxonomy_category = $post_type.'category';

+			$taxonomy_tags = $post_type.'_tags';

 			

 			$post_category = '';

 			$default_category_id = $gd_post_info->default_category;

 			$default_category = '';

 			$post_tags = '';

-			$terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );

+			$terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags));

 			

-			if ( !empty( $terms ) && !is_wp_error( $terms ) ) {

+			if (!empty($terms) && !is_wp_error($terms)) {

 				$post_category = array();

 				$post_tags = array();

 			

-				foreach ( $terms as $term ) {

-					if ( $term->taxonomy == $taxonomy_category ) {

+				foreach ($terms as $term) {

+					if ($term->taxonomy == $taxonomy_category) {

 						$post_category[] = $term->name;

 						

 						if ($default_category_id == $term->term_id) {

@@ -5489,7 +5489,7 @@ 
 						}

 					}

 					

-					if ( $term->taxonomy == $taxonomy_tags ) {

+					if ($term->taxonomy == $taxonomy_tags) {

 						$post_tags[] = $term->name;

 					}

 				}

@@ -5497,47 +5497,47 @@ 
 				if (empty($default_category) && !empty($post_category)) {

 					$default_category = $post_category[0]; // Set first one as default category.

 				}

-				$post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';

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

+				$post_category = !empty($post_category) ? implode(',', $post_category) : '';

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

 			}

 

 			// Franchise data

-			if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {

+			if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {

 				$franchise_id = $post_info['franchise'];

 				$gd_franchise_info = geodir_get_post_info($franchise_id);

 

 				if (geodir_franchise_pkg_is_active($gd_franchise_info)) {

-					$franchise_info = (array)$gd_franchise_info;

+					$franchise_info = (array) $gd_franchise_info;

 					$locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);

 					

 					if (!empty($locked_fields)) {

-						foreach( $locked_fields as $locked_field) {

+						foreach ($locked_fields as $locked_field) {

 							if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {

 								$post_info[$locked_field] = $franchise_info[$locked_field];

 							}

 							

 							if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {

-								$franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );

+								$franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags));

 			

-								if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {

+								if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {

 									$franchise_post_category = array();

 									$franchise_post_tags = array();

 								

-									foreach ( $franchise_terms as $franchise_term ) {

-										if ( $franchise_term->taxonomy == $taxonomy_category ) {

+									foreach ($franchise_terms as $franchise_term) {

+										if ($franchise_term->taxonomy == $taxonomy_category) {

 											$franchise_post_category[] = $franchise_term->name;

 										}

 										

-										if ( $franchise_term->taxonomy == $taxonomy_tags ) {

+										if ($franchise_term->taxonomy == $taxonomy_tags) {

 											$franchise_post_tags[] = $franchise_term->name;

 										}

 									}

 									

 									if (in_array($taxonomy_category, $locked_fields)) {

-										$post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';

+										$post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';

 									}

 									if (in_array('post_tags', $locked_fields)) {

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

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

 									}

 								}

 							}

@@ -5546,18 +5546,18 @@ 
 				}

 			}

 						

-			$post_images = geodir_get_images( $post_id );

+			$post_images = geodir_get_images($post_id);

 			$current_images = array();

-			if ( !empty( $post_images ) ) {

-				foreach ( $post_images as $post_image ) {

-					$post_image = (array)$post_image;

-					$image = !empty( $post_image ) && isset( $post_image['path'] ) && $wp_filesystem->is_file( $post_image['path'] ) && $wp_filesystem->exists( $post_image['path'] ) ? $post_image['src'] : '';

-					if ( $image ) {

+			if (!empty($post_images)) {

+				foreach ($post_images as $post_image) {

+					$post_image = (array) $post_image;

+					$image = !empty($post_image) && isset($post_image['path']) && $wp_filesystem->is_file($post_image['path']) && $wp_filesystem->exists($post_image['path']) ? $post_image['src'] : '';

+					if ($image) {

 						$current_images[] = $image;

 					}

 				}

 				

-				$images_count = max( $images_count, count( $current_images ) );

+				$images_count = max($images_count, count($current_images));

 			}

 

 			$csv_row = array();

@@ -5569,7 +5569,7 @@ 
 			$csv_row[] = $default_category; // default_category

 			$csv_row[] = $post_tags; // post_tags

 			$csv_row[] = $post_type; // post_type

-			if ( $post_type == 'gd_event' ) {

+			if ($post_type == 'gd_event') {

 				$event_data = geodir_imex_get_event_data($post, $gd_post_info);

 				$csv_row[] = $event_data['event_date']; // event_date

 				$csv_row[] = $event_data['event_enddate']; // enddate

@@ -5590,12 +5590,12 @@ 
 				$csv_row[] = $event_data['recurring_end_date']; // repeat_end

 			}

 			$csv_row[] = $post_info['post_status']; // post_status

-			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

+			$csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured

             if ($is_claim_active) {

-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

+                $csv_row[] = !empty($post_info['claimed']) && (int) $post_info['claimed'] == 1 ? 1 : ''; // claimed

             }

 			if ($is_payment_plugin) {

-				$csv_row[] = (int)$post_info['package_id']; // package_id

+				$csv_row[] = (int) $post_info['package_id']; // package_id

 				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

 			}

             $csv_row[] = $post_info['post_date']; // post_date

@@ -5631,14 +5631,14 @@ 
 			$csv_row[] = $post_info['geodir_special_offers']; // geodir_special_offers

 			// WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $post_id, 'post_' . $post_type );

-				$csv_row[] = geodir_imex_original_post_id( $post_id, 'post_' . $post_type );

+				$csv_row[] = geodir_get_language_for_element($post_id, 'post_'.$post_type);

+				$csv_row[] = geodir_imex_original_post_id($post_id, 'post_'.$post_type);

 			}

 			// WPML

 			

-			if ( !empty( $custom_fields ) ) {

-				foreach ( $custom_fields as $custom_field ) {

-					$csv_row[] = isset( $post_info[$custom_field->htmlvar_name] ) ? $post_info[$custom_field->htmlvar_name] : '';

+			if (!empty($custom_fields)) {

+				foreach ($custom_fields as $custom_field) {

+					$csv_row[] = isset($post_info[$custom_field->htmlvar_name]) ? $post_info[$custom_field->htmlvar_name] : '';

 				}

 			}

 			

@@ -5649,15 +5649,15 @@ 
 				$franchise = '';

 					

 				if (geodir_franchise_pkg_is_active($gd_post_info)) {

-					$gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );

-					$locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';

+					$gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true);

+					$locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : '';

 					$locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');

-					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id

+					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id

 				}

 				

-				$csv_row[] = (int)$gd_is_franchise; // gd_is_franchise

+				$csv_row[] = (int) $gd_is_franchise; // gd_is_franchise

 				$csv_row[] = $locaked_fields; // gd_franchise_lock fields

-				$csv_row[] = (int)$franchise; // franchise id

+				$csv_row[] = (int) $franchise; // franchise id

 			}

             

             /**

@@ -5671,15 +5671,15 @@ 
              */

             $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

 			

-			for ( $c = 0; $c < $images_count; $c++ ) {

-				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

+			for ($c = 0; $c < $images_count; $c++) {

+				$csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE

 			}

 			

 			$csv_rows[] = $csv_row;

 

 		}

 

-		for ( $c = 0; $c < $images_count; $c++ ) {

+		for ($c = 0; $c < $images_count; $c++) {

 			$csv_rows[0][] = 'IMAGE';

 		}

 	}

@@ -5701,30 +5701,30 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

+function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {

     global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

+    if (!post_type_exists($post_type))

         return new stdClass;

         

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

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

 

     $limit = '';

-    if ( $per_page > 0 && $page_no > 0 ) {

-        $offset = ( $page_no - 1 ) * $per_page;

+    if ($per_page > 0 && $page_no > 0) {

+        $offset = ($page_no - 1) * $per_page;

         

-        if ( $offset > 0 ) {

-            $limit = " LIMIT " . $offset . "," . $per_page;

+        if ($offset > 0) {

+            $limit = " LIMIT ".$offset.",".$per_page;

         } else {

-            $limit = " LIMIT " . $per_page;

+            $limit = " LIMIT ".$per_page;

         }

     }

 

     // Skip listing with statuses trash, auto-draft etc...

     $skip_statuses = geodir_imex_export_skip_statuses();

     $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+    if (!empty($skip_statuses) && is_array($skip_statuses)) {

+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

     }

     

     /**

@@ -5735,9 +5735,9 @@ 
      *

      * @param string $where SQL where clause part.

      */

-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+    $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);

 

-    $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

+    $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." ORDER BY {$wpdb->posts}.ID ASC".$limit, $post_type);

     /**

      * Modify returned posts SQL query for the current post type.

      *

@@ -5747,8 +5747,8 @@ 
      * @param int $query The SQL query.

      * @param string $post_type Post type.

      */

-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

-    $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

+    $query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);

+    $results = (array) $wpdb->get_results($wpdb->prepare($query, $post_type), ARRAY_A);

 

     /**

      * Modify returned post results for the current post type.

@@ -5759,7 +5759,7 @@ 
      * @param object $results An object containing all post ids.

      * @param string $post_type Post type.

      */

-    return apply_filters( 'geodir_export_posts', $results, $post_type );

+    return apply_filters('geodir_export_posts', $results, $post_type);

 }

 

 /**

@@ -5777,24 +5777,24 @@ 
  * @param string $post_type Post type.

  * @return string The SQL query.

  */

-function geodir_imex_get_events_query( $query, $post_type ) {

-    if ( $post_type == 'gd_event' ) {

+function geodir_imex_get_events_query($query, $post_type) {

+    if ($post_type == 'gd_event') {

         global $wpdb, $plugin_prefix;

         

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

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

         $schedule_table = EVENT_SCHEDULE;

         

         // Skip listing with statuses trash, auto-draft etc...

         $skip_statuses = geodir_imex_export_skip_statuses();

         $where_statuses = '';

-        if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+        if (!empty($skip_statuses) && is_array($skip_statuses)) {

+            $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

         }

         

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

-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+        $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);

 

-        $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

+        $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type);

     }

 

     return $query;

@@ -5818,35 +5818,35 @@ 
  * @param  string $post_type Post type.

  * @return int Total terms count.

  */

-function geodir_get_terms_count( $post_type ) {

-    $args = array( 'hide_empty' => 0 );

+function geodir_get_terms_count($post_type) {

+    $args = array('hide_empty' => 0);

 

-    remove_all_filters( 'get_terms' );

+    remove_all_filters('get_terms');

 

-    $taxonomy = $post_type . 'category';

+    $taxonomy = $post_type.'category';

 

     // WPML

     $is_wpml = geodir_is_wpml();

     $active_lang = 'all';

-    if ( $is_wpml ) {

+    if ($is_wpml) {

         global $sitepress;

         $active_lang = $sitepress->get_current_language();

         

-        if ( $active_lang != 'all' ) {

-            $sitepress->switch_lang( 'all', true );

+        if ($active_lang != 'all') {

+            $sitepress->switch_lang('all', true);

         }

     }

     // WPML

             

-    $count_terms = wp_count_terms( $taxonomy, $args );

+    $count_terms = wp_count_terms($taxonomy, $args);

 

     // WPML

-    if ( $is_wpml && $active_lang !== 'all' ) {

+    if ($is_wpml && $active_lang !== 'all') {

         global $sitepress;

-        $sitepress->switch_lang( $active_lang, true );

+        $sitepress->switch_lang($active_lang, true);

     }

     // WPML

-    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+    $count_terms = !is_wp_error($count_terms) ? $count_terms : 0;

      

     return $count_terms;

 }

@@ -5863,23 +5863,23 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of terms data.

  */

-function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {

-	$args = array( 'hide_empty' => 0, 'orderby' => 'id' );

+function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {

+	$args = array('hide_empty' => 0, 'orderby' => 'id');

 	

-	remove_all_filters( 'get_terms' );

+	remove_all_filters('get_terms');

 	

-	$taxonomy = $post_type . 'category';

+	$taxonomy = $post_type.'category';

 	

-	if ( $per_page > 0 && $page_no > 0 ) {

-		$args['offset'] = ( $page_no - 1 ) * $per_page;

+	if ($per_page > 0 && $page_no > 0) {

+		$args['offset'] = ($page_no - 1) * $per_page;

 		$args['number'] = $per_page;

 	}

 	

-	$terms = get_terms( $taxonomy, $args );

+	$terms = get_terms($taxonomy, $args);

 

 	$csv_rows = array();

 	

-	if ( !empty( $terms ) ) {

+	if (!empty($terms)) {

 		$csv_row = array();

 		$csv_row[] = 'cat_id';

 		$csv_row[] = 'cat_name';

@@ -5901,16 +5901,16 @@ 
 		

 		$csv_rows[] = $csv_row;

 		

-		foreach ( $terms as $term ) {

-			$cat_icon = get_tax_meta( $term->term_id, 'ct_cat_icon', false, $post_type );

-			$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+		foreach ($terms as $term) {

+			$cat_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $post_type);

+			$cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

 			

-			$cat_image = geodir_get_default_catimage( $term->term_id, $post_type );

-			$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : ''; 

+			$cat_image = geodir_get_default_catimage($term->term_id, $post_type);

+			$cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : ''; 

 			

 			$cat_parent = '';

-			if (isset($term->parent) && (int)$term->parent > 0 && term_exists((int)$term->parent, $taxonomy)) {

-				$parent_term = (array)get_term_by( 'id', (int)$term->parent, $taxonomy );

+			if (isset($term->parent) && (int) $term->parent > 0 && term_exists((int) $term->parent, $taxonomy)) {

+				$parent_term = (array) get_term_by('id', (int) $term->parent, $taxonomy);

 				$cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';

 			}

 			

@@ -5920,15 +5920,15 @@ 
 			$csv_row[] = $term->slug;

 			$csv_row[] = $post_type;

 			$csv_row[] = $cat_parent;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type);

             // WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

-                $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

+				$csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_'.$taxonomy);

+                $csv_row[] = geodir_imex_original_post_id($term->term_id, 'tax_'.$taxonomy);

 			}

 			// WPML

 			$csv_row[] = $term->description;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type);

 			$csv_row[] = $cat_image;

 			$csv_row[] = $cat_icon;

 			

@@ -5947,10 +5947,10 @@ 
  * @param  bool $relative True for relative path & False for absolute path.

  * @return string Path to the cache directory.

  */

-function geodir_path_import_export( $relative = true ) {

+function geodir_path_import_export($relative = true) {

 	$upload_dir = wp_upload_dir();

 	

-	return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';

+	return $relative ? $upload_dir['baseurl'].'/cache' : $upload_dir['basedir'].'/cache';

 }

 

 /**

@@ -5966,8 +5966,8 @@ 
  * @param  bool $clear If true then it overwrite data otherwise add rows at the end of file.

  * @return bool true if success otherwise false.

  */

-function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {

-	if ( empty( $csv_data ) ) {

+function geodir_save_csv_data($file_path, $csv_data = array(), $clear = true) {

+	if (empty($csv_data)) {

 		return false;

 	}

 	

@@ -5975,17 +5975,17 @@ 
 	

 	$mode = $clear ? 'w+' : 'a+';

 	

-	if ( function_exists( 'fputcsv' ) ) {

-		$file = fopen( $file_path, $mode );

-		foreach( $csv_data as $csv_row ) {

+	if (function_exists('fputcsv')) {

+		$file = fopen($file_path, $mode);

+		foreach ($csv_data as $csv_row) {

 			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$write_successful = fputcsv( $file, $csv_row, ",", $enclosure = '"' );

+			$write_successful = fputcsv($file, $csv_row, ",", $enclosure = '"');

 		}

-		fclose( $file );

+		fclose($file);

 	} else {

-		foreach( $csv_data as $csv_row ) {

+		foreach ($csv_data as $csv_row) {

 			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$wp_filesystem->put_contents( $file_path, $csv_row );

+			$wp_filesystem->put_contents($file_path, $csv_row);

 		}

 	}

 		

@@ -6003,14 +6003,14 @@ 
  * @param  string $file Full path to file.

  * @return int No of file rows.

  */

-function geodir_import_export_line_count( $file ) {

+function geodir_import_export_line_count($file) {

 	global $wp_filesystem;

 	

-	if ( $wp_filesystem->is_file( $file ) && $wp_filesystem->exists( $file ) ) {

-		$contents = $wp_filesystem->get_contents_array( $file );

+	if ($wp_filesystem->is_file($file) && $wp_filesystem->exists($file)) {

+		$contents = $wp_filesystem->get_contents_array($file);

 		

-		if ( !empty( $contents ) && is_array( $contents ) ) {

-			return count( $contents ) - 1;

+		if (!empty($contents) && is_array($contents)) {

+			return count($contents) - 1;

 		}

 	}

 	

@@ -6027,11 +6027,11 @@ 
  * @param string $post_type The post type.

  * @return object Queried object.

  */

-function geodir_imex_get_custom_fields( $post_type ) {

+function geodir_imex_get_custom_fields($post_type) {

 	global $wpdb;

 	 

-	$sql = $wpdb->prepare("SELECT htmlvar_name FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array( $post_type ) );

-	$rows = $wpdb->get_results( $sql );

+	$sql = $wpdb->prepare("SELECT htmlvar_name FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1' AND is_admin!='1' AND field_type != 'fieldset' AND htmlvar_name != '' ORDER BY id ASC", array($post_type));

+	$rows = $wpdb->get_results($sql);

 	 

 	return $rows;

 }

@@ -6110,14 +6110,14 @@ 
 	global $wpdb, $plugin_prefix;

 	

 	$post_type = get_post_type($master_post_id);

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

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

 	

-	$query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

-	$data = (array)$wpdb->get_row($query);

+	$query = $wpdb->prepare("SELECT * FROM ".$post_table." WHERE post_id = %d", array($master_post_id));

+	$data = (array) $wpdb->get_row($query);

 	

-	if ( !empty( $data ) ) {

+	if (!empty($data)) {

 		$data['post_id'] = $tr_post_id;

-		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

+		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type.'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

 		

 		$wpdb->update($post_table, $data, array('post_id' => $tr_post_id));		

 		return true;

@@ -6143,7 +6143,7 @@ 
 	global $sitepress, $wpdb;

 	$post_type = get_post_type($master_post_id);

 	

-	remove_filter('get_term', array($sitepress,'get_term_adjust_id')); // AVOID filtering to current language

+	remove_filter('get_term', array($sitepress, 'get_term_adjust_id')); // AVOID filtering to current language

 

 	$taxonomies = get_object_taxonomies($post_type);

 	foreach ($taxonomies as $taxonomy) {

@@ -6152,9 +6152,9 @@ 
 		

 		if ($terms) {

 			foreach ($terms as $term) {

-				$tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

+				$tr_id = apply_filters('translate_object_id', $term->term_id, $taxonomy, false, $lang);

 				

-				if (!is_null($tr_id)){

+				if (!is_null($tr_id)) {

 					// not using get_term - unfiltered get_term

 					$translated_term = $wpdb->get_row($wpdb->prepare("

 						SELECT * FROM {$wpdb->terms} t JOIN {$wpdb->term_taxonomy} x ON x.term_id = t.term_id WHERE t.term_id = %d AND x.taxonomy = %s", $tr_id, $taxonomy));

@@ -6163,14 +6163,14 @@ 
 				}

 			}

 

-			if (!is_taxonomy_hierarchical($taxonomy)){

-				$terms_array = array_unique( array_map( 'intval', $terms_array ) );

+			if (!is_taxonomy_hierarchical($taxonomy)) {

+				$terms_array = array_unique(array_map('intval', $terms_array));

 			}

 

 			wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

 			

-			if ($taxonomy == $post_type . 'category') {

-				geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

+			if ($taxonomy == $post_type.'category') {

+				geodir_set_postcat_structure($tr_post_id, $post_type.'category');

 			}

 		}

 	}

@@ -6191,15 +6191,15 @@ 
 function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {

 	global $wpdb;

 	

-	$query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

+	$query = $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

 	$wpdb->query($query);

 	

-	$query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

+	$query = $wpdb->prepare("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

 	$post_images = $wpdb->get_results($query);

 	

-	if ( !empty( $post_images ) ) {

-		foreach ( $post_images as $post_image) {

-			$image_data = (array)$post_image;

+	if (!empty($post_images)) {

+		foreach ($post_images as $post_image) {

+			$image_data = (array) $post_image;

 			unset($image_data['ID']);

 			$image_data['post_id'] = $tr_post_id;

 			

@@ -6225,10 +6225,10 @@ 
  * @return array Event data array.

  */

 function geodir_imex_get_event_data($post, $gd_post_info) {

-	$event_date = isset( $post['event_date'] ) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $post['event_date'] ) ) : '';

+	$event_date = isset($post['event_date']) && $post['event_date'] != '' && $post['event_date'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($post['event_date'])) : '';

 	$event_enddate = $event_date;

-	$starttime = isset( $post['starttime'] ) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['starttime'] ) ) : '';

-	$endtime = isset( $post['endtime'] ) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $post['endtime'] ) ) : '';

+	$starttime = isset($post['starttime']) && $post['starttime'] != '' && $post['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['starttime'])) : '';

+	$endtime = isset($post['endtime']) && $post['endtime'] != '' && $post['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($post['endtime'])) : '';

 	

 	$is_recurring_event = '';

 	$event_duration_days = '';

@@ -6245,15 +6245,15 @@ 
 		

 	$recurring_data = isset($gd_post_info->recurring_dates) ? maybe_unserialize($gd_post_info->recurring_dates) : array();

 	if (!empty($recurring_data)) {

-		$event_date = isset( $recurring_data['event_start'] ) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_start'] ) ) : $event_date;

-		$event_enddate = isset( $recurring_data['event_end'] ) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['event_end'] ) ) : $event_date;

-		$starttime = isset( $recurring_data['starttime'] ) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['starttime'] ) ) : $starttime;

-		$endtime = isset( $recurring_data['endtime'] ) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n( 'H:i', strtotime( $recurring_data['endtime'] ) ) : $endtime;

+		$event_date = isset($recurring_data['event_start']) && $recurring_data['event_start'] != '' && $recurring_data['event_start'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_start'])) : $event_date;

+		$event_enddate = isset($recurring_data['event_end']) && $recurring_data['event_end'] != '' && $recurring_data['event_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['event_end'])) : $event_date;

+		$starttime = isset($recurring_data['starttime']) && $recurring_data['starttime'] != '' && $recurring_data['starttime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['starttime'])) : $starttime;

+		$endtime = isset($recurring_data['endtime']) && $recurring_data['endtime'] != '' && $recurring_data['endtime'] != '00:00:00' ? date_i18n('H:i', strtotime($recurring_data['endtime'])) : $endtime;

 		$is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';

 		$different_times = !empty($recurring_data['different_times']) ? true : false;

 	

-		$recurring_pkg = geodir_event_recurring_pkg( $gd_post_info );

-		$is_recurring = isset( $gd_post_info->is_recurring ) && (int)$gd_post_info->is_recurring == 0 ? false : true;

+		$recurring_pkg = geodir_event_recurring_pkg($gd_post_info);

+		$is_recurring = isset($gd_post_info->is_recurring) && (int) $gd_post_info->is_recurring == 0 ? false : true;

 			

 		if ($recurring_pkg && $is_recurring) {

 			$recurring_dates = $event_date;

@@ -6263,13 +6263,13 @@ 
 			$recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';

 			

 			if (!empty($recurring_data['event_recurring_dates'])) {

-				$event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

+				$event_recurring_dates = explode(',', $recurring_data['event_recurring_dates']);

 				

 				if (!empty($event_recurring_dates)) {

 					$recurring_dates = array();

 					

 					foreach ($event_recurring_dates as $date) {

-						$recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );

+						$recurring_dates[] = date_i18n('d/m/Y', strtotime($date));

 					}

 					

 					$recurring_dates = implode(",", $recurring_dates);

@@ -6285,7 +6285,7 @@ 
 						$times = array();

 						

 						foreach ($recurring_data['starttimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';

 						}

 						

 						$event_starttimes = implode(",", $times);

@@ -6295,7 +6295,7 @@ 
 						$times = array();

 						

 						foreach ($recurring_data['endtimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+							$times[] = $time != '00:00:00' ? date_i18n('H:i', strtotime($time)) : '00:00';

 						}

 						

 						$event_endtimes = implode(",", $times);

@@ -6307,8 +6307,8 @@ 
 					}

 				}

 			} else {

-				$event_duration_days = isset($recurring_data['duration_x']) ? (int)$recurring_data['duration_x'] : 1;

-				$recurring_interval = !empty($recurring_data['repeat_x']) && (int)$recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

+				$event_duration_days = isset($recurring_data['duration_x']) ? (int) $recurring_data['duration_x'] : 1;

+				$recurring_interval = !empty($recurring_data['repeat_x']) && (int) $recurring_data['repeat_x'] > 0 ? $recurring_data['repeat_x'] : 1;

 				

 				if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {

 					$week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

@@ -6324,11 +6324,11 @@ 
 				}

 				

 				$recurring_week_nos = $recurring_type == 'month' && !empty($recurring_data['repeat_weeks']) ? implode(",", $recurring_data['repeat_weeks']) : $recurring_week_nos;

-				if (!empty($recurring_data['repeat_end_type']) && (int)$recurring_data['repeat_end_type'] == 1) {

-					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n( 'd/m/Y', strtotime( $recurring_data['repeat_end'] ) ) : '';

+				if (!empty($recurring_data['repeat_end_type']) && (int) $recurring_data['repeat_end_type'] == 1) {

+					$recurring_end_date = isset($recurring_data['repeat_end']) && $recurring_data['repeat_end'] != '' && $recurring_data['repeat_end'] != '0000-00-00 00:00:00' ? date_i18n('d/m/Y', strtotime($recurring_data['repeat_end'])) : '';

 					$max_recurring_count = empty($recurring_end_date) ? 1 : '';

 				} else {

-					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int)$recurring_data['max_repeat'] > 0 ? (int)$recurring_data['max_repeat'] : 1);

+					$max_recurring_count = (!empty($recurring_data['max_repeat']) && (int) $recurring_data['max_repeat'] > 0 ? (int) $recurring_data['max_repeat'] : 1);

 				}

 			}

 		}

@@ -6392,9 +6392,9 @@ 
  * @return array Event data array.

  */

 function geodir_imex_process_event_data($gd_post) {

-	$recurring_pkg = geodir_event_recurring_pkg( (object)$gd_post );

+	$recurring_pkg = geodir_event_recurring_pkg((object) $gd_post);

 

-	$is_recurring = isset( $gd_post['is_recurring_event'] ) && (int)$gd_post['is_recurring_event'] == 0 ? false : true;

+	$is_recurring = isset($gd_post['is_recurring_event']) && (int) $gd_post['is_recurring_event'] == 0 ? false : true;

 	$event_date = isset($gd_post['event_date']) && $gd_post['event_date'] != '' ? geodir_imex_get_date_ymd($gd_post['event_date']) : '';

 	$event_enddate = isset($gd_post['event_enddate']) && $gd_post['event_enddate'] != '' ? geodir_imex_get_date_ymd($gd_post['event_enddate']) : $event_date;

 	$all_day = isset($gd_post['is_whole_day_event']) && !empty($gd_post['is_whole_day_event']) ? true : false;

@@ -6441,17 +6441,17 @@ 
 				$event_recurring_dates = implode(",", $event_recurring_dates);

 			}

 		} else {

-			$duration_x = !empty( $gd_post['event_duration_days'] ) ? (int)$gd_post['event_duration_days'] : 1;

-			$repeat_x = !empty( $gd_post['recurring_interval'] ) ? (int)$gd_post['recurring_interval'] : 1;

-			$max_repeat = !empty( $gd_post['max_recurring_count'] ) ? (int)$gd_post['max_recurring_count'] : 1;

-			$repeat_end = !empty( $gd_post['recurring_end_date'] ) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

+			$duration_x = !empty($gd_post['event_duration_days']) ? (int) $gd_post['event_duration_days'] : 1;

+			$repeat_x = !empty($gd_post['recurring_interval']) ? (int) $gd_post['recurring_interval'] : 1;

+			$max_repeat = !empty($gd_post['max_recurring_count']) ? (int) $gd_post['max_recurring_count'] : 1;

+			$repeat_end = !empty($gd_post['recurring_end_date']) ? geodir_imex_get_date_ymd($gd_post['recurring_end_date']) : '';

 			

 			$repeat_end_type = $repeat_end != '' ? 1 : 0;

 			$max_repeat = $repeat_end != '' ? '' : $max_repeat;

 			

 			$week_days = array_flip(array('sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'));

 			

-			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days'])!='' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

+			$a_repeat_days = isset($gd_post['recurring_week_days']) && trim($gd_post['recurring_week_days']) != '' ? explode(',', trim($gd_post['recurring_week_days'])) : array();

 			$repeat_days = array();

 			if (!empty($a_repeat_days)) {

 				foreach ($a_repeat_days as $repeat_day) {

@@ -6469,7 +6469,7 @@ 
 			$repeat_weeks = array();

 			if (!empty($a_repeat_weeks)) {

 				foreach ($a_repeat_weeks as $repeat_week) {

-					$repeat_weeks[] = (int)$repeat_week;

+					$repeat_weeks[] = (int) $repeat_week;

 				}

 				

 				$repeat_weeks = array_unique($repeat_weeks);

@@ -6533,7 +6533,7 @@ 
 

     $page_found = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",

             array($slug)

         )

     );

@@ -6588,7 +6588,7 @@ 
  */

 function geodir_admin_upgrade_notice() {

     $class = "error";

-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

+    $message = __("Please update core GeoDirectory or some addons may not function correctly.", "geodirectory");

     echo"<div class=\"$class\"> <p>$message</p></div>";

 }

 

@@ -6600,7 +6600,7 @@ 
  * @param (object) $r

  * @return (string) $output

  */

-function geodire_admin_upgrade_notice( $plugin_data, $r )

+function geodire_admin_upgrade_notice($plugin_data, $r)

 {

     // readme contents

     $args = array(

@@ -6608,7 +6608,7 @@ 
         'redirection' => 5

     );

     $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

-    $data       = wp_remote_get( $url, $args );

+    $data = wp_remote_get($url, $args);

 

     if (!is_wp_error($data) && $data['response']['code'] == 200) {

 

@@ -6623,20 +6623,20 @@ 
 function geodir_in_plugin_update_message($content) {

     // Output Upgrade Notice

     $matches        = null;

-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

+    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote(GEODIRECTORY_VERSION).'\s*=|$)~Uis';

     $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

+    if (preg_match($regexp, $content, $matches)) {

+        if (empty($matches)) {return; }

 

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

+        $version = trim($matches[1]);

+        if ($version && $version > GEODIRECTORY_VERSION) {

 

 

-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

+        $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));

+        if (version_compare(GEODIRECTORY_VERSION, $version, '<')) {

             $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+            foreach ($notices as $index => $line) {

+                $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));

             }

             $upgrade_notice .= '</div> ';

         }

@@ -6660,7 +6660,7 @@ 
 		$default_language = $sitepress->get_default_language();

 		if ($current_language != 'all' && $current_language != $default_language) {

 	?>

-	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory');?></strong></p></div>

+	<div class="updated error notice-success" id="message"><p style="color:red"><strong><?php _e('Saving GeoDirectory pages settings on a different language breaks pages settings. Try to save after switching to default language.', 'geodirectory'); ?></strong></p></div>

 	<?php

 		}

 	}

@@ -6675,7 +6675,7 @@ 
  * @param array Listing statuses to be skipped.

  */

 function geodir_imex_export_skip_statuses() {

-    $statuses = array( 'trash', 'auto-draft' );

+    $statuses = array('trash', 'auto-draft');

     

     /**

      * Filter the statuses to skip during GD export listings.

@@ -6685,7 +6685,7 @@ 
      *

      * @param array $statuses Listing statuses to be skipped.

      */

-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

+    $statuses = apply_filters('geodir_imex_export_skip_statuses', $statuses);

      

     return $statuses;

 }

@@ -6725,16 +6725,16 @@ 
 function geodir_imex_get_filter_where($where = '', $post_type = '') {

     global $wpdb;

     

-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+    $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;

     

-    if ( !empty( $filters ) ) {

-        foreach ( $filters as $field => $value ) {

+    if (!empty($filters)) {

+        foreach ($filters as $field => $value) {

             switch ($field) {

                 case 'start_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

+                    $where .= " AND `".$wpdb->posts."`.`post_date` >= '".sanitize_text_field($value)." 00:00:00'";

                 break;

                 case 'end_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

+                    $where .= " AND `".$wpdb->posts."`.`post_date` <= '".sanitize_text_field($value)." 23:59:59'";

                 break;

             }

         }