GeoDirectory / geodirectory

geodirectory-admin/admin_functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -6537,7 +6537,7 @@ 
  *

  * @since 1.5.0

  *

- * @return True if WPML is active else False.

+ * @return boolean if WPML is active else False.

  */

 function geodir_is_wpml() {

 	if (function_exists('icl_object_id')) {

@@ -6633,7 +6633,7 @@ 
  * @param int $master_post_id Original Post ID.

  * @param int $tr_post_id Translation Post ID.

  * @param string $lang Language code for translating post.

- * @return bool True for success, False for fail.

+ * @return boolean|null True for success, False for fail.

  */

 function geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang) {

 	global $sitepress, $wpdb;

Spacing +638 added lines, -638 removed lines

@@ -474,15 +474,15 @@ 
                 <?php

 

                     $default_location = geodir_get_default_location();

-                  $city =  isset($default_location->city) ? $default_location->city : '';

-                  $region =isset($default_location->region) ? $default_location->region : '';

-                  $country =isset($default_location->country) ? $default_location->country : '';

-                  $city_latitude =isset($default_location->city_latitude) ? $default_location->city_latitude : '';

-                  $city_longitude =isset($default_location->city_longitude) ? $default_location->city_longitude : '';

+                  $city = isset($default_location->city) ? $default_location->city : '';

+                  $region = isset($default_location->region) ? $default_location->region : '';

+                  $country = isset($default_location->country) ? $default_location->country : '';

+                  $city_latitude = isset($default_location->city_latitude) ? $default_location->city_latitude : '';

+                  $city_longitude = isset($default_location->city_longitude) ? $default_location->city_longitude : '';

 

                 ?>

                 var geocoder = new google.maps.Geocoder();

-                var CITY_ADDRESS = '<?php echo $city.','.$region.','.$country;?>';

+                var CITY_ADDRESS = '<?php echo $city . ',' . $region . ',' . $country; ?>';

                 var bound_lat_lng;

                 var lat = <?php echo $city_latitude; ?>;

                 var lng = <?php echo $city_longitude; ?>;

@@ -519,7 +519,7 @@ 
                             );

 

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

                         }

                     });

 

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

@@ -551,7 +551,7 @@ 
                         jQuery.post('<?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,

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

                                 if (dummy_post_index <= total_dummy_post_count)

                                     geodir_autoinstall(obj, id, nonce, posttype);

@@ -662,7 +662,7 @@ 
                     else

                         $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

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

@@ -703,7 +703,7 @@ 
                 else

                     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

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

@@ -1015,7 +1015,7 @@ 
  */

 function geodir_extend_geodirectory_setting_tab($tabs)

 {

-    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory'). ' <i class="fa fa-plug"></i>', 'url' => 'http://wpgeodirectory.com', 'target' => '_blank');

+    $tabs['extend_geodirectory_settings'] = array('label' => __('Extend Geodirectory', 'geodirectory') . ' <i class="fa fa-plug"></i>', 'url' => 'http://wpgeodirectory.com', 'target' => '_blank');

     return $tabs;

 }

 

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

     }

 

@@ -1512,7 +1512,7 @@ 
                     jQuery('#gd-import-perc').text('0%');

 

                     jQuery('.gd-csv-form-table .filelist .file').remove();

-                    jQuery('#gd-import-msg').find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr( PLZ_SELECT_CSV_FILE );?></p>");

+                    jQuery('#gd-import-msg').find('#message').removeClass('updated').addClass('error').html("<p><?php echo esc_attr(PLZ_SELECT_CSV_FILE); ?></p>");

                     jQuery('#gd-import-msg').show();

 

                     return false;

@@ -1680,38 +1680,38 @@ 
 

                 var gdMsg = '<p></p>';

                 if (gd_invalidcount == 0 && gd_blank_address == 0 && gd_invalid_post_type == 0 && gd_invalid_title == 0) {

-                    gdMsg += "<p><?php echo esc_attr( CSV_INSERT_DATA );?></p>";

+                    gdMsg += "<p><?php echo esc_attr(CSV_INSERT_DATA); ?></p>";

                 }

 

-                var msgParse = '<p><?php echo addslashes( CSV_TOTAL_RECORD );?></p>';

+                var msgParse = '<p><?php echo addslashes(CSV_TOTAL_RECORD); ?></p>';

                 gdMsg += msgParse.replace("%s", gd_rowcount);

 

                 if (gd_invalidcount > 0) {

-                    msgParse = msgParse = '<p><?php echo sprintf( CSV_INVALID_DEFUALT_ADDRESS, '%s', '%d' );?></p>';

+                    msgParse = msgParse = '<p><?php echo sprintf(CSV_INVALID_DEFUALT_ADDRESS, '%s', '%d'); ?></p>';

                     msgParse = msgParse.replace("%s", gd_invalidcount);

                     msgParse = msgParse.replace("%d", gd_total_records);

                     gdMsg += msgParse;

                 }

                 if (gd_blank_address > 0) {

-                    msgParse = '<p><?php echo addslashes( sprintf( CSV_INVALID_TOTAL_RECORD, '%s', '%d' ) );?></p>';

+                    msgParse = '<p><?php echo addslashes(sprintf(CSV_INVALID_TOTAL_RECORD, '%s', '%d')); ?></p>';

                     msgParse = msgParse.replace("%s", gd_blank_address);

                     msgParse = msgParse.replace("%d", gd_total_records);

                     gdMsg += msgParse;

                 }

                 if (gd_invalid_post_type > 0) {

-                    msgParse = '<p><?php echo addslashes( sprintf( CSV_INVALID_POST_TYPE, '%s', '%d' ) );?></p>';

+                    msgParse = '<p><?php echo addslashes(sprintf(CSV_INVALID_POST_TYPE, '%s', '%d')); ?></p>';

                     msgParse = msgParse.replace("%s", gd_invalid_post_type);

                     msgParse = msgParse.replace("%d", gd_total_records);

                     gdMsg += msgParse;

                 }

                 if (gd_invalid_title > 0) {

-                    msgParse = '<p><?php echo addslashes( sprintf( CSV_BLANK_POST_TITLE, '%s', '%d' ) );?></p>';

+                    msgParse = '<p><?php echo addslashes(sprintf(CSV_BLANK_POST_TITLE, '%s', '%d')); ?></p>';

                     msgParse = msgParse.replace("%s", gd_invalid_title);

                     msgParse = msgParse.replace("%d", gd_total_records);

                     gdMsg += msgParse;

                 }

                 if (gd_upload_files > 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').find('#message').removeClass('error').addClass('updated').html(gdMsg);

@@ -1721,7 +1721,7 @@ 
         <table class="form-table gd-csv-form-table">

             <tbody>

             <tr valign="top" class="single_select_page">

-                <th class="titledesc" scope="row"><?php echo SELECT_CSV_FILE;?></th>

+                <th class="titledesc" scope="row"><?php echo SELECT_CSV_FILE; ?></th>

                 <td class="forminp">

                     <div class="gtd-formfeild">

                         <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox">

@@ -1756,12 +1756,12 @@ 
                                id="gd_import_data" class="button-primary" name="save">

                         <input onclick="gdContinueImport()" type="button" value="Continue Import Data"

                                id="gd_continue_data" class="button-primary" style="display:none"/>

-                        <input type="button" value="<?php _e("Terminate Import Data", 'geodirectory');?>"

+                        <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="gdTerminateImport()"/>

 

                         <div id="gd_process_data" style="display:none"><span class="spinner"

-                                                                             style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory');?>

+                                                                             style="display:inline-block;margin:0 5px 0 5px;float:left"></span><?php _e("Wait, processing import data...", 'geodirectory'); ?>

                         </div>

                     </div>

                     <div id="gd_importer" style="display:none">

@@ -1779,7 +1779,7 @@ 
                         <input type="hidden" id="gd_total_records" value="0"/>

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

@@ -2038,7 +2038,7 @@ 
                             $payment_info = array();

                             $package_info = array();

 

-                            $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);

+                            $package_info = (array) geodir_post_package_info($package_info, '', $buffer[5]);

                             $package_id = '';

                             if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {

                                 $package_id = $gd_post_info['package_id'];

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

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

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

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

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

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

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

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

                                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

@@ -2675,7 +2675,7 @@ 
                     <textarea

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

 

@@ -2722,7 +2722,7 @@ 
 					}

 				}

 				//

-				$page_setting = (int)get_option($value['id']);

+				$page_setting = (int) get_option($value['id']);

 

                 $args = array('name' => $value['id'],

                     'id' => $value['id'],

@@ -2749,7 +2749,7 @@ 
                 break;

             case 'single_select_country' :

                 $countries = $geodirectory->countries->countries;

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

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

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

@@ -2806,10 +2806,10 @@ 
 

                             $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

                             $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

-                            $state = "&state=123";//any string

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

+                            $client_id = "&client_id=" . get_option('geodir_ga_client_id');

                             $access_type = "&access_type=offline";

                             $approval_prompt = "&approval_prompt=force";

 

@@ -2819,7 +2819,7 @@ 
                             ?>

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

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

                             }

                             ?>

@@ -2912,15 +2912,15 @@ 
 

 

             <?php

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

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

             {

 

                 ?>

             jQuery('.geodir_option_tabs').removeClass('gd-tab-active');

-            jQuery('#<?php echo $_REQUEST['active_tab'];?>').addClass('gd-tab-active');

+            jQuery('#<?php echo $_REQUEST['active_tab']; ?>').addClass('gd-tab-active');

 

             jQuery('.gd-content-heading').hide();

-            jQuery('#sub_<?php echo $_REQUEST['active_tab'];?>').show();

+            jQuery('#sub_<?php echo $_REQUEST['active_tab']; ?>').show();

 

 

             <?php

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

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

 

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

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

 }

 

@@ -3491,7 +3491,7 @@ 
  * @return string Html content.

  */

 function geodir_import_export_page() {

-	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

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

@@ -3501,7 +3501,7 @@ 
      *

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

     /**

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

@@ -3542,7 +3542,7 @@ 
      *

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

@@ -3553,38 +3553,38 @@ 
 ?>

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

@@ -3596,20 +3596,20 @@ 
 	<div id="gd_ie_imposts" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_im_posts" class="postbox">

-          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Import CSV', 'geodirectory' );?></span></h3>

+          <h3 class="hndle"><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.

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

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

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

@@ -3665,25 +3665,25 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

 	  <div class="meta-box-sortables ui-sortable">

 		<div id="gd_ie_ex_posts" class="postbox">

-		  <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Export CSV', 'geodirectory' );?></span></h3>

+		  <h3 class="hndle"><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>

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

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

@@ -3710,20 +3710,20 @@ 
 	<div id="gd_ie_imcategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_imcats" class="postbox">

-          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Import CSV', 'geodirectory' );?></span></h3>

+          <h3 class="hndle"><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.

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

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

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

@@ -3779,25 +3779,25 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_ex_cats" class="postbox">

-          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Export CSV', 'geodirectory' );?></span></h3>

+          <h3 class="hndle"><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>

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

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

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

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

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

@@ -4155,21 +4155,21 @@ 
 		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.', '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.', 'geodirectory'), '%s', '%d')); ?></p>';

 		msgParse = msgParse.replace("%s", invalid);

 		msgParse = msgParse.replace("%d", total);

 		gdMsg += msgParse;

 	}

 	

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

@@ -4318,7 +4318,7 @@ 
 		

 	function gd_process_export_posts(el, post_type, total_posts, chunk_size, pages, page) {

 		if (page < 2) {

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

 		}

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

+			data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page,

 			dataType : 'json',

 			cache: false,

 			beforeSend: function (jqXHR, settings) {},

@@ -4340,11 +4340,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.ceil(( page / pages ) * 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;

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

 		}

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

@@ -4396,11 +4396,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.ceil(( page / pages ) * 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;

@@ -4457,8 +4457,8 @@ 
 function geodir_init_filesystem()

 {

 

-    if(!function_exists('get_filesystem_method')){

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

+    if (!function_exists('get_filesystem_method')) {

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

     }

     $access_type = get_filesystem_method();

     if ($access_type === 'direct') {

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

@@ -4546,18 +4546,18 @@ 
     // 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');

         }

     }

@@ -4566,43 +4566,43 @@ 
 

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

 		}

 	}

 

-	switch ( $task ) {

+	switch ($task) {

 		case 'export_posts': {

 			// WPML

 			$is_wpml = geodir_is_wpml();

@@ -4613,12 +4613,12 @@ 
 				$sitepress->switch_lang('all', true);

 			}

 			// WPML

-			if ( $post_type == 'gd_event' ) {

+			if ($post_type == 'gd_event') {

 				//add_filter( 'geodir_imex_count_posts', 'geodir_imex_count_events', 10, 2 );

-				add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+				add_filter('geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2);

 			}

-			$file_name = $post_type . '_' . date( 'dmyHi' );

-			$posts_count = geodir_get_posts_count( $post_type );

+			$file_name = $post_type . '_' . date('dmyHi');

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

@@ -4626,10 +4626,10 @@ 
 			

 			$chunk_file_paths = array();

 

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

+			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

@@ -4637,49 +4637,49 @@ 
 					$sitepress->switch_lang($active_lang, true);

 				}

 				// WPML

-				wp_send_json( $json );

+				wp_send_json($json);

 				exit;

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

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

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

 					}

 					

-					if ( !empty($chunk_file_paths) ) {

+					if (!empty($chunk_file_paths)) {

 						$json['total'] = $posts_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

@@ -4687,7 +4687,7 @@ 
 					$sitepress->switch_lang($active_lang, true);

 				}

 				// WPML

-				wp_send_json( $json );

+				wp_send_json($json);

 			}

 		}

 		break;

@@ -4701,9 +4701,9 @@ 
 				$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 );

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

@@ -4711,10 +4711,10 @@ 
 			

 			$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

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

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

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

 					}

 					

-					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

@@ -4771,67 +4771,67 @@ 
 					$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_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 ) ) {

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

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

 					}

 					

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

@@ -4847,32 +4847,32 @@ 
 			}

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

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

 

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

 					$json['rows'] = 0;

 					

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

 							}

 						}

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

 			$requested_limit = $limit;

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

 					}

 					

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

@@ -4957,26 +4957,26 @@ 
 							$cat_language = '';

 							

 							$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

@@ -4987,7 +4987,7 @@ 
 								$c++;

 							}

 							

-							if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

+							if ($cat_name == '' || !in_array($cat_posttype, $post_types)) {

 								$invalid++;

 								continue;

 							}

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

 							

@@ -5014,14 +5014,14 @@ 
 							$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)) {

 									$term_parent = $term_parent;

-								} else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+								} else if ($term_parent = get_term_by('slug', $cat_parent, $taxonomy)) {

 									$term_parent = $term_parent;

-								} else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+								} else if ($term_parent = get_term_by('id', $cat_parent, $taxonomy)) {

 									$term_parent = $term_parent;

 								} else {

 									$term_parent_data = array();

@@ -5029,47 +5029,47 @@ 
 									//$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++;

 									}

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

 									}

 								} else {

-									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+									if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

 										$created++;

 									} else {

 										$invalid++;

 									}

 								}

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

@@ -5079,37 +5079,37 @@ 
 								$invalid++;

 							}

 							

-							if ( $term_id ) {

-								if ( isset( $term_data['top_description'] ) ) {

-									update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

+							if ($term_id) {

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

 								}

 							}

@@ -5131,14 +5131,14 @@ 
 				$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');

@@ -5148,26 +5148,26 @@ 
 				if (!empty($file)) {

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

 					}

 

-                    $processed_actual=0;

+                    $processed_actual = 0;

 					for ($i = 1; $i <= $limit; $i++) {

 						$index = $processed + $i;

 						$gd_post = array();

 						

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

@@ -5201,73 +5201,73 @@ 
 							$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 = $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( ',', $row[$c] );

-								} else if ( $column == 'post_type' ) {

+								} else if ($column == 'post_tags' && $row[$c] != '') {

+									$post_tags = explode(',', $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 = $row[$c];

-								} else if ( $column == 'post_city' ) {

+								} else if ($column == 'post_city') {

 									$post_city = $row[$c];

-								} else if ( $column == 'post_region' ) {

+								} else if ($column == 'post_region') {

 									$post_region = $row[$c];

-								} else if ( $column == 'post_country' ) {

+								} else if ($column == 'post_country') {

 									$post_country = $row[$c];

-								} else if ( $column == 'post_zip' ) {

+								} else if ($column == 'post_zip') {

 									$post_zip = $row[$c];

-								} else if ( $column == 'post_latitude' ) {

+								} else if ($column == 'post_latitude') {

 									$post_latitude = $row[$c];

-								} else if ( $column == 'post_longitude' ) {

+								} else if ($column == 'post_longitude') {

 									$post_longitude = $row[$c];

-								} else if ( $column == 'geodir_timing' ) {

+								} else if ($column == 'geodir_timing') {

 									$geodir_timing = $row[$c];

-								} else if ( $column == 'geodir_contact' ) {

+								} else if ($column == 'geodir_contact') {

 									$geodir_contact = $row[$c];

-								} else if ( $column == 'geodir_email' ) {

+								} else if ($column == 'geodir_email') {

 									$geodir_email = $row[$c];

-								} else if ( $column == 'geodir_website' ) {

+								} else if ($column == 'geodir_website') {

 									$geodir_website = $row[$c];

-								} else if ( $column == 'geodir_twitter' ) {

+								} else if ($column == 'geodir_twitter') {

 									$geodir_twitter = $row[$c];

-								} else if ( $column == 'geodir_facebook' ) {

+								} else if ($column == 'geodir_facebook') {

 									$geodir_facebook = $row[$c];

-								} else if ( $column == 'geodir_twitter' ) {

+								} else if ($column == 'geodir_twitter') {

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

@@ -5282,24 +5282,24 @@ 
 

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

 							}

 							

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

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

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

 									} else {

@@ -5310,7 +5310,7 @@ 
 								}

 							}

 							

-							if ( !$valid ) {

+							if (!$valid) {

 								continue;

 							}

 

@@ -5323,16 +5323,16 @@ 
 

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

@@ -5340,13 +5340,13 @@ 
 											//$term_data = array_map( 'utf8_encode', $term_data );										

 											$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[] = $term_category->slug;

 											$post_category[] = intval($term_category->term_id);

 											

@@ -5368,28 +5368,28 @@ 
 							$save_post['post_tags'] = $post_tags;

 

 							$saved_post_id = NULL;

-							if ( $import_choice == 'update' ) {

-								if ( $post_id > 0 && get_post( $post_id ) ) {

+							if ($import_choice == 'update') {

+								if ($post_id > 0 && get_post($post_id)) {

 									$save_post['ID'] = $post_id;

 									

-									if ( wp_update_post( $save_post ) ) {

+									if (wp_update_post($save_post)) {

 										$saved_post_id = $post_id;

 										$updated++;

 									}

 								} else {

-									if ( $saved_post_id = wp_insert_post( $save_post ) ) {

+									if ($saved_post_id = wp_insert_post($save_post)) {

 										$created++;

 									}

 								}

 								

-								if ( !$saved_post_id > 0 ) {

+								if (!$saved_post_id > 0) {

 									$invalid++;

 								}

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

+									if ($saved_post_id = wp_insert_post($save_post)) {

 										$created++;	

 									} else {

 										$invalid++;

@@ -5399,19 +5399,19 @@ 
 								$invalid++;

 							}

 

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

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

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

 									$post_location_info = array(

 																'city' => $post_city,

 																'region' => $post_region,

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

 									}

 								}

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

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

 										}

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

@@ -5514,12 +5514,12 @@ 
 								}

 								

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

 									}

@@ -5533,15 +5533,15 @@ 
 									

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

@@ -5549,30 +5549,30 @@ 
 									

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

@@ -5585,46 +5585,46 @@ 
 											$attachment['is_featured'] = 0;

 

 											$attachment_set = '';

-											foreach ( $attachment as $key => $val ) {

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

 										$menu_order = 1;

 										

-										foreach ( $saved_post_images_arr as $img_name ) {

-											$wpdb->query( $wpdb->prepare( "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d WHERE post_id =%d AND file LIKE %s", array( $menu_order, $saved_post_id, '%/' . $img_name ) ) );

+										foreach ($saved_post_images_arr as $img_name) {

+											$wpdb->query($wpdb->prepare("UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d WHERE post_id =%d AND file LIKE %s", array($menu_order, $saved_post_id, '%/' . $img_name)));

 											

-											if( $menu_order == 1 ) {

-												if ( $featured_image = $wpdb->get_var( $wpdb->prepare( "SELECT file FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =%d AND file LIKE %s", array( $saved_post_id, '%/' . $img_name ) ) ) ) {

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

+											if ($menu_order == 1) {

+												if ($featured_image = $wpdb->get_var($wpdb->prepare("SELECT file FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =%d AND file LIKE %s", array($saved_post_id, '%/' . $img_name)))) {

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

 												}

 											}

 											$menu_order++;

 										}

 									}

 									

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

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

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

 				

@@ -5669,7 +5669,7 @@ 
 					

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

 					}

 					

 					for ($i = 1; $i <= $limit; $i++) {

@@ -5677,59 +5677,59 @@ 
 						

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

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

 									}

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

 									}

 								} else {

-									if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+									if ($location_id = geodir_location_insert_city($data, true)) {

 										$created++;

 									} else {

 										$invalid++;

 									}

 								}

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

@@ -5750,7 +5750,7 @@ 
 				$json['invalid'] = $invalid;

 				$json['images'] = $images;

 				

-				wp_send_json( $json );

+				wp_send_json($json);

 			}

 		}

 		break;

@@ -5794,29 +5794,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 $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

+    if (!empty($term)) {

+		$result = wp_insert_term($term, $taxonomy, $args);

+        if (!is_wp_error($result)) {

+            return $term_id = isset($result['term_id']) ? $result['term_id'] : 0;

         }

     }

 	

@@ -5846,37 +5846,37 @@ 
  * }

  * @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 = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

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

+	$term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : '';

+	$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 $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return $term_id = 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 $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return $term_id = 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;

@@ -5891,9 +5891,9 @@ 
  * @param string $post_type Post type.

  * @return int Posts count.

  */

-function geodir_get_posts_count( $post_type ) {

-	$posts_count = wp_count_posts( $post_type );

-	$posts_count = array_sum( (array)$posts_count );

+function geodir_get_posts_count($post_type) {

+	$posts_count = wp_count_posts($post_type);

+	$posts_count = array_sum((array) $posts_count);

 	

 	/**

 	 * Modify returned post counts for the current post type.

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

 }

@@ -5922,8 +5922,8 @@ 
  * @param string $post_type Post type.

  * @return int Posts count.

  */

-function geodir_imex_count_events( $posts_count, $post_type ) {

-	if ( $post_type == 'gd_event' ) {

+function geodir_imex_count_events($posts_count, $post_type) {

+	if ($post_type == 'gd_event') {

 		global $wpdb, $plugin_prefix;

 		

 		$table = $plugin_prefix . $post_type . '_detail';

@@ -5931,7 +5931,7 @@ 
 

 		$query = "SELECT COUNT({$wpdb->posts}.ID) AS total 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";

 		

-		$posts_count = (int)$wpdb->get_var( $wpdb->prepare( $query, $post_type ) );

+		$posts_count = (int) $wpdb->get_var($wpdb->prepare($query, $post_type));

 	}

 	

 	return $posts_count;

@@ -5953,15 +5953,15 @@ 
  * @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');

 		

 		$csv_row = array();

 		$csv_row[] = 'post_id';

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

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

@@ -6039,12 +6039,12 @@ 
 		$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';

@@ -6053,14 +6053,14 @@ 
 			$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) {

@@ -6068,7 +6068,7 @@ 
 						}

 					}

 					

-					if ( $term->taxonomy == $taxonomy_tags ) {

+					if ($term->taxonomy == $taxonomy_tags) {

 						$post_tags[] = $term->name;

 					}

 				}

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

@@ -6085,42 +6085,42 @@ 
 			$franchise_info = array();

 			$locked_fields = array();

 			

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

 									}

 								}

 							}

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

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

@@ -6173,9 +6173,9 @@ 
 				$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_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['geodir_video']; // geodir_video

@@ -6196,14 +6196,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] : '';

 				}

 			}

 			

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

 			}

 			

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

 		}

 	}

@@ -6255,19 +6255,19 @@ 
  * @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';

 	

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

+		if ($offset > 0) {

 			$limit = " LIMIT " . $offset . "," . $per_page;

 		} else {

 			$limit = " LIMIT " . $per_page;

@@ -6284,9 +6284,9 @@ 
 	 * @param int $query The SQL query.

 	 * @param string $post_type Post type.

 	 */

-	$query = apply_filters( 'geodir_imex_export_posts_query', $query, $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 );

+	$results = (array) $wpdb->get_results($wpdb->prepare($query, $post_type), ARRAY_A);

 

 	/**

 	 * Modify returned post results for the current post type.

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

 }

 

 /**

@@ -6314,8 +6314,8 @@ 
  * @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';

@@ -6336,15 +6336,15 @@ 
  * @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';

 

-	$count_terms = wp_count_terms( $taxonomy, $args );

-	$count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+	$count_terms = wp_count_terms($taxonomy, $args);

+	$count_terms = !is_wp_error($count_terms) ? $count_terms : 0;

 	 

 	return $count_terms;

 }

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

 	

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

@@ -6398,16 +6398,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'] : '';

 			}

 			

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

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

 			// WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

+				$csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_' . $taxonomy);

 			}

 			// WPML

 			

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

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

 	}

 	

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

 		}

 	}

 		

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

 		}

 	}

 	

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

 }

@@ -6609,9 +6609,9 @@ 
 	$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);

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

 		

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

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

@@ -6659,8 +6659,8 @@ 
 				}

 			}

 

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

@@ -6693,9 +6693,9 @@ 
 	$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;

 			

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

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

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

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

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

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

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

 				}

 			}

 		}

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

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

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

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

 }

 

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

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

 

@@ -7125,20 +7125,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; }

         //print_r($matches );

-        $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( WC_VERSION, $version, '<' ) ) {

+        $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));

+        if (version_compare(WC_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> ';

         }

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

 		}

 	}

Braces +240 added lines, -133 removed lines

@@ -177,8 +177,9 @@ 
 

         $thumb_img_arr = array();

 

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

-            $thumb_img_arr = geodir_get_images($_REQUEST['pid']);

+        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                    $thumb_img_arr = geodir_get_images($_REQUEST['pid']);
+        }
 

         $totImg = '';

         $image_limit = '';

@@ -234,7 +235,9 @@ 
     {

         global $menu, $geodirectory;

 

-        if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

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

 

@@ -303,7 +306,9 @@ 
      */

     function geodir_admin_custom_menu_order()

     {

-        if (!current_user_can('manage_options')) return false;

+        if (!current_user_can('manage_options')) {
+            return false;
+        }
         return true;

     }

 }

@@ -334,10 +339,11 @@ 
 			case 'fail':

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

-				else

-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

+				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>';
+				} else {
+									echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
+				}
                 break;

         }

     }

@@ -374,8 +380,12 @@ 
         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'], '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'));
+        }
 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -387,8 +397,9 @@ 
 		 */

 		do_action('geodir_before_update_options', $current_tab, $geodir_settings);		

 		

-        if (!empty($geodir_settings[$current_tab]))

-            geodir_update_options($geodir_settings[$current_tab]);

+        if (!empty($geodir_settings[$current_tab])) {
+                    geodir_update_options($geodir_settings[$current_tab]);
+        }
 

         /**

          * Called after GeoDirectory options settings are updated.

@@ -456,8 +467,9 @@ 
                 $options_list = '';

                 for ($option = 1; $option <= 30; $option++) {

                     $selected = '';

-                    if ($option == 10)

-                        $selected = 'selected="selected"';

+                    if ($option == 10) {
+                                            $selected = 'selected="selected"';
+                    }
 

                     $options_list .= '<option ' . $selected . ' value="' . $option . '">' . $option . '</option>';

                 }

@@ -657,10 +669,11 @@ 
                     }

 

 

-                    if (geodir_dummy_folder_exists())

-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

-                    else

-                        $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

+                    if (geodir_dummy_folder_exists()) {
+                                            $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+                    } else {
+                                            $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
+                    }
                     $catname = str_replace(' ', '_', $catname);

                     $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

 

@@ -698,10 +711,11 @@ 
             if (!term_exists($catname, 'gd_placecategory')) {

                 $last_catid = wp_insert_term($catname, 'gd_placecategory');

 

-                if (geodir_dummy_folder_exists())

-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

-                else

-                    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

+                if (geodir_dummy_folder_exists()) {
+                                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";
+                } else {
+                                    $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';
+                }
                 $catname = str_replace(' ', '_', $catname);

                 $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

 

@@ -753,11 +767,14 @@ 
 {

    // print_r($_POST);    print_r($options);    exit;

 

-    if ((!isset($_POST) || !$_POST) && !$dummy) return false;

+    if ((!isset($_POST) || !$_POST) && !$dummy) {
+        return false;
+    }
 

     foreach ($options as $value) {

-        if ($dummy && isset($value['std']))

-            $_POST[$value['id']] = $value['std'];

+        if ($dummy && isset($value['std'])) {
+                    $_POST[$value['id']] = $value['std'];
+        }
 

 

         if (isset($value['type']) && $value['type'] == 'checkbox') :

@@ -766,25 +783,23 @@ 
                 update_option($value['id'], $_POST[$value['id']]);

             } else {

                 update_option($value['id'], 0);

-            }

-

-        elseif (isset($value['type']) && $value['type'] == 'image_width') :

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

-                else :

-                    update_option($value['id'] . '_crop', 0);

+                else {
+                    :

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

-            }

-

-        elseif (isset($value['type']) && $value['type'] == 'map') :

+            } elseif (isset($value['type']) && $value['type'] == 'map') :

             $post_types = array();

             $categories = array();

             $i = 0;

@@ -830,8 +845,9 @@ 
                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

                     $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

+                    if (file_exists($img_path)) {
+                                            unlink($img_path);
+                    }
                 }

 

                 update_option($value['id'], '');

@@ -847,8 +863,10 @@ 
                 foreach ($uploadedfile as $key => $uplaod):

                     if ($key == 'name'):

                         $uplaods[$key] = $filename;

-                    else :

-                        $uplaods[$key] = $uplaod;

+                    else {
+                        :

+                        $uplaods[$key] = $uplaod;
+                    }
                     endif;

                 endforeach;

 

@@ -858,8 +876,9 @@ 
                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

                     $img_path = $uploads['path'] . '/' . $noimg_name;

-                    if (file_exists($img_path))

-                        unlink($img_path);

+                    if (file_exists($img_path)) {
+                                            unlink($img_path);
+                    }
                 }

 

                 $upload_overrides = array('test_form' => false);

@@ -874,10 +893,12 @@ 
             endif;

 

 

-        else :

+        else {
+            :

             // same menu setting per theme.

             if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

-                $theme = wp_get_theme();

+                $theme = wp_get_theme();
+        }
                 update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

             }

 

@@ -889,8 +910,9 @@ 
 

         endif;

     }

-    if ($dummy)

-        unset($_POST);

+    if ($dummy) {
+            unset($_POST);
+    }
     return true;

 

 }

@@ -1035,9 +1057,12 @@ 
         $new_columns = array('location' => __('Location (ID)', 'geodirectory'),

             'categorys' => __('Categories', 'geodirectory'));

 

-        if (($offset = array_search('author', array_keys($columns))) === false) // if the key doesn't exist

+        if (($offset = array_search('author', array_keys($columns))) === false) {
+            // if the key doesn't exist

         {

-            $offset = 0; // should we prepend $array with $data?

+            $offset = 0;
+        }
+        // should we prepend $array with $data?

             $offset = count($columns); // or should we append $array with $data? lets pick this one...

         }

 

@@ -1097,11 +1122,13 @@ 
                     $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 (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;

+                else {
+                                    echo $expire_date . $date_diff_text;
+                }
                 break;

 

             /* If displaying the 'categorys' column. */

@@ -1174,21 +1201,26 @@ 
 

     $geodir_posttypes = geodir_get_posttypes();

 

-    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

-        return;

+    if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+            return;
+    }
 

     if (!wp_is_post_revision($post_id) && isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)) {

-        if (isset($_REQUEST['_status']))

-            geodir_change_post_status($post_id, $_REQUEST['_status']);

+        if (isset($_REQUEST['_status'])) {
+                    geodir_change_post_status($post_id, $_REQUEST['_status']);
+        }
 

-        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash'))

-            return;

+        if (isset($_REQUEST['action']) && ($_REQUEST['action'] == 'trash' || $_REQUEST['action'] == 'untrash')) {
+                    return;
+        }
 

-        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__)))

-            return;

+        if (!isset($_POST['geodir_post_info_noncename']) || !wp_verify_nonce($_POST['geodir_post_info_noncename'], plugin_basename(__FILE__))) {
+                    return;
+        }
 

-        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__)))

-            return;

+        if (!isset($_POST['geodir_post_attachments_noncename']) || !wp_verify_nonce($_POST['geodir_post_attachments_noncename'], plugin_basename(__FILE__))) {
+                    return;
+        }
 

         geodir_save_listing($_REQUEST);

     }

@@ -2024,8 +2056,9 @@ 
                                         'geo_lng' => $post_longitude);

 

                                     $post_location_info = $request_info['post_location'];

-                                    if ($location_id = geodir_add_new_location($post_location_info))

-                                        $post_location_id = $location_id;

+                                    if ($location_id = geodir_add_new_location($post_location_info)) {
+                                                                            $post_location_id = $location_id;
+                                    }
 

                                 } else {

                                     $post_location_id = 0;

@@ -2089,8 +2122,9 @@ 
                                     $attachment_set = '';

 

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

-                                        if ($val != '')

-                                            $attachment_set .= $key . " = '" . $val . "', ";

+                                        if ($val != '') {
+                                                                                    $attachment_set .= $key . " = '" . $val . "', ";
+                                        }
                                     }

 

                                     $attachment_set = trim($attachment_set, ", ");

@@ -2140,8 +2174,9 @@ 
                 fclose($fd);

                 //unlink($csv_target_path);

                 //rmdir($destination_path);

-                if (!empty($filename))

-                    geodir_remove_temp_images();

+                if (!empty($filename)) {
+                                    geodir_remove_temp_images();
+                }
 

 

                 echo $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=csv_upload_settings&msg=success&rowcount=' . $countpost . '&invalidcount=' . $address_invalid . '&blank_address=' . $blank_address . '&upload_files=' . $upload_files . '&invalid_post_type=' . $invalid_post_type . '&invalid_title=' . $invalid_title . '&total_records=' . $total_records;

@@ -2174,10 +2209,18 @@ 
     $tab_id = '';

     $i = 0;

     foreach ($options as $value) :

-        if (!isset($value['name'])) $value['name'] = '';

-        if (!isset($value['class'])) $value['class'] = '';

-        if (!isset($value['css'])) $value['css'] = '';

-        if (!isset($value['std'])) $value['std'] = '';

+        if (!isset($value['name'])) {
+            $value['name'] = '';
+        }
+        if (!isset($value['class'])) {
+            $value['class'] = '';
+        }
+        if (!isset($value['css'])) {
+            $value['css'] = '';
+        }
+        if (!isset($value['std'])) {
+            $value['std'] = '';
+        }
         $desc = '';

         switch ($value['type']) :

             case 'dummy_installer':

@@ -2196,11 +2239,13 @@ 
 

                 $i++;

 

-                if (isset($value['id']) && $value['id'])

-                    $tab_id = $value['id'];

+                if (isset($value['id']) && $value['id']) {
+                                    $tab_id = $value['id'];
+                }
 

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+                if (isset($value['desc']) && $value['desc']) {
+                                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';
+                }
 

                 if (isset($value['name']) && $value['name']) {

                     if ($first_title === true) {

@@ -2231,10 +2276,12 @@ 
                 break;

 

             case 'sectionstart':

-                if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

-                if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

+                if (isset($value['desc']) && $value['desc']) {
+                                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';
+                }
+                if (isset($value['name']) && $value['name']) {
+                                    echo '<h3>' . $value['name'] . $desc . '</h3>';
+                }
                 /**

                  * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

                  *

@@ -2242,7 +2289,9 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

+                if (isset($value['id']) && $value['id']) {
+                    do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');
+                }
                 echo '<table class="form-table">' . "\n\n";

 

                 break;

@@ -2254,7 +2303,9 @@ 
                  *

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

@@ -2263,7 +2314,9 @@ 
                  *

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

                 ?>

@@ -2335,17 +2388,32 @@ 
                     <?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

@@ -2357,17 +2425,22 @@ 
                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

                                             id="<?php echo esc_attr($value['id']); ?>"

                                             style="<?php echo esc_attr($value['css']); ?>"

-                                            class="<?php if (isset($value['class'])) echo $value['class']; ?>"

+                                            class="<?php if (isset($value['class'])) {
+    echo $value['class'];
+}
+?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

                             $geodir_select_value = '';

                             if (get_option($value['id']) != '') {

-                                if (get_option($value['id']) != '' && get_option($value['id']) == $key)

-                                    $geodir_select_value = ' selected="selected" ';

+                                if (get_option($value['id']) != '' && get_option($value['id']) == $key) {
+                                                                    $geodir_select_value = ' selected="selected" ';
+                                }
                             } else {

-                                if ($value['std'] == $key)

-                                    $geodir_select_value = ' selected="selected" ';

+                                if ($value['std'] == $key) {
+                                                                    $geodir_select_value = ' selected="selected" ';
+                                }
                             }

 

 

@@ -2389,8 +2462,14 @@ 
                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"

                                             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'];?>"

+                                            class="<?php if (isset($value['class'])) {
+    echo $value['class'];
+}
+?>"

+                                            data-placeholder="<?php if (isset($value['placeholder_text'])) {
+    echo $value['placeholder_text'];
+}
+?>"

                                             option-ajaxchosen="false">

                         <?php

                         foreach ($value['options'] as $key => $val) {

@@ -2419,7 +2498,10 @@ 
                 <td class="forminp">

                     <input type="file" name="<?php echo esc_attr($value['id']); ?>"

                            id="<?php echo esc_attr($value['id']); ?>" style="<?php echo esc_attr($value['css']); ?>"

-                           class="<?php if (isset($value['class'])) echo $value['class']; ?>"/>

+                           class="<?php if (isset($value['class'])) {
+    echo $value['class'];
+}
+?>"/>

                     <?php if (get_option($value['id'])) { ?>

                         <input type="hidden" name="<?php echo esc_attr($value['id']); ?>_remove"

                                id="<?php echo esc_attr($value['id']); ?>_remove" value="0">

@@ -2500,13 +2582,15 @@ 
                                 'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

                             );

                             $geodir_default_map_language = get_option('geodir_default_map_language');

-                            if (empty($geodir_default_map_language))

-                                $geodir_default_map_language = 'en';

+                            if (empty($geodir_default_map_language)) {
+                                                            $geodir_default_map_language = 'en';
+                            }
                             foreach ($arr_map_langages as $language_key => $language_txt) {

-                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language)

-                                    $geodir_default_language_selected = "selected='selected'";

-                                else

-                                    $geodir_default_language_selected = '';

+                                if (!empty($geodir_default_map_language) && $language_key == $geodir_default_map_language) {
+                                                                    $geodir_default_language_selected = "selected='selected'";
+                                } else {
+                                                                    $geodir_default_language_selected = '';
+                                }
 

                                 ?>

                                 <option

@@ -2526,14 +2610,16 @@ 
                             <?php

                             $post_types = geodir_get_posttypes('array');

                             $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-                            if (empty($geodir_default_map_search_pt))

-                                $geodir_default_map_search_pt = 'gd_place';

+                            if (empty($geodir_default_map_search_pt)) {
+                                                            $geodir_default_map_search_pt = 'gd_place';
+                            }
                             if (is_array($post_types)) {

                                 foreach ($post_types as $key => $post_types_obj) {

-                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt)

-                                        $geodir_search_pt_selected = "selected='selected'";

-                                    else

-                                        $geodir_search_pt_selected = '';

+                                    if (!empty($geodir_default_map_search_pt) && $key == $geodir_default_map_search_pt) {
+                                                                            $geodir_search_pt_selected = "selected='selected'";
+                                    } else {
+                                                                            $geodir_search_pt_selected = '';
+                                    }
 

                                     ?>

                                     <option

@@ -2653,7 +2739,7 @@ 
                                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

@@ -2673,10 +2759,18 @@ 
                 <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 }?>

-                        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

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

 

                 </td>

@@ -2690,10 +2784,11 @@ 
                 <td class="forminp"><?php

 

                     $content = '';

-                    if (get_option($value['id']))

-                        $content = stripslashes(get_option($value['id']));

-                    else

-                        $content = $value['std'];

+                    if (get_option($value['id'])) {
+                                            $content = stripslashes(get_option($value['id']));
+                    } else {
+                                            $content = $value['std'];
+                    }
 

                     $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);

 

@@ -2733,7 +2828,9 @@ 
                     'echo' => false,

                     'selected' => $page_setting);

 

-                if (isset($value['args'])) $args = wp_parse_args($value['args'], $args);

+                if (isset($value['args'])) {
+                    $args = wp_parse_args($value['args'], $args);
+                }
 

                 ?>

                 <tr valign="top" class="single_select_page">

@@ -2753,8 +2850,10 @@ 
                 if (strstr($country_setting, ':')) :

                     $country = current(explode(':', $country_setting));

                     $state = end(explode(':', $country_setting));

-                else :

-                    $country = $country_setting;

+                else {
+                    :

+                    $country = $country_setting;
+                }
                     $state = '*';

                 endif;

                 ?>

@@ -2781,8 +2880,10 @@ 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"

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

+                        if ($countries) {
+                            foreach ($countries as $key => $val) :

+                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';
+                        }
                         endforeach;

                         ?>

                     </select>

@@ -3046,8 +3147,9 @@ 
         endforeach;

     endif;

 

-    if (!empty($place_img_array))

-        $curImages = implode(',', $place_img_array);

+    if (!empty($place_img_array)) {
+            $curImages = implode(',', $place_img_array);
+    }
 

 

     // adjust values here

@@ -3394,16 +3496,17 @@ 
 	

 	$post_type = NULL;

 	

-	if ($post && isset($post->post_type))

-		$post_type = $post->post_type;

-	elseif ($typenow)

-		$post_type = $typenow;

-	elseif ($current_screen && isset($current_screen->post_type))

-		$post_type = $current_screen->post_type;

-	elseif (isset($_REQUEST['post_type']))

-		$post_type = sanitize_key($_REQUEST['post_type']);

-	elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

-		$post_type = get_post_type($_REQUEST['post']);

+	if ($post && isset($post->post_type)) {
+			$post_type = $post->post_type;
+	} elseif ($typenow) {
+			$post_type = $typenow;
+	} elseif ($current_screen && isset($current_screen->post_type)) {
+			$post_type = $current_screen->post_type;
+	} elseif (isset($_REQUEST['post_type'])) {
+			$post_type = sanitize_key($_REQUEST['post_type']);
+	} elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post'])) {
+			$post_type = get_post_type($_REQUEST['post']);
+	}
 

 	return $post_type;

 }

@@ -3462,9 +3565,10 @@ 
 function geodir_hide_admin_preview_button() {

     global $post_type;

     $post_types = geodir_get_posttypes();

-    if(in_array($post_type, $post_types))

-        echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';

-}

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

 

@@ -6258,8 +6362,9 @@ 
 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

 	global $wpdb, $plugin_prefix;

 

-	if ( ! post_type_exists( $post_type ) )

-		return new stdClass;

+	if ( ! post_type_exists( $post_type ) ) {
+			return new stdClass;
+	}
 		

 	$table = $plugin_prefix . $post_type . '_detail';

 	

@@ -7039,7 +7144,9 @@ 
 

     if ($page_found) :

         // Page exists

-        if (!$option_value) update_option($option, $page_found);

+        if (!$option_value) {
+            update_option($option, $page_found);
+        }
         return;

     endif;

 

Indentation +1889 added lines, -1889 removed lines

@@ -1,10 +1,10 @@ 
 <?php

 /**

- * Admin functions.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Admin functions.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 /**

  * Updates option value when GeoDirectory get deactivated.

@@ -132,14 +132,14 @@ 
         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_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_enqueue_script('geodir-jRating-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);

+            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_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_enqueue_script('geodir-on-document-load');

@@ -337,13 +337,13 @@ 
                 flush_rewrite_rules(false);

 

                 break;

-			case 'fail':

-				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';

+            case 'fail':

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

-				else

-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

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

+                else

+                    echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

                 break;

         }

     }

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

 		

-		/**

-		 * Fires before updating geodirectory admin settings.

-		 *

-		 * @since 1.4.2

-		 *

-		 * @param string $current_tab Current tab in geodirectory settings.

-		 * @param array  $geodir_settings Array of geodirectory settings.

-		 */

-		do_action('geodir_before_update_options', $current_tab, $geodir_settings);		

+        /**

+         * Fires before updating geodirectory admin settings.

+         *

+         * @since 1.4.2

+         *

+         * @param string $current_tab Current tab in geodirectory settings.

+         * @param array  $geodir_settings Array of geodirectory settings.

+         */

+        do_action('geodir_before_update_options', $current_tab, $geodir_settings);		

 		

         if (!empty($geodir_settings[$current_tab]))

             geodir_update_options($geodir_settings[$current_tab]);

@@ -480,11 +480,11 @@ 
                 <?php

 

                     $default_location = geodir_get_default_location();

-                  $city =  isset($default_location->city) ? $default_location->city : '';

-                  $region =isset($default_location->region) ? $default_location->region : '';

-                  $country =isset($default_location->country) ? $default_location->country : '';

-                  $city_latitude =isset($default_location->city_latitude) ? $default_location->city_latitude : '';

-                  $city_longitude =isset($default_location->city_longitude) ? $default_location->city_longitude : '';

+                    $city =  isset($default_location->city) ? $default_location->city : '';

+                    $region =isset($default_location->region) ? $default_location->region : '';

+                    $country =isset($default_location->country) ? $default_location->country : '';

+                    $city_latitude =isset($default_location->city_latitude) ? $default_location->city_latitude : '';

+                    $city_longitude =isset($default_location->city_longitude) ? $default_location->city_longitude : '';

 

                 ?>

                 var geocoder = new google.maps.Geocoder();

@@ -757,7 +757,7 @@ 
  */

 function geodir_update_options($options, $dummy = false)

 {

-   // print_r($_POST);    print_r($options);    exit;

+    // print_r($_POST);    print_r($options);    exit;

 

     if ((!isset($_POST) || !$_POST) && !$dummy) return false;

 

@@ -2281,10 +2281,10 @@ 
                                            <?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'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

+                                                echo esc_attr(stripslashes(get_option($value['id'])));

+                                            } else {

+                                                echo esc_attr($value['std']);

+                                            } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

                 break;

 

@@ -2298,10 +2298,10 @@ 
                                            <?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'])));

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

+                                                echo esc_attr(stripslashes(get_option($value['id'])));

+                                            } else {

+                                                echo esc_attr($value['std']);

+                                            } ?>"/> <span class="description"><?php echo $value['desc']; ?></span></td>

                 </tr><?php

                 break;

 

@@ -2321,10 +2321,10 @@ 
                                            id="<?php echo esc_attr($value['id']); ?>" type="text"

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

-                                           } else {

-                                               echo esc_attr($value['std']);

-                                           } ?>" class="colorpick"/> <span

+                                                echo esc_attr(stripslashes(get_option($value['id'])));

+                                            } else {

+                                                echo esc_attr($value['std']);

+                                            } ?>" class="colorpick"/> <span

                         class="description"><?php echo $value['desc']; ?></span>

 

                     <div id="colorPickerDiv_<?php echo esc_attr($value['id']); ?>" class="colorpickdiv"

@@ -2713,22 +2713,22 @@ 
 

             case 'single_select_page' :

                 // WPML

-				$switch_lang = false;

-				$disabled = '';

-				if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

-					global $sitepress;

+                $switch_lang = false;

+                $disabled = '';

+                if (geodir_is_wpml() && isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

+                    global $sitepress;

 					

-					$default_lang = $sitepress->get_default_language();

-					$current_lang = $sitepress->get_current_language();

+                    $default_lang = $sitepress->get_default_language();

+                    $current_lang = $sitepress->get_current_language();

 					

-					if ($current_lang != 'all' && $current_lang != $default_lang) {

-						$disabled = "disabled='disabled'";

-						$switch_lang = $current_lang;

-						$sitepress->switch_lang('all', true);

-					}

-				}

-				//

-				$page_setting = (int)get_option($value['id']);

+                    if ($current_lang != 'all' && $current_lang != $default_lang) {

+                        $disabled = "disabled='disabled'";

+                        $switch_lang = $current_lang;

+                        $sitepress->switch_lang('all', true);

+                    }

+                }

+                //

+                $page_setting = (int)get_option($value['id']);

 

                 $args = array('name' => $value['id'],

                     'id' => $value['id'],

@@ -2749,9 +2749,9 @@ 
                     <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

-				if ($switch_lang) {

-					$sitepress->switch_lang($switch_lang, true);

-				}

+                if ($switch_lang) {

+                    $sitepress->switch_lang($switch_lang, true);

+                }

                 break;

             case 'single_select_country' :

                 $countries = $geodirectory->countries->countries;

@@ -3396,22 +3396,22 @@ 
  * @return string Post type ex: gd_place

  */

 function geodir_admin_current_post_type() {

-	global $post, $typenow, $current_screen;

+    global $post, $typenow, $current_screen;

 	

-	$post_type = NULL;

+    $post_type = NULL;

 	

-	if ($post && isset($post->post_type))

-		$post_type = $post->post_type;

-	elseif ($typenow)

-		$post_type = $typenow;

-	elseif ($current_screen && isset($current_screen->post_type))

-		$post_type = $current_screen->post_type;

-	elseif (isset($_REQUEST['post_type']))

-		$post_type = sanitize_key($_REQUEST['post_type']);

-	elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

-		$post_type = get_post_type($_REQUEST['post']);

-

-	return $post_type;

+    if ($post && isset($post->post_type))

+        $post_type = $post->post_type;

+    elseif ($typenow)

+        $post_type = $typenow;

+    elseif ($current_screen && isset($current_screen->post_type))

+        $post_type = $current_screen->post_type;

+    elseif (isset($_REQUEST['post_type']))

+        $post_type = sanitize_key($_REQUEST['post_type']);

+    elseif (isset($_REQUEST['post']) && get_post_type($_REQUEST['post']))

+        $post_type = get_post_type($_REQUEST['post']);

+

+    return $post_type;

 }

 

 /**

@@ -3426,33 +3426,33 @@ 
  * @param array  $geodir_settings Array of geodirectory settings.

  */

 function geodir_before_update_options($current_tab, $geodir_settings) {

-	$active_tab = isset($_REQUEST['active_tab']) ? trim($_REQUEST['active_tab']) : '';

+    $active_tab = isset($_REQUEST['active_tab']) ? trim($_REQUEST['active_tab']) : '';

 		

-	// Permalink settings

-	if ($current_tab == 'permalink_settings') {

-		$listing_prefix = isset($_POST['geodir_listing_prefix']) ? trim($_POST['geodir_listing_prefix']) : '';

-		$location_prefix = isset($_POST['geodir_location_prefix']) ? trim($_POST['geodir_location_prefix']) : '';

+    // Permalink settings

+    if ($current_tab == 'permalink_settings') {

+        $listing_prefix = isset($_POST['geodir_listing_prefix']) ? trim($_POST['geodir_listing_prefix']) : '';

+        $location_prefix = isset($_POST['geodir_location_prefix']) ? trim($_POST['geodir_location_prefix']) : '';

 		

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

-        	wp_redirect($redirect_url);

-			exit;

-		}

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

+            wp_redirect($redirect_url);

+            exit;

+        }

 		

-		// Don't allow to update page settings on different language.

-		if (geodir_is_wpml()) {

-			global $sitepress;

-			$current_language = $sitepress->get_current_language();

-			$default_language = $sitepress->get_default_language();

+        // Don't allow to update page settings on different language.

+        if (geodir_is_wpml()) {

+            global $sitepress;

+            $current_language = $sitepress->get_current_language();

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

-				wp_redirect($redirect_url);

-				exit;

-			}

-		}

-	}

+            if ($current_language != 'all' && $current_language != $default_language) {

+                $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab);

+                wp_redirect($redirect_url);

+                exit;

+            }

+        }

+    }

 }

 

 

@@ -3483,7 +3483,7 @@ 
  * @return array Array of tab data.

  */

 function geodir_import_export_tab( $tabs ) {

-	$tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

+    $tabs['import_export'] = array( 'label' => __( 'Import & Export', 'geodirectory' ) );

     return $tabs;

 }

 

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

      *

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

      *

@@ -3520,42 +3520,42 @@ 
      */

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

-	}

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

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

+    }

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

 	

-	$gd_chunksize_options = array();

-	$gd_chunksize_options[100] = 100;

-	$gd_chunksize_options[200] = 200;

-	$gd_chunksize_options[500] = 500;

-	$gd_chunksize_options[1000] = 1000;

-	$gd_chunksize_options[2000] = 2000;

-	$gd_chunksize_options[5000] = 5000;

-	$gd_chunksize_options[10000] = 10000;

-	$gd_chunksize_options[20000] = 20000;

-	$gd_chunksize_options[50000] = 50000;

-	$gd_chunksize_options[100000] = 100000;

+    $gd_chunksize_options = array();

+    $gd_chunksize_options[100] = 100;

+    $gd_chunksize_options[200] = 200;

+    $gd_chunksize_options[500] = 500;

+    $gd_chunksize_options[1000] = 1000;

+    $gd_chunksize_options[2000] = 2000;

+    $gd_chunksize_options[5000] = 5000;

+    $gd_chunksize_options[10000] = 10000;

+    $gd_chunksize_options[20000] = 20000;

+    $gd_chunksize_options[50000] = 50000;

+    $gd_chunksize_options[100000] = 100000;

 	 

-	 /**

-     * Filter max entries per export csv file.

-     *

-     * @since 1.5.6

-     * @package GeoDirectory

-     *

-     * @param string $gd_chunksize_options Entries options.

-     */

+        /**

+         * Filter max entries per export csv file.

+         *

+         * @since 1.5.6

+         * @package GeoDirectory

+         *

+         * @param string $gd_chunksize_options Entries 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 = '';

+    foreach ($gd_chunksize_options as $value => $title) {

+        $gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>';

+    }

 	

-	$uploads = wp_upload_dir();

+    $uploads = wp_upload_dir();

 ?>

 </form>

 <div class="inner_content_tab_main gd-import-export">

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

-							 *

-							 * @since 1.0.0

-							 */

-							do_action('geodir_sample_csv_download_link');

-							?>

+                            /**

+                             * Called just after the sample CSV download link.

+                             *

+                             * @since 1.0.0

+                             */

+                            do_action('geodir_sample_csv_download_link');

+                            ?>

 							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_postpluploadan' ); ?>"></span>

 							<div class="filelist"></div>

 						</div>

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

-						 *

-						 * @since 1.0.0

+                        /**

+                         * Called just after the sample CSV download link.

+                         *

+                         * @since 1.0.0

                          * @package GeoDirectory

-						 */

-						do_action('geodir_sample_cats_csv_download_link');

-						?>

+                         */

+                        do_action('geodir_sample_cats_csv_download_link');

+                        ?>

 							<span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce( 'gd_im_catpluploadan' ); ?>"></span>

 							<div class="filelist"></div>

 						</div>

@@ -3814,19 +3814,19 @@ 
       </div>

     </div>

 	<?php

-	/**

-	 * Allows you to add more setting to the GD > Import & Export page.

-	 *

-	 * Called after the last setting on the GD > Import & Export page.

-	 * @since 1.4.6

+    /**

+     * Allows you to add more setting to the GD > Import & Export page.

+     *

+     * Called after the last setting on the GD > Import & Export page.

+     * @since 1.4.6

      * @package GeoDirectory

-	 *

-	 * @param array $gd_posttypes GD post types.

+     *

+     * @param array $gd_posttypes GD post types.

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

 <script type="text/javascript">

@@ -4547,7 +4547,7 @@ 
  * @return string Json data.

  */

 function geodir_ajax_import_export() {

-	global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;

+    global $wpdb, $plugin_prefix, $current_user, $wp_filesystem;

 

     // try to set higher limits for import

     $max_input_time = ini_get('max_input_time');

@@ -4568,26 +4568,26 @@ 
         }

     }

 

-	error_reporting(0);

+    error_reporting(0);

 

-	$json = array();

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

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

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

 	

     $wp_filesystem = geodir_init_filesystem();

     if (!$wp_filesystem) {

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

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

-	}

+    }

 	

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

+        }

+    }

 

-	switch ( $task ) {

-		case 'export_posts': {

-			// WPML

-			$is_wpml = geodir_is_wpml();

-			if ($is_wpml) {

-				global $sitepress;

-				$active_lang = ICL_LANGUAGE_CODE;

+    switch ( $task ) {

+        case 'export_posts': {

+            // WPML

+            $is_wpml = geodir_is_wpml();

+            if ($is_wpml) {

+                global $sitepress;

+                $active_lang = ICL_LANGUAGE_CODE;

 				

-				$sitepress->switch_lang('all', true);

-			}

-			// WPML

-			if ( $post_type == 'gd_event' ) {

-				//add_filter( 'geodir_imex_count_posts', 'geodir_imex_count_events', 10, 2 );

-				add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

-			}

-			$file_name = $post_type . '_' . date( 'dmyHi' );

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

+                $sitepress->switch_lang('all', true);

+            }

+            // WPML

+            if ( $post_type == 'gd_event' ) {

+                //add_filter( 'geodir_imex_count_posts', 'geodir_imex_count_events', 10, 2 );

+                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+            }

+            $file_name = $post_type . '_' . date( 'dmyHi' );

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

+            $chunk_file_paths = array();

 

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

+            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

-				if ($is_wpml) {

-					$sitepress->switch_lang($active_lang, true);

-				}

-				// WPML

-				wp_send_json( $json );

-				exit;

-			} else {				

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

+                $json['percentage'] = $percentage;

+                // WPML

+                if ($is_wpml) {

+                    $sitepress->switch_lang($active_lang, true);

+                }

+                // WPML

+                wp_send_json( $json );

+                exit;

+            } else {				

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

 					

-					$j = $chunk_page_no;

-					$chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+                    $j = $chunk_page_no;

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

+                    $per_page = 500;

+                    if ($per_page > $chunk_per_page) {

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

-					}

+                        $clear = $i == 0 ? true : false;

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

-						$json['total'] = $posts_count;

-						$json['files'] = $chunk_file_paths;

-					} else {

-						$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-					}

-				}

-				// WPML

-				if ($is_wpml) {

-					$sitepress->switch_lang($active_lang, true);

-				}

-				// WPML

-				wp_send_json( $json );

-			}

-		}

-		break;

-		case 'export_cats': {

-			// WPML

-			$is_wpml = geodir_is_wpml();

-			if ($is_wpml) {

-				global $sitepress;

-				$active_lang = ICL_LANGUAGE_CODE;

+                    if ( !empty($chunk_file_paths) ) {

+                        $json['total'] = $posts_count;

+                        $json['files'] = $chunk_file_paths;

+                    } else {

+                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                    }

+                }

+                // WPML

+                if ($is_wpml) {

+                    $sitepress->switch_lang($active_lang, true);

+                }

+                // WPML

+                wp_send_json( $json );

+            }

+        }

+        break;

+        case 'export_cats': {

+            // WPML

+            $is_wpml = geodir_is_wpml();

+            if ($is_wpml) {

+                global $sitepress;

+                $active_lang = ICL_LANGUAGE_CODE;

 				

-				$sitepress->switch_lang('all', true);

-			}

-			// WPML

-			$file_name = $post_type . 'category_' . date( 'dmyHi' );

+                $sitepress->switch_lang('all', true);

+            }

+            // WPML

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

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

-				if ($is_wpml) {

-					$sitepress->switch_lang($active_lang, true);

-				}

-				// WPML

-				wp_send_json( $json );

-			} else {				

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

+                $json['percentage'] = $percentage;

+                // WPML

+                if ($is_wpml) {

+                    $sitepress->switch_lang($active_lang, true);

+                }

+                // WPML

+                wp_send_json( $json );

+            } else {				

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

 					

-					$j = $chunk_page_no;					

-					$chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+                    $j = $chunk_page_no;					

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

+                    $per_page = 500;

+                    if ($per_page > $chunk_per_page) {

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

-					}

+                        $clear = $i == 0 ? true : false;

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

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

-					}

-				}

-				// WPML

-				if ($is_wpml) {

-					$sitepress->switch_lang($active_lang, true);

-				}

-				// WPML

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

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

+                    }

+                }

+                // WPML

+                if ($is_wpml) {

+                    $sitepress->switch_lang($active_lang, true);

+                }

+                // WPML

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

 			

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

-			} else {

-				$chunk_file_paths = array();

+                $json['percentage'] = $percentage;

+                wp_send_json( $json );

+            } else {

+                $chunk_file_paths = array();

 				

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

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

 					

-					$j = $chunk_page_no;					

-					$chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+                    $j = $chunk_page_no;					

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

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

-					}

+                        $clear = $i == 0 ? true : false;

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

-						$json['total'] = $items_count;

-						$json['files'] = $chunk_file_paths;

-					} else {

-						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

-					}

-				}

-				wp_send_json( $json );

-			}

-		}

-		break;

-		case 'prepare_import':

-		case 'import_cat':

-		case 'import_post':

-		case 'import_loc': {

-			// WPML

-			$is_wpml = geodir_is_wpml();

-			if ($is_wpml) {

-				global $sitepress;

-				$active_lang = ICL_LANGUAGE_CODE;

-			}

-			// WPML

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

+                    }

+                }

+                wp_send_json( $json );

+            }

+        }

+        break;

+        case 'prepare_import':

+        case 'import_cat':

+        case 'import_post':

+        case 'import_loc': {

+            // WPML

+            $is_wpml = geodir_is_wpml();

+            if ($is_wpml) {

+                global $sitepress;

+                $active_lang = ICL_LANGUAGE_CODE;

+            }

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

+            $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['file'] = $csv_file;

+            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

 

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

-					$json['rows'] = 0;

+                if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

+                    $json['error'] = NULL;

+                    $json['rows'] = 0;

 					

-					if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-						while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-							if ( !empty( $data ) ) {

-								$file[] = $data;

-							}

-						}

-						fclose($handle);

-					}

+                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

+                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

+                            if ( !empty( $data ) ) {

+                                $file[] = $data;

+                            }

+                        }

+                        fclose($handle);

+                    }

 	

-					$json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

+                    $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

 					

-					if (!$json['rows'] > 0) {

-						$json['error'] = __('No data found in csv file.', 'geodirectory');

-					}

-				} else {

-					wp_send_json( $json );

-				}

-			} else {

-				wp_send_json( $json );

-			}

+                    if (!$json['rows'] > 0) {

+                        $json['error'] = __('No data found in csv file.', 'geodirectory');

+                    }

+                } else {

+                    wp_send_json( $json );

+                }

+            } else {

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

+            $total = $json['rows'];

+            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

+            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

 			

-			$count = $limit;

-			$requested_limit = $limit;

+            $count = $limit;

+            $requested_limit = $limit;

 			

-			if ($count < $total) {

-				$count = $processed + $count;

-				if ($count > $total) {

-					$count = $total;

-				}

-			} else {

-				$count = $total;

-			}

+            if ($count < $total) {

+                $count = $processed + $count;

+                if ($count > $total) {

+                    $count = $total;

+                }

+            } else {

+                $count = $total;

+            }

 			

-			$created = 0;

-			$updated = 0;

-			$skipped = 0;

-			$invalid = 0;

-			$invalid_addr = 0;

-			$images = 0;

+            $created = 0;

+            $updated = 0;

+            $skipped = 0;

+            $invalid = 0;

+            $invalid_addr = 0;

+            $images = 0;

 			

-			$invalid_title = 0;

-			$customKeyarray = array();

-			$gd_post_info = array();

-			$post_location = array();

-			$countpost = 0;

+            $invalid_title = 0;

+            $customKeyarray = array();

+            $gd_post_info = array();

+            $post_location = array();

+            $countpost = 0;

 			

-			$post_types = geodir_get_posttypes();

+            $post_types = geodir_get_posttypes();

 	

-			if ( $task == 'import_cat' ) {				

-				if (!empty($file)) {

-					$columns = isset($file[0]) ? $file[0] : NULL;

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

-						exit;

-					}

+                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+                        $json['error'] = CSV_INVAILD_FILE;

+                        wp_send_json( $json );

+                        exit;

+                    }

 					

-					for ($i = 1; $i <= $limit; $i++) {

-						$index = $processed + $i;

+                    for ($i = 1; $i <= $limit; $i++) {

+                        $index = $processed + $i;

 						

-						if (isset($file[$index])) {

-							$row = $file[$index];

-							$row = array_map( 'trim', $row );

-							//$row = array_map( 'utf8_encode', $row );

+                        if (isset($file[$index])) {

+                            $row = $file[$index];

+                            $row = array_map( 'trim', $row );

+                            //$row = array_map( 'utf8_encode', $row );

 							

-							$cat_id = '';

-							$cat_name = '';

-							$cat_slug = '';

-							$cat_posttype = '';

-							$cat_parent = '';

-							$cat_description = '';

-							$cat_schema = '';

-							$cat_top_description = '';

-							$cat_image = '';

-							$cat_icon = '';

-							$cat_language = '';

+                            $cat_id = '';

+                            $cat_name = '';

+                            $cat_slug = '';

+                            $cat_posttype = '';

+                            $cat_parent = '';

+                            $cat_description = '';

+                            $cat_schema = '';

+                            $cat_top_description = '';

+                            $cat_image = '';

+                            $cat_icon = '';

+                            $cat_language = '';

 							

-							$c = 0;

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

-									$cat_slug = $row[$c];

-								} else if ( $column == 'cat_posttype' ) {

-									$cat_posttype = $row[$c];

-								} else if ( $column == 'cat_parent' ) {

-									$cat_parent = trim($row[$c]);

-								} else if ( $column == 'cat_schema' && $row[$c] != '' ) {

-									$cat_schema = $row[$c];

-								} else if ( $column == 'cat_description' ) {

-									$cat_description = $row[$c];

-								} else if ( $column == 'cat_top_description' ) {

-									$cat_top_description = $row[$c];

-								} else if ( $column == 'cat_image' ) {

-									$cat_image = $row[$c];

-								} else if ( $column == 'cat_icon' ) {

-									$cat_icon = $row[$c];

-								}

-								// WPML

-								if ($is_wpml && $column == 'cat_language') {

-									$cat_language = geodir_strtolower(trim($row[$c]));

-								}

-								// WPML

-								$c++;

-							}

+                            $c = 0;

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

+                                    $cat_slug = $row[$c];

+                                } else if ( $column == 'cat_posttype' ) {

+                                    $cat_posttype = $row[$c];

+                                } else if ( $column == 'cat_parent' ) {

+                                    $cat_parent = trim($row[$c]);

+                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {

+                                    $cat_schema = $row[$c];

+                                } else if ( $column == 'cat_description' ) {

+                                    $cat_description = $row[$c];

+                                } else if ( $column == 'cat_top_description' ) {

+                                    $cat_top_description = $row[$c];

+                                } else if ( $column == 'cat_image' ) {

+                                    $cat_image = $row[$c];

+                                } else if ( $column == 'cat_icon' ) {

+                                    $cat_icon = $row[$c];

+                                }

+                                // WPML

+                                if ($is_wpml && $column == 'cat_language') {

+                                    $cat_language = geodir_strtolower(trim($row[$c]));

+                                }

+                                // WPML

+                                $c++;

+                            }

 							

-							if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

-								$invalid++;

-								continue;

-							}

+                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

+                                $invalid++;

+                                continue;

+                            }

 							

-							// WPML

-							if ($is_wpml && $cat_language != '') {

-								$sitepress->switch_lang($cat_language, true);

-							}

-							// WPML

+                            // WPML

+                            if ($is_wpml && $cat_language != '') {

+                                $sitepress->switch_lang($cat_language, true);

+                            }

+                            // WPML

 														

-							$term_data = array();

-							$term_data['name'] = $cat_name;

-							$term_data['slug'] = $cat_slug;

-							$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 = array();

+                            $term_data['name'] = $cat_name;

+                            $term_data['slug'] = $cat_slug;

+                            $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 = array_map( 'utf8_encode', $term_data );

+                            //$term_data = array_map( 'utf8_encode', $term_data );

 							

-							$taxonomy = $cat_posttype . 'category';

+                            $taxonomy = $cat_posttype . 'category';

 							

-							$term_data['taxonomy'] = $taxonomy;

+                            $term_data['taxonomy'] = $taxonomy;

 

-							$term_parent_id = 0;

-							if ($cat_parent != "" || (int)$cat_parent > 0) {

-								$term_parent = '';

+                            $term_parent_id = 0;

+                            if ($cat_parent != "" || (int)$cat_parent > 0) {

+                                $term_parent = '';

 								

-								if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

-									$term_parent = $term_parent;

-								} else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

-									$term_parent = $term_parent;

-								} else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

-									$term_parent = $term_parent;

-								} else {

-									$term_parent_data = array();

-									$term_parent_data['name'] = $cat_parent;											

-									//$term_parent_data = array_map( 'utf8_encode', $term_parent_data );										

-									$term_parent_data['taxonomy'] = $taxonomy;

+                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+                                    $term_parent = $term_parent;

+                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+                                    $term_parent = $term_parent;

+                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+                                    $term_parent = $term_parent;

+                                } else {

+                                    $term_parent_data = array();

+                                    $term_parent_data['name'] = $cat_parent;											

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

-								}

-							}

-							$term_data['parent'] = (int)$term_parent_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_id = NULL;

-							if ( $import_choice == 'update' ) {

-								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-									$term_data['term_id'] = $term['term_id'];

+                            $term_id = NULL;

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

-										$updated++;

-									} else {

-										$invalid++;

-									}

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

+                                        $updated++;

+                                    } else {

+                                        $invalid++;

+                                    }

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

-										$updated++;

-									} else {

-										$invalid++;

-									}

-								} else {

-									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

-										$created++;

-									} else {

-										$invalid++;

-									}

-								}

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

-									$skipped++;

-								} else {

-									if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {										

-										$created++;

-									} else {

-										$invalid++;

-									}

-								}

-							} else {

-								$invalid++;

-							}

+                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                        $updated++;

+                                    } else {

+                                        $invalid++;

+                                    }

+                                } else {

+                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                        $created++;

+                                    } else {

+                                        $invalid++;

+                                    }

+                                }

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

+                                    $skipped++;

+                                } else {

+                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {										

+                                        $created++;

+                                    } else {

+                                        $invalid++;

+                                    }

+                                }

+                            } else {

+                                $invalid++;

+                            }

 							

-							if ( $term_id ) {

-								if ( isset( $term_data['top_description'] ) ) {

-									update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

-								}

+                            if ( $term_id ) {

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

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

-									}

-								}

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

+                                    }

+                                }

 								

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

-										$attachment = true;

-										update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

-									}

-								}

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

+                                    }

+                                }

 								

-								if ( $attachment ) {

-									$images++;

-								}

-							}

+                                if ( $attachment ) {

+                                    $images++;

+                                }

+                            }

 							

-							// WPML

-							if ($is_wpml && $cat_language != '') {

-								$sitepress->switch_lang($active_lang, true);

-							}

-							// WPML

-						}

-					}

-				}

+                            // WPML

+                            if ($is_wpml && $cat_language != '') {

+                                $sitepress->switch_lang($active_lang, true);

+                            }

+                            // WPML

+                        }

+                    }

+                }

 				

-				$json = array();

-				$json['processed'] = $limit;

-				$json['created'] = $created;

-				$json['updated'] = $updated;

-				$json['skipped'] = $skipped;

-				$json['invalid'] = $invalid;

-				$json['images'] = $images;

+                $json = array();

+                $json['processed'] = $limit;

+                $json['created'] = $created;

+                $json['updated'] = $updated;

+                $json['skipped'] = $skipped;

+                $json['invalid'] = $invalid;

+                $json['images'] = $images;

 				

-				wp_send_json( $json );

-				exit;

-			} else if ( $task == 'import_post' ) {

+                wp_send_json( $json );

+                exit;

+            } else if ( $task == 'import_post' ) {

 

                 //run some stuff to make the import quicker

                 wp_defer_term_counting( true );

@@ -5151,503 +5151,503 @@ 
                 //remove_all_actions('publish_future_post');

 

 

-				if (!empty($file)) {

-					$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

-					$default_status = 'publish';

-					$current_date = date_i18n( 'Y-m-d', time() );

+                if (!empty($file)) {

+                    $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

+                    $default_status = 'publish';

+                    $current_date = date_i18n( 'Y-m-d', time() );

 					

-					$columns = isset($file[0]) ? $file[0] : NULL;

+                    $columns = isset($file[0]) ? $file[0] : NULL;

 					

-					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-						$json['error'] = CSV_INVAILD_FILE;

-						wp_send_json( $json );

-						exit;

-					}

+                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+                        $json['error'] = CSV_INVAILD_FILE;

+                        wp_send_json( $json );

+                        exit;

+                    }

 

                     $processed_actual=0;

-					for ($i = 1; $i <= $limit; $i++) {

-						$index = $processed + $i;

-						$gd_post = array();

+                    for ($i = 1; $i <= $limit; $i++) {

+                        $index = $processed + $i;

+                        $gd_post = array();

 						

-						if (isset($file[$index])) {$processed_actual++;

-							$row = $file[$index];

-							$row = array_map( 'trim', $row );

-							//$row = array_map( 'utf8_encode', $row );

-							$row = array_map( 'addslashes_gpc', $row );

+                        if (isset($file[$index])) {$processed_actual++;

+                            $row = $file[$index];

+                            $row = array_map( 'trim', $row );

+                            //$row = array_map( 'utf8_encode', $row );

+                            $row = array_map( 'addslashes_gpc', $row );

 							

-							$post_id = '';

-							$post_title = '';

-							$post_author = '';

-							$post_content = '';

-							$post_category_arr = array();

-							$default_category = '';

-							$post_tags = array();

-							$post_type = '';

-							$post_status = '';

-							$geodir_video = '';

-							$post_address = '';

-							$post_city = '';

-							$post_region = '';

-							$post_country = '';

-							$post_zip = '';

-							$post_latitude = '';

-							$post_longitude = '';

-							$geodir_timing = '';

-							$geodir_contact = '';

-							$geodir_email = '';

-							$geodir_website = '';

-							$geodir_twitter = '';

-							$geodir_facebook = '';

-							$geodir_twitter = '';

-							$post_images = array();

+                            $post_id = '';

+                            $post_title = '';

+                            $post_author = '';

+                            $post_content = '';

+                            $post_category_arr = array();

+                            $default_category = '';

+                            $post_tags = array();

+                            $post_type = '';

+                            $post_status = '';

+                            $geodir_video = '';

+                            $post_address = '';

+                            $post_city = '';

+                            $post_region = '';

+                            $post_country = '';

+                            $post_zip = '';

+                            $post_latitude = '';

+                            $post_longitude = '';

+                            $geodir_timing = '';

+                            $geodir_contact = '';

+                            $geodir_email = '';

+                            $geodir_website = '';

+                            $geodir_twitter = '';

+                            $geodir_facebook = '';

+                            $geodir_twitter = '';

+                            $post_images = array();

 							

-							$expire_date = 'Never';

+                            $expire_date = 'Never';

 							

-							$language = '';

-							$original_post_id = '';

+                            $language = '';

+                            $original_post_id = '';

 														

-							$c = 0;

-							foreach ($columns as $column ) {

-								$gd_post[$column] = $row[$c];

+                            $c = 0;

+                            foreach ($columns as $column ) {

+                                $gd_post[$column] = $row[$c];

 								

-								if ( $column == 'post_id' ) {

-									$post_id = $row[$c];

-								} else if ( $column == 'post_title' ) {

-									$post_title = $row[$c];

-								} else if ( $column == 'post_author' ) {

-									$post_author = $row[$c];

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

-									$default_category = wp_kses_normalize_entities($row[$c]);

-								} else if ( $column == 'post_tags' && $row[$c] != '' ) {

-									$post_tags = explode( ',', $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' ) {

-									$geodir_video = $row[$c];

-								} else if ( $column == 'post_address' ) {

-									$post_address = $row[$c];

-								} else if ( $column == 'post_city' ) {

-									$post_city = $row[$c];

-								} else if ( $column == 'post_region' ) {

-									$post_region = $row[$c];

-								} else if ( $column == 'post_country' ) {

-									$post_country = $row[$c];

-								} else if ( $column == 'post_zip' ) {

-									$post_zip = $row[$c];

-								} else if ( $column == 'post_latitude' ) {

-									$post_latitude = $row[$c];

-								} else if ( $column == 'post_longitude' ) {

-									$post_longitude = $row[$c];

-								} else if ( $column == 'geodir_timing' ) {

-									$geodir_timing = $row[$c];

-								} else if ( $column == 'geodir_contact' ) {

-									$geodir_contact = $row[$c];

-								} else if ( $column == 'geodir_email' ) {

-									$geodir_email = $row[$c];

-								} else if ( $column == 'geodir_website' ) {

-									$geodir_website = $row[$c];

-								} else if ( $column == 'geodir_twitter' ) {

-									$geodir_twitter = $row[$c];

-								} else if ( $column == 'geodir_facebook' ) {

-									$geodir_facebook = $row[$c];

-								} else if ( $column == 'geodir_twitter' ) {

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

-									$row[$c] = str_replace('/', '-', $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];

-									}

-								}

-								// WPML

-								$c++;

-							}

+                                if ( $column == 'post_id' ) {

+                                    $post_id = $row[$c];

+                                } else if ( $column == 'post_title' ) {

+                                    $post_title = $row[$c];

+                                } else if ( $column == 'post_author' ) {

+                                    $post_author = $row[$c];

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

+                                    $default_category = wp_kses_normalize_entities($row[$c]);

+                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {

+                                    $post_tags = explode( ',', $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' ) {

+                                    $geodir_video = $row[$c];

+                                } else if ( $column == 'post_address' ) {

+                                    $post_address = $row[$c];

+                                } else if ( $column == 'post_city' ) {

+                                    $post_city = $row[$c];

+                                } else if ( $column == 'post_region' ) {

+                                    $post_region = $row[$c];

+                                } else if ( $column == 'post_country' ) {

+                                    $post_country = $row[$c];

+                                } else if ( $column == 'post_zip' ) {

+                                    $post_zip = $row[$c];

+                                } else if ( $column == 'post_latitude' ) {

+                                    $post_latitude = $row[$c];

+                                } else if ( $column == 'post_longitude' ) {

+                                    $post_longitude = $row[$c];

+                                } else if ( $column == 'geodir_timing' ) {

+                                    $geodir_timing = $row[$c];

+                                } else if ( $column == 'geodir_contact' ) {

+                                    $geodir_contact = $row[$c];

+                                } else if ( $column == 'geodir_email' ) {

+                                    $geodir_email = $row[$c];

+                                } else if ( $column == 'geodir_website' ) {

+                                    $geodir_website = $row[$c];

+                                } else if ( $column == 'geodir_twitter' ) {

+                                    $geodir_twitter = $row[$c];

+                                } else if ( $column == 'geodir_facebook' ) {

+                                    $geodir_facebook = $row[$c];

+                                } else if ( $column == 'geodir_twitter' ) {

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

+                                    $row[$c] = str_replace('/', '-', $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];

+                                    }

+                                }

+                                // WPML

+                                $c++;

+                            }

 							

-							// WPML

-							if ($is_wpml && $language != '') {

-								$sitepress->switch_lang($language, true);

-							}

-							// WPML

+                            // WPML

+                            if ($is_wpml && $language != '') {

+                                $sitepress->switch_lang($language, true);

+                            }

+                            // WPML

 

-							$gd_post['IMAGE'] = $post_images;

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

+                            $valid = true;

 							

-							if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

-								$invalid++;

-								$valid = false;

-							}

+                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+                                $invalid++;

+                                $valid = false;

+                            }

 							

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

-									$invalid_addr++;

-									$valid = false;

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

-									} else {

-										if (!function_exists('geodir_location_plugin_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.

-										}

-									}

-								}

-							}

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

+                                    $invalid_addr++;

+                                    $valid = false;

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

+                                    } else {

+                                        if (!function_exists('geodir_location_plugin_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 ) {

-								continue;

-							}

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

-							}

+                            if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

+                                $post_category_arr = array_merge(array($default_category), $post_category_arr);

+                            }

 

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

+                            $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 ( $category_name != '' ) {

-										$term_category = array();

+                                    if ( $category_name != '' ) {

+                                        $term_category = array();

 										

-										if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

-											$term_category = $term;

-										} 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 = array_map( 'utf8_encode', $term_data );										

-											$term_data['taxonomy'] = $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 ) ) {

+                                            $term_category = $term;

+                                        } else {

+                                            $term_data = array();

+                                            $term_data['name'] = $category_name;											

+                                            //$term_data = array_map( 'utf8_encode', $term_data );										

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

-											//$post_category[] = $term_category->slug;

-											$post_category[] = intval($term_category->term_id);

+                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+                                            //$post_category[] = $term_category->slug;

+                                            $post_category[] = intval($term_category->term_id);

 											

-											if ($category_name == $default_category) {

-												$default_category_id = intval($term_category->term_id);

-											}

-										}

-									}

-								}

-							}

+                                            if ($category_name == $default_category) {

+                                                $default_category_id = intval($term_category->term_id);

+                                            }

+                                        }

+                                    }

+                                }

+                            }

 

-							$save_post = array();

-							$save_post['post_title'] = $post_title;

-							$save_post['post_content'] = $post_content;

-							$save_post['post_type'] = $post_type;

-							$save_post['post_author'] = $post_author;

-							$save_post['post_status'] = $post_status;

-							$save_post['post_category'] = $post_category;

-							$save_post['post_tags'] = $post_tags;

-

-							$saved_post_id = NULL;

-							if ( $import_choice == 'update' ) {

-								if ( $post_id > 0 && get_post( $post_id ) ) {

-									$save_post['ID'] = $post_id;

+                            $save_post = array();

+                            $save_post['post_title'] = $post_title;

+                            $save_post['post_content'] = $post_content;

+                            $save_post['post_type'] = $post_type;

+                            $save_post['post_author'] = $post_author;

+                            $save_post['post_status'] = $post_status;

+                            $save_post['post_category'] = $post_category;

+                            $save_post['post_tags'] = $post_tags;

+

+                            $saved_post_id = NULL;

+                            if ( $import_choice == 'update' ) {

+                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                                    $save_post['ID'] = $post_id;

 									

-									if ( wp_update_post( $save_post ) ) {

-										$saved_post_id = $post_id;

-										$updated++;

-									}

-								} else {

-									if ( $saved_post_id = wp_insert_post( $save_post ) ) {

-										$created++;

-									}

-								}

+                                    if ( wp_update_post( $save_post ) ) {

+                                        $saved_post_id = $post_id;

+                                        $updated++;

+                                    }

+                                } else {

+                                    if ( $saved_post_id = wp_insert_post( $save_post ) ) {

+                                        $created++;

+                                    }

+                                }

 								

-								if ( !$saved_post_id > 0 ) {

-									$invalid++;

-								}

-							} else if ( $import_choice == 'skip' ) {

-								if ( $post_id > 0 && get_post( $post_id ) ) {

-									$skipped++;	

-								} else {

-									if ( $saved_post_id = wp_insert_post( $save_post ) ) {

-										$created++;	

-									} else {

-										$invalid++;

-									}

-								}

-							} else {

-								$invalid++;

-							}

+                                if ( !$saved_post_id > 0 ) {

+                                    $invalid++;

+                                }

+                            } else if ( $import_choice == 'skip' ) {

+                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                                    $skipped++;	

+                                } else {

+                                    if ( $saved_post_id = wp_insert_post( $save_post ) ) {

+                                        $created++;	

+                                    } else {

+                                        $invalid++;

+                                    }

+                                }

+                            } else {

+                                $invalid++;

+                            }

 

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

-									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

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

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

-								}

-								// WPML

-								$gd_post_info = geodir_get_post_info( $saved_post_id );

+                                    $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['post_id'] = $saved_post_id;

-								$gd_post['ID'] = $saved_post_id;

-								$gd_post['post_tags'] = $post_tags;

-								$gd_post['post_title'] = $post_title;

-								$gd_post['post_status'] = $post_status;

-								$gd_post['submit_time'] = time();

-								$gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

+                                $gd_post['post_id'] = $saved_post_id;

+                                $gd_post['ID'] = $saved_post_id;

+                                $gd_post['post_tags'] = $post_tags;

+                                $gd_post['post_title'] = $post_title;

+                                $gd_post['post_status'] = $post_status;

+                                $gd_post['submit_time'] = time();

+                                $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

 													

-								// post location

-								$post_location_id = 0;

-								if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

-									$post_location_info = array(

-																'city' => $post_city,

-																'region' => $post_region,

-																'country' => $post_country,

-																'geo_lat' => $post_latitude,

-																'geo_lng' => $post_longitude

-															);

-									if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

-										$post_location_id = $location_id;

-									}

-								}

-								$gd_post['post_location_id'] = $post_location_id;

+                                // post location

+                                $post_location_id = 0;

+                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+                                    $post_location_info = array(

+                                                                'city' => $post_city,

+                                                                'region' => $post_region,

+                                                                'country' => $post_country,

+                                                                'geo_lat' => $post_latitude,

+                                                                'geo_lng' => $post_longitude

+                                                            );

+                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+                                        $post_location_id = $location_id;

+                                    }

+                                }

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

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

-								}

+                                // post package info

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

+                                if ($package_id && function_exists('geodir_get_package_info_by_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();

-									}

-								}

+                                    if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

+                                        $package_info = array();

+                                    }

+                                }

 								

-								if (empty($package_info)) {

-									$package_info = (array)geodir_post_package_info( array(), '', $post_type );

-								}

+                                if (empty($package_info)) {

+                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

+                                }

 								 

-								if (!empty($package_info))	 {

-									$package_id = $package_info['pid'];

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

-										} else {

-											$gd_post['expire_date'] = 'Never';

-										}

-									}

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

+                                        } else {

+                                            $gd_post['expire_date'] = 'Never';

+                                        }

+                                    }

 									

-									$gd_post['package_id'] = $package_id;

-								}

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

-								}

+                                if ($post_type == 'gd_event') {

+                                    $gd_post = geodir_imex_process_event_data($gd_post);

+                                }

 								

-								if (isset($gd_post['post_id'])) {

-									unset($gd_post['post_id']);

-								}

-

-								// Export franchise fields

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

-										$gd_franchise_lock = array();

+                                if (isset($gd_post['post_id'])) {

+                                    unset($gd_post['post_id']);

+                                }

+

+                                // Export franchise fields

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

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

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

-										}

-									}

-								}

+                                        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 (!empty($save_post['post_category']) && is_array($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;

-									}

-									$gd_post[$cat_taxonomy] = $save_post['post_category'];

-								}

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

+                                    if ($default_category_id) {

+                                        $save_post['post_default_category'] = $default_category_id;

+                                        $gd_post['default_category'] = $default_category_id;

+                                    }

+                                    $gd_post[$cat_taxonomy] = $save_post['post_category'];

+                                }

 								

-								// Save post info

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

+                                // Save post info

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

 									

-									$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_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:' : '';

 									

-									if ($post_category_str != '' && $post_default_category) {

-										$post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

-									}

+                                    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 = $post_category_str != '' ? array($cat_taxonomy => $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 ) ) {

-									$post_images = array_unique($post_images);

+                                // Post images

+                                if ( !empty( $post_images ) ) {

+                                    $post_images = array_unique($post_images);

 									

-									$old_post_images_arr = array();

-									$saved_post_images_arr = array();

+                                    $old_post_images_arr = array();

+                                    $saved_post_images_arr = array();

 									

-									$order = 1;

+                                    $order = 1;

 									

-									$old_post_images = geodir_get_images( $saved_post_id );

-									if (!empty($old_post_images)) {

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

-											}

-										}

-									}

+                                    $old_post_images = geodir_get_images( $saved_post_id );

+                                    if (!empty($old_post_images)) {

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

-										$saved_post_images_arr[] = $image_name;

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

-											continue; // Skip if image already exists.

-										}

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

-											$uploaded_file_type = $arr_file_type['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['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 . "', ";

-												}

-											}

-											$attachment_set = trim( $attachment_set, ", " );

+                                            $attachment = array();

+                                            $attachment['post_id'] = $saved_post_id;

+                                            $attachment['title'] = $proper_image_name;

+                                            $attachment['content'] = '';

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

+                                                }

+                                            }

+                                            $attachment_set = trim( $attachment_set, ", " );

 																						

-											// Add new attachment

-											$wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+                                            // Add new attachment

+                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

 																						

-											$order++;

-										}

-									}

+                                            $order++;

+                                        }

+                                    }

 

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

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

 									

-									if ( !empty( $saved_post_images_arr ) ) {

-										$menu_order = 1;

+                                    if ( !empty( $saved_post_images_arr ) ) {

+                                        $menu_order = 1;

 										

-										foreach ( $saved_post_images_arr as $img_name ) {

-											$wpdb->query( $wpdb->prepare( "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d WHERE post_id =%d AND file LIKE %s", array( $menu_order, $saved_post_id, '%/' . $img_name ) ) );

+                                        foreach ( $saved_post_images_arr as $img_name ) {

+                                            $wpdb->query( $wpdb->prepare( "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d WHERE post_id =%d AND file LIKE %s", array( $menu_order, $saved_post_id, '%/' . $img_name ) ) );

 											

-											if( $menu_order == 1 ) {

-												if ( $featured_image = $wpdb->get_var( $wpdb->prepare( "SELECT file FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =%d AND file LIKE %s", array( $saved_post_id, '%/' . $img_name ) ) ) ) {

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

-												}

-											}

-											$menu_order++;

-										}

-									}

+                                            if( $menu_order == 1 ) {

+                                                if ( $featured_image = $wpdb->get_var( $wpdb->prepare( "SELECT file FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id =%d AND file LIKE %s", array( $saved_post_id, '%/' . $img_name ) ) ) ) {

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

+                                                }

+                                            }

+                                            $menu_order++;

+                                        }

+                                    }

 									

-									if ( $order > 1 ) {

-										$images++;

-									}

-								}

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

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

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

-								}

-								if (isset($gd_post['expire_date'])) {

-									geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

-								}

-							}

+                                if (isset($is_featured)) {

+                                    geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

+                                }

+                                if (isset($gd_post['expire_date'])) {

+                                    geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

+                                }

+                            }

 							

-							// WPML

-							if ($is_wpml && $language != '') {

-								$sitepress->switch_lang($active_lang, true);

-							}

-							// WPML

-						}

-					}

-				}

+                            // WPML

+                            if ($is_wpml && $language != '') {

+                                $sitepress->switch_lang($active_lang, true);

+                            }

+                            // WPML

+                        }

+                    }

+                }

 

                 //undo some stuff to make the import quicker

                 wp_defer_term_counting( false );

@@ -5655,111 +5655,111 @@ 
                 $wpdb->query( 'COMMIT;' );

                 $wpdb->query( 'SET autocommit = 1;' );

 

-				$json = array();

-				$json['processed'] = $processed_actual;

-				$json['created'] = $created;

-				$json['updated'] = $updated;

-				$json['skipped'] = $skipped;

-				$json['invalid'] = $invalid;

-				$json['invalid_addr'] = $invalid_addr;

-				$json['images'] = $images;

+                $json = array();

+                $json['processed'] = $processed_actual;

+                $json['created'] = $created;

+                $json['updated'] = $updated;

+                $json['skipped'] = $skipped;

+                $json['invalid'] = $invalid;

+                $json['invalid_addr'] = $invalid_addr;

+                $json['images'] = $images;

 				

-				wp_send_json( $json );

-				exit;

-			} else if ( $task == 'import_loc' ) {

-				global $gd_post_types;

-				$gd_post_types = $post_types;

+                wp_send_json( $json );

+                exit;

+            } else if ( $task == 'import_loc' ) {

+                global $gd_post_types;

+                $gd_post_types = $post_types;

 				

-				if (!empty($file)) {

-					$columns = isset($file[0]) ? $file[0] : NULL;

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

-					}

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

+                    }

 					

-					for ($i = 1; $i <= $limit; $i++) {

-						$index = $processed + $i;

+                    for ($i = 1; $i <= $limit; $i++) {

+                        $index = $processed + $i;

 						

-						if (isset($file[$index])) {

-							$row = $file[$index];

-							$row = array_map( 'trim', $row );

-							$data = array();

+                        if (isset($file[$index])) {

+                            $row = $file[$index];

+                            $row = array_map( 'trim', $row );

+                            $data = array();

 							

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

-								}

-							}

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

-								$invalid++;

-								continue;

-							}

+                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+                                $invalid++;

+                                continue;

+                            }

 							

-							$data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

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

-										$updated++;

-									} else {

-										$invalid++;

-									}

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

+                                    }

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

-										$updated++;

-									} else {

-										$invalid++;

-									}

-								} else {

-									if ( $location_id = geodir_location_insert_city( $data, true ) ) {

-										$created++;

-									} else {

-										$invalid++;

-									}

-								}

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

-									$skipped++;

-								} else {

-									if ( $location_id = geodir_location_insert_city( $data, true ) ) {										

-										$created++;

-									} else {

-										$invalid++;

-									}

-								}

-							} else {

-								$invalid++;

-							}

-						}

-					}

-				}

+                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                                        $updated++;

+                                    } else {

+                                        $invalid++;

+                                    }

+                                } else {

+                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                        $created++;

+                                    } else {

+                                        $invalid++;

+                                    }

+                                }

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

+                                    $skipped++;

+                                } else {

+                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {										

+                                        $created++;

+                                    } else {

+                                        $invalid++;

+                                    }

+                                }

+                            } else {

+                                $invalid++;

+                            }

+                        }

+                    }

+                }

 				

-				$json = array();

-				$json['processed'] = $limit;

-				$json['created'] = $created;

-				$json['updated'] = $updated;

-				$json['skipped'] = $skipped;

-				$json['invalid'] = $invalid;

-				$json['images'] = $images;

+                $json = array();

+                $json['processed'] = $limit;

+                $json['created'] = $created;

+                $json['updated'] = $updated;

+                $json['skipped'] = $skipped;

+                $json['invalid'] = $invalid;

+                $json['images'] = $images;

 				

-				wp_send_json( $json );

-			}

-		}

-		break;

+                wp_send_json( $json );

+            }

+        }

+        break;

         case 'import_finish':{

             /**

              * Run an action when an import finishes.

@@ -5773,9 +5773,9 @@ 
         }

         break;

 

-	}

-	echo '0';

-	wp_die();

+    }

+    echo '0';

+    wp_die();

 }

 

 /**

@@ -5801,32 +5801,32 @@ 
  * @return int|bool Term id when success, false when fail.

  */

 function geodir_imex_insert_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

-		return false;

-	}

+    if ( empty( $taxonomy ) || empty( $term_data ) ) {

+        return false;

+    }

 	

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

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

 	

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

+        $result = wp_insert_term( $term, $taxonomy, $args );

         if( !is_wp_error( $result ) ) {

             return $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

         }

     }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -5853,39 +5853,39 @@ 
  * @return int|bool Term id when success, false when fail.

  */

 function geodir_imex_update_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

-		return false;

-	}

+    if ( empty( $taxonomy ) || empty( $term_data ) ) {

+        return false;

+    }

 	

-	$term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

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

+    $term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

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

 	

-	if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {

-		$term_data['term_id'] = $term_info['term_id'];

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

+        if( !is_wp_error( $result ) ) {

             return $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

         }

-	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-		$term_data['term_id'] = $term_info['term_id'];

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

+        if( !is_wp_error( $result ) ) {

             return $term_id = isset( $result['term_id'] ) ? $result['term_id'] : 0;

         }

-	} else {

-		return geodir_imex_insert_term( $taxonomy, $term_data );

-	}

+    } else {

+        return geodir_imex_insert_term( $taxonomy, $term_data );

+    }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -5898,21 +5898,21 @@ 
  * @return int Posts count.

  */

 function geodir_get_posts_count( $post_type ) {

-	$posts_count = wp_count_posts( $post_type );

-	$posts_count = array_sum( (array)$posts_count );

+    $posts_count = wp_count_posts( $post_type );

+    $posts_count = array_sum( (array)$posts_count );

 	

-	/**

-	 * Modify returned post counts for the current post type.

-	 *

-	 * @since 1.4.6

+    /**

+     * Modify returned post counts for the current post type.

+     *

+     * @since 1.4.6

      * @package GeoDirectory

-	 *

-	 * @param int $posts_count Post counts.

-	 * @param string $post_type Post type.

-	 */

-	$posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );	 

+     *

+     * @param int $posts_count Post counts.

+     * @param string $post_type Post type.

+     */

+    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );	 

 	

-	return $posts_count;

+    return $posts_count;

 }

 

 /**

@@ -5929,18 +5929,18 @@ 
  * @return int Posts count.

  */

 function geodir_imex_count_events( $posts_count, $post_type ) {

-	if ( $post_type == 'gd_event' ) {

-		global $wpdb, $plugin_prefix;

+    if ( $post_type == 'gd_event' ) {

+        global $wpdb, $plugin_prefix;

 		

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

-		$schedule_table = EVENT_SCHEDULE;

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

+        $schedule_table = EVENT_SCHEDULE;

 

-		$query = "SELECT COUNT({$wpdb->posts}.ID) AS total 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";

+        $query = "SELECT COUNT({$wpdb->posts}.ID) AS total 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";

 		

-		$posts_count = (int)$wpdb->get_var( $wpdb->prepare( $query, $post_type ) );

-	}

+        $posts_count = (int)$wpdb->get_var( $wpdb->prepare( $query, $post_type ) );

+    }

 	

-	return $posts_count;

+    return $posts_count;

 }

 

 /**

@@ -5960,290 +5960,290 @@ 
  * @return array Array of posts data.

  */

 function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {	

-	global $wp_filesystem;

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

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

 		

-		$csv_row = array();

-		$csv_row[] = 'post_id';

-		$csv_row[] = 'post_title';

-		$csv_row[] = 'post_author';

-		$csv_row[] = 'post_content';

-		$csv_row[] = 'post_category';

-		$csv_row[] = 'default_category';

-		$csv_row[] = 'post_tags';

-		$csv_row[] = 'post_type';

-		if ( $post_type == 'gd_event' ) {

-			$csv_row[] = 'event_date';

-			$csv_row[] = 'event_enddate';

-			$csv_row[] = 'starttime';

-			$csv_row[] = 'endtime';

+        $csv_row = array();

+        $csv_row[] = 'post_id';

+        $csv_row[] = 'post_title';

+        $csv_row[] = 'post_author';

+        $csv_row[] = 'post_content';

+        $csv_row[] = 'post_category';

+        $csv_row[] = 'default_category';

+        $csv_row[] = 'post_tags';

+        $csv_row[] = 'post_type';

+        if ( $post_type == 'gd_event' ) {

+            $csv_row[] = 'event_date';

+            $csv_row[] = 'event_enddate';

+            $csv_row[] = 'starttime';

+            $csv_row[] = 'endtime';

 			

-			$csv_row[] = 'is_recurring_event';

-			$csv_row[] = 'event_duration_days';

-			$csv_row[] = 'recurring_dates';

-			$csv_row[] = 'is_whole_day_event';

-			$csv_row[] = 'event_starttimes';

-			$csv_row[] = 'event_endtimes';

-			$csv_row[] = 'recurring_type';

-			$csv_row[] = 'recurring_interval';

-			$csv_row[] = 'recurring_week_days';

-			$csv_row[] = 'recurring_week_nos';

-			$csv_row[] = 'max_recurring_count';

-			$csv_row[] = 'recurring_end_date';

-		}

-		$csv_row[] = 'post_status';

-		$csv_row[] = 'is_featured';

-		if ($is_payment_plugin) {

-			$csv_row[] = 'package_id';

-			$csv_row[] = 'expire_date';

-		}

-		$csv_row[] = 'geodir_video';

-		$csv_row[] = 'post_address';

-		$csv_row[] = 'post_city';

-		$csv_row[] = 'post_region';

-		$csv_row[] = 'post_country';

-		$csv_row[] = 'post_zip';

-		$csv_row[] = 'post_latitude';

-		$csv_row[] = 'post_longitude';

-		$csv_row[] = 'geodir_timing';

-		$csv_row[] = 'geodir_contact';

-		$csv_row[] = 'geodir_email';

-		$csv_row[] = 'geodir_website';

-		$csv_row[] = 'geodir_twitter';

-		$csv_row[] = 'geodir_facebook';

-		$csv_row[] = 'geodir_video';

-		$csv_row[] = 'geodir_special_offers';

-		// WPML

-		$is_wpml = geodir_is_wpml();

-		if ($is_wpml) {

-			$csv_row[] = 'language';

-			$csv_row[] = 'original_post_id';

-		}

-		// WPML

+            $csv_row[] = 'is_recurring_event';

+            $csv_row[] = 'event_duration_days';

+            $csv_row[] = 'recurring_dates';

+            $csv_row[] = 'is_whole_day_event';

+            $csv_row[] = 'event_starttimes';

+            $csv_row[] = 'event_endtimes';

+            $csv_row[] = 'recurring_type';

+            $csv_row[] = 'recurring_interval';

+            $csv_row[] = 'recurring_week_days';

+            $csv_row[] = 'recurring_week_nos';

+            $csv_row[] = 'max_recurring_count';

+            $csv_row[] = 'recurring_end_date';

+        }

+        $csv_row[] = 'post_status';

+        $csv_row[] = 'is_featured';

+        if ($is_payment_plugin) {

+            $csv_row[] = 'package_id';

+            $csv_row[] = 'expire_date';

+        }

+        $csv_row[] = 'geodir_video';

+        $csv_row[] = 'post_address';

+        $csv_row[] = 'post_city';

+        $csv_row[] = 'post_region';

+        $csv_row[] = 'post_country';

+        $csv_row[] = 'post_zip';

+        $csv_row[] = 'post_latitude';

+        $csv_row[] = 'post_longitude';

+        $csv_row[] = 'geodir_timing';

+        $csv_row[] = 'geodir_contact';

+        $csv_row[] = 'geodir_email';

+        $csv_row[] = 'geodir_website';

+        $csv_row[] = 'geodir_twitter';

+        $csv_row[] = 'geodir_facebook';

+        $csv_row[] = 'geodir_video';

+        $csv_row[] = 'geodir_special_offers';

+        // WPML

+        $is_wpml = geodir_is_wpml();

+        if ($is_wpml) {

+            $csv_row[] = 'language';

+            $csv_row[] = 'original_post_id';

+        }

+        // WPML

 

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

-			}

-		}

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

-		if ($is_franchise_active) {

-			$csv_row[] = 'gd_is_franchise';

-			$csv_row[] = 'gd_franchise_lock';

-			$csv_row[] = 'franchise';

-		}

+        // Export franchise fields

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

+            $csv_row[] = 'franchise';

+        }

 		

-		$csv_rows[] = $csv_row;

+        $csv_rows[] = $csv_row;

 

-		$images_count = 5;

+        $images_count = 5;

         $xx=0;

-		foreach ( $posts as $post ) {$xx++;

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

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

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

 			

-			if ( !empty( $terms ) && !is_wp_error( $terms ) ) {

-				$post_category = array();

-				$post_tags = array();

+            if ( !empty( $terms ) && !is_wp_error( $terms ) ) {

+                $post_category = array();

+                $post_tags = array();

 			

-				foreach ( $terms as $term ) {

-					if ( $term->taxonomy == $taxonomy_category ) {

-						$post_category[] = $term->name;

+                foreach ( $terms as $term ) {

+                    if ( $term->taxonomy == $taxonomy_category ) {

+                        $post_category[] = $term->name;

 						

-						if ($default_category_id == $term->term_id) {

-							$default_category = $term->name; // Default category.

-						}

-					}

+                        if ($default_category_id == $term->term_id) {

+                            $default_category = $term->name; // Default category.

+                        }

+                    }

 					

-					if ( $term->taxonomy == $taxonomy_tags ) {

-						$post_tags[] = $term->name;

-					}

-				}

+                    if ( $term->taxonomy == $taxonomy_tags ) {

+                        $post_tags[] = $term->name;

+                    }

+                }

 				

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

-			}

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

+            }

 

-			// Franchise data

-			$franchise_id = NULL;

-			$franchise_info = array();

-			$locked_fields = array();

+            // Franchise data

+            $franchise_id = NULL;

+            $franchise_info = array();

+            $locked_fields = array();

 			

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

-					$locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);

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

-							if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {

-								$post_info[$locked_field] = $franchise_info[$locked_field];

-							}

+                    if (!empty($locked_fields)) {

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

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

 			

-								if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {

-									$franchise_post_category = array();

-									$franchise_post_tags = array();

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

-											$franchise_post_category[] = $franchise_term->name;

-										}

+                                    foreach ( $franchise_terms as $franchise_term ) {

+                                        if ( $franchise_term->taxonomy == $taxonomy_category ) {

+                                            $franchise_post_category[] = $franchise_term->name;

+                                        }

 										

-										if ( $franchise_term->taxonomy == $taxonomy_tags ) {

-											$franchise_post_tags[] = $franchise_term->name;

-										}

-									}

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

-									}

-									if (in_array('post_tags', $locked_fields)) {

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

-									}

-								}

-							}

-						}

-					}

-				}

-			}

+                                    if (in_array($taxonomy_category, $locked_fields)) {

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

-						$current_images[] = $image;

-					}

-				}

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

+                        $current_images[] = $image;

+                    }

+                }

 				

-				$images_count = max( $images_count, count( $current_images ) );

-			}

+                $images_count = max( $images_count, count( $current_images ) );

+            }

 

-			$csv_row = array();

-			$csv_row[] = $post_id; // post_id

-			$csv_row[] = $post_info['post_title']; // post_title

-			$csv_row[] = $post_info['post_author']; // post_author

-			$csv_row[] = $post_info['post_content']; // post_content

-			$csv_row[] = $post_category; // post_category

-			$csv_row[] = $default_category; // default_category

-			$csv_row[] = $post_tags; // post_tags

-			$csv_row[] = $post_type; // post_type

-			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

-				$csv_row[] = $event_data['starttime']; // starttime

-				$csv_row[] = $event_data['endtime']; // endtime

+            $csv_row = array();

+            $csv_row[] = $post_id; // post_id

+            $csv_row[] = $post_info['post_title']; // post_title

+            $csv_row[] = $post_info['post_author']; // post_author

+            $csv_row[] = $post_info['post_content']; // post_content

+            $csv_row[] = $post_category; // post_category

+            $csv_row[] = $default_category; // default_category

+            $csv_row[] = $post_tags; // post_tags

+            $csv_row[] = $post_type; // post_type

+            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

+                $csv_row[] = $event_data['starttime']; // starttime

+                $csv_row[] = $event_data['endtime']; // endtime

 				

-				$csv_row[] = $event_data['is_recurring_event']; // is_recurring

-				$csv_row[] = $event_data['event_duration_days']; // duration_x

-				$csv_row[] = $event_data['recurring_dates']; // recurring_dates

-				$csv_row[] = $event_data['is_whole_day_event']; // all_day

-				$csv_row[] = $event_data['event_starttimes']; // starttimes

-				$csv_row[] = $event_data['event_endtimes']; // endtimes

-				$csv_row[] = $event_data['recurring_type']; // repeat_type

-				$csv_row[] = $event_data['recurring_interval']; // repeat_x

-				$csv_row[] = $event_data['recurring_week_days']; // repeat_days

-				$csv_row[] = $event_data['recurring_week_nos']; // repeat_weeks

-				$csv_row[] = $event_data['max_recurring_count']; // max_repeat

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

-			if ($is_payment_plugin) {

-				$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['geodir_video']; // geodir_video

-			$csv_row[] = $post_info['post_address']; // post_address

-			$csv_row[] = $post_info['post_city']; // post_city

-			$csv_row[] = $post_info['post_region']; // post_region

-			$csv_row[] = $post_info['post_country']; // post_country

-			$csv_row[] = $post_info['post_zip']; // post_zip

-			$csv_row[] = $post_info['post_latitude']; // post_latitude

-			$csv_row[] = $post_info['post_longitude']; // post_longitude

-			$csv_row[] = $post_info['geodir_timing']; // geodir_timing

-			$csv_row[] = $post_info['geodir_contact']; // geodir_contact

-			$csv_row[] = $post_info['geodir_email']; // geodir_email

-			$csv_row[] = $post_info['geodir_website']; // geodir_website

-			$csv_row[] = $post_info['geodir_twitter']; // geodir_twitter

-			$csv_row[] = $post_info['geodir_facebook']; // geodir_facebook

-			$csv_row[] = $post_info['geodir_video']; // geodir_video

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

-			}

-			// WPML

+                $csv_row[] = $event_data['is_recurring_event']; // is_recurring

+                $csv_row[] = $event_data['event_duration_days']; // duration_x

+                $csv_row[] = $event_data['recurring_dates']; // recurring_dates

+                $csv_row[] = $event_data['is_whole_day_event']; // all_day

+                $csv_row[] = $event_data['event_starttimes']; // starttimes

+                $csv_row[] = $event_data['event_endtimes']; // endtimes

+                $csv_row[] = $event_data['recurring_type']; // repeat_type

+                $csv_row[] = $event_data['recurring_interval']; // repeat_x

+                $csv_row[] = $event_data['recurring_week_days']; // repeat_days

+                $csv_row[] = $event_data['recurring_week_nos']; // repeat_weeks

+                $csv_row[] = $event_data['max_recurring_count']; // max_repeat

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

+            if ($is_payment_plugin) {

+                $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['geodir_video']; // geodir_video

+            $csv_row[] = $post_info['post_address']; // post_address

+            $csv_row[] = $post_info['post_city']; // post_city

+            $csv_row[] = $post_info['post_region']; // post_region

+            $csv_row[] = $post_info['post_country']; // post_country

+            $csv_row[] = $post_info['post_zip']; // post_zip

+            $csv_row[] = $post_info['post_latitude']; // post_latitude

+            $csv_row[] = $post_info['post_longitude']; // post_longitude

+            $csv_row[] = $post_info['geodir_timing']; // geodir_timing

+            $csv_row[] = $post_info['geodir_contact']; // geodir_contact

+            $csv_row[] = $post_info['geodir_email']; // geodir_email

+            $csv_row[] = $post_info['geodir_website']; // geodir_website

+            $csv_row[] = $post_info['geodir_twitter']; // geodir_twitter

+            $csv_row[] = $post_info['geodir_facebook']; // geodir_facebook

+            $csv_row[] = $post_info['geodir_video']; // geodir_video

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

+            }

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

+                }

+            }

 			

-			// Franchise data

-			if ($is_franchise_active) {

-				$gd_is_franchise = '';

-				$locaked_fields = '';

-				$franchise = '';

+            // Franchise data

+            if ($is_franchise_active) {

+                $gd_is_franchise = '';

+                $locaked_fields = '';

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

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

-				}

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

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

+                }

 				

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

+                $csv_row[] = $locaked_fields; // gd_franchise_lock fields

+                $csv_row[] = (int)$franchise; // franchise id

+            }

 			

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

+            $csv_rows[] = $csv_row;

 

-		}

+        }

 

-		for ( $c = 0; $c < $images_count; $c++ ) {

-			$csv_rows[0][] = 'IMAGE';

-		}

-	}

-	return $csv_rows;

+        for ( $c = 0; $c < $images_count; $c++ ) {

+            $csv_rows[0][] = 'IMAGE';

+        }

+    }

+    return $csv_rows;

 }

 

 /**

@@ -6262,48 +6262,48 @@ 
  * @return array Array of posts data.

  */

 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

-	global $wpdb, $plugin_prefix;

+    global $wpdb, $plugin_prefix;

 

-	if ( ! post_type_exists( $post_type ) )

-		return new stdClass;

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

+    $limit = '';

+    if ( $per_page > 0 && $page_no > 0 ) {

+        $offset = ( $page_no - 1 ) * $per_page;

 		

-		if ( $offset > 0 ) {

-			$limit = " LIMIT " . $offset . "," . $per_page;

-		} else {

-			$limit = " LIMIT " . $per_page;

-		}

-	}

+        if ( $offset > 0 ) {

+            $limit = " LIMIT " . $offset . "," . $per_page;

+        } else {

+            $limit = " LIMIT " . $per_page;

+        }

+    }

 

-	$query = "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ORDER BY {$wpdb->posts}.ID ASC" . $limit;

-	/**

-	 * Modify returned posts SQL query for the current post type.

-	 *

-	 * @since 1.4.6

+    $query = "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ORDER BY {$wpdb->posts}.ID ASC" . $limit;

+    /**

+     * Modify returned posts SQL query for the current post type.

+     *

+     * @since 1.4.6

      * @package GeoDirectory

-	 *

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

-

-	/**

-	 * Modify returned post results for the current post type.

-	 *

-	 * @since 1.4.6

+     *

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

+

+    /**

+     * Modify returned post results for the current post type.

+     *

+     * @since 1.4.6

      * @package GeoDirectory

-	 *

-	 * @param object $results An object containing all post ids.

-	 * @param string $post_type Post type.

-	 */

-	return apply_filters( 'geodir_export_posts', $results, $post_type );

+     *

+     * @param object $results An object containing all post ids.

+     * @param string $post_type Post type.

+     */

+    return apply_filters( 'geodir_export_posts', $results, $post_type );

 }

 

 /**

@@ -6321,16 +6321,16 @@ 
  * @return string The SQL query.

  */

 function geodir_imex_get_events_query( $query, $post_type ) {

-	if ( $post_type == 'gd_event' ) {

-		global $wpdb, $plugin_prefix;

+    if ( $post_type == 'gd_event' ) {

+        global $wpdb, $plugin_prefix;

 		

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

-		$schedule_table = EVENT_SCHEDULE;

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

+        $schedule_table = EVENT_SCHEDULE;

 

-		$query = "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 GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC";

-	}

+        $query = "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 GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC";

+    }

 	

-	return $query; 

+    return $query; 

 }

 

 /**

@@ -6343,16 +6343,16 @@ 
  * @return int Total terms count.

  */

 function geodir_get_terms_count( $post_type ) {

-	$args = array( 'hide_empty' => 0 );

+    $args = array( 'hide_empty' => 0 );

 	

-	remove_all_filters( 'get_terms' );

+    remove_all_filters( 'get_terms' );

 	

-	$taxonomy = $post_type . 'category';

+    $taxonomy = $post_type . 'category';

 

-	$count_terms = wp_count_terms( $taxonomy, $args );

-	$count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+    $count_terms = wp_count_terms( $taxonomy, $args );

+    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

 	 

-	return $count_terms;

+    return $count_terms;

 }

 

 /**

@@ -6368,76 +6368,76 @@ 
  * @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' );

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

-		$args['number'] = $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();

+    $csv_rows = array();

 	

-	if ( !empty( $terms ) ) {

-		$csv_row = array();

-		$csv_row[] = 'cat_id';

-		$csv_row[] = 'cat_name';

-		$csv_row[] = 'cat_slug';

-		$csv_row[] = 'cat_posttype';

-		$csv_row[] = 'cat_parent';

-		$csv_row[] = 'cat_schema';

-		$csv_row[] = 'cat_description';

-		$csv_row[] = 'cat_top_description';

-		$csv_row[] = 'cat_image';

-		$csv_row[] = 'cat_icon';

-		// WPML

-		$is_wpml = geodir_is_wpml();

-		if ($is_wpml) {

-			$csv_row[] = 'cat_language';

-		}

-		// WPML

+    if ( !empty( $terms ) ) {

+        $csv_row = array();

+        $csv_row[] = 'cat_id';

+        $csv_row[] = 'cat_name';

+        $csv_row[] = 'cat_slug';

+        $csv_row[] = 'cat_posttype';

+        $csv_row[] = 'cat_parent';

+        $csv_row[] = 'cat_schema';

+        $csv_row[] = 'cat_description';

+        $csv_row[] = 'cat_top_description';

+        $csv_row[] = 'cat_image';

+        $csv_row[] = 'cat_icon';

+        // WPML

+        $is_wpml = geodir_is_wpml();

+        if ($is_wpml) {

+            $csv_row[] = 'cat_language';

+        }

+        // WPML

 		

-		$csv_rows[] = $csv_row;

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

-				$cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';

-			}

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

+                $cat_parent = !empty($parent_term) && isset($parent_term['name']) ? $parent_term['name'] : '';

+            }

 			

-			$csv_row = array();

-			$csv_row[] = $term->term_id;

-			$csv_row[] = $term->name;

-			$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[] = $term->description;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

-			$csv_row[] = $cat_image;

-			$csv_row[] = $cat_icon;

-			// WPML

-			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

-			}

-			// WPML

+            $csv_row = array();

+            $csv_row[] = $term->term_id;

+            $csv_row[] = $term->name;

+            $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[] = $term->description;

+            $csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

+            $csv_row[] = $cat_image;

+            $csv_row[] = $cat_icon;

+            // WPML

+            if ($is_wpml) {

+                $csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

+            }

+            // WPML

 			

-			$csv_rows[] = $csv_row;

-		}

-	}

-	return $csv_rows;

+            $csv_rows[] = $csv_row;

+        }

+    }

+    return $csv_rows;

 }

 

 /**

@@ -6450,9 +6450,9 @@ 
  * @return string Path to the cache directory.

  */

 function geodir_path_import_export( $relative = true ) {

-	$upload_dir = wp_upload_dir();

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

 }

 

 /**

@@ -6469,29 +6469,29 @@ 
  * @return bool true if success otherwise false.

  */

 function geodir_save_csv_data( $file_path, $csv_data = array(), $clear = true ) {

-	if ( empty( $csv_data ) ) {

-		return false;

-	}

+    if ( empty( $csv_data ) ) {

+        return false;

+    }

 	

-	global $wp_filesystem;

+    global $wp_filesystem;

 	

-	$mode = $clear ? 'w+' : 'a+';

+    $mode = $clear ? 'w+' : 'a+';

 	

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

-		}

-		fclose( $file );

-	} else {

-		foreach( $csv_data as $csv_row ) {

-			//$csv_row = array_map( 'utf8_decode', $csv_row );

-			$wp_filesystem->put_contents( $file_path, $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 = '"' );

+        }

+        fclose( $file );

+    } else {

+        foreach( $csv_data as $csv_row ) {

+            //$csv_row = array_map( 'utf8_decode', $csv_row );

+            $wp_filesystem->put_contents( $file_path, $csv_row );

+        }

+    }

 		

-	return true;

+    return true;

 }

 

 /**

@@ -6506,17 +6506,17 @@ 
  * @return int No of file rows.

  */

 function geodir_import_export_line_count( $file ) {

-	global $wp_filesystem;

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

+        }

+    }

 	

-	return NULL;

+    return NULL;

 }

 

 /**

@@ -6530,12 +6530,12 @@ 
  * @return object Queried object.

  */

 function geodir_imex_get_custom_fields( $post_type ) {

-	global $wpdb;

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

+    return $rows;

 }

 

 /**

@@ -6546,11 +6546,11 @@ 
  * @return True if WPML is active else False.

  */

 function geodir_is_wpml() {

-	if (function_exists('icl_object_id')) {

-		return true;

-	}

+    if (function_exists('icl_object_id')) {

+        return true;

+    }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -6565,9 +6565,9 @@ 
  * @return Language code.

  */

 function geodir_get_language_for_element($element_id, $element_type) {

-	global $sitepress;

+    global $sitepress;

 	

-	return $sitepress->get_language_for_element($element_id, $element_type);

+    return $sitepress->get_language_for_element($element_id, $element_type);

 }

 

 /**

@@ -6581,18 +6581,18 @@ 
  * @param int $tr_post_id Translation Post ID.

  */

 function geodir_icl_make_duplicate($master_post_id, $lang, $postarr, $tr_post_id) {

-	$post_type = get_post_type($master_post_id);

+    $post_type = get_post_type($master_post_id);

 

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

-		// Duplicate post details

-		geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang);

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

+        // Duplicate post details

+        geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang);

 		

-		// Duplicate taxonomies

-		geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang);

+        // Duplicate taxonomies

+        geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang);

 		

-		// Duplicate post images

-		geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang);

-	}

+        // Duplicate post images

+        geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang);

+    }

 }

 

 /**

@@ -6609,23 +6609,23 @@ 
  * @return bool True for success, False for fail.

  */

 function geodir_icl_duplicate_post_details($master_post_id, $tr_post_id, $lang) {

-	global $wpdb, $plugin_prefix;

+    global $wpdb, $plugin_prefix;

 	

-	$post_type = get_post_type($master_post_id);

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

+    $post_type = get_post_type($master_post_id);

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

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

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

 		

-		$wpdb->update($post_table, $data, array('post_id' => $tr_post_id));		

-		return true;

-	}

+        $wpdb->update($post_table, $data, array('post_id' => $tr_post_id));		

+        return true;

+    }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -6642,40 +6642,40 @@ 
  * @return bool True for success, False for fail.

  */

 function geodir_icl_duplicate_taxonomies($master_post_id, $tr_post_id, $lang) {

-	global $sitepress, $wpdb;

-	$post_type = get_post_type($master_post_id);

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

-		$terms = get_the_terms($master_post_id, $taxonomy);

-		$terms_array = array();

+    $taxonomies = get_object_taxonomies($post_type);

+    foreach ($taxonomies as $taxonomy) {

+        $terms = get_the_terms($master_post_id, $taxonomy);

+        $terms_array = array();

 		

-		if ($terms) {

-			foreach ($terms as $term) {

-				$tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

+        if ($terms) {

+            foreach ($terms as $term) {

+                $tr_id = apply_filters( 'translate_object_id',$term->term_id, $taxonomy, false, $lang);

 				

-				if (!is_null($tr_id)){

-					// not using get_term - unfiltered get_term

-					$translated_term = $wpdb->get_row($wpdb->prepare("

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

 

-					$terms_array[] = $translated_term->term_id;

-				}

-			}

+                    $terms_array[] = $translated_term->term_id;

+                }

+            }

 

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

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

+            }

+        }

+    }

 }

 

 /**

@@ -6691,29 +6691,29 @@ 
  * @return bool True for success, False for fail.

  */

 function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {

-	global $wpdb;

+    global $wpdb;

 	

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

-	$post_images = $wpdb->get_results($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));

+    $post_images = $wpdb->get_results($query);

 	

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

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

 			

-			$wpdb->insert(GEODIR_ATTACHMENT_TABLE, $image_data);

+            $wpdb->insert(GEODIR_ATTACHMENT_TABLE, $image_data);

 			

-			geodir_set_wp_featured_image($tr_post_id);

-		}

+            geodir_set_wp_featured_image($tr_post_id);

+        }

 		

-		return true;

-	}

+        return true;

+    }

 	

-	return false;

+    return false;

 }

 

 /**

@@ -6727,141 +6727,141 @@ 
  * @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_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'] ) ) : '';

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

 	

-	$is_recurring_event = '';

-	$event_duration_days = '';

-	$is_whole_day_event = '';

-	$recurring_dates = '';

-	$event_starttimes = '';

-	$event_endtimes = '';

-	$recurring_type = '';

-	$recurring_interval = '';

-	$recurring_week_days = '';

-	$recurring_week_nos = '';

-	$max_recurring_count = '';

-	$recurring_end_date = '';

-	$recurring_dates = '';

+    $is_recurring_event = '';

+    $event_duration_days = '';

+    $is_whole_day_event = '';

+    $recurring_dates = '';

+    $event_starttimes = '';

+    $event_endtimes = '';

+    $recurring_type = '';

+    $recurring_interval = '';

+    $recurring_week_days = '';

+    $recurring_week_nos = '';

+    $max_recurring_count = '';

+    $recurring_end_date = '';

+    $recurring_dates = '';

 		

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

-		$is_whole_day_event = !empty($recurring_data['all_day']) ? 1 : '';

-		$different_times = !empty($recurring_data['different_times']) ? true : false;

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

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

-			$event_enddate = '';

-			$is_recurring_event = 1;

+        if ($recurring_pkg && $is_recurring) {

+            $recurring_dates = $event_date;

+            $event_enddate = '';

+            $is_recurring_event = 1;

 						

-			$recurring_type = !empty($recurring_data['repeat_type']) && in_array($recurring_data['repeat_type'], array('day', 'week', 'month', 'year', 'custom')) ? $recurring_data['repeat_type'] : 'custom';

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

+            if (!empty($recurring_data['event_recurring_dates'])) {

+                $event_recurring_dates = explode( ',', $recurring_data['event_recurring_dates'] );

 				

-				if (!empty($event_recurring_dates)) {

-					$recurring_dates = array();

+                if (!empty($event_recurring_dates)) {

+                    $recurring_dates = array();

 					

-					foreach ($event_recurring_dates as $date) {

-						$recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );

-					}

+                    foreach ($event_recurring_dates as $date) {

+                        $recurring_dates[] = date_i18n( 'd/m/Y', strtotime( $date ) );

+                    }

 					

-					$recurring_dates = implode(",", $recurring_dates);

-				}

-			}

+                    $recurring_dates = implode(",", $recurring_dates);

+                }

+            }

 			

-			if ($recurring_type == 'custom') {

-				if (!$is_whole_day_event) {

-					$event_starttimes = $starttime;

-					$event_endtimes = $endtime;

+            if ($recurring_type == 'custom') {

+                if (!$is_whole_day_event) {

+                    $event_starttimes = $starttime;

+                    $event_endtimes = $endtime;

 			

-					if (!empty($recurring_data['starttimes'])) {

-						$times = array();

+                    if (!empty($recurring_data['starttimes'])) {

+                        $times = array();

 						

-						foreach ($recurring_data['starttimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

-						}

+                        foreach ($recurring_data['starttimes'] as $time) {

+                            $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+                        }

 						

-						$event_starttimes = implode(",", $times);

-					}

+                        $event_starttimes = implode(",", $times);

+                    }

 					

-					if (!empty($recurring_data['endtimes'])) {

-						$times = array();

+                    if (!empty($recurring_data['endtimes'])) {

+                        $times = array();

 						

-						foreach ($recurring_data['endtimes'] as $time) {

-							$times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

-						}

+                        foreach ($recurring_data['endtimes'] as $time) {

+                            $times[] = $time != '00:00:00' ? date_i18n( 'H:i', strtotime( $time ) ) : '00:00';

+                        }

 						

-						$event_endtimes = implode(",", $times);

-					}

+                        $event_endtimes = implode(",", $times);

+                    }

 					

-					if (!$different_times) {

-						$event_starttimes = '';

-						$event_endtimes = '';

-					}

-				}

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

+                    if (!$different_times) {

+                        $event_starttimes = '';

+                        $event_endtimes = '';

+                    }

+                }

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

 				

-				if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {

-					$week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

+                if (($recurring_type == 'week' || $recurring_type == 'month') && !empty($recurring_data['repeat_days'])) {

+                    $week_days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat');

 					

-					$days = array();

-					foreach ($recurring_data['repeat_days'] as $day) {

-						if (isset($week_days[$day])) {

-							$days[] = $week_days[$day];

-						}

-					}

+                    $days = array();

+                    foreach ($recurring_data['repeat_days'] as $day) {

+                        if (isset($week_days[$day])) {

+                            $days[] = $week_days[$day];

+                        }

+                    }

 					

-					$recurring_week_days = implode(",", array_unique($days));

-				}

+                    $recurring_week_days = implode(",", array_unique($days));

+                }

 				

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

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

-				}

-			}

-		}

-	}

-	if ($is_whole_day_event) {

-		$starttime = '';

-		$endtime = '';

-		$event_starttimes = '';

-		$event_endtimes = '';

-	}

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

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

+                }

+            }

+        }

+    }

+    if ($is_whole_day_event) {

+        $starttime = '';

+        $endtime = '';

+        $event_starttimes = '';

+        $event_endtimes = '';

+    }

 	

-	$data = array();

-	$data['event_date'] = $event_date;

-	$data['event_enddate'] = $event_enddate;

-	$data['starttime'] = $starttime;

-	$data['endtime'] = $endtime;

-	$data['is_recurring_event'] = $is_recurring_event;

-	$data['recurring_dates'] = $recurring_dates;

-	$data['event_duration_days'] = $event_duration_days;

-	$data['is_whole_day_event'] = $is_whole_day_event;

-	$data['event_starttimes'] = $event_starttimes;

-	$data['event_endtimes'] = $event_endtimes;

-	$data['recurring_type'] = $recurring_type;

-	$data['recurring_interval'] = $recurring_interval;

-	$data['recurring_week_days'] = $recurring_week_days;

-	$data['recurring_week_nos'] = $recurring_week_nos;

-	$data['max_recurring_count'] = $max_recurring_count;

-	$data['recurring_end_date'] = $recurring_end_date;

+    $data = array();

+    $data['event_date'] = $event_date;

+    $data['event_enddate'] = $event_enddate;

+    $data['starttime'] = $starttime;

+    $data['endtime'] = $endtime;

+    $data['is_recurring_event'] = $is_recurring_event;

+    $data['recurring_dates'] = $recurring_dates;

+    $data['event_duration_days'] = $event_duration_days;

+    $data['is_whole_day_event'] = $is_whole_day_event;

+    $data['event_starttimes'] = $event_starttimes;

+    $data['event_endtimes'] = $event_endtimes;

+    $data['recurring_type'] = $recurring_type;

+    $data['recurring_interval'] = $recurring_interval;

+    $data['recurring_week_days'] = $recurring_week_days;

+    $data['recurring_week_nos'] = $recurring_week_nos;

+    $data['max_recurring_count'] = $max_recurring_count;

+    $data['recurring_end_date'] = $recurring_end_date;

 	

-	return $data;

+    return $data;

 }

 

 /**

@@ -6877,12 +6877,12 @@ 
  * @return doesn't Date.

  */

 function geodir_imex_get_date_ymd($date) {

-	if (strpos($date, '/') !== false) {

-		$date = str_replace('/', '-', $date); // PHP doesn't work well with dd/mm/yyyy format.

-	}

+    if (strpos($date, '/') !== false) {

+        $date = str_replace('/', '-', $date); // PHP doesn't work well with dd/mm/yyyy format.

+    }

 	

-	$date = date_i18n('Y-m-d', strtotime($date));

-	return $date;

+    $date = date_i18n('Y-m-d', strtotime($date));

+    return $date;

 }

 

 /**

@@ -6895,117 +6895,117 @@ 
  * @return array Event data array.

  */

 function geodir_imex_process_event_data($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;

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

-	$starttime = isset($gd_post['starttime']) && !$all_day ? $gd_post['starttime'] : '';

-	$endtime = isset($gd_post['endtime']) && !$all_day ? $gd_post['endtime'] : '';

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

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

+    $starttime = isset($gd_post['starttime']) && !$all_day ? $gd_post['starttime'] : '';

+    $endtime = isset($gd_post['endtime']) && !$all_day ? $gd_post['endtime'] : '';

 	

-	$repeat_type = '';

-	$different_times = '';

-	$starttimes = '';

-	$endtimes = '';

-	$repeat_days = '';

-	$repeat_weeks = '';

-	$event_recurring_dates = '';

-	$repeat_x = '';

-	$duration_x = '';

-	$repeat_end_type = '';

-	$max_repeat = '';

-	$repeat_end = '';

+    $repeat_type = '';

+    $different_times = '';

+    $starttimes = '';

+    $endtimes = '';

+    $repeat_days = '';

+    $repeat_weeks = '';

+    $event_recurring_dates = '';

+    $repeat_x = '';

+    $duration_x = '';

+    $repeat_end_type = '';

+    $max_repeat = '';

+    $repeat_end = '';

 	

-	if ($recurring_pkg && $is_recurring) {

-		$repeat_type = $gd_post['recurring_type'];

+    if ($recurring_pkg && $is_recurring) {

+        $repeat_type = $gd_post['recurring_type'];

 		

-		if ($repeat_type == 'custom') {

-			$starttimes = !$all_day && !empty($gd_post['event_starttimes']) ? explode(",", $gd_post['event_starttimes']) : array();

-			$endtimes = !$all_day && !empty($gd_post['event_endtimes']) ? explode(",", $gd_post['event_endtimes']) : array();

+        if ($repeat_type == 'custom') {

+            $starttimes = !$all_day && !empty($gd_post['event_starttimes']) ? explode(",", $gd_post['event_starttimes']) : array();

+            $endtimes = !$all_day && !empty($gd_post['event_endtimes']) ? explode(",", $gd_post['event_endtimes']) : array();

 			

-			if (!empty($starttimes) || !empty($endtimes)) {

-				$different_times = true;

-			}

+            if (!empty($starttimes) || !empty($endtimes)) {

+                $different_times = true;

+            }

 			

-			$recurring_dates = isset($gd_post['recurring_dates']) && $gd_post['recurring_dates'] != '' ? explode(",", $gd_post['recurring_dates']) : array();

-			if (!empty($recurring_dates)) {

-				$event_recurring_dates = array();

+            $recurring_dates = isset($gd_post['recurring_dates']) && $gd_post['recurring_dates'] != '' ? explode(",", $gd_post['recurring_dates']) : array();

+            if (!empty($recurring_dates)) {

+                $event_recurring_dates = array();

 				

-				foreach ($recurring_dates as $recurring_date) {

-					$recurring_date = trim($recurring_date);

+                foreach ($recurring_dates as $recurring_date) {

+                    $recurring_date = trim($recurring_date);

 					

-					if ($recurring_date != '') {

-						$event_recurring_dates[] = geodir_imex_get_date_ymd($recurring_date);

-					}

-				}

+                    if ($recurring_date != '') {

+                        $event_recurring_dates[] = geodir_imex_get_date_ymd($recurring_date);

+                    }

+                }

 				

-				$event_recurring_dates = array_unique($event_recurring_dates);

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

+                $event_recurring_dates = array_unique($event_recurring_dates);

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

 			

-			$repeat_end_type = $repeat_end != '' ? 1 : 0;

-			$max_repeat = $repeat_end != '' ? '' : $max_repeat;

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

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

-			$repeat_days = array();

-			if (!empty($a_repeat_days)) {

-				foreach ($a_repeat_days as $repeat_day) {

-					$repeat_day = geodir_strtolower(trim($repeat_day));

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

+                    $repeat_day = geodir_strtolower(trim($repeat_day));

 					

-					if ($repeat_day != '' && isset($week_days[$repeat_day])) {

-						$repeat_days[] = $week_days[$repeat_day];

-					}

-				}

+                    if ($repeat_day != '' && isset($week_days[$repeat_day])) {

+                        $repeat_days[] = $week_days[$repeat_day];

+                    }

+                }

 				

-				$repeat_days = array_unique($repeat_days);

-			}

+                $repeat_days = array_unique($repeat_days);

+            }

 			

-			$a_repeat_weeks = isset($gd_post['recurring_week_nos']) && trim($gd_post['recurring_week_nos']) != '' ? explode(",", trim($gd_post['recurring_week_nos'])) : array();

-			$repeat_weeks = array();

-			if (!empty($a_repeat_weeks)) {

-				foreach ($a_repeat_weeks as $repeat_week) {

-					$repeat_weeks[] = (int)$repeat_week;

-				}

+            $a_repeat_weeks = isset($gd_post['recurring_week_nos']) && trim($gd_post['recurring_week_nos']) != '' ? explode(",", trim($gd_post['recurring_week_nos'])) : array();

+            $repeat_weeks = array();

+            if (!empty($a_repeat_weeks)) {

+                foreach ($a_repeat_weeks as $repeat_week) {

+                    $repeat_weeks[] = (int)$repeat_week;

+                }

 				

-				$repeat_weeks = array_unique($repeat_weeks);

-			}

-		}

-	}

+                $repeat_weeks = array_unique($repeat_weeks);

+            }

+        }

+    }

 	

-	if (isset($gd_post['recurring_dates'])) {

-		unset($gd_post['recurring_dates']);

-	}

+    if (isset($gd_post['recurring_dates'])) {

+        unset($gd_post['recurring_dates']);

+    }

 

-	$gd_post['is_recurring'] = $is_recurring;

-	$gd_post['event_date'] = $event_date;

-	$gd_post['event_start'] = $event_date;

-	$gd_post['event_end'] = $event_enddate;

-	$gd_post['all_day'] = $all_day;

-	$gd_post['starttime'] = $starttime;

-	$gd_post['endtime'] = $endtime;

+    $gd_post['is_recurring'] = $is_recurring;

+    $gd_post['event_date'] = $event_date;

+    $gd_post['event_start'] = $event_date;

+    $gd_post['event_end'] = $event_enddate;

+    $gd_post['all_day'] = $all_day;

+    $gd_post['starttime'] = $starttime;

+    $gd_post['endtime'] = $endtime;

 	

-	$gd_post['repeat_type'] = $repeat_type;

-	$gd_post['different_times'] = $different_times;

-	$gd_post['starttimes'] = $starttimes;

-	$gd_post['endtimes'] = $endtimes;

-	$gd_post['repeat_days'] = $repeat_days;

-	$gd_post['repeat_weeks'] = $repeat_weeks;

-	$gd_post['event_recurring_dates'] = $event_recurring_dates;

-	$gd_post['repeat_x'] = $repeat_x;

-	$gd_post['duration_x'] = $duration_x;

-	$gd_post['repeat_end_type'] = $repeat_end_type;

-	$gd_post['max_repeat'] = $max_repeat;

-	$gd_post['repeat_end'] = $repeat_end;

-

-	return $gd_post;

+    $gd_post['repeat_type'] = $repeat_type;

+    $gd_post['different_times'] = $different_times;

+    $gd_post['starttimes'] = $starttimes;

+    $gd_post['endtimes'] = $endtimes;

+    $gd_post['repeat_days'] = $repeat_days;

+    $gd_post['repeat_weeks'] = $repeat_weeks;

+    $gd_post['event_recurring_dates'] = $event_recurring_dates;

+    $gd_post['repeat_x'] = $repeat_x;

+    $gd_post['duration_x'] = $duration_x;

+    $gd_post['repeat_end_type'] = $repeat_end_type;

+    $gd_post['max_repeat'] = $max_repeat;

+    $gd_post['repeat_end'] = $repeat_end;

+

+    return $gd_post;

 }

 

 /**

@@ -7077,12 +7077,12 @@ 
  * @return Original element id.

  */

 function geodir_imex_original_post_id($element_id, $element_type) {

-	global $sitepress;

+    global $sitepress;

 	

-	$original_element_id = $sitepress->get_original_element_id($element_id, $element_type);

-	$element_id = $element_id != $original_element_id ? $original_element_id : '';

+    $original_element_id = $sitepress->get_original_element_id($element_id, $element_type);

+    $element_id = $element_id != $original_element_id ? $original_element_id : '';

 	

-	return $element_id;

+    return $element_id;

 }

 

 /*

@@ -7162,15 +7162,15 @@ 
  * @global object $sitepress Sitepress WPML object.

  */

 function geodir_wpml_permalink_setting_notice() {

-	if (geodir_is_wpml()) {

-		global $sitepress;

-		$current_language = $sitepress->get_current_language();

-		$default_language = $sitepress->get_default_language();

-		if ($current_language != 'all' && $current_language != $default_language) {

-	?>

+    if (geodir_is_wpml()) {

+        global $sitepress;

+        $current_language = $sitepress->get_current_language();

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

 	<?php

-		}

-	}

+        }

+    }

 }

 ?>
\ No newline at end of file

geodirectory-admin/admin_hooks_actions.php

Doc Comments +1 added lines

@@ -1639,6 +1639,7 @@
  * @since 1.0.0

  * @package GeoDirectory

  * @global object $current_user Current user object.

+ * @param string|null $input
  * @return array Returns parsed data as array.

  */

 function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")

Indentation +24 added lines, -24 removed lines

@@ -1,12 +1,12 @@ 
 <?php

 /**

- * GeoDirectory Admin.

- *

- * Main admin file which loads all settings panels and sets up admin menus.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * GeoDirectory Admin.

+     *

+     * Main admin file which loads all settings panels and sets up admin menus.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 add_action('admin_init', 'geodir_admin_init');

 if (!function_exists('geodir_admin_init')) {

@@ -85,11 +85,11 @@ 
 {

     global $pagenow;

 	

-	// Get the current post type

-	$post_type = geodir_admin_current_post_type();

-	$geodir_post_types = geodir_get_posttypes();

+    // Get the current post type

+    $post_type = geodir_admin_current_post_type();

+    $geodir_post_types = geodir_get_posttypes();

     

-	if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {

+    if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {

         add_action('admin_enqueue_scripts', 'geodir_admin_scripts');

         add_action('admin_enqueue_scripts', 'geodir_admin_styles');

     }

@@ -426,7 +426,7 @@ 
 

 

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

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

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

 

             $check_html_variable = $wpdb->get_var(

                 $wpdb->prepare(

@@ -1546,20 +1546,20 @@ 
 function geodir_diagnose_load_db_language() {

     global $wpdb;

 	

-	$is_error_during_diagnose = geodirectory_load_db_language();

+    $is_error_during_diagnose = geodirectory_load_db_language();

 

     $output_str = '';

 

     if ($is_error_during_diagnose) {

         $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

-		$info_div_class = "geodir_problem_info";

+        $info_div_class = "geodir_problem_info";

     } else {

         $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

-		$info_div_class = "geodir_noproblem_info";

+        $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

     }

     

-	echo "<ul class='$info_div_class'>";

+    echo "<ul class='$info_div_class'>";

     echo $output_str;

     echo $fix_button_txt;

     echo "</ul>";

@@ -1684,7 +1684,7 @@ 
     $uploads = wp_upload_dir();

     ini_set('auto_detect_line_endings', true);

 	

-	$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

+    $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

 

     $task = isset($_POST['task']) ? $_POST['task'] : '';

     $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;

@@ -1884,8 +1884,8 @@ 
                             $post_longitude = addslashes($buffer[$c]);

                         }

 						

-						// Post status

-						if ($customKeyarray[$c] == 'post_status') {

+                        // Post status

+                        if ($customKeyarray[$c] == 'post_status') {

                             $post_status = sanitize_key( $buffer[$c] );

                         }

                     }

@@ -1902,10 +1902,10 @@ 
                         }

                     }

 					

-					// Default post status

-					$default_status = 'publish';

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

+                    // Default post status

+                    $default_status = 'publish';

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

 

                     $my_post['post_title'] = $post_title;

                     $my_post['post_content'] = $post_desc;

@@ -2128,5 +2128,5 @@ 
 add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

 

 if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

-	add_action('geodir_before_admin_panel', 'geodir_wpml_permalink_setting_notice');

+    add_action('geodir_before_admin_panel', 'geodir_wpml_permalink_setting_notice');

 }
\ No newline at end of file

Spacing +82 added lines, -82 removed lines

@@ -62,7 +62,7 @@ 
  */

 function geodir_get_admin_option_form($current_tab)

 {

-    geodir_admin_option_form($current_tab);// defined in admin template tags.php

+    geodir_admin_option_form($current_tab); // defined in admin template tags.php

 }

 

 

@@ -70,7 +70,7 @@ 
 add_action('geodir_update_options_compatibility_settings', 'geodir_update_options_compatibility_settings');

 add_action('geodir_update_options_default_location_settings', 'geodir_location_form_submit');

 add_action('geodir_before_admin_panel', 'geodir_before_admin_panel'); // this function is in admin_functions.php

-add_action('geodir_before_update_options', 'geodir_before_update_options',10,2);

+add_action('geodir_before_update_options', 'geodir_before_update_options', 10, 2);

 

 //add_action('geodir_before_admin_panel', 'geodir_autoinstall_admin_header');

 

@@ -236,7 +236,7 @@ 
 

 }

 

-add_action('save_post', 'geodir_post_information_save',10,2);

+add_action('save_post', 'geodir_post_information_save', 10, 2);

 

 

 

@@ -263,7 +263,7 @@ 
 

             $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

 

-            if(!empty($gd_taxonomy)) {

+            if (!empty($gd_taxonomy)) {

                 foreach ($gd_taxonomy as $tax) {

 

                     remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

@@ -416,7 +416,7 @@ 
     global $wpdb;

     $listing_type = ($_REQUEST['listing_type'] != '') ? $_REQUEST['listing_type'] : 'gd_place';

     ?>

-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo $_REQUEST['subtab']; ?>"/>

     <ul>

 

@@ -441,11 +441,11 @@ 
 

 

             ?>

-            <li <?php echo $display;?>>

-            <a id="gt-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>"

-               title="<?php echo $val['site_title'];?>"

-               class="gt-draggable-form-items gt-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>"

-               href="javascript:void(0);"><b></b><?php _e($val['site_title'], 'geodirectory');?></a>

+            <li <?php echo $display; ?>>

+            <a id="gt-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>"

+               title="<?php echo $val['site_title']; ?>"

+               class="gt-draggable-form-items gt-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>"

+               href="javascript:void(0);"><b></b><?php _e($val['site_title'], 'geodirectory'); ?></a>

             </li><?php

 

         }

@@ -513,40 +513,40 @@ 
 

     $listing_type = ($_REQUEST['listing_type'] != '') ? $_REQUEST['listing_type'] : 'gd_place';

     ?>

-    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type;?>"/>

+    <input type="hidden" name="listing_type" id="new_post_type" value="<?php echo $listing_type; ?>"/>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo $_REQUEST['subtab']; ?>"/>

     <ul class="full">

         <li><a id="gt-fieldset" class="gt-draggable-form-items gt-fieldset"

-               href="javascript:void(0);"><?php _e('Fieldset', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><?php _e('Fieldset', 'geodirectory'); ?></a></li>

     </ul>

     <ul>

         <li><a id="gt-text" class="gt-draggable-form-items gt-text"

-               href="javascript:void(0);"><b></b><?php _e('Text', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Text', 'geodirectory'); ?></a></li>

         <li><a id="gt-datepicker" class="gt-draggable-form-items gt-datepicker"

-               href="javascript:void(0);"><b></b><?php _e('Date', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Date', 'geodirectory'); ?></a></li>

         <li><a id="gt-textarea" class="gt-draggable-form-items gt-textarea"

-               href="javascript:void(0);"><b></b><?php _e('Textarea', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Textarea', 'geodirectory'); ?></a></li>

         <li><a id="gt-time" class="gt-draggable-form-items gt-time"

-               href="javascript:void(0);"><b></b><?php _e('Time', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Time', 'geodirectory'); ?></a></li>

         <li><a id="gt-checkbox" class="gt-draggable-form-items gt-checkbox"

-               href="javascript:void(0);"><b></b><?php _e('Checkbox', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Checkbox', 'geodirectory'); ?></a></li>

         <li><a id="gt-phone" class="gt-draggable-form-items gt-phone"

-               href="javascript:void(0);"><b></b><?php _e('Phone', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Phone', 'geodirectory'); ?></a></li>

         <li><a id="gt-radio" class="gt-draggable-form-items gt-radio"

-               href="javascript:void(0);"><b></b><?php _e('Radio', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Radio', 'geodirectory'); ?></a></li>

         <li><a id="gt-email" class="gt-draggable-form-items gt-email"

-               href="javascript:void(0);"><b></b><?php _e('Email', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Email', 'geodirectory'); ?></a></li>

         <li><a id="gt-select" class="gt-draggable-form-items gt-select"

-               href="javascript:void(0);"><b></b><?php _e('Select', 'geodirectory');?></a></li>

-        <!--<li><a id="gt-taxonomy" class="gt-draggable-form-items gt-select" href="javascript:void(0);"><b></b><?php _e('Taxonomy', 'geodirectory');?></a></li>-->

+               href="javascript:void(0);"><b></b><?php _e('Select', 'geodirectory'); ?></a></li>

+        <!--<li><a id="gt-taxonomy" class="gt-draggable-form-items gt-select" href="javascript:void(0);"><b></b><?php _e('Taxonomy', 'geodirectory'); ?></a></li>-->

         <li><a id="gt-multiselect" class="gt-draggable-form-items gt-multiselect"

-               href="javascript:void(0);"><b></b><?php _e('Multi Select', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('Multi Select', 'geodirectory'); ?></a></li>

         <li><a id="gt-url" class="gt-draggable-form-items gt-url"

-               href="javascript:void(0);"><b></b><?php _e('URL', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('URL', 'geodirectory'); ?></a></li>

         <li><a id="gt-html" class="gt-draggable-form-items gt-html"

-               href="javascript:void(0);"><b></b><?php _e('HTML', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('HTML', 'geodirectory'); ?></a></li>

         <li><a id="gt-file" class="gt-draggable-form-items gt-file"

-               href="javascript:void(0);"><b></b><?php _e('File Upload', 'geodirectory');?></a></li>

+               href="javascript:void(0);"><b></b><?php _e('File Upload', 'geodirectory'); ?></a></li>

 

     </ul>

 

@@ -663,7 +663,7 @@ 
 

     switch ($sub_tab) {

         case 'custom_fields':

-            $note = sprintf(__('Click on any box below to add a field of that type on add %s listing form. You must be use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type));;

+            $note = sprintf(__('Click on any box below to add a field of that type on add %s listing form. You must be use a fieldset to group your fields.', 'geodirectory'), get_post_type_singular_label($listing_type)); ;

             break;

 

         case 'sorting_options':

@@ -717,7 +717,7 @@ 
 

     switch ($sub_tab) {

         case 'custom_fields':

-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type));;

+            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order on add %s listing form too.', 'geodirectory'), get_post_type_singular_label($listing_type)); ;

             break;

 

         case 'sorting_options':

@@ -816,13 +816,13 @@ 
         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

-            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak");// get backup table count

-            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table");// get new table count

+            $ms_bak_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $table . "_ms_bak"); // get backup table count

+            $new_table_count = $wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table"); // get new table count

 

             if ($ms_bak_count == $new_table_count) {// if they are the same count rename to bak2

                 //$filter_arr['output_str'] .= "<li>".sprintf( __('-->PROBLEM: %s table count is the same as new table, contact support' , 'geodirectory'), $table )."</li>" ;

 

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename bak table to new table

+                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2"); // rename bak table to new table

 

                 if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

                     $filter_arr['output_str'] .= "<li>" . __('-->FIXED: Renamed and backed up the tables', 'geodirectory') . "</li>";

@@ -832,8 +832,8 @@ 
 

             } elseif ($ms_bak_count > $new_table_count) {//if backup is greater then restore it

 

-                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2");// rename new table to bak2

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table");// rename bak table to new table

+                $wpdb->query("RENAME TABLE " . $wpdb->prefix . "$table TO " . $table . "_ms_bak2"); // rename new table to bak2

+                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $wpdb->prefix . "$table"); // rename bak table to new table

 

                 if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") && $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

                     $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: restored largest table %s', 'geodirectory'), $table) . "</li>";

@@ -843,7 +843,7 @@ 
 

             } elseif ($new_table_count > $ms_bak_count) {// we cant do much so rename the table to stop errors

 

-                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2");// rename ms_bak table to ms_bak2

+                $wpdb->query("RENAME TABLE " . $table . "_ms_bak TO " . $table . "_ms_bak2"); // rename ms_bak table to ms_bak2

 

                 if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") == 0) {

                     $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: table %s_ms_bak renamed and backed up', 'geodirectory'), $table) . "</li>";

@@ -1027,7 +1027,7 @@ 
                             $post_categories[$p->post_type . 'category'] = str_replace("d:", "", $post_categories[$p->post_type . 'category']);

                             foreach (explode(",", $post_categories[$p->post_type . 'category']) as $cat_part) {

                                 if (is_numeric($cat_part)) {

-                                    $raw_cats[] = (int)$cat_part;

+                                    $raw_cats[] = (int) $cat_part;

                                 }

                             }

 

@@ -1337,9 +1337,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_home_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1362,9 +1362,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_add_listing_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1388,9 +1388,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_preview_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1413,9 +1413,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_success_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1438,9 +1438,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_info_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1463,9 +1463,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_login_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1488,9 +1488,9 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_location_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

         $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

     else {

         $is_error_during_diagnose = true;

@@ -1508,13 +1508,13 @@ 
     /* Diagnose Location Page Ends */

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

 

-    $page_chk_arr = array('output_str'=>$output_str,'is_error_during_diagnose'=>$is_error_during_diagnose );

+    $page_chk_arr = array('output_str'=>$output_str, 'is_error_during_diagnose'=>$is_error_during_diagnose);

     /**

      * This action is called at the end of the GD Tools page check function.

      *

      * @since 1.5.2

      */

-    $page_chk_arr = apply_filters('geodir_diagnose_default_pages',$page_chk_arr);

+    $page_chk_arr = apply_filters('geodir_diagnose_default_pages', $page_chk_arr);

 

     $output_str = $page_chk_arr['output_str'];

     $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

@@ -1711,7 +1711,7 @@ 
 

                 if (($handle = fopen($target_path, "r")) !== FALSE) {

                     while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

-                        if(is_array($data) && !empty($data)) {

+                        if (is_array($data) && !empty($data)) {

                             $file[] = '"' . implode('","', $data) . '"';

                         }

                     }

@@ -1886,7 +1886,7 @@ 
 						

 						// Post status

 						if ($customKeyarray[$c] == 'post_status') {

-                            $post_status = sanitize_key( $buffer[$c] );

+                            $post_status = sanitize_key($buffer[$c]);

                         }

                     }

 

@@ -1904,8 +1904,8 @@ 
 					

 					// Default post status

 					$default_status = 'publish';

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

 

                     $my_post['post_title'] = $post_title;

                     $my_post['post_content'] = $post_desc;

@@ -1949,7 +1949,7 @@ 
                     $payment_info = array();

                     $package_info = array();

 

-                    $package_info = (array)geodir_post_package_info($package_info, '', $buffer[5]);

+                    $package_info = (array) geodir_post_package_info($package_info, '', $buffer[5]);

                     $package_id = '';

                     if (isset($gd_post_info['package_id']) && $gd_post_info['package_id'] != '') {

                         $package_id = $gd_post_info['package_id'];

@@ -2050,11 +2050,11 @@ 
 }

 

 // Add the tab in left sidebar menu fro import & export page.

-add_filter( 'geodir_settings_tabs_array', 'geodir_import_export_tab', 94 );

+add_filter('geodir_settings_tabs_array', 'geodir_import_export_tab', 94);

 

 // Handle ajax request for impot/export.

-add_action( 'wp_ajax_geodir_import_export', 'geodir_ajax_import_export' );

-add_action( 'wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export' );

+add_action('wp_ajax_geodir_import_export', 'geodir_ajax_import_export');

+add_action('wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export');

 

 

 /**

@@ -2065,40 +2065,40 @@ 
  * @param $post_id int $post_id The post ID of the post being saved.

  * @param $post object $post The post object of the post being saved.

  */

-function geodir_update_location_prefix($post_id,$post){

-    if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

-        update_option('geodir_location_prefix',$post->post_name);

+function geodir_update_location_prefix($post_id, $post) {

+    if ($post->post_type == 'page' && $post->post_name && $post_id == get_option('geodir_location_page')) {

+        update_option('geodir_location_prefix', $post->post_name);

     }

 

 }

 

-add_action('save_post', 'geodir_update_location_prefix',10,2);

+add_action('save_post', 'geodir_update_location_prefix', 10, 2);

 

-add_action( 'wp_ajax_geodir_ga_callback', 'geodir_ga_callback' );

+add_action('wp_ajax_geodir_ga_callback', 'geodir_ga_callback');

 

-function geodir_ga_callback(){

+function geodir_ga_callback() {

 

-if(isset($_REQUEST['code']) && $_REQUEST['code']) {

+if (isset($_REQUEST['code']) && $_REQUEST['code']) {

     $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

-    $code = "code=".$_REQUEST['code'];

+    $code = "code=" . $_REQUEST['code'];

     $grant_type = "&grant_type=authorization_code";

     $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

-    $client_id = "&client_id=".get_option('geodir_ga_client_id');

-    $client_secret = "&client_secret=".get_option('geodir_ga_client_secret');

+    $client_id = "&client_id=" . get_option('geodir_ga_client_id');

+    $client_secret = "&client_secret=" . get_option('geodir_ga_client_secret');

 

-    $auth_url = $oAuthURL . $code . $redirect_uri .  $grant_type . $client_id .$client_secret;

+    $auth_url = $oAuthURL . $code . $redirect_uri . $grant_type . $client_id . $client_secret;

 

     $response = wp_remote_post($auth_url, array('timeout' => 15));

 

     //print_r($response);

 

-    $error_msg =  __('Something went wrong','geodirectory');

-    if(!empty($response['response']['code']) && $response['response']['code']==200){

+    $error_msg = __('Something went wrong', 'geodirectory');

+    if (!empty($response['response']['code']) && $response['response']['code'] == 200) {

 

         $parts = json_decode($response['body']);

         //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+        if (!isset($parts->access_token)) {echo $error_msg . " - #1"; exit; }

+        else {

 

             update_option('gd_ga_access_token', $parts->access_token);

             update_option('gd_ga_refresh_token', $parts->refresh_token);

@@ -2107,25 +2107,25 @@ 
 

 

     }

-    elseif(!empty($response['response']['code'])) {

+    elseif (!empty($response['response']['code'])) {

         $parts = json_decode($response['body']);

 

-        if(isset($parts->error)){

-            echo $parts->error.": ".$parts->error_description;exit;

-        }else{

-            echo $error_msg." - #2";exit;

+        if (isset($parts->error)) {

+            echo $parts->error . ": " . $parts->error_description; exit;

+        } else {

+            echo $error_msg . " - #2"; exit;

         }

 

-    }else{

+    } else {

 

-        echo $error_msg." - #3";exit;

+        echo $error_msg . " - #3"; exit;

 

     }

 }

     exit;

 }

 

-add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

+add_filter('icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4);

 

 if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

 	add_action('geodir_before_admin_panel', 'geodir_wpml_permalink_setting_notice');

Braces +61 added lines, -52 removed lines

@@ -24,8 +24,11 @@ 
             global $current_tab;

             geodir_redirect_to_admin_panel_on_installed();

             $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

-            if (!(isset($_REQUEST['action']))) // this will avoide Ajax requests

-                geodir_handle_option_form_submit($current_tab); // located in admin function.php

+            if (!(isset($_REQUEST['action']))) {
+                // this will avoide Ajax requests

+                geodir_handle_option_form_submit($current_tab);
+            }
+            // located in admin function.php

             /**

              * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

              *

@@ -313,8 +316,9 @@ 
     if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

 

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

-            if ($value['type'] == 'textarea')

-                $notification[$key]['type'] = 'editor';

+            if ($value['type'] == 'textarea') {
+                            $notification[$key]['type'] = 'editor';
+            }
         }

 

     }

@@ -339,8 +343,9 @@ 
     if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

 

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

-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

-                $design_setting[$key]['type'] = 'editor';

+            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') {
+                            $design_setting[$key]['type'] = 'editor';
+            }
         }

 

     }

@@ -436,8 +441,9 @@ 
             );

 

             $display = '';

-            if ($check_html_variable)

-                $display = ' style="display:none;"';

+            if ($check_html_variable) {
+                            $display = ' style="display:none;"';
+            }
 

 

             ?>

@@ -744,8 +750,9 @@ 
 

     if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'")) {
+                    $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
+        }
 

         update_option('geodir_remove_unnecessary_fields', '1');

 

@@ -771,15 +778,17 @@ 
         $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];

         switch ($geodir_admin_ajax_action) {

             case 'diagnosis' :

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

-                    $diagnose_this = $_REQUEST['diagnose_this'];

+                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
+                                    $diagnose_this = $_REQUEST['diagnose_this'];
+                }
                 call_user_func('geodir_diagnose_' . $diagnose_this);

                 exit();

                 break;

 

             case 'diagnosis-fix' :

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

-                    $diagnose_this = $_REQUEST['diagnose_this'];

+                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
+                                    $diagnose_this = $_REQUEST['diagnose_this'];
+                }
                 call_user_func('geodir_diagnose_' . $diagnose_this);

                 exit();

                 break;

@@ -1337,11 +1346,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_home_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1362,11 +1371,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_add_listing_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1388,11 +1397,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_preview_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1413,11 +1422,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_success_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1438,11 +1447,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_info_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1463,11 +1472,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_login_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1488,11 +1497,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_location_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1936,8 +1945,9 @@ 
                             );

 

                             $post_location_info = $request_info['post_location'];

-                            if ($location_id = geodir_add_new_location($post_location_info))

-                                $post_location_id = $location_id;

+                            if ($location_id = geodir_add_new_location($post_location_info)) {
+                                                            $post_location_id = $location_id;
+                            }
                         } else {

                             $post_location_id = 0;

                         }

@@ -2000,8 +2010,9 @@ 
                             $attachment_set = '';

 

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

-                                if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                if ($val != '') {
+                                                                    $attachment_set .= $key . " = '" . $val . "', ";
+                                }
                             }

                             $attachment_set = trim($attachment_set, ", ");

 

@@ -2097,8 +2108,7 @@ 
 

         $parts = json_decode($response['body']);

         //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;} else{

 

             update_option('gd_ga_access_token', $parts->access_token);

             update_option('gd_ga_refresh_token', $parts->refresh_token);

@@ -2106,17 +2116,16 @@ 
         }

 

 

-    }

-    elseif(!empty($response['response']['code'])) {

+    } elseif(!empty($response['response']['code'])) {

         $parts = json_decode($response['body']);

 

         if(isset($parts->error)){

             echo $parts->error.": ".$parts->error_description;exit;

-        }else{

+        } else{

             echo $error_msg." - #2";exit;

         }

 

-    }else{

+    } else{

 

         echo $error_msg." - #3";exit;

 

geodirectory-functions/cat-meta-functions/Tax-meta-class.php

Doc Comments +15 added lines

@@ -2054,6 +2054,11 @@ 
         }
 
         //update meta
+
+        /**
+         * @param string $term_id
+         * @param string $key
+         */
         public function update_tax_meta($term_id, $key, $value, $post_type = '')
         {
 
@@ -2095,6 +2100,12 @@ 
 
 //get term meta field
 if (!function_exists('get_tax_meta')) {
+
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
     {
 
@@ -2139,6 +2150,10 @@ 
 
 //update meta
 if (!function_exists('update_tax_meta')) {
+
+    /**
+     * @param string $key
+     */
     function update_tax_meta($term_id, $key, $value, $post_type = '')
     {
 

Spacing +31 added lines, -31 removed lines

@@ -803,7 +803,7 @@ 
         {
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
             echo "<select class='at-select' name='{$field['id']}" . ($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'") . ">";
@@ -827,7 +827,7 @@ 
         {
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
             foreach ($field['options'] as $key => $value) {
@@ -890,7 +890,7 @@ 
             global $post;
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
             echo "{$field['desc']}<br />";
@@ -1013,7 +1013,7 @@ 
         {
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
 
@@ -1073,7 +1073,7 @@ 
         {
             global $post;
 
-            if (!is_array($meta)) $meta = (array)$meta;
+            if (!is_array($meta)) $meta = (array) $meta;
             $this->show_field_begin($field, $meta);
             $options = $field['options'];
             $posts = get_posts($options['args']);
@@ -1111,7 +1111,7 @@ 
         {
             global $post;
 
-            if (!is_array($meta)) $meta = (array)$meta;
+            if (!is_array($meta)) $meta = (array) $meta;
             $this->show_field_begin($field, $meta);
             $options = $field['options'];
             $terms = get_terms($options['taxonomy'], $options['args']);
@@ -1370,7 +1370,7 @@ 
                 if (!is_wp_error($id)) {
 
                     wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
-                    add_post_meta($term_id, $name, $id, false);    // save file's url in meta fields
+                    add_post_meta($term_id, $name, $id, false); // save file's url in meta fields
 
                 } // End if
 
@@ -1415,7 +1415,7 @@ 
                 if (!is_wp_error($id)) {
 
                     wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));
-                    return $id;    // return file's url in meta fields
+                    return $id; // return file's url in meta fields
                 } // End if
             } // End foreach
         }
@@ -1430,9 +1430,9 @@ 
         {
 
             // Default values for meta box
-            $this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array)$this->_meta_box);
+            $this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array) $this->_meta_box);
 
-            if(is_array($this->_fields)) {
+            if (is_array($this->_fields)) {
                 // Default values for fields
                 foreach ($this->_fields as &$field) {
                     $multiple = in_array($field['type'], array('checkbox_list', 'file', 'image'));
@@ -1452,7 +1452,7 @@ 
          */
         public function has_field($type)
         {
-            if(is_array($this->_fields)) {
+            if (is_array($this->_fields)) {
                 foreach ($this->_fields as $field) {
                     if ($type == $field['type'])
                         return true;
@@ -2020,12 +2020,12 @@ 
                 $post_type = $taxObject->object_type[0];
             }
 
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
+            if ($post_type == 'post') {$post_type = ''; }
+            if ($post_type) {$post_type = $post_type . '_'; }
 
             $t_id = (is_object($term_id)) ? $term_id->term_id : $term_id;
 
-            $m = get_option('tax_meta_' . $post_type  . $t_id);
+            $m = get_option('tax_meta_' . $post_type . $t_id);
             if (isset($m[$key])) {
                 return $m[$key];
             } else {
@@ -2042,15 +2042,15 @@ 
                 $post_type = $taxObject->object_type[0];
             }
 
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
+            if ($post_type == 'post') {$post_type = ''; }
+            if ($post_type) {$post_type = $post_type . '_'; }
 
-            $m = get_option('tax_meta_' . $post_type  . $term_id);
+            $m = get_option('tax_meta_' . $post_type . $term_id);
 
             if (isset($m[$key])) {
                 unset($m[$key]);
             }
-            update_option('tax_meta_' . $post_type  . $term_id, $m);
+            update_option('tax_meta_' . $post_type . $term_id, $m);
         }
 
         //update meta
@@ -2062,13 +2062,13 @@ 
                 $post_type = $taxObject->object_type[0];
             }
 
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
+            if ($post_type == 'post') {$post_type = ''; }
+            if ($post_type) {$post_type = $post_type . '_'; }
 
-            $m = get_option('tax_meta_' . $post_type  . $term_id);
+            $m = get_option('tax_meta_' . $post_type . $term_id);
 
             $m[$key] = $value;
-            update_option('tax_meta_' . $post_type  . $term_id, $m);
+            update_option('tax_meta_' . $post_type . $term_id, $m);
 
             /**
              * Called after the tax meta is updated.
@@ -2103,12 +2103,12 @@ 
             $post_type = $taxObject->object_type[0];
         }
 
-        if($post_type=='post'){$post_type='';}
-        if($post_type){$post_type = $post_type.'_';}
+        if ($post_type == 'post') {$post_type = ''; }
+        if ($post_type) {$post_type = $post_type . '_'; }
 
         $t_id = (is_object($term_id)) ? $term_id->term_id : $term_id;
 
-        $m = get_option('tax_meta_' . $post_type  . $t_id);
+        $m = get_option('tax_meta_' . $post_type . $t_id);
         if (isset($m[$key])) {
             return $m[$key];
         } else {
@@ -2125,15 +2125,15 @@ 
         $taxObject = get_taxonomy($_REQUEST['taxonomy']);
         $post_type = $taxObject->object_type[0];
 
-        if($post_type=='post'){$post_type='';}
-        if($post_type){$post_type = $post_type.'_';}
+        if ($post_type == 'post') {$post_type = ''; }
+        if ($post_type) {$post_type = $post_type . '_'; }
 
         $m = get_option('tax_meta_' . $post_type . $term_id);
 
         if (isset($m[$key])) {
             unset($m[$key]);
         }
-        update_option('tax_meta_' . $post_type  . $term_id, $m);
+        update_option('tax_meta_' . $post_type . $term_id, $m);
     }
 }
 
@@ -2147,10 +2147,10 @@ 
             $post_type = $taxObject->object_type[0];
         }
 
-        if($post_type=='post'){$post_type='';}
-        if($post_type){$post_type = $post_type.'_';}
+        if ($post_type == 'post') {$post_type = ''; }
+        if ($post_type) {$post_type = $post_type . '_'; }
 
-        $m = get_option('tax_meta_' . $post_type  . $term_id);
+        $m = get_option('tax_meta_' . $post_type . $term_id);
 
         $m[$key] = $value;
         update_option('tax_meta_' . $post_type . $term_id, $m);

Braces +106 added lines, -69 removed lines

@@ -102,8 +102,9 @@ 
         {
 
             // If we are not in admin area exit.
-            if (!is_admin())
-                return;
+            if (!is_admin()) {
+                            return;
+            }
 
             // Assign meta box values to local variables and add it's missed values.
             $this->_meta_box = $meta_box;
@@ -111,15 +112,15 @@ 
             $this->_fields = &$this->_meta_box['fields'];
             $this->_Local_images = (isset($meta_box['local_images'])) ? true : false;
             $this->add_missed_values();
-            if (isset($meta_box['use_with_theme']))
-                if ($meta_box['use_with_theme'] === true) {
+            if (isset($meta_box['use_with_theme'])) {
+                            if ($meta_box['use_with_theme'] === true) {
                     $this->SelfPath = get_stylesheet_directory_uri() . '/library/cat-meta';
+            }
                 } elseif ($meta_box['use_with_theme'] === false) {
                     $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
                 } else {
                     $this->SelfPath = $meta_box['use_with_theme'];
-                }
-            else {
+                } else {
                 $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
             }
 
@@ -190,8 +191,9 @@ 
         {
 
             // Check if the field is an image or file. If not, return.
-            if (!$this->has_field('image') && !$this->has_field('file'))
-                return;
+            if (!$this->has_field('image') && !$this->has_field('file')) {
+                            return;
+            }
 
 
             add_action('wp_enqueue_scripts', array(&$this, 'enqueue_tax_meta_scripts'), 100);
@@ -235,8 +237,9 @@ 
         {
 
             // If post variables are empty, return.
-            if (!isset($_POST['at-insert']) || empty($_POST['attachments']))
-                return;
+            if (!isset($_POST['at-insert']) || empty($_POST['attachments'])) {
+                            return;
+            }
 
             // Security Check
             check_admin_referer('media-form');
@@ -256,8 +259,9 @@ 
                 $attachment = stripslashes_deep($attachment);
 
                 // If not selected or url is empty, continue in loop.
-                if (empty($attachment['selected']) || empty($attachment['url']))
-                    continue;
+                if (empty($attachment['selected']) || empty($attachment['url'])) {
+                                    continue;
+                }
 
                 $li = "<li id='item_{$attachment_id}'>";
                 $li .= "<img src='{$attachment['url']}' alt='image_{$attachment_id}' />";
@@ -308,13 +312,15 @@ 
 
 
             // If data is not set, die.
-            if (!isset($_POST['data']))
-                die();
+            if (!isset($_POST['data'])) {
+                            die();
+            }
 
             list($nonce, $term_id, $key, $attach_id) = explode('|', $_POST['data']);
 
-            if (!wp_verify_nonce($nonce, 'at_ajax_delete'))
-                die('1');
+            if (!wp_verify_nonce($nonce, 'at_ajax_delete')) {
+                            die('1');
+            }
 
             $this->delete_tax_meta($term_id, $key, $attach_id);
 
@@ -336,8 +342,9 @@ 
             $ok = false;
             if (strpos($field_id, '[') === false) {
                 check_admin_referer("at-delete-mupload_" . urldecode($field_id));
-                if ($term_id > 0)
-                    $this->delete_tax_meta($term_id, $field_id);
+                if ($term_id > 0) {
+                                    $this->delete_tax_meta($term_id, $field_id);
+                }
                 //$ok = wp_delete_attachment( $attachment_id );
                 $ok = 1;
             } else {
@@ -349,8 +356,9 @@ 
                 $saved = $this->get_tax_meta($term_id, $f[0], true);
                 if (isset($saved[$f[1]][$f[2]])) {
                     unset($saved[$f[1]][$f[2]]);
-                    if ($term_id > 0)
-                        update_post_meta($term_id, $f[0], $saved);
+                    if ($term_id > 0) {
+                                            update_post_meta($term_id, $f[0], $saved);
+                    }
                     //$ok = wp_delete_attachment( $attachment_id );
                     $ok = 1;
                 }
@@ -375,13 +383,15 @@ 
         public function reorder_images()
         {
 
-            if (!isset($_POST['data']))
-                die();
+            if (!isset($_POST['data'])) {
+                            die();
+            }
 
             list($order, $term_id, $key, $nonce) = explode('|', $_POST['data']);
 
-            if (!wp_verify_nonce($nonce, 'at_ajax_reorder'))
-                die('1');
+            if (!wp_verify_nonce($nonce, 'at_ajax_reorder')) {
+                            die('1');
+            }
 
             parse_str($order, $items);
             $items = $items['item'];
@@ -513,8 +523,9 @@ 
             foreach ($this->_fields as $field) {
                 $meta = $this->get_tax_meta($term_id, $field['id'], !$field['multiple']);
                 $meta = ($meta !== '') ? $meta : $field['std'];
-                if ('image' != $field['type'] && $field['type'] != 'repeater')
-                    $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
+                if ('image' != $field['type'] && $field['type'] != 'repeater') {
+                                    $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
+                }
 
                 if ($field['validate_func']) {
                     echo '<tr class="form-field form-required ' . $field['style'] . '">';
@@ -560,8 +571,9 @@ 
                         $id = $field['id'] . '[' . $c . '][' . $f['id'] . ']';
                         $m = $me[$f['id']];
                         $m = ($m !== '') ? $m : $f['std'];
-                        if ('image' != $f['type'] && $f['type'] != 'repeater')
-                            $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
+                        if ('image' != $f['type'] && $f['type'] != 'repeater') {
+                                                    $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
+                        }
                         //set new id for field in array format
                         $f['id'] = $id;
                         if (!$field['inline']) {
@@ -802,8 +814,9 @@ 
         public function show_field_select($field, $meta)
         {
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
             echo "<select class='at-select' name='{$field['id']}" . ($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'") . ">";
@@ -826,8 +839,9 @@ 
         public function show_field_radio($field, $meta)
         {
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
             foreach ($field['options'] as $key => $value) {
@@ -889,8 +903,9 @@ 
 
             global $post;
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
             echo "{$field['desc']}<br />";
@@ -934,8 +949,9 @@ 
             $this->show_field_begin($field, $meta);
             $html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_" . $field['id'], false, false);
             if (is_array($meta)) {
-                if (isset($meta[0]) && is_array($meta[0]))
-                    $meta = $meta[0];
+                if (isset($meta[0]) && is_array($meta[0])) {
+                                    $meta = $meta[0];
+                }
             }
 
             $uploads = wp_upload_dir();
@@ -947,8 +963,9 @@ 
                 //print_r($uploads);
                 //print_r($file_info);
 
-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
-                    $sub_dir = $file_info['dirname'];
+                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+                                    $sub_dir = $file_info['dirname'];
+                }
 
                 $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs	
                 $uploads_baseurl = $uploads['baseurl'];
@@ -988,8 +1005,9 @@ 
         public function show_field_color($field, $meta)
         {
 
-            if (empty($meta))
-                $meta = '#';
+            if (empty($meta)) {
+                            $meta = '#';
+            }
 
             $this->show_field_begin($field, $meta);
 
@@ -1012,8 +1030,9 @@ 
         public function show_field_checkbox_list($field, $meta)
         {
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
 
@@ -1073,7 +1092,9 @@ 
         {
             global $post;
 
-            if (!is_array($meta)) $meta = (array)$meta;
+            if (!is_array($meta)) {
+                $meta = (array)$meta;
+            }
             $this->show_field_begin($field, $meta);
             $options = $field['options'];
             $posts = get_posts($options['args']);
@@ -1111,7 +1132,9 @@ 
         {
             global $post;
 
-            if (!is_array($meta)) $meta = (array)$meta;
+            if (!is_array($meta)) {
+                $meta = (array)$meta;
+            }
             $this->show_field_begin($field, $meta);
             $options = $field['options'];
             $terms = get_terms($options['taxonomy'], $options['args']);
@@ -1145,17 +1168,20 @@ 
         {
 
             $taxnow = '';
-            if (isset($_POST['taxonomy']))
-                $taxnow = $_POST['taxonomy'];
+            if (isset($_POST['taxonomy'])) {
+                            $taxnow = $_POST['taxonomy'];
+            }
 
             if (!isset($term_id)                                                        // Check Revision
                 || (!in_array($taxnow, $this->_meta_box['pages']))                            // Check if current taxonomy type is supported.
                 || (!check_admin_referer(basename(__FILE__), 'tax_meta_class_nonce'))        // Check nonce - Security
                 || (!current_user_can('manage_categories'))
-            )                                // Check permission
+            ) {
+                // Check permission
             {
                 return $term_id;
             }
+            }
 
 
             foreach ($this->_fields as $field) {
@@ -1249,8 +1275,9 @@ 
         {
             $name = $field['id'];
             $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array())
-                return;
+            if ($new === '' || $new === array()) {
+                            return;
+            }
 
             $this->update_tax_meta($term_id, $name, $new);
         }
@@ -1270,8 +1297,9 @@ 
             $name = $field['id'];
 
             $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '')
-                return;
+            if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '') {
+                            return;
+            }
 
             $this->update_tax_meta($term_id, $name, $new);
         }
@@ -1318,8 +1346,9 @@ 
                                 break;
                         }
                     }
-                    if (!$this->is_array_empty($n))
-                        $temp[] = $n;
+                    if (!$this->is_array_empty($n)) {
+                                            $temp[] = $n;
+                    }
                 }
                 if (isset($temp) && count($temp) > 0 && !$this->is_array_empty($temp)) {
                     $this->update_tax_meta($term_id, $field['id'], $temp);
@@ -1347,14 +1376,16 @@ 
         {
 
             $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
+            if (empty($_FILES[$name])) {
+                            return;
+            }
             $this->fix_file_array($_FILES[$name]);
             foreach ($_FILES[$name] as $position => $fileitem) {
 
                 $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
+                if (empty($file['file'])) {
+                                    continue;
+                }
                 $filename = $file['file'];
 
                 $attachment = array(
@@ -1392,14 +1423,16 @@ 
         {
 
             $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
+            if (empty($_FILES[$name])) {
+                            return;
+            }
             $this->fix_file_array($_FILES[$name]);
             foreach ($_FILES[$name] as $position => $fileitem) {
 
                 $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
+                if (empty($file['file'])) {
+                                    continue;
+                }
                 $filename = $file['file'];
 
                 $attachment = array(
@@ -1454,8 +1487,9 @@ 
         {
             if(is_array($this->_fields)) {
                 foreach ($this->_fields as $field) {
-                    if ($type == $field['type'])
-                        return true;
+                    if ($type == $field['type']) {
+                                            return true;
+                    }
                 }
             }
             return false;
@@ -1993,18 +2027,21 @@ 
          */
         public function is_array_empty($array)
         {
-            if (!is_array($array))
-                return true;
+            if (!is_array($array)) {
+                            return true;
+            }
 
             foreach ($array as $a) {
                 if (is_array($a)) {
                     foreach ($a as $sub_a) {
-                        if (!empty($sub_a) && $sub_a != '')
-                            return false;
+                        if (!empty($sub_a) && $sub_a != '') {
+                                                    return false;
+                        }
                     }
                 } else {
-                    if (!empty($a) && $a != '')
-                        return false;
+                    if (!empty($a) && $a != '') {
+                                            return false;
+                    }
                 }
             }
             return true;

geodirectory-functions/compatibility/X.php

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
  * @since 1.0.0
  * @package GeoDirectory
  * @param array $classes Class array.
- * @return array Modified class array.
+ * @return string[] Modified class array.
  */
 function geodir_x_body_class($classes)
 {

Spacing +8 added lines, -8 removed lines

@@ -307,7 +307,7 @@ 
             // 8. Get shop title.
             //
 
-            GLOBAL $post,$wp;
+            GLOBAL $post, $wp;
 
             if (geodir_is_page('detail') || geodir_is_page('listing') || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id())) {
                 geodir_breadcrumb();
@@ -315,13 +315,13 @@ 
 
                 $stack = x_get_stack();
                 $delimiter = ' <span class="delimiter"><i class="x-icon-angle-right"></i></span> '; // 1
-                $home_text = '<span class="home"><i class="x-icon-home"></i></span>';               // 2
-                $home_link = home_url();                                                            // 3
-                $current_before = '<span class="current">';                                              // 4
-                $current_after = '</span>';                                                             // 5
-                $page_title = get_the_title();                                                       // 6
-                $blog_title = get_the_title(get_option('page_for_posts', true));                 // 7
-                $shop_title = get_theme_mod('x_' . $stack . '_shop_title');                        // 8
+                $home_text = '<span class="home"><i class="x-icon-home"></i></span>'; // 2
+                $home_link = home_url(); // 3
+                $current_before = '<span class="current">'; // 4
+                $current_after = '</span>'; // 5
+                $page_title = get_the_title(); // 6
+                $blog_title = get_the_title(get_option('page_for_posts', true)); // 7
+                $shop_title = get_theme_mod('x_' . $stack . '_shop_title'); // 8
 
                 if (function_exists('woocommerce_get_page_id')) {
                     $shop_url = x_get_shop_link();

Braces +6 added lines, -2 removed lines

@@ -336,7 +336,9 @@ 
                     echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter;
                     if (is_category()) {
                         $the_cat = get_category(get_query_var('cat'), false);
-                        if ($the_cat->parent != 0) echo get_category_parents($the_cat->parent, TRUE, $delimiter);
+                        if ($the_cat->parent != 0) {
+                            echo get_category_parents($the_cat->parent, TRUE, $delimiter);
+                        }
                         echo $current_before . single_cat_title('', false) . $current_after;
                     } elseif (x_is_product_category()) {
                         echo $shop_link . $delimiter . $current_before . single_cat_title('', false) . $current_after;
@@ -371,7 +373,9 @@ 
                         $breadcrumbs = array_reverse($breadcrumbs);
                         for ($i = 0; $i < count($breadcrumbs); $i++) {
                             echo $breadcrumbs[$i];
-                            if ($i != count($breadcrumbs) - 1) echo $delimiter;
+                            if ($i != count($breadcrumbs) - 1) {
+                                echo $delimiter;
+                            }
                         }
                         echo $delimiter . $current_before . $page_title . $current_after;
                     } elseif (is_tag()) {

geodirectory-functions/custom_fields_functions.php

Doc Comments +3 added lines, -3 removed lines

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

  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @param int $post_id The post ID.

- * @return mixed Returns video.

+ * @return string Returns video.

  */

 function geodir_get_video($post_id)

 {

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

  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @param int $post_id The post ID.

- * @return mixed Returns special offers.

+ * @return string Returns special offers.

  */

 function geodir_get_special_offers($post_id)

 {

@@ -3498,7 +3498,7 @@ 
 	 *

 	 * @since 1.0.0

 	 * @package GeoDirectory

-	 * @return mixed|void Returns max upload file size.

+	 * @return string|null Returns max upload file size.

 	 */

 	function geodir_max_upload_size()

     {

Spacing +183 added lines, -183 removed lines

@@ -49,7 +49,7 @@ 
 	function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

     {

         global $wpdb;

-        $result = 0;// no rows affected

+        $result = 0; // no rows affected

         if (!geodir_column_exist($db, $column)) {

             if (!empty($db) && !empty($column))

                 $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

@@ -431,7 +431,7 @@ 
 

                 $last_order = $wpdb->get_var("SELECT MAX(sort_order) as last_order FROM " . GEODIR_CUSTOM_FIELDS_TABLE);

 

-                $sort_order = (int)$last_order + 1;

+                $sort_order = (int) $last_order + 1;

             }

 

             $default_value_add = '';

@@ -683,18 +683,18 @@ 
                     $op_size = '500';

 

                     // only make the field as big as it needs to be.

-                    if(isset($option_values) && $option_values && $field_type=='select'){

-                        $option_values_arr = explode(',',$option_values);

-                        if(is_array($option_values_arr)){

+                    if (isset($option_values) && $option_values && $field_type == 'select') {

+                        $option_values_arr = explode(',', $option_values);

+                        if (is_array($option_values_arr)) {

                             $op_max = 0;

-                            foreach($option_values_arr as $op_val){

-                                if(strlen($op_val) && strlen($op_val)>$op_max){$op_max = strlen($op_val);}

+                            foreach ($option_values_arr as $op_val) {

+                                if (strlen($op_val) && strlen($op_val) > $op_max) {$op_max = strlen($op_val); }

                             }

-                            if($op_max){$op_size =$op_max; }

+                            if ($op_max) {$op_size = $op_max; }

                         }

-                    }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

-                        if(strlen($option_values)){

-                            $op_size =  strlen($option_values);

+                    }elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

+                        if (strlen($option_values)) {

+                            $op_size = strlen($option_values);

                         }

                     }

 

@@ -705,8 +705,8 @@ 
                         }

 

                     $alter_result = $wpdb->query($meta_field_add);

-                    if($alter_result===false){

-                        return __('Column change failed, you may have too many columns.','geodirectory');

+                    if ($alter_result === false) {

+                        return __('Column change failed, you may have too many columns.', 'geodirectory');

                     }

 

                         if (isset($request_field['cat_display_type']))

@@ -722,8 +722,8 @@ 
                     case 'html':

 

                     $alter_result = $wpdb->query("ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` TEXT NULL");

-                    if($alter_result===false){

-                        return __('Column change failed, you may have too many columns.','geodirectory');

+                    if ($alter_result === false) {

+                        return __('Column change failed, you may have too many columns.', 'geodirectory');

                     }

                         if (isset($request_field['advanced_editor']))

                             $extra_fields = $request_field['advanced_editor'];

@@ -737,7 +737,7 @@ 
                     default:

                         if ($data_type != 'VARCHAR' && $data_type != '') {

                             if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int)$decimal_point . ") NULL";

+                                $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` DECIMAL(11, " . (int) $decimal_point . ") NULL";

                             } else {

                                 $default_value_add = "ALTER TABLE " . $detail_table . " CHANGE `" . $old_html_variable . "` `" . $htmlvar_name . "` " . $data_type . " NULL";

                             }

@@ -753,8 +753,8 @@ 
                         }

 

                         $alter_result = $wpdb->query($default_value_add);

-                        if($alter_result===false){

-                            return __('Column change failed, you may have too many columns.','geodirectory');

+                        if ($alter_result === false) {

+                            return __('Column change failed, you may have too many columns.', 'geodirectory');

                         }

                         break;

                 endswitch;

@@ -802,7 +802,7 @@ 
 					for_admin_use = %s

 					where id = %d",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use, $cf)

+                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_required, $required_msg, $css_class, $field_icon, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use, $cf)

                     )

 

                 );

@@ -962,7 +962,7 @@ 
                         $data_type = 'TINYINT';

 

                         $meta_field_add = $data_type . "( 1 ) NOT NULL ";

-                        if ((int)$default_value === 1) {

+                        if ((int) $default_value === 1) {

                             $meta_field_add .= " DEFAULT '1'";

                         }

 

@@ -995,7 +995,7 @@ 
                             }

                         } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

                             if (strlen($option_values)) {

-                                $op_size =  strlen($option_values);

+                                $op_size = strlen($option_values);

                             }

 							

 							if (isset($request_field['multi_display_type'])) {

@@ -1068,7 +1068,7 @@ 
                             $meta_field_add = $data_type . " NULL ";

 

                             if ($data_type == 'FLOAT' && $decimal_point > 0) {

-                                $meta_field_add = "DECIMAL(11, " . (int)$decimal_point . ") NULL ";

+                                $meta_field_add = "DECIMAL(11, " . (int) $decimal_point . ") NULL ";

                             }

 

                             if (is_numeric($default_value) && $default_value != '') {

@@ -1133,7 +1133,7 @@ 
 					validation_msg = %s,

 					for_admin_use = %s ",

 

-                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point,$validation_pattern,$validation_msg, $for_admin_use)

+                        array($post_type, $admin_title, $site_title, $field_type, $htmlvar_name, $admin_desc, $clabels, $default_value, $sort_order, $is_active, $is_default, $is_admin, $is_required, $required_msg, $css_class, $field_icon, $show_on_listing, $show_on_detail, $show_as_tab, $option_values, $price_pkg, $cat_sort, $cat_filter, $data_type, $extra_field_query, $decimal_point, $validation_pattern, $validation_msg, $for_admin_use)

 

                     )

 

@@ -1145,7 +1145,7 @@ 
 

             }

 

-            return (int)$lastid;

+            return (int) $lastid;

 

 

         } else {

@@ -1234,7 +1234,7 @@ 
         $value = '';

 

         /* field available to site admin only for edit */

-        $for_admin_use = isset($val['for_admin_use']) && (int)$val['for_admin_use'] == 1 ? true : false;

+        $for_admin_use = isset($val['for_admin_use']) && (int) $val['for_admin_use'] == 1 ? true : false;

         if ($for_admin_use && !is_super_admin()) {

             continue;

         }

@@ -1271,10 +1271,10 @@ 
         do_action('geodir_before_custom_form_field_' . $name, $listing_type, $package_id, $val);

 

         if ($type == 'fieldset') {

-            $fieldset_id = (int)$val['id'];

+            $fieldset_id = (int) $val['id'];

 			$fieldset_field_class = 'gd-fieldset-' . $fieldset_id;

-			?><h5 id="geodir_fieldset_<?php echo $fieldset_id;?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id;?>"><?php echo $site_title;?>

-            <?php if ($admin_desc != '') echo '<small>( ' . $admin_desc . ' )</small>';?>

+			?><h5 id="geodir_fieldset_<?php echo $fieldset_id; ?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id; ?>"><?php echo $site_title; ?>

+            <?php if ($admin_desc != '') echo '<small>( ' . $admin_desc . ' )</small>'; ?>

             </h5><?php

 

         } elseif ($type == 'address') {

@@ -1302,7 +1302,7 @@ 
                 $mapview = isset($post[$prefix . 'mapview']) ? $post[$prefix . 'mapview'] : '';

                 $mapzoom = isset($post[$prefix . 'mapzoom']) ? $post[$prefix . 'mapzoom'] : '';

             } else if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '' && $post_info = geodir_get_post_info($_REQUEST['pid'])) {

-                $post_info = (array)$post_info;

+                $post_info = (array) $post_info;

 

                 $address = $post_info[$prefix . 'address'];

                 $zip = isset($post_info[$prefix . 'zip']) ? $post_info[$prefix . 'zip'] : '';

@@ -1346,16 +1346,16 @@ 
 

             ?>

 

-            <div id="geodir_<?php echo $prefix . 'address';?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="geodir_<?php echo $prefix . 'address'; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php _e($address_title, 'geodirectory'); ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input type="text" field_type="<?php echo $type;?>" name="<?php echo $prefix . 'address';?>"

-                       id="<?php echo $prefix . 'address';?>" class="geodir_textfield"

+                <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'address'; ?>"

+                       id="<?php echo $prefix . 'address'; ?>" class="geodir_textfield"

                        value="<?php echo esc_attr(stripslashes($address)); ?>"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1376,7 +1376,7 @@ 
             if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) { ?>

 

                 <div id="geodir_<?php echo $prefix . 'zip'; ?>_row"

-                     class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                     class="<?php /*if($is_required) echo 'required_field';*/ ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                     <label>

                         <?php _e($zip_title, 'geodirectory'); ?>

                         <?php /*if($is_required) echo '<span>*</span>';*/ ?>

@@ -1392,7 +1392,7 @@ 
 

             <?php if (isset($extra_fields['show_map']) && $extra_fields['show_map']) { ?>

 

-                <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                <div id="geodir_<?php echo $prefix . 'map'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                     <?php

                     /**

                      * Contains add listing page map functions.

@@ -1411,7 +1411,7 @@ 
                 /* show lat lng */

                 $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>

                 <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LAT; ?>

                         <?php if ($is_required) echo '<span>*</span>'; ?>

@@ -1426,7 +1426,7 @@ 
                 </div>

 

                 <div id="geodir_<?php echo $prefix . 'longitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LNG; ?>

                         <?php if ($is_required) echo '<span>*</span>'; ?>

@@ -1442,7 +1442,7 @@ 
             <?php } ?>

 

             <?php if (isset($extra_fields['show_mapview']) && $extra_fields['show_mapview']) { ?>

-                <div id="geodir_<?php echo $prefix . 'mapview'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                <div id="geodir_<?php echo $prefix . 'mapview'; ?>_row" class="geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                     <label><?php _e($mapview_title, 'geodirectory'); ?></label>

 

 

@@ -1484,30 +1484,30 @@ 
         <?php } elseif ($type == 'text') {

 

             //number and float validation $validation_pattern

-            if(isset($val['data_type']) && $val['data_type']=='INT'){$type = 'number';}

-            elseif(isset($val['data_type']) && $val['data_type']=='FLOAT'){$type = 'float';}

+            if (isset($val['data_type']) && $val['data_type'] == 'INT') {$type = 'number'; }

+            elseif (isset($val['data_type']) && $val['data_type'] == 'FLOAT') {$type = 'float'; }

             //print_r($val);

             //validation

-            if(isset($val['validation_pattern']) && $val['validation_pattern']){

-                $validation = 'pattern="'.$val['validation_pattern'].'"';

-            }else{$validation='';}

+            if (isset($val['validation_pattern']) && $val['validation_pattern']) {

+                $validation = 'pattern="' . $val['validation_pattern'] . '"';

+            } else {$validation = ''; }

 

             // validation message

-            if(isset($val['validation_msg']) && $val['validation_msg']){

-                $validation_msg = 'title="'.$val['validation_msg'].'"';

-            }else{$validation_msg='';}

+            if (isset($val['validation_msg']) && $val['validation_msg']) {

+                $validation_msg = 'title="' . $val['validation_msg'] . '"';

+            } else {$validation_msg = ''; }

             ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="<?php echo $type;?>" class="geodir_textfield" <?php echo $validation;echo $validation_msg;?> />

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="<?php echo $type; ?>" class="geodir_textfield" <?php echo $validation; echo $validation_msg; ?> />

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1518,16 +1518,16 @@ 
                 $value = '';

             }?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="email" class="geodir_textfield"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="email" class="geodir_textfield"/>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1538,16 +1538,16 @@ 
                 $value = '';

             } ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="tel" class="geodir_textfield"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="tel" class="geodir_textfield"/>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1558,31 +1558,31 @@ 
                 $value = '';

             }?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr(stripslashes($value));?>" type="url" class="geodir_textfield"

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr(stripslashes($value)); ?>" type="url" class="geodir_textfield"

                        oninvalid="setCustomValidity('<?php _e('Please enter a valid URL including http://', 'geodirectory'); ?>')"

                        onchange="try{setCustomValidity('')}catch(e){}"

                     />

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

             </div>

 

         <?php } elseif ($type == 'radio') { ?>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

 				<?php if ($option_values) {

                     $option_values = geodir_string_values_to_options($option_values, true);

@@ -1591,14 +1591,14 @@ 
 						foreach ($option_values as $option_value) {

 							if (empty($option_value['optgroup'])) {

 							?>

-							<input name="<?php echo $name;?>" id="<?php echo $name;?>" <?php checked($value, $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $type;?>" type="radio" /><?php echo $option_value['label']; ?>

+							<input name="<?php echo $name; ?>" id="<?php echo $name; ?>" <?php checked($value, $option_value['value']); ?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $type; ?>" type="radio" /><?php echo $option_value['label']; ?>

 							<?php

 							}

 						}

 					}

                 }

                 ?>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1606,22 +1606,22 @@ 
 

         <?php } elseif ($type == 'checkbox') { ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

                 <?php if ($value != '1') {

                     $value = '0';

                 }?>

-                <input type="hidden" name="<?php echo $name;?>" id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>"/>

+                <input type="hidden" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($value); ?>"/>

                 <input  <?php if ($value == '1') {

                     echo 'checked="checked"';

-                }?>  value="1" class="gd-checkbox" field_type="<?php echo $type;?>" type="checkbox"

-                     onchange="if(this.checked){jQuery('#<?php echo $name;?>').val('1');} else{ jQuery('#<?php echo $name;?>').val('0');}"/>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                }?>  value="1" class="gd-checkbox" field_type="<?php echo $type; ?>" type="checkbox"

+                     onchange="if(this.checked){jQuery('#<?php echo $name; ?>').val('1');} else{ jQuery('#<?php echo $name; ?>').val('0');}"/>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1630,44 +1630,44 @@ 
         <?php } elseif ($type == 'textarea') {

             ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label><?php

 

 

                 if (is_array($extra_fields) && in_array('1', $extra_fields)) {

 

-                    $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10);?>

+                    $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>

 

-                <div class="editor" field_id="<?php echo $name;?>" field_type="editor">

+                <div class="editor" field_id="<?php echo $name; ?>" field_type="editor">

                     <?php wp_editor(stripslashes($value), $name, $editor_settings); ?>

                     </div><?php

 

                 } else {

 

-                    ?><textarea field_type="<?php echo $type;?>" class="geodir_textarea" name="<?php echo $name;?>"

-                                id="<?php echo $name;?>"><?php echo stripslashes($value);?></textarea><?php

+                    ?><textarea field_type="<?php echo $type; ?>" class="geodir_textarea" name="<?php echo $name; ?>"

+                                id="<?php echo $name; ?>"><?php echo stripslashes($value); ?></textarea><?php

 

                 }?>

 

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

             </div>

 

         <?php } elseif ($type == 'select') { ?>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

                 <?php

                 $option_values_arr = geodir_string_values_to_options($option_values, true);

@@ -1688,11 +1688,11 @@ 
                     }

                 }

                 ?>

-                <select field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

+                <select field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

                         class="geodir_textfield textfield_x chosen_select"

-                        data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;';?>"

-                        option-ajaxchosen="false"><?php echo $select_options;?></select>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                        data-placeholder="<?php echo __('Choose', 'geodirectory') . ' ' . $site_title . '&hellip;'; ?>"

+                        option-ajaxchosen="false"><?php echo $select_options; ?></select>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1706,7 +1706,7 @@ 
             }

             ?>

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

@@ -1780,7 +1780,7 @@ 
             ?>

 

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

@@ -1810,8 +1810,8 @@ 
 

             $date_format = str_replace($search, $replace, $extra_fields['date_format']);

 

-            if($value=='0000-00-00'){$value='';}//if date not set, then mark it empty

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

+            if ($value == '0000-00-00') {$value = ''; }//if date not set, then mark it empty

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

                 $time = strtotime($value);

                 $value = date($date_format, $time);

             }

@@ -1821,37 +1821,37 @@ 
 

                 jQuery(function () {

 

-                    jQuery("#<?php echo $name;?>").datepicker({changeMonth: true, changeYear: true <?php

+                    jQuery("#<?php echo $name; ?>").datepicker({changeMonth: true, changeYear: true <?php

                     /**

                      * Used to add extra option to datepicker per custom field.

                      *

                      * @since 1.5.7

                      * @param string $name The custom field name.

                      */

-                    echo apply_filters("gd_datepicker_extra_{$name}",'');?>});

+                    echo apply_filters("gd_datepicker_extra_{$name}", ''); ?>});

 

-                    jQuery("#<?php echo $name;?>").datepicker("option", "dateFormat", '<?php echo $extra_fields['date_format'];?>');

+                    jQuery("#<?php echo $name; ?>").datepicker("option", "dateFormat", '<?php echo $extra_fields['date_format']; ?>');

 

-                    <?php if(!empty($value)){?>

-                    jQuery("#<?php echo $name;?>").datepicker("setDate", "<?php echo $value;?>");

+                    <?php if (!empty($value)) {?>

+                    jQuery("#<?php echo $name; ?>").datepicker("setDate", "<?php echo $value; ?>");

                     <?php } ?>

 

                 });

 

             </script>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

 

-                <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

-                       value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>

+                <input field_type="<?php echo $type; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>"

+                       value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1865,25 +1865,25 @@ 
             <script type="text/javascript">

                 jQuery(document).ready(function () {

 

-                    jQuery('#<?php echo $name;?>').timepicker({

+                    jQuery('#<?php echo $name; ?>').timepicker({

                         showPeriod: true,

                         showLeadingZero: true,

                         showPeriod: true,

                     });

                 });

             </script>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

-                <input readonly="readonly" field_type="<?php echo $type;?>" name="<?php echo $name;?>"

-                       id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>

+                <input readonly="readonly" field_type="<?php echo $type; ?>" name="<?php echo $name; ?>"

+                       id="<?php echo $name; ?>" value="<?php echo esc_attr($value); ?>" type="text" class="geodir_textfield"/>

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -1893,15 +1893,15 @@ 
             if ($value == $val['default']) {

                 $value = '';

             } ?>

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) echo '<span>*</span>'; ?>

                 </label>

 

-                <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">

+                <div id="<?php echo $name; ?>" class="geodir_taxonomy_field" style="float:left; width:70%;">

                     <?php

                     global $wpdb, $post, $cat_display, $post_cat, $package_id, $exclude_cats;

 

@@ -1913,7 +1913,7 @@ 
 

                         $package_info = array();

 

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

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

 

                         if (!empty($package_info)) {

 

@@ -1996,7 +1996,7 @@ 
                     ?>

                 </div>

 

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -2038,7 +2038,7 @@ 
                     $file_totImg = count($curImages);

             }

 			

-			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

+			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? implode(",", $extra_fields['gd_file_types']) : '';

 			$display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';

 

             ?>

@@ -2049,13 +2049,13 @@ 
 			</h5>   <?php */

             ?>

 

-            <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+            <div id="<?php echo $name; ?>_row"

+                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class; ?>">

 

                 <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">

                     <label

                         style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');

-                        echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>

+                        echo $site_title; ?><?php if ($is_required) echo '<span>*</span>'; ?></label>

                     <input class="geodir-custom-file-upload" field_type="file" type="hidden"

                            name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"

                            value="<?php echo esc_attr($file_value); ?>"/>

@@ -2063,7 +2063,7 @@ 
                            id="<?php echo $file_id; ?>image_limit" value="<?php echo $file_image_limit; ?>"/>

 					<?php if ($allowed_file_types != '') { ?>

 					<input type="hidden" name="<?php echo $file_id; ?>_allowed_types"

-                           id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types);?>"/>

+                           id="<?php echo $file_id; ?>_allowed_types" value="<?php echo esc_attr($allowed_file_types); ?>" data-exts="<?php echo esc_attr($display_file_types); ?>"/>

 					<?php } ?>

                     <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"

                            value="<?php if (isset($file_totImg)) {

@@ -2079,7 +2079,7 @@ 
                             <?php /*?><h4><?php _e('Drop files to upload');?></h4><br/><?php */

                             ?>

                             <input id="<?php echo $file_id; ?>plupload-browse-button" type="button"

-                                   value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory') ); ?>"

+                                   value="<?php ($file_image_limit > 1 ? esc_attr_e('Select Files', 'geodirectory') : esc_attr_e('Select File', 'geodirectory')); ?>"

                                    class="geodir_button" style="margin-top:10px;"/>

                             <span class="ajaxnonceplu"

                                   id="ajaxnonceplu<?php echo wp_create_nonce($file_id . 'pluploadan'); ?>"></span>

@@ -2102,7 +2102,7 @@ 
 

                     </div>

                 </div>

-                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?> <?php echo ( $display_file_types != '' ? __('Allowed file types:', 'geodirectory') . ' ' . $display_file_types : '' );?></span>

+                <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory'); ?> <?php echo ($display_file_types != '' ? __('Allowed file types:', 'geodirectory') . ' ' . $display_file_types : ''); ?></span>

                 <?php if ($is_required) { ?>

                     <span class="geodir_message_error"><?php _e($required_msg, 'geodirectory'); ?></span>

                 <?php } ?>

@@ -2208,7 +2208,7 @@ 
 

                 $variables_array = array();

 

-                if ($fields_location == 'detail' && isset($type['show_as_tab']) && (int)$type['show_as_tab'] == 1 && in_array($type['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

+                if ($fields_location == 'detail' && isset($type['show_as_tab']) && (int) $type['show_as_tab'] == 1 && in_array($type['type'], array('text', 'datepicker', 'textarea', 'time', 'phone', 'email', 'select', 'multiselect', 'url', 'html', 'fieldset', 'radio', 'checkbox', 'file'))) {

                     continue;

                 }

 

@@ -2234,12 +2234,12 @@ 
 

                     case 'fieldset':

 

-                        $fieldset_class = 'fieldset-'.sanitize_title_with_dashes($type['site_title']);

+                        $fieldset_class = 'fieldset-' . sanitize_title_with_dashes($type['site_title']);

 

                         if ($field_set_start == 1) {

-                            echo '</div><div class="geodir-company_info field-group ' . $type['htmlvar_name'] . '"><h2 class="'.$fieldset_class.'">' . __($type['site_title'], 'geodirectory') . '</h2>';

+                            echo '</div><div class="geodir-company_info field-group ' . $type['htmlvar_name'] . '"><h2 class="' . $fieldset_class . '">' . __($type['site_title'], 'geodirectory') . '</h2>';

                         } else {

-                            echo '<h2 class="'.$fieldset_class.'">' . __($type['site_title'], 'geodirectory') . '</h2>';

+                            echo '<h2 class="' . $fieldset_class . '">' . __($type['site_title'], 'geodirectory') . '</h2>';

                             $field_set_start = 1;

                         }

 

@@ -2411,7 +2411,7 @@ 
 

 							$website = !empty($a_url['url']) ? $a_url['url'] : '';

 							$title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

-                            if(!empty($type['default_value'])){$title = $type['default_value'];}

+                            if (!empty($type['default_value'])) {$title = $type['default_value']; }

 							$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

 

 

@@ -2524,17 +2524,17 @@ 
                                 $date_format = $date_format['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

+                            $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' ? str_replace('/', '-', $post->{$type['htmlvar_name']}) : $post->{$type['htmlvar_name']}; // PHP doesn't work well with dd/mm/yyyy format

 

                             $value = '';

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

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

                                 $value = date($date_format, strtotime($post_htmlvar_value));

-                            }else{

+                            } else {

                                 continue;

                             }

 

@@ -2677,7 +2677,7 @@ 
 

                         $html_var = $type['htmlvar_name'];

 

-                        if ((int)$post->$html_var == 1):

+                        if ((int) $post->$html_var == 1):

 

                             if ($post->{$type['htmlvar_name']} == '1'):

                                 $html_val = __('Yes', 'geodirectory');

@@ -2904,8 +2904,8 @@ 
                                 $html = '<div class="geodir_more_info ' . $geodir_odd_even . ' ' . $type['css_class'] . ' ' . $type['htmlvar_name'] . '" style="clear:both;"><span class="geodir-i-email" style="' . $field_icon . '">' . $field_icon_af;

                                 $html .= (trim($type['site_title'])) ? __($type['site_title'], 'geodirectory') . ': ' : '';

                                 $html .= '</span><span class="geodir-email-address-output">';

-                                $email = stripslashes($post->{$type['htmlvar_name']}) ;

-                                if($e_split = explode('@',$email)){

+                                $email = stripslashes($post->{$type['htmlvar_name']});

+                                if ($e_split = explode('@', $email)) {

                                     /**

                                      * Filter email custom field name output.

                                      *

@@ -2914,10 +2914,10 @@ 
                                      * @param string $email The email string being output.

                                      * @param array $type Custom field variables array.

                                      */

-                                    $email_name = apply_filters('geodir_email_field_name_output',$email,$type);

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

+                                    $html .= "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";

+                                } else {

+                                    $html .= $email;

                                 }

                                 $html .= '</span></div>';

                             }

@@ -2937,7 +2937,7 @@ 
                             if (!empty($files)):

 

                                $extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['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) {

@@ -2968,7 +2968,7 @@ 
                                         // If the uploaded file is image

                                         if (in_array($uploaded_file_type, $image_file_types)) {

                                             $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';

-                                            $file_paths .= '<a href="'.$file.'">';

+                                            $file_paths .= '<a href="' . $file . '">';

 											$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

 											$file_paths .= '</a>';

                                             //$file_paths .= '<img src="'.$file.'"  />';	

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

                                 if (strpos($field_icon, 'http') !== false) {

@@ -3267,7 +3267,7 @@ 
             $geodir_uploadurl = $uploads['url'];

             $sub_dir = $uploads['subdir'];

 			

-			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types']) ? $extra_fields['gd_file_types'] : '';

 

             for ($m = 0; $m < count($post_image); $m++) {

 

@@ -3338,8 +3338,8 @@ 
         if (!empty($postcurr_images)) {

 

             if ($file_urls != $postcurr_images) {

-                $invalid_files[] = (object)array('src' => $postcurr_images);

-                $invalid_files = (object)$invalid_files;

+                $invalid_files[] = (object) array('src' => $postcurr_images);

+                $invalid_files = (object) $invalid_files;

             }

         }

 

@@ -3426,7 +3426,7 @@ 
         remove_filter('upload_dir', 'geodir_upload_dir');

 

 

-        if(!isset($status['url']) && isset($status['error'])){

+        if (!isset($status['url']) && isset($status['error'])) {

             print_r($status);

         }

 

@@ -3502,10 +3502,10 @@ 
 	 */

 	function geodir_max_upload_size()

     {

-        $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

+        $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);

 

         if ($max_filesize > 0 && $max_filesize < 1) {

-            $max_filesize = (int)($max_filesize * 1024) . 'kb';

+            $max_filesize = (int) ($max_filesize * 1024) . 'kb';

         } else {

             $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

         }

@@ -3813,7 +3813,7 @@ 
         }

 

 

-        return (int)$lastid;

+        return (int) $lastid;

 

     }

 }

@@ -3909,38 +3909,38 @@ 
         $nonce = wp_create_nonce('custom_fields_' . $result_str);

 

         ?>

-        <li class="text" id="licontainer_<?php echo $result_str;?>">

-            <div class="title title<?php echo $result_str;?> gt-fieldset"

-                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory');?>"

-                 ondblclick="show_hide('field_frm<?php echo $result_str;?>')">

+        <li class="text" id="licontainer_<?php echo $result_str; ?>">

+            <div class="title title<?php echo $result_str; ?> gt-fieldset"

+                 title="<?php _e('Double Click to toggle and drag-drop to sort', 'geodirectory'); ?>"

+                 ondblclick="show_hide('field_frm<?php echo $result_str; ?>')">

                 <?php

 

                 $nonce = wp_create_nonce('custom_fields_' . $result_str);

                 ?>

 

-                <div title="<?php _e('Click to remove field', 'geodirectory');?>"

-                     onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

+                <div title="<?php _e('Click to remove field', 'geodirectory'); ?>"

+                     onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                      class="handlediv close"></div>

 

                 <b style="cursor:pointer;"

-                   onclick="show_hide('field_frm<?php echo $result_str;?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' (' . $site_title . ')');?></b>

+                   onclick="show_hide('field_frm<?php echo $result_str; ?>')"><?php echo geodir_ucwords(__('Field:', 'geodirectory') . ' (' . $site_title . ')'); ?></b>

 

             </div>

 

-            <div id="field_frm<?php echo $result_str;?>" class="field_frm"

+            <div id="field_frm<?php echo $result_str; ?>" class="field_frm"

                  style="display:<?php if ($field_ins_upd == 'submit') {

                      echo 'block;';

                  } else {

                      echo 'none;';

                  } ?>">

                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>

-                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>

-                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>

-                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str;?>"/>

+                <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type; ?>"/>

+                <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type; ?>"/>

+                <input type="hidden" name="field_id" id="field_id" value="<?php echo $result_str; ?>"/>

                 <input type="hidden" name="data_type" id="data_type" value="<?php if (isset($field_info->data_type)) {

                     echo $field_info->data_type;

                 }?>"/>

-                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name;?>"/>

+                <input type="hidden" name="htmlvar_name" id="htmlvar_name" value="<?php echo $htmlvar_name; ?>"/>

 

 

                 <table class="widefat post fixed" border="0" style="width:100%;">

@@ -4022,42 +4022,42 @@ 
                     <?php } ?>

 

                     <tr>

-                        <td><strong><?php _e('Is active :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Is active :', 'geodirectory'); ?></strong></td>

                         <td align="left">

                             <select name="is_active" id="is_active">

                                 <option

                                     value="1" <?php if (isset($field_info->is_active) && $field_info->is_active == '1') {

                                     echo 'selected="selected"';

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

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

                                 <option

                                     value="0" <?php if (isset($field_info->is_active) && $field_info->is_active == '0') {

                                     echo 'selected="selected"';

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

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

                             </select>

                             <br/>

-                            <span><?php _e('Select yes or no. If no is selected then the field will not be displayed anywhere.', 'geodirectory');?></span>

+                            <span><?php _e('Select yes or no. If no is selected then the field will not be displayed anywhere.', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

-                        <td><strong><?php _e('Display order :', 'geodirectory');?></strong></td>

+                        <td><strong><?php _e('Display order :', 'geodirectory'); ?></strong></td>

                         <td align="left"><input type="text" readonly="readonly" name="sort_order" id="sort_order"

                                                 value="<?php if (isset($field_info->sort_order)) {

                                                     echo esc_attr($field_info->sort_order);

                                                 }?>" size="50"/>

                             <br/>

-                            <span><?php _e('Enter the display order of this field in backend. e.g. 5', 'geodirectory');?></span>

+                            <span><?php _e('Enter the display order of this field in backend. e.g. 5', 'geodirectory'); ?></span>

                         </td>

                     </tr>

 

                     <tr>

                         <td>&nbsp;</td>

                         <td align="left">

-                            <input type="button" class="button" name="save" id="save" value="<?php esc_attr_e('Save', 'geodirectory');?>"

-                                   onclick="save_sort_field('<?php echo $result_str;?>')"/>

+                            <input type="button" class="button" name="save" id="save" value="<?php esc_attr_e('Save', 'geodirectory'); ?>"

+                                   onclick="save_sort_field('<?php echo $result_str; ?>')"/>

 

-                            <a href="javascript:void(0)"><input type="button" name="delete" value="<?php esc_attr_e('Delete', 'geodirectory');?>"

-                                                                onclick="delete_sort_field('<?php echo $result_str;?>', '<?php echo $nonce;?>', this)"

+                            <a href="javascript:void(0)"><input type="button" name="delete" value="<?php esc_attr_e('Delete', 'geodirectory'); ?>"

+                                                                onclick="delete_sort_field('<?php echo $result_str; ?>', '<?php echo $nonce; ?>', this)"

                                                                 class="button_n"/></a>

 

                         </td>

@@ -4092,7 +4092,7 @@ 
         if (!$package_id || !$field_name || !$post_type) {

             return true;

         }

-        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int)$package_id));

+        $sql = $wpdb->prepare("SELECT id FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE is_active='1' AND htmlvar_name=%s AND post_type=%s AND FIND_IN_SET(%s, packages)", array($field_name, $post_type, (int) $package_id));

 

         if ($wpdb->get_var($sql)) {

             return true;

Braces +372 added lines, -186 removed lines

@@ -51,8 +51,9 @@ 
         global $wpdb;

         $result = 0;// no rows affected

         if (!geodir_column_exist($db, $column)) {

-            if (!empty($db) && !empty($column))

-                $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");

+            if (!empty($db) && !empty($column)) {
+                            $result = $wpdb->query("ALTER TABLE `$db` ADD `$column`  $column_attr");
+            }
         }

         return $result;

     }

@@ -82,10 +83,11 @@ 
 

     $default_query = '';

 

-    if ($default == 'default')

-        $default_query = " and is_default IN ('1') ";

-    elseif ($default == 'custom')

-        $default_query = " and is_default = '0' ";

+    if ($default == 'default') {
+            $default_query = " and is_default IN ('1') ";
+    } elseif ($default == 'custom') {
+            $default_query = " and is_default = '0' ";
+    }
 

     if ($fields_location == 'detail') {

         $default_query = " and show_on_detail='1' ";

@@ -243,10 +245,12 @@ 
 

                 return $field_id;

 

-            } else

-                return 0;

-        } else

-            return 0;

+            } else {
+                            return 0;
+            }
+        } else {
+                    return 0;
+        }
 

     }

 }

@@ -355,7 +359,9 @@ 
 		}*/

 

 

-            if ($post_type == '') $post_type = 'gd_place';

+            if ($post_type == '') {
+                $post_type = 'gd_place';
+            }
 

 

             $detail_table = $plugin_prefix . $post_type . '_detail';

@@ -388,20 +394,23 @@ 
             }

 

             $option_values = '';

-            if (isset($request_field['option_values']))

-                $option_values = $request_field['option_values'];

+            if (isset($request_field['option_values'])) {
+                            $option_values = $request_field['option_values'];
+            }
 

             $cat_sort = '';

-            if (isset($request_field['cat_sort']) && !empty($request_field['cat_sort']))

-                $cat_sort = implode(",", $request_field['cat_sort']);

+            if (isset($request_field['cat_sort']) && !empty($request_field['cat_sort'])) {
+                            $cat_sort = implode(",", $request_field['cat_sort']);
+            }
 

             $cat_filter = '';

-            if (isset($request_field['cat_filter']) && !empty($request_field['cat_filter']))

-                $cat_filter = implode(",", $request_field['cat_filter']);

+            if (isset($request_field['cat_filter']) && !empty($request_field['cat_filter'])) {
+                            $cat_filter = implode(",", $request_field['cat_filter']);
+            }
 

-            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg']))

-                $price_pkg = implode(",", $request_field['show_on_pkg']);

-            else {

+            if (isset($request_field['show_on_pkg']) && !empty($request_field['show_on_pkg'])) {
+                            $price_pkg = implode(",", $request_field['show_on_pkg']);
+            } else {

                 $package_info = array();

 

                 $package_info = geodir_post_package_info($package_info, '', $post_type);

@@ -409,22 +418,29 @@ 
             }

 

 

-            if (isset($request_field['extra']) && !empty($request_field['extra']))

-                $extra_fields = $request_field['extra'];

+            if (isset($request_field['extra']) && !empty($request_field['extra'])) {
+                            $extra_fields = $request_field['extra'];
+            }
 

-            if (isset($request_field['is_default']) && $request_field['is_default'] != '')

-                $is_default = $request_field['is_default'];

-            else

-                $is_default = '0';

+            if (isset($request_field['is_default']) && $request_field['is_default'] != '') {
+                            $is_default = $request_field['is_default'];
+            } else {
+                            $is_default = '0';
+            }
 

-            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '')

-                $is_admin = $request_field['is_admin'];

-            else

-                $is_admin = '0';

+            if (isset($request_field['is_admin']) && $request_field['is_admin'] != '') {
+                            $is_admin = $request_field['is_admin'];
+            } else {
+                            $is_admin = '0';
+            }
 

 

-            if ($is_active == '') $is_active = 1;

-            if ($is_required == '') $is_required = 0;

+            if ($is_active == '') {
+                $is_active = 1;
+            }
+            if ($is_required == '') {
+                $is_required = 0;
+            }
 

 

             if ($sort_order == '') {

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

                             if($op_max){$op_size =$op_max; }

                         }

-                    }elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

+                    } elseif(isset($option_values) && $option_values && $field_type=='multiselect'){

                         if(strlen($option_values)){

                             $op_size =  strlen($option_values);

                         }

@@ -709,11 +725,13 @@ 
                         return __('Column change failed, you may have too many columns.','geodirectory');

                     }

 

-                        if (isset($request_field['cat_display_type']))

-                            $extra_fields = $request_field['cat_display_type'];

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

-                        if (isset($request_field['multi_display_type']))

-                            $extra_fields = $request_field['multi_display_type'];

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

 

                         break;

@@ -725,8 +743,9 @@ 
                     if($alter_result===false){

                         return __('Column change failed, you may have too many columns.','geodirectory');

                     }

-                        if (isset($request_field['advanced_editor']))

-                            $extra_fields = $request_field['advanced_editor'];

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

                         break;

 

@@ -820,8 +839,9 @@ 
                 );

 

 

-                if ($cat_sort == '')

-                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));

+                if ($cat_sort == '') {
+                                    $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where post_type = %s and htmlvar_name = %s", array($post_type, $htmlvar_name)));
+                }
 

 

                 /**

@@ -1188,8 +1208,10 @@ 
         }

 

         return $post_meta_info;

-    else:

-        return false;

+    else {
+        :

+        return false;
+    }
     endif;

 }

 

@@ -1242,8 +1264,9 @@ 
         if (is_admin()) {

             global $post;

 

-            if (isset($_REQUEST['post']))

-                $_REQUEST['pid'] = $_REQUEST['post'];

+            if (isset($_REQUEST['post'])) {
+                            $_REQUEST['pid'] = $_REQUEST['post'];
+            }
         }

 

         if (isset($_REQUEST['backandedit']) && $_REQUEST['backandedit'] && $gd_ses_listing = $gd_session->get('listing')) {

@@ -1274,7 +1297,10 @@ 
             $fieldset_id = (int)$val['id'];

 			$fieldset_field_class = 'gd-fieldset-' . $fieldset_id;

 			?><h5 id="geodir_fieldset_<?php echo $fieldset_id;?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id;?>"><?php echo $site_title;?>

-            <?php if ($admin_desc != '') echo '<small>( ' . $admin_desc . ' )</small>';?>

+            <?php if ($admin_desc != '') {
+    echo '<small>( ' . $admin_desc . ' )</small>';
+}
+?>

             </h5><?php

 

         } elseif ($type == 'address') {

@@ -1313,17 +1339,27 @@ 
             }

 

             $location = geodir_get_default_location();

-            if (empty($city)) $city = isset($location->city) ? $location->city : '';

-            if (empty($region)) $region = isset($location->region) ? $location->region : '';

-            if (empty($country)) $country = isset($location->country) ? $location->country : '';

+            if (empty($city)) {
+                $city = isset($location->city) ? $location->city : '';
+            }
+            if (empty($region)) {
+                $region = isset($location->region) ? $location->region : '';
+            }
+            if (empty($country)) {
+                $country = isset($location->country) ? $location->country : '';
+            }
 

             $lat_lng_blank = false;

             if (empty($lat) && empty($lng)) {

                 $lat_lng_blank = true;

             }

 

-            if (empty($lat)) $lat = isset($location->city_latitude) ? $location->city_latitude : '';

-            if (empty($lng)) $lng = isset($location->city_longitude) ? $location->city_longitude : '';

+            if (empty($lat)) {
+                $lat = isset($location->city_latitude) ? $location->city_latitude : '';
+            }
+            if (empty($lng)) {
+                $lng = isset($location->city_longitude) ? $location->city_longitude : '';
+            }
 

             /**

              * Filter the default latitude.

@@ -1347,10 +1383,16 @@ 
             ?>

 

             <div id="geodir_<?php echo $prefix . 'address';?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php _e($address_title, 'geodirectory'); ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input type="text" field_type="<?php echo $type;?>" name="<?php echo $prefix . 'address';?>"

                        id="<?php echo $prefix . 'address';?>" class="geodir_textfield"

@@ -1411,10 +1453,16 @@ 
                 /* show lat lng */

                 $style_latlng = ((isset($extra_fields['show_latlng']) && $extra_fields['show_latlng']) || is_admin()) ? '' : 'style="display:none"'; ?>

                 <div id="geodir_<?php echo $prefix . 'latitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                     class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LAT; ?>

-                        <?php if ($is_required) echo '<span>*</span>'; ?>

+                        <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                     </label>

                     <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'latitude'; ?>"

                            id="<?php echo $prefix . 'latitude'; ?>" class="geodir_textfield"

@@ -1426,10 +1474,16 @@ 
                 </div>

 

                 <div id="geodir_<?php echo $prefix . 'longitude'; ?>_row"

-                     class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

+                     class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>" <?php echo $style_latlng; ?>>

                     <label>

                         <?php echo PLACE_ADDRESS_LNG; ?>

-                        <?php if ($is_required) echo '<span>*</span>'; ?>

+                        <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                     </label>

                     <input type="text" field_type="<?php echo $type; ?>" name="<?php echo $prefix . 'longitude'; ?>"

                            id="<?php echo $prefix . 'longitude'; ?>" class="geodir_textfield"

@@ -1484,26 +1538,31 @@ 
         <?php } elseif ($type == 'text') {

 

             //number and float validation $validation_pattern

-            if(isset($val['data_type']) && $val['data_type']=='INT'){$type = 'number';}

-            elseif(isset($val['data_type']) && $val['data_type']=='FLOAT'){$type = 'float';}

+            if(isset($val['data_type']) && $val['data_type']=='INT'){$type = 'number';} elseif(isset($val['data_type']) && $val['data_type']=='FLOAT'){$type = 'float';}

             //print_r($val);

             //validation

             if(isset($val['validation_pattern']) && $val['validation_pattern']){

                 $validation = 'pattern="'.$val['validation_pattern'].'"';

-            }else{$validation='';}

+            } else{$validation='';}

 

             // validation message

             if(isset($val['validation_msg']) && $val['validation_msg']){

                 $validation_msg = 'title="'.$val['validation_msg'].'"';

-            }else{$validation_msg='';}

+            } else{$validation_msg='';}

             ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

                        value="<?php echo esc_attr(stripslashes($value));?>" type="<?php echo $type;?>" class="geodir_textfield" <?php echo $validation;echo $validation_msg;?> />

@@ -1519,11 +1578,17 @@ 
             }?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

                        value="<?php echo esc_attr(stripslashes($value));?>" type="email" class="geodir_textfield"/>

@@ -1539,11 +1604,17 @@ 
             } ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

                        value="<?php echo esc_attr(stripslashes($value));?>" type="tel" class="geodir_textfield"/>

@@ -1559,11 +1630,17 @@ 
             }?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

                        value="<?php echo esc_attr(stripslashes($value));?>" type="url" class="geodir_textfield"

@@ -1578,11 +1655,17 @@ 
 

         <?php } elseif ($type == 'radio') { ?>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

 				<?php if ($option_values) {

                     $option_values = geodir_string_values_to_options($option_values, true);

@@ -1607,11 +1690,17 @@ 
         <?php } elseif ($type == 'checkbox') { ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <?php if ($value != '1') {

                     $value = '0';

@@ -1631,11 +1720,17 @@ 
             ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label><?php

 

 

@@ -1663,11 +1758,17 @@ 
 

         <?php } elseif ($type == 'select') { ?>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row geodir_custom_fields clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <?php

                 $option_values_arr = geodir_string_values_to_options($option_values, true);

@@ -1706,11 +1807,17 @@ 
             }

             ?>

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>'; ?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input type="hidden" name="gd_field_<?php echo $name; ?>" value="1"/>

                 <?php if ($multi_display == 'select') { ?>

@@ -1780,11 +1887,17 @@ 
             ?>

 

             <div id="<?php echo $name; ?>_row"

-                 class="<?php if ($is_required) echo 'required_field'; ?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>'; ?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

 

                 <?php $editor_settings = array('media_buttons' => false, 'textarea_rows' => 10); ?>

@@ -1801,8 +1914,9 @@ 
             </div>

         <?php } elseif ($type == 'datepicker') {

 

-            if ($extra_fields['date_format'] == '')

-                $extra_fields['date_format'] = 'yy-mm-dd';

+            if ($extra_fields['date_format'] == '') {
+                            $extra_fields['date_format'] = 'yy-mm-dd';
+            }
 

 

             $search = array('dd', 'mm', 'yy');

@@ -1840,12 +1954,18 @@ 
 

             </script>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

 

                 <input field_type="<?php echo $type;?>" name="<?php echo $name;?>" id="<?php echo $name;?>"

@@ -1859,8 +1979,9 @@ 
 

         <?php } elseif ($type == 'time') {

 

-            if ($value != '')

-                $value = date('H:i', strtotime($value));

+            if ($value != '') {
+                            $value = date('H:i', strtotime($value));
+            }
             ?>

             <script type="text/javascript">

                 jQuery(document).ready(function () {

@@ -1873,12 +1994,18 @@ 
                 });

             </script>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

 

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

                 <input readonly="readonly" field_type="<?php echo $type;?>" name="<?php echo $name;?>"

                        id="<?php echo $name;?>" value="<?php echo esc_attr($value);?>" type="text" class="geodir_textfield"/>

@@ -1894,11 +2021,17 @@ 
                 $value = '';

             } ?>

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

                 <label>

                     <?php $site_title = __($site_title, 'geodirectory');

                     echo (trim($site_title)) ? $site_title : '&nbsp;'; ?>

-                    <?php if ($is_required) echo '<span>*</span>';?>

+                    <?php if ($is_required) {
+    echo '<span>*</span>';
+}
+?>

                 </label>

 

                 <div id="<?php echo $name;?>" class="geodir_taxonomy_field" style="float:left; width:70%;">

@@ -1932,8 +2065,9 @@ 
                         $post_cat = implode(",", $post_cat[$name]);

 

                     } else {

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

-                            $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);

+                        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                                                    $post_cat = geodir_get_post_meta($_REQUEST['pid'], $name, true);
+                        }
                     }

 

 

@@ -1971,21 +2105,24 @@ 
 

                             $cat_display == '';

                             $multiple = '';

-                            if ($cat_display == 'multiselect')

-                                $multiple = 'multiple="multiple"';

+                            if ($cat_display == 'multiselect') {
+                                                            $multiple = 'multiple="multiple"';
+                            }
 

                             echo '<select id="' . $name . '" ' . $multiple . ' type="' . $name . '" name="post_category[' . $name . '][]" alt="' . $name . '" field_type="' . $cat_display . '" class="geodir_textfield textfield_x chosen_select" data-placeholder="' . __('Select Category', 'geodirectory') . '">';

 

 

-                            if ($cat_display == 'select')

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

+                            if ($cat_display == 'select') {
+                                                            echo '<option value="">' . __('Select Category', 'geodirectory') . '</option>';
+                            }
 

                         }

 

                         echo geodir_custom_taxonomy_walker($name, $catadd_limit = 0);

 

-                        if ($cat_display == 'select' || $cat_display == 'multiselect')

-                            echo '</select>';

+                        if ($cat_display == 'select' || $cat_display == 'multiselect') {
+                                                    echo '</select>';
+                        }
 

                     } else {

 

@@ -2015,18 +2152,23 @@ 
 

                 $file_value = trim($value, ","); // this will be initial value of the above form field. Image urls.

 

-            } else

-                $file_value = '';

+            } else {
+                            $file_value = '';
+            }
 

-            if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple'])

-                $file_multiple = true; // allow multiple files upload

-            else

-                $file_multiple = false;

+            if (isset($extra_fields['file_multiple']) && $extra_fields['file_multiple']) {
+                            $file_multiple = true;
+            }
+            // allow multiple files upload

+            else {
+                            $file_multiple = false;
+            }
 

-            if (isset($extra_fields['image_limit']) && $extra_fields['image_limit'])

-                $file_image_limit = $extra_fields['image_limit'];

-            else

-                $file_image_limit = 1;

+            if (isset($extra_fields['image_limit']) && $extra_fields['image_limit']) {
+                            $file_image_limit = $extra_fields['image_limit'];
+            } else {
+                            $file_image_limit = 1;
+            }
 

             $file_width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

@@ -2034,8 +2176,9 @@ 
 

             if (!empty($file_value)) {

                 $curImages = explode(',', $file_value);

-                if (!empty($curImages))

-                    $file_totImg = count($curImages);

+                if (!empty($curImages)) {
+                                    $file_totImg = count($curImages);
+                }
             }

 			

 			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

@@ -2050,12 +2193,18 @@ 
             ?>

 

             <div id="<?php echo $name;?>_row"

-                 class="<?php if ($is_required) echo 'required_field';?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

+                 class="<?php if ($is_required) {
+    echo 'required_field';
+}
+?> geodir_form_row clearfix <?php echo $fieldset_field_class;?>">

 

                 <div id="<?php echo $file_id; ?>dropbox" style="text-align:center;">

                     <label

                         style="text-align:left; padding-top:10px;"><?php $site_title = __($site_title, 'geodirectory');

-                        echo $site_title; ?><?php if ($is_required) echo '<span>*</span>';?></label>

+                        echo $site_title; ?><?php if ($is_required) {
+                            echo '<span>*</span>';
+                        }
+                        ?></label>

                     <input class="geodir-custom-file-upload" field_type="file" type="hidden"

                            name="<?php echo $file_id; ?>" id="<?php echo $file_id; ?>"

                            value="<?php echo esc_attr($file_value); ?>"/>

@@ -2196,9 +2345,10 @@ 
             $field_set_start = 0;

 

 

-            if ($fields_location == 'detail')

-

-                $i = 1;

+            if ($fields_location == 'detail') {
+            

+                $i = 1;
+            }
             foreach ($fields_info as $type) {

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

                 $html = '';

@@ -2215,8 +2365,9 @@ 
                     $variables_array['post_id'] = $post->ID;

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

                     $variables_array['value'] = '';

-                    if (isset($post->{$type['htmlvar_name']}))

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

+                    if (isset($post->{$type['htmlvar_name']})) {
+                                            $variables_array['value'] = $post->{$type['htmlvar_name']};
+                    }
                 endif;

 

                 //if($type['field_icon'])

@@ -2343,8 +2494,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2418,8 +2570,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2461,8 +2614,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2482,9 +2636,10 @@ 
                         if ($post->{$type['htmlvar_name']}):

 

                             $value = '';

-                            if ($post->{$type['htmlvar_name']} != '')

-                                //$value = date('h:i',strtotime($post->{$type['htmlvar_name']}));

-                                $value = date(get_option('time_format'), strtotime($post->{$type['htmlvar_name']}));

+                            if ($post->{$type['htmlvar_name']} != '') {
+                                                            //$value = date('h:i',strtotime($post->{$type['htmlvar_name']}));

+                                $value = date(get_option('time_format'), strtotime($post->{$type['htmlvar_name']}));
+                            }
 

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

@@ -2499,8 +2654,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2533,7 +2689,7 @@ 
                             $value = '';

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

                                 $value = date($date_format, strtotime($post_htmlvar_value));

-                            }else{

+                            } else{

                                 continue;

                             }

 

@@ -2550,8 +2706,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2583,8 +2740,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2608,8 +2766,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2659,8 +2818,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2680,8 +2840,10 @@ 
 

                             if ($post->{$type['htmlvar_name']} == '1'):

                                 $html_val = __('Yes', 'geodirectory');

-                            else:

-                                $html_val = __('No', 'geodirectory');

+                            else {
+                                :

+                                $html_val = __('No', 'geodirectory');
+                            }
                             endif;

 

                             if (strpos($field_icon, 'http') !== false) {

@@ -2697,8 +2859,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2742,8 +2905,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2794,8 +2958,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2849,8 +3014,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -2895,8 +3061,9 @@ 
                                 if ($fields_location == 'detail') {

 

                                     $geodir_odd_even = 'geodir_more_info_odd';

-                                    if ($i % 2 == 0)

-                                        $geodir_odd_even = 'geodir_more_info_even';

+                                    if ($i % 2 == 0) {
+                                                                            $geodir_odd_even = 'geodir_more_info_even';
+                                    }
 

                                     $i++;

                                 }

@@ -2916,7 +3083,7 @@ 
                                      */

                                     $email_name = apply_filters('geodir_email_field_name_output',$email,$type);

                                     $html .=  "<script>document.write('<a href=\"mailto:'+'$e_split[0]' + '@' + '$e_split[1]'+'\">$email_name</a>')</script>";

-                                }else{

+                                } else{

                                     $html .=  $email;

                                 }

                                 $html .= '</span></div>';

@@ -2994,8 +3161,9 @@ 
                                 if ($fields_location == 'detail') {

 

                                     $geodir_odd_even = 'geodir_more_info_odd';

-                                    if ($i % 2 == 0)

-                                        $geodir_odd_even = 'geodir_more_info_even';

+                                    if ($i % 2 == 0) {
+                                                                            $geodir_odd_even = 'geodir_more_info_even';
+                                    }
 

                                     $i++;

                                 }

@@ -3029,8 +3197,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -3058,8 +3227,9 @@ 
                             if ($fields_location == 'detail') {

 

                                 $geodir_odd_even = 'geodir_more_info_odd';

-                                if ($i % 2 == 0)

-                                    $geodir_odd_even = 'geodir_more_info_even';

+                                if ($i % 2 == 0) {
+                                                                    $geodir_odd_even = 'geodir_more_info_even';
+                                }
 

                                 $i++;

                             }

@@ -3154,7 +3324,9 @@ 
                      * @param string $html Custom field unfiltered HTML.

                      * @param array $variables_array Custom field variables array.

                      */

-                    if ($html) echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);

+                    if ($html) {
+                        echo apply_filters("geodir_show_{$html_var}", $html, $variables_array);
+                    }
 

                     /**

                      * Called after a custom fields is output on the frontend.

@@ -3188,10 +3360,11 @@ 
 	 */

 	function geodir_default_date_format()

     {

-        if ($format = get_option('date_format'))

-            return $format;

-        else

-            return 'dd-mm-yy';

+        if ($format = get_option('date_format')) {
+                    return $format;
+        } else {
+                    return 'dd-mm-yy';
+        }
     }

 }

 

@@ -3298,11 +3471,13 @@ 
                     // Set an array containing a list of acceptable formats

                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

-					if (!function_exists('wp_handle_upload'))

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

+					if (!function_exists('wp_handle_upload')) {
+											require_once(ABSPATH . 'wp-admin/includes/file.php');
+					}
 

-					if (!is_dir($geodir_uploadpath))

-						mkdir($geodir_uploadpath);

+					if (!is_dir($geodir_uploadpath)) {
+											mkdir($geodir_uploadpath);
+					}
 

 					$new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

 					$explode_sub_dir = explode("/", $sub_dir);

@@ -3315,16 +3490,19 @@ 
 					}

 

 					$uploaded_file = '';

-					if (file_exists($img_path))

-						$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+					if (file_exists($img_path)) {
+											$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);
+					}
 

 					if ($curr_img_dir != $geodir_uploaddir) {

-						if (file_exists($img_path))

-							unlink($img_path);

+						if (file_exists($img_path)) {
+													unlink($img_path);
+						}
 					}

 

-					if (!empty($uploaded_file))

-						$file_urls = $geodir_uploadurl . '/' . $new_name;

+					if (!empty($uploaded_file)) {
+											$file_urls = $geodir_uploadurl . '/' . $new_name;
+					}
 

                 } else {

                     $file_urls = $post_image[$m];

@@ -3345,8 +3523,9 @@ 
 

         geodir_save_post_meta($post_id, $field_id, $file_urls);

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

+        if (!empty($invalid_files)) {
+                    geodir_remove_attachments($invalid_files);
+        }
 

     }

 }

@@ -3577,8 +3756,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

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

-            return false;

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

         $fields = array();

 

@@ -3666,8 +3846,10 @@ 
         }

 

         return $field_ids;

-    else:

-        return false;

+    else {
+        :

+        return false;
+    }
     endif;

 }

 

@@ -3840,8 +4022,9 @@ 
 

             return $field_id;

 

-        } else

-            return 0;

+        } else {
+                    return 0;
+        }
 

     }

 }

@@ -3876,8 +4059,9 @@ 
 

         if (!isset($field_info->post_type)) {

             $post_type = $_REQUEST['listing_type'];

-        } else

-            $post_type = $field_info->post_type;

+        } else {
+                    $post_type = $field_info->post_type;
+        }
 

 

         $field_types = explode('-_-', $field_type);

@@ -3885,8 +4069,9 @@ 
         $htmlvar_name = isset($field_types[1]) ? $field_types[1] : '';

 

         $site_title = '';

-        if ($site_title == '')

-            $site_title = isset($field_info->site_title) ? $field_info->site_title : '';

+        if ($site_title == '') {
+                    $site_title = isset($field_info->site_title) ? $field_info->site_title : '';
+        }
 

         if ($site_title == '') {

 

@@ -3903,8 +4088,9 @@ 
 

         }

 

-        if ($htmlvar_name == '')

-            $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';

+        if ($htmlvar_name == '') {
+                    $htmlvar_name = isset($field_info->htmlvar_name) ? $field_info->htmlvar_name : '';
+        }
 

         $nonce = wp_create_nonce('custom_fields_' . $result_str);

 

Indentation +330 added lines, -330 removed lines

@@ -1,26 +1,26 @@ 
 <?php

 /**

- * Custom fields functions

- *

- * @since 1.0.0

- * @package GeoDirectory

- * @global object $wpdb WordPress Database object.

- * @global string $table_prefix WordPress Database Table prefix.

- */

+                     * Custom fields functions

+                     *

+                     * @since 1.0.0

+                     * @package GeoDirectory

+                     * @global object $wpdb WordPress Database object.

+                     * @global string $table_prefix WordPress Database Table prefix.

+                     */

 global $wpdb, $table_prefix;

 

 if (!function_exists('geodir_column_exist')) {

-	/**

-	 * Check table column exist or not.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Check table column exist or not.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $db The table name.

-	 * @param string $column The column name.

-	 * @return bool If column exists returns true. Otherwise false.

-	 */

-	function geodir_column_exist($db, $column)

+     * @param string $db The table name.

+     * @param string $column The column name.

+     * @return bool If column exists returns true. Otherwise false.

+     */

+    function geodir_column_exist($db, $column)

     {

         global $wpdb;

         $exists = false;

@@ -36,17 +36,17 @@ 
 }

 

 if (!function_exists('geodir_add_column_if_not_exist')) {

-	/**

-	 * Add column if table column not exist.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Add column if table column not exist.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $db The table name.

-	 * @param string $column The column name.

-	 * @param string $column_attr The column attributes.

-	 */

-	function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

+     * @param string $db The table name.

+     * @param string $column The column name.

+     * @param string $column_attr The column attributes.

+     */

+    function geodir_add_column_if_not_exist($db, $column, $column_attr = "VARCHAR( 255 ) NOT NULL")

     {

         global $wpdb;

         $result = 0;// no rows affected

@@ -152,18 +152,18 @@ 
 }

 

 if (!function_exists('geodir_custom_field_adminhtml')) {

-	/**

-	 * Adds admin html for custom fields.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Adds admin html for custom fields.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $field_type The form field type.

-	 * @param object|int $result_str The custom field results object or row id.

-	 * @param string $field_ins_upd When set to "submit" displays form.

-	 * @param bool $default when set to true field will be for admin use only.

-	 */

-	function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

+     * @param string $field_type The form field type.

+     * @param object|int $result_str The custom field results object or row id.

+     * @param string $field_ins_upd When set to "submit" displays form.

+     * @param bool $default when set to true field will be for admin use only.

+     */

+    function geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

     {

         global $wpdb;

         $cf = $result_str;

@@ -186,32 +186,32 @@ 
 }

 

 if (!function_exists('geodir_custom_field_delete')) {

-	/**

-	 * Delete custom field using field id.

-	 *

-	 * @since 1.0.0

-	 * @since 1.5.7 Delete field from sorting fields table when custom field deleted.

-	 * @package GeoDirectory

+    /**

+     * Delete custom field using field id.

+     *

+     * @since 1.0.0

+     * @since 1.5.7 Delete field from sorting fields table when custom field deleted.

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

-	 * @param string $field_id The custom field ID.

-	 * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.

-	 */

-	function geodir_custom_field_delete($field_id = '') {

+     * @param string $field_id The custom field ID.

+     * @return int|string If field deleted successfully, returns field id. Otherwise returns 0.

+     */

+    function geodir_custom_field_delete($field_id = '') {

         global $wpdb, $plugin_prefix;

         

-		if ($field_id != '') {

+        if ($field_id != '') {

             $cf = trim($field_id, '_');

 

             if ($field = $wpdb->get_row($wpdb->prepare("select htmlvar_name,post_type,field_type from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d", array($cf)))) {

                 $wpdb->query($wpdb->prepare("delete from " . GEODIR_CUSTOM_FIELDS_TABLE . " where id= %d ", array($cf)));

 

                 $post_type = $field->post_type;

-				$htmlvar_name = $field->htmlvar_name;

+                $htmlvar_name = $field->htmlvar_name;

 				

-				if ($post_type != '' && $htmlvar_name != '') {

-					$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

-				}

+                if ($post_type != '' && $htmlvar_name != '') {

+                    $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name=%s AND post_type=%s LIMIT 1", array($htmlvar_name, $post_type)));

+                }

 

                 /**

                  * Called after a custom field is deleted.

@@ -248,15 +248,15 @@ 
 }

 

 if (!function_exists('geodir_custom_field_save')) {

-	/**

-	 * Save or Update custom fields into the database.

-	 *

-	 * @since 1.0.0

+    /**

+     * Save or Update custom fields into the database.

+     *

+     * @since 1.0.0

      * @since 1.5.6 Fix for saving multiselect custom field "Display Type" on first attempt.

-	 * @package GeoDirectory

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

-	 * @param array $request_field {

+     * @param array $request_field {

      *    Attributes of the request field array.

      *

      *    @type string $action Ajax Action name. Default "geodir_ajax_action".

@@ -289,10 +289,10 @@ 
      *    @type string $css_class Enter custom css class for field custom style.

      *

      * }

-	 * @param bool $default Not yet implemented.

-	 * @return int|string If field is unique returns inserted row id. Otherwise returns error string.

-	 */

-	function geodir_custom_field_save($request_field = array(), $default = false)

+     * @param bool $default Not yet implemented.

+     * @return int|string If field is unique returns inserted row id. Otherwise returns error string.

+     */

+    function geodir_custom_field_save($request_field = array(), $default = false)

     {

 

         global $wpdb, $plugin_prefix;

@@ -976,27 +976,27 @@ 
                         if (isset($option_values) && $option_values && $field_type == 'select') {

                             $option_values_arr = explode(',', $option_values);

                             

-							if (is_array($option_values_arr)) {

+                            if (is_array($option_values_arr)) {

                                 $op_max = 0;

                                 

-								foreach ($option_values_arr as $op_val) {

+                                foreach ($option_values_arr as $op_val) {

                                     if (strlen($op_val) && strlen($op_val) > $op_max) {

-										$op_max = strlen($op_val);

-									}

+                                        $op_max = strlen($op_val);

+                                    }

                                 }

                                 

-								if ($op_max) {

-									$op_size = $op_max;

-								}

+                                if ($op_max) {

+                                    $op_size = $op_max;

+                                }

                             }

                         } elseif (isset($option_values) && $option_values && $field_type == 'multiselect') {

                             if (strlen($option_values)) {

                                 $op_size =  strlen($option_values);

                             }

 							

-							if (isset($request_field['multi_display_type'])) {

-								$extra_fields = $request_field['multi_display_type'];

-							}

+                            if (isset($request_field['multi_display_type'])) {

+                                $extra_fields = $request_field['multi_display_type'];

+                            }

                         }

 

                         $meta_field_add = $data_type . "( $op_size ) NULL ";

@@ -1214,10 +1214,10 @@ 
     $custom_fields = geodir_post_custom_fields($package_id, $default, $post_type);

 

     $fieldset_id = '';

-	$fieldset_field_class = 'gd-fieldset-details';

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

+    $fieldset_field_class = 'gd-fieldset-details';

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

         $val = stripslashes_deep($val); // strip slashes from labels

-		$name = $val['name'];

+        $name = $val['name'];

         $site_title = $val['site_title'];

         $type = $val['type'];

         $admin_desc = $val['desc'];

@@ -1268,8 +1268,8 @@ 
 

         if ($type == 'fieldset') {

             $fieldset_id = (int)$val['id'];

-			$fieldset_field_class = 'gd-fieldset-' . $fieldset_id;

-			?><h5 id="geodir_fieldset_<?php echo $fieldset_id;?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id;?>"><?php echo $site_title;?>

+            $fieldset_field_class = 'gd-fieldset-' . $fieldset_id;

+            ?><h5 id="geodir_fieldset_<?php echo $fieldset_id;?>" class="geodir-fieldset-row" gd-fieldset="<?php echo $fieldset_id;?>"><?php echo $site_title;?>

             <?php if ($admin_desc != '') echo '<small>( ' . $admin_desc . ' )</small>';?>

             </h5><?php

 

@@ -1583,15 +1583,15 @@ 
 				<?php if ($option_values) {

                     $option_values = geodir_string_values_to_options($option_values, true);

 					

-					if (!empty($option_values)) {

-						foreach ($option_values as $option_value) {

-							if (empty($option_value['optgroup'])) {

-							?>

+                    if (!empty($option_values)) {

+                        foreach ($option_values as $option_value) {

+                            if (empty($option_value['optgroup'])) {

+                            ?>

 							<input name="<?php echo $name;?>" id="<?php echo $name;?>" <?php checked($value, $option_value['value']);?> value="<?php echo esc_attr($option_value['value']); ?>" class="gd-checkbox" field_type="<?php echo $type;?>" type="radio" /><?php echo $option_value['label']; ?>

 							<?php

-							}

-						}

-					}

+                            }

+                        }

+                    }

                 }

                 ?>

                 <span class="geodir_message_note"><?php _e($admin_desc, 'geodirectory');?></span>

@@ -2034,8 +2034,8 @@ 
                     $file_totImg = count($curImages);

             }

 			

-			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

-			$display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';

+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? implode(",", $extra_fields['gd_file_types']) : '';

+            $display_file_types = $allowed_file_types != '' ? '.' . implode(", .", $extra_fields['gd_file_types']) : '';

 

             ?>

             <?php /*?> <h5 class="geodir-form_title"> <?php echo $site_title; ?>

@@ -2063,10 +2063,10 @@ 
 					<?php } ?>

                     <input type="hidden" name="<?php echo $file_id; ?>totImg" id="<?php echo $file_id; ?>totImg"

                            value="<?php if (isset($file_totImg)) {

-                               echo esc_attr($file_totImg);

-                           } else {

-                               echo '0';

-                           } ?>"/>

+                                echo esc_attr($file_totImg);

+                            } else {

+                                echo '0';

+                            } ?>"/>

 

                     <div style="float:left; width:55%;">

                         <div

@@ -2125,18 +2125,18 @@ 
 

 

 if (!function_exists('geodir_get_field_infoby')) {

-	/**

-	 * Get custom field using key and value.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Get custom field using key and value.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $key The key you want to look for.

-	 * @param string $value The value of the key you want to look for.

-	 * @param string $geodir_post_type The post type.

-	 * @return bool|mixed Returns field info when available. otherwise returns false.

-	 */

-	function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')

+     * @param string $key The key you want to look for.

+     * @param string $value The value of the key you want to look for.

+     * @param string $geodir_post_type The post type.

+     * @return bool|mixed Returns field info when available. otherwise returns false.

+     */

+    function geodir_get_field_infoby($key = '', $value = '', $geodir_post_type = '')

     {

 

         global $wpdb;

@@ -2159,21 +2159,21 @@ 
 

 

 if (!function_exists('geodir_show_listing_info')) {

-	/**

-	 * Show listing info depending on field location.

-	 *

-	 * @since 1.0.0

-	 * @since 1.5.7 Custom fields option values added to db translation.

+    /**

+     * Show listing info depending on field location.

+     *

+     * @since 1.0.0

+     * @since 1.5.7 Custom fields option values added to db translation.

      *              Changes to display url fields title.

-	 * @package GeoDirectory

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global object $post The current post object.

      * @global bool $send_to_friend True if send to friend link already rendered. Otherwise false.

      *

-	 * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.

-	 * @return string Returns listing info html.

-	 */

-	function geodir_show_listing_info($fields_location = '') {

+     * @param string $fields_location In which page you are going to place this custom fields?. Ex: listing, detail etc.

+     * @return string Returns listing info html.

+     */

+    function geodir_show_listing_info($fields_location = '') {

         global $post, $preview, $wpdb, $send_to_friend;

 

         $payment_info = array();

@@ -2182,7 +2182,7 @@ 
         $package_info = geodir_post_package_info($package_info, $post);

         $post_package_id = $package_info->pid;

         $p_type = (geodir_get_current_posttype()) ? geodir_get_current_posttype() : $post->post_type;

-		$send_to_friend = false;

+        $send_to_friend = false;

 

         ob_start();

         $fields_info = geodir_post_custom_fields($post_package_id, 'default', $p_type, $fields_location);

@@ -2196,7 +2196,7 @@ 
 

                 $i = 1;

             foreach ($fields_info as $type) {

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

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

                 $html = '';

                 $html_var = '';

                 $field_icon = '';

@@ -2401,13 +2401,13 @@ 
                                 $field_icon = '';

                             }

 							

-							$a_url = geodir_parse_custom_field_url($post->{$type['htmlvar_name']});

+                            $a_url = geodir_parse_custom_field_url($post->{$type['htmlvar_name']});

 

 

-							$website = !empty($a_url['url']) ? $a_url['url'] : '';

-							$title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

+                            $website = !empty($a_url['url']) ? $a_url['url'] : '';

+                            $title = !empty($a_url['label']) ? $a_url['label'] : $type['site_title'];

                             if(!empty($type['default_value'])){$title = $type['default_value'];}

-							$title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

+                            $title = $title != '' ? __(stripslashes($title), 'geodirectory') : '';

 

 

                             $geodir_odd_even = '';

@@ -2625,22 +2625,22 @@ 
                         if ($post->{$type['htmlvar_name']} != ''):

 

                             if ($post->{$type['htmlvar_name']} == 'f' || $post->{$type['htmlvar_name']} == '0') {

-								$html_val = __('No', 'geodirectory');

-							} else if ($post->{$type['htmlvar_name']} == 't' || $post->{$type['htmlvar_name']} == '1') {

-								$html_val = __('Yes', 'geodirectory');

-							} else {								

-								if (!empty($type['option_values'])) {

-									$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+                                $html_val = __('No', 'geodirectory');

+                            } else if ($post->{$type['htmlvar_name']} == 't' || $post->{$type['htmlvar_name']} == '1') {

+                                $html_val = __('Yes', 'geodirectory');

+                            } else {								

+                                if (!empty($type['option_values'])) {

+                                    $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 									

-									if (!empty($cf_option_values)) {

-										foreach ($cf_option_values as $cf_option_value) {

-											if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$type['htmlvar_name']}) {

-												$html_val = $cf_option_value['label'];

-											}

-										}

-									}

-								}

-							}

+                                    if (!empty($cf_option_values)) {

+                                        foreach ($cf_option_values as $cf_option_value) {

+                                            if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->{$type['htmlvar_name']}) {

+                                                $html_val = $cf_option_value['label'];

+                                            }

+                                        }

+                                    }

+                                }

+                            }

 

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

@@ -2711,19 +2711,19 @@ 
                         $html_var = $type['htmlvar_name'];

 

                         if ($post->{$type['htmlvar_name']}):

-							$field_value = __($post->$type['htmlvar_name'], 'geodirectory');

+                            $field_value = __($post->$type['htmlvar_name'], 'geodirectory');

 							

-							if (!empty($type['option_values'])) {

-								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+                            if (!empty($type['option_values'])) {

+                                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 								

-								if (!empty($cf_option_values)) {

-									foreach ($cf_option_values as $cf_option_value) {

-										if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

-											$field_value = $cf_option_value['label'];

-										}

-									}

-								}

-							}

+                                if (!empty($cf_option_values)) {

+                                    foreach ($cf_option_values as $cf_option_value) {

+                                        if (isset($cf_option_value['value']) && $cf_option_value['value'] == $post->$type['htmlvar_name']) {

+                                            $field_value = $cf_option_value['label'];

+                                        }

+                                    }

+                                }

+                            }

 							

                             if (strpos($field_icon, 'http') !== false) {

                                 $field_icon_af = '';

@@ -2771,19 +2771,19 @@ 
                                 $field_icon = '';

                             }

 							

-							$field_values = explode(',', trim($post->$type['htmlvar_name'], ","));

+                            $field_values = explode(',', trim($post->$type['htmlvar_name'], ","));

 

                             $option_values = array();

-							if (!empty($type['option_values'])) {

-								$cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

+                            if (!empty($type['option_values'])) {

+                                $cf_option_values = geodir_string_values_to_options(stripslashes_deep($type['option_values']), true);

 								

-								if (!empty($cf_option_values)) {

-									foreach ($cf_option_values as $cf_option_value) {

-										if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {

-											$option_values[] = $cf_option_value['label'];

-										}

-									}

-								}

+                                if (!empty($cf_option_values)) {

+                                    foreach ($cf_option_values as $cf_option_value) {

+                                        if (isset($cf_option_value['value']) && in_array($cf_option_value['value'], $field_values)) {

+                                            $option_values[] = $cf_option_value['label'];

+                                        }

+                                    }

+                                }

                             }

 							

                             $geodir_odd_even = '';

@@ -2803,11 +2803,11 @@ 
                             if (count($option_values) > 1) {

                                 $html .= '<ul>';

                                 

-								foreach ($option_values as $val) {

+                                foreach ($option_values as $val) {

                                     $html .= '<li>' . $val . '</li>';

                                 }

                                 

-								$html .= '</ul>';

+                                $html .= '</ul>';

                             } else {

                                 $html .= $post->$type['htmlvar_name'];

                             }

@@ -2816,13 +2816,13 @@ 
                         endif;

                         break;

                     case 'email':

-						if ($type['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {

-							continue; // Remove Send Enquiry | Send To Friend from listings page

-						}

+                        if ($type['htmlvar_name'] == 'geodir_email' && !(geodir_is_page('detail') || geodir_is_page('preview'))) {

+                            continue; // Remove Send Enquiry | Send To Friend from listings page

+                        }

                        

-					    if ($type['htmlvar_name'] == 'geodir_email' && ((isset($package_info->sendtofriend) && $package_info->sendtofriend) || $post->{$type['htmlvar_name']})) {

-						    $send_to_friend = true;

-							$b_send_inquiry = '';

+                        if ($type['htmlvar_name'] == 'geodir_email' && ((isset($package_info->sendtofriend) && $package_info->sendtofriend) || $post->{$type['htmlvar_name']})) {

+                            $send_to_friend = true;

+                            $b_send_inquiry = '';

                             $b_sendtofriend = '';

 

                             $html = '';

@@ -2860,7 +2860,7 @@ 
 

                             if (isset($package_info->sendtofriend) && $package_info->sendtofriend) {

                                 $html .= $seperator . '<a href="javascript:void(0);" class="' . $b_sendtofriend . '">' . SEND_TO_FRIEND . '</a>';

-							}

+                            }

 

                             $html .= '</span></div>';

 

@@ -2933,13 +2933,13 @@ 
                             if (!empty($files)):

 

                                $extra_fields = !empty($type['extra_fields']) ? maybe_unserialize($type['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 = '';

+                                $file_paths = '';

                                 foreach ($files as $file) {

                                     if (!empty($file)) {

 

-                                       // $filetype = wp_check_filetype($file);

+                                        // $filetype = wp_check_filetype($file);

 

                                         $image_name_arr = explode('/', $file);

                                         $curr_img_dir = $image_name_arr[count($image_name_arr) - 2];

@@ -2948,29 +2948,29 @@ 
 

                                         $arr_file_type = wp_check_filetype($filename);

                                         if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

-											continue;

-										}

+                                            continue;

+                                        }

 										

-										$uploaded_file_type = $arr_file_type['type'];

-										$uploaded_file_ext = $arr_file_type['ext'];

+                                        $uploaded_file_type = $arr_file_type['type'];

+                                        $uploaded_file_ext = $arr_file_type['ext'];

 										

-										if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

-											continue; // Invalid file type.

-										}

+                                        if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

+                                            continue; // Invalid file type.

+                                        }

 

                                         //$allowed_file_types = array('application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

-										$image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');

+                                        $image_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'image/bmp', 'image/x-icon');

 

                                         // If the uploaded file is image

                                         if (in_array($uploaded_file_type, $image_file_types)) {

                                             $file_paths .= '<div class="geodir-custom-post-gallery" class="clearfix">';

                                             $file_paths .= '<a href="'.$file.'">';

-											$file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

-											$file_paths .= '</a>';

+                                            $file_paths .= geodir_show_image(array('src' => $file), 'thumbnail', false, false);

+                                            $file_paths .= '</a>';

                                             //$file_paths .= '<img src="'.$file.'"  />';	

                                             $file_paths .= '</div>';

                                         } else {

-											$ext_path = '_' . $html_var . '_';

+                                            $ext_path = '_' . $html_var . '_';

                                             $filename = explode($ext_path, $filename);

                                             $file_paths .= '<a href="' . $file . '" target="_blank">' . $filename[count($filename) - 1] . '</a>';

                                         }

@@ -3175,14 +3175,14 @@ 
 }

 

 if (!function_exists('geodir_default_date_format')) {

-	/**

-	 * Returns default date format.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 * @return mixed|string|void Returns default date format.

-	 */

-	function geodir_default_date_format()

+    /**

+     * Returns default date format.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @return mixed|string|void Returns default date format.

+     */

+    function geodir_default_date_format()

     {

         if ($format = get_option('date_format'))

             return $format;

@@ -3192,30 +3192,30 @@ 
 }

 

 if (!function_exists('geodir_get_formated_date')) {

-	/**

-	 * Returns formatted date.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 * @param string $date Date string to convert.

-	 * @return bool|int|string Returns formatted date.

-	 */

-	function geodir_get_formated_date($date)

+    /**

+     * Returns formatted date.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @param string $date Date string to convert.

+     * @return bool|int|string Returns formatted date.

+     */

+    function geodir_get_formated_date($date)

     {

         return mysql2date(get_option('date_format'), $date);

     }

 }

 

 if (!function_exists('geodir_get_formated_time')) {

-	/**

-	 * Returns formatted time.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 * @param string $time Time string to convert.

-	 * @return bool|int|string Returns formatted time.

-	 */

-	function geodir_get_formated_time($time)

+    /**

+     * Returns formatted time.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @param string $time Time string to convert.

+     * @return bool|int|string Returns formatted time.

+     */

+    function geodir_get_formated_time($time)

     {

         return mysql2date(get_option('time_format'), $time, $translate = true);

     }

@@ -3223,21 +3223,21 @@ 
 

 

 if (!function_exists('geodir_save_post_file_fields')) {

-	/**

-	 * Save post file fields

-	 *

-	 * @since 1.0.0

-	 * @since 1.4.7 Added `$extra_fields` parameter.

-	 * @package GeoDirectory

+    /**

+     * Save post file fields

+     *

+     * @since 1.0.0

+     * @since 1.4.7 Added `$extra_fields` parameter.

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

      * @global object $current_user Current user object.

-	 * @param int $post_id

-	 * @param string $field_id

-	 * @param array $post_image

-	 * @param array $extra_fields Array of extra fields.

-	 */

-	function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())

+     * @param int $post_id

+     * @param string $field_id

+     * @param array $post_image

+     * @param array $extra_fields Array of extra fields.

+     */

+    function geodir_save_post_file_fields($post_id = 0, $field_id = '', $post_image = array(), $extra_fields = array())

     {

 

         global $wpdb, $plugin_prefix, $current_user;

@@ -3263,7 +3263,7 @@ 
             $geodir_uploadurl = $uploads['url'];

             $sub_dir = $uploads['subdir'];

 			

-			$allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

+            $allowed_file_types = !empty($extra_fields['gd_file_types']) && is_array($extra_fields['gd_file_types']) && !in_array("*", $extra_fields['gd_file_types'] ) ? $extra_fields['gd_file_types'] : '';

 

             for ($m = 0; $m < count($post_image); $m++) {

 

@@ -3280,47 +3280,47 @@ 
 

                     $arr_file_type = wp_check_filetype($filename);

 					

-					if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

-						continue;

-					}

+                    if (empty($arr_file_type['ext']) || empty($arr_file_type['type'])) {

+                        continue;

+                    }

 					

-					$uploaded_file_type = $arr_file_type['type'];

-					$uploaded_file_ext = $arr_file_type['ext'];

+                    $uploaded_file_type = $arr_file_type['type'];

+                    $uploaded_file_ext = $arr_file_type['ext'];

 					

-					if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

-						continue; // Invalid file type.

-					}

+                    if (!empty($allowed_file_types) && !in_array($uploaded_file_ext, $allowed_file_types)) {

+                        continue; // Invalid file type.

+                    }

 

                     // Set an array containing a list of acceptable formats

                     //$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png', 'application/pdf', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/octet-stream', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'text/csv', 'text/plain');

 

-					if (!function_exists('wp_handle_upload'))

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

+                    if (!function_exists('wp_handle_upload'))

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

 

-					if (!is_dir($geodir_uploadpath))

-						mkdir($geodir_uploadpath);

+                    if (!is_dir($geodir_uploadpath))

+                        mkdir($geodir_uploadpath);

 

-					$new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

-					$explode_sub_dir = explode("/", $sub_dir);

-					if ($curr_img_dir == end($explode_sub_dir)) {

-						$img_path = $geodir_uploadpath . '/' . $filename;

-						$img_url = $geodir_uploadurl . '/' . $filename;

-					} else {

-						$img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-						$img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

-					}

+                    $new_name = $post_id . '_' . $field_id . '_' . $img_name_arr[0] . '.' . $img_name_arr[1];

+                    $explode_sub_dir = explode("/", $sub_dir);

+                    if ($curr_img_dir == end($explode_sub_dir)) {

+                        $img_path = $geodir_uploadpath . '/' . $filename;

+                        $img_url = $geodir_uploadurl . '/' . $filename;

+                    } else {

+                        $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+                        $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+                    }

 

-					$uploaded_file = '';

-					if (file_exists($img_path))

-						$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+                    $uploaded_file = '';

+                    if (file_exists($img_path))

+                        $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

 

-					if ($curr_img_dir != $geodir_uploaddir) {

-						if (file_exists($img_path))

-							unlink($img_path);

-					}

+                    if ($curr_img_dir != $geodir_uploaddir) {

+                        if (file_exists($img_path))

+                            unlink($img_path);

+                    }

 

-					if (!empty($uploaded_file))

-						$file_urls = $geodir_uploadurl . '/' . $new_name;

+                    if (!empty($uploaded_file))

+                        $file_urls = $geodir_uploadurl . '/' . $new_name;

 

                 } else {

                     $file_urls = $post_image[$m];

@@ -3375,16 +3375,16 @@ 
 

 if (!function_exists('geodir_plupload_action')) {

 

-	/**

-	 * Get upload directory path details

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Get upload directory path details

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $current_user Current user object.

-	 * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.

-	 * @return mixed Returns upload directory details as an array.

-	 */

-	function geodir_upload_dir($upload)

+     * @param array $upload Array of upload directory data with keys of 'path','url', 'subdir, 'basedir', and 'error'.

+     * @return mixed Returns upload directory details as an array.

+     */

+    function geodir_upload_dir($upload)

     {

         global $current_user;

         $upload['subdir'] = $upload['subdir'] . '/temp_' . $current_user->data->ID;

@@ -3393,13 +3393,13 @@ 
         return $upload;

     }

 

-	/**

-	 * Handles place file and image upload.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 */

-	function geodir_plupload_action()

+    /**

+     * Handles place file and image upload.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

+    function geodir_plupload_action()

     {

 

         // check ajax noonce

@@ -3489,14 +3489,14 @@ 
 }

 

 if (!function_exists('geodir_max_upload_size')) {

-	/**

-	 * Get max upload file size

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

-	 * @return mixed|void Returns max upload file size.

-	 */

-	function geodir_max_upload_size()

+    /**

+     * Get max upload file size

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     * @return mixed|void Returns max upload file size.

+     */

+    function geodir_max_upload_size()

     {

         $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

 

@@ -3669,14 +3669,14 @@ 
 

 

 if (!function_exists('geodir_custom_sort_field_save')) {

-	/**

-	 * Save or Update custom sort fields into the database.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Save or Update custom sort fields into the database.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

-	 * @param array $request_field {

+     * @param array $request_field {

      *    Attributes of the Request field.

      *

      *    @type string $action Ajax action name.

@@ -3695,10 +3695,10 @@ 
      *    @type string $sort_order Sort Order.

      *

      * }

-	 * @param bool $default Not yet implemented.

-	 * @return int Returns the last affected db table row id.

-	 */

-	function geodir_custom_sort_field_save($request_field = array(), $default = false)

+     * @param bool $default Not yet implemented.

+     * @return int Returns the last affected db table row id.

+     */

+    function geodir_custom_sort_field_save($request_field = array(), $default = false)

     {

 

         global $wpdb, $plugin_prefix;

@@ -3816,16 +3816,16 @@ 
 

 

 if (!function_exists('geodir_custom_sort_field_delete')) {

-	/**

-	 * Delete a custom sort field using field id.

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Delete a custom sort field using field id.

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global string $plugin_prefix Geodirectory plugin table prefix.

-	 * @param string $field_id The field ID.

-	 * @return int|string Returns field id when successful deletion, else returns 0.

-	 */

-	function geodir_custom_sort_field_delete($field_id = '')

+     * @param string $field_id The field ID.

+     * @return int|string Returns field id when successful deletion, else returns 0.

+     */

+    function geodir_custom_sort_field_delete($field_id = '')

     {

 

         global $wpdb, $plugin_prefix;

@@ -3844,18 +3844,18 @@ 
 

 

 if (!function_exists('geodir_custom_sort_field_adminhtml')) {

-	/**

-	 * Custom sort field admin html.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Custom sort field admin html.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

-	 * @param string $field_type The form field type.

-	 * @param object|int $result_str The custom field results object or row id.

-	 * @param string $field_ins_upd When set to "submit" displays form.

-	 * @param bool $default when set to true field will be for admin use only.

-	 */

-	function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

+     * @param string $field_type The form field type.

+     * @param object|int $result_str The custom field results object or row id.

+     * @param string $field_ins_upd When set to "submit" displays form.

+     * @param bool $default when set to true field will be for admin use only.

+     */

+    function geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd = '', $default = false)

     {

         global $wpdb;

         $cf = $result_str;

@@ -3868,7 +3868,7 @@ 
             $result_str = $cf->id;

         }

 		

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

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

 

         if (!isset($field_info->post_type)) {

             $post_type = $_REQUEST['listing_type'];

@@ -3889,9 +3889,9 @@ 
             $fields = geodir_get_custom_sort_options($post_type);

 

             foreach ($fields as $val) {

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

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

                 

-				if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {

+                if ($val['field_type'] == $field_type && $val['htmlvar_name'] == $htmlvar_name) {

                     $site_title = isset($val['site_title']) ? $val['site_title'] : '';

                 }

 

@@ -3925,10 +3925,10 @@ 
 

             <div id="field_frm<?php echo $result_str;?>" class="field_frm"

                  style="display:<?php if ($field_ins_upd == 'submit') {

-                     echo 'block;';

-                 } else {

-                     echo 'none;';

-                 } ?>">

+                        echo 'block;';

+                    } else {

+                        echo 'none;';

+                    } ?>">

                 <input type="hidden" name="_wpnonce" value="<?php echo $nonce; ?>"/>

                 <input type="hidden" name="listing_type" id="listing_type" value="<?php echo $post_type;?>"/>

                 <input type="hidden" name="field_type" id="field_type" value="<?php echo $field_type;?>"/>

@@ -3956,8 +3956,8 @@ 
                                 <input type="text" name="asc_title" id="asc_title"

                                        placeholder="<?php esc_attr_e('Ascending title', 'geodirectory'); ?>"

                                        value="<?php if (isset($field_info->asc_title)) {

-                                           echo esc_attr($field_info->asc_title);

-                                       } ?>" style="width:45%;"/>

+                                            echo esc_attr($field_info->asc_title);

+                                        } ?>" style="width:45%;"/>

 

                                 <input type="radio" name="is_default"

                                        value="<?php echo $htmlvar_name; ?>_asc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_asc') {

@@ -3980,8 +3980,8 @@ 
                                 <input type="text" name="desc_title" id="desc_title"

                                        placeholder="<?php esc_attr_e('Descending title', 'geodirectory'); ?>"

                                        value="<?php if (isset($field_info->desc_title)) {

-                                           echo esc_attr($field_info->desc_title);

-                                       } ?>" style="width:45%;"/>

+                                            echo esc_attr($field_info->desc_title);

+                                        } ?>" style="width:45%;"/>

                                 <input type="radio" name="is_default"

                                        value="<?php echo $htmlvar_name; ?>_desc" <?php if (isset($field_info->default_order) && $field_info->default_order == $htmlvar_name . '_desc') {

                                     echo 'checked="checked"';

@@ -4067,19 +4067,19 @@ 
 }

 

 if (!function_exists('check_field_visibility')) {

-	/**

-	 * Check field visibility as per price package.

-	 *

-	 * @since 1.0.0

-	 * @package GeoDirectory

+    /**

+     * Check field visibility as per price package.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

      * @global object $wpdb WordPress Database object.

      * @global array $geodir_addon_list List of active GeoDirectory extensions.

-	 * @param int|string $package_id The package ID.

-	 * @param string $field_name The field name.

-	 * @param string $post_type Optional. The wordpress post type.

-	 * @return bool Returns true when field visible, otherwise false.

-	 */

-	function check_field_visibility($package_id, $field_name, $post_type)

+     * @param int|string $package_id The package ID.

+     * @param string $field_name The field name.

+     * @param string $post_type Optional. The wordpress post type.

+     * @return bool Returns true when field visible, otherwise false.

+     */

+    function check_field_visibility($package_id, $field_name, $post_type)

     {

         global $wpdb, $geodir_addon_list;

         if (!(isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes')) {

@@ -4127,15 +4127,15 @@ 
                 $input_str = explode("/", $input_str, 2);

                 $label = trim($input_str[0]);

                 if ($translated && $label != '') {

-					$label = __($label, 'geodirectory');

-				}

-				$label = ucfirst($label);

+                    $label = __($label, 'geodirectory');

+                }

+                $label = ucfirst($label);

                 $value = trim($input_str[1]);

             } else {

                 if ($translated && $input_str != '') {

-					$input_str = __($input_str, 'geodirectory');

-				}

-				$label = ucfirst($input_str);

+                    $input_str = __($input_str, 'geodirectory');

+                }

+                $label = ucfirst($input_str);

                 $value = $input_str;

             }

 

@@ -4181,9 +4181,9 @@ 
                     if (strpos($optgroup_str, "|") !== false) {

                         $optgroup_str_arr = explode("|", $optgroup_str, 2);

                         $optgroup_label = trim($optgroup_str_arr[0]);

-						if ($translated && $optgroup_label != '') {

-							$optgroup_label = __($optgroup_label, 'geodirectory');

-						}

+                        if ($translated && $optgroup_label != '') {

+                            $optgroup_label = __($optgroup_label, 'geodirectory');

+                        }

                         $optgroup_label = ucfirst($optgroup_label);

                         $optgroup_str = $optgroup_str_arr[1];

                     }

geodirectory-functions/custom_functions.php

Doc Comments +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
  * @param array $package_info Package info array.

  * @param object|string $post The post object.

  * @param string $post_type The post type.

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

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

  */

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

 {

Indentation +46 added lines, -46 removed lines

@@ -1,10 +1,10 @@ 
 <?php

 /**

- * Custom functions

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Custom functions

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 /**

  * Front end listing view template selection.

@@ -18,7 +18,7 @@ 
  */

 function geodir_list_view_select() {

     global $gd_session;

-	?>

+    ?>

     <script type="text/javascript">

 	function geodir_list_view_select(list) {

 		//alert(listval);

@@ -92,8 +92,8 @@ 
     }

     $out = '';

 	

-	$temp_post = $post;

-	$excerpt = get_the_excerpt();

+    $temp_post = $post;

+    $excerpt = get_the_excerpt();

 

     $charlength++;

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

@@ -140,7 +140,7 @@ 
             $out .= $excerpt;

         }

     }

-	$post = $temp_post;

+    $post = $temp_post;

 

     return $out;

 }

@@ -585,14 +585,14 @@ 
 {

     global $wp_query;

 	

-	/**

-	 * On search pages there should be no sort options, sorting is done by search criteria.

-	 *

-	 * @since 1.4.4

-	 */

-	if ( is_search() ) {

-		return;

-	}

+    /**

+     * On search pages there should be no sort options, sorting is done by search criteria.

+     *

+     * @since 1.4.4

+     */

+    if ( is_search() ) {

+        return;

+    }

 

     $sort_by = '';

 

@@ -607,7 +607,7 @@ 
 

     if (!empty($sort_options)) {

         foreach ($sort_options as $sort) {

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

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

 

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

 

@@ -760,34 +760,34 @@ 
 

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

 

-       $location_url = '';

+        $location_url = '';

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

-				$location_url[] = $gd_country;

-				$location_url[] = $gd_region;

-			} else if ($geodir_show_location_url == 'country_city') {

-				$location_url[] = $gd_country;

-			} else if ($geodir_show_location_url == 'region_city') {

-				$location_url[] = $gd_region;

-			}

+            if ($geodir_show_location_url == 'all') {

+                $location_url[] = $gd_country;

+                $location_url[] = $gd_region;

+            } else if ($geodir_show_location_url == 'country_city') {

+                $location_url[] = $gd_country;

+            } else if ($geodir_show_location_url == 'region_city') {

+                $location_url[] = $gd_region;

+            }

 			

-			$location_url[] = $gd_city;

+            $location_url[] = $gd_city;

 

             $location_url = implode('/', $location_url);

         }

@@ -946,18 +946,18 @@ 
         return;

     }// if non GD page, bail

 

-	$use_gd_meta = true;

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

-		$use_gd_meta = false;

+    $use_gd_meta = true;

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

+        $use_gd_meta = false;

 		

-		if (geodir_is_page('search')) {

-			$use_gd_meta = true;

-		}

-	}

+        if (geodir_is_page('search')) {

+            $use_gd_meta = true;

+        }

+    }

 	

-	if (!$use_gd_meta) {

-		return;

-	}// bail if Yoast Wordpress SEO or All_in_One_SEO_Pack active.

+    if (!$use_gd_meta) {

+        return;

+    }// bail if Yoast Wordpress SEO or All_in_One_SEO_Pack active.

 

     $current_term = $wp_query->get_queried_object();

 

Spacing +53 added lines, -53 removed lines

@@ -51,20 +51,20 @@ 
 			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>

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

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

-            <option value="5" <?php selected(5, $listing_view);?>><?php _e('View: Grid 5', '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>

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

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

         </select>

     </div>

 <?php

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

 

 }

 

@@ -298,7 +298,7 @@ 
         // strip slashes 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

     }

 

     /**

@@ -403,7 +403,7 @@ 
      * }

      */

     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

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

@@ -590,7 +590,7 @@ 
 	 *

 	 * @since 1.4.4

 	 */

-	if ( is_search() ) {

+	if (is_search()) {

 		return;

 	}

 

@@ -614,7 +614,7 @@ 
             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_field_options .= '<option ' . $selected . ' value="' . esc_url(add_query_arg('sort_by', $key)) . '">' . __($label, 'geodirectory') . '</option>';

             }

 

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

@@ -627,7 +627,7 @@ 
                 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_field_options .= '<option ' . $selected . ' value="' . esc_url(add_query_arg('sort_by', $key)) . '">' . __($label, 'geodirectory') . '</option>';

             }

 

             if ($sort->sort_desc) {

@@ -636,7 +636,7 @@ 
                 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_field_options .= '<option ' . $selected . ' value="' . esc_url(add_query_arg('sort_by', $key)) . '">' . __($label, 'geodirectory') . '</option>';

             }

 

         }

@@ -651,9 +651,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 == '') echo 'selected="selected"';?>><?php _e('Sort By', 'geodirectory');?></option><?php

+                    value="<?php echo esc_url(add_query_arg('sort_by', '')); ?>" <?php if ($sort_by == '') echo 'selected="selected"'; ?>><?php _e('Sort By', 'geodirectory'); ?></option><?php

 

-                echo $sort_field_options;?>

+                echo $sort_field_options; ?>

 

             </select>

 

@@ -722,7 +722,7 @@ 
         $category = array();

 

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

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

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

             $post_type = $post->listing_type;

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

                 $post_id = $_REQUEST['pid'];

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

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

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

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

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

@@ -1090,45 +1090,45 @@ 
 

 

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

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

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

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

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

 

     }

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

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

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

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

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

     }

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

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

@@ -1362,8 +1362,8 @@ 
 

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

 

-    $post_id = !empty($post) && isset($post->ID) ? (int)$post->ID : 0;

-    $request_post_id = !empty($_REQUEST['p']) ? (int)$_REQUEST['p'] : 0;

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

@@ -1398,7 +1398,7 @@ 
         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 .= '<a href="' . $image->src . '" title="' . $caption . '">';

                 $thumb_image .= geodir_show_image($image, 'thumbnail', true, false);

                 $thumb_image .= '</a>';

             }

@@ -1477,12 +1477,12 @@ 
     }

 

 

-    $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_name = '';

-    foreach($arr_detail_page_tabs as $tabs){

-        if(isset($tabs['is_active_tab']) && $tabs['is_active_tab'] && isset($tabs['heading_text']) && $tabs['heading_text']){

-            $active_tab_name = __($tabs['heading_text'],'geodirectory');

+    foreach ($arr_detail_page_tabs as $tabs) {

+        if (isset($tabs['is_active_tab']) && $tabs['is_active_tab'] && isset($tabs['heading_text']) && $tabs['heading_text']) {

+            $active_tab_name = __($tabs['heading_text'], 'geodirectory');

         }

     }

     ?>

@@ -1491,7 +1491,7 @@ 
 

         <div id="geodir-tab-mobile-menu" >

             <i class="fa fa-bars"></i>

-            <span class="geodir-mobile-active-tab"><?php echo $active_tab_name;?></span>

+            <span class="geodir-mobile-active-tab"><?php echo $active_tab_name; ?></span>

             <i class="fa fa-sort-desc"></i>

         </div>

 

@@ -1511,18 +1511,18 @@ 
                 if ($detail_page_tab['is_display']) {

                     ?>

                     <dt></dt> <!-- added to comply with validation -->

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

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

                     </dd>

 

                     <?php

                     ob_start() // start tab content buffering

                     ?>

-                    <li id="<?php echo $tab_index;?>Tab" <?php if ($tab_index == 'post_profile') {

+                    <li id="<?php echo $tab_index; ?>Tab" <?php if ($tab_index == 'post_profile') {

                         //echo 'itemprop="description"';

                     }?>>

-                        <div id="<?php echo $tab_index;?>" class="hash-offset"></div>

+                        <div id="<?php echo $tab_index; ?>" class="hash-offset"></div>

                         <?php

                         /**

                          * Called before the details tab content is output per tab.

@@ -1572,7 +1572,7 @@ 
                                 break;

                             case 'post_video':

                                 /** 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 wpautop(stripslashes($special_offers));

@@ -1885,9 +1885,9 @@ 
             $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 .= '</a>';}

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

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

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

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

Braces +61 added lines, -50 removed lines

@@ -526,13 +526,15 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

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

-            return false;

+        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($post_type, 1, 1)));

 

-        if (!empty($sort_field_info))

-            return $sort_field_info;

+        if (!empty($sort_field_info)) {
+                    return $sort_field_info;
+        }
 

     }

 

@@ -556,8 +558,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

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

-            return false;

+        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') order by sort_order asc", array($post_type, 1)));

@@ -596,7 +599,9 @@ 
 

     $sort_by = '';

 

-    if (isset($_REQUEST['sort_by'])) $sort_by = $_REQUEST['sort_by'];

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

     $gd_post_type = geodir_get_current_posttype();

 

@@ -624,8 +629,9 @@ 
             if ($sort->sort_asc) {

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

                 $label = $sort->site_title;

-                if ($sort->asc_title)

-                    $label = $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>';

             }

@@ -633,8 +639,9 @@ 
             if ($sort->sort_desc) {

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

                 $label = $sort->site_title;

-                if ($sort->desc_title)

-                    $label = $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>';

             }

@@ -651,7 +658,10 @@ 
             <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 == '') echo 'selected="selected"';?>><?php _e('Sort By', 'geodirectory');?></option><?php

+                    value="<?php echo esc_url( add_query_arg('sort_by', '') );?>" <?php if ($sort_by == '') {
+    echo 'selected="selected"';
+}
+?>><?php _e('Sort By', 'geodirectory');?></option><?php

 

                 echo $sort_field_options;?>

 

@@ -724,8 +734,9 @@ 
         if (isset($_REQUEST['backandedit'])) {

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

             $post_type = $post->listing_type;

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

-                $post_id = $_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']);

             $post_type = $post->post_type;

@@ -738,25 +749,29 @@ 
         if ($relate_to == 'category') {

 

             $category_taxonomy = $post_type . $relate_to;

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

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

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

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

 

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

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

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

+            if ($post->post_tags != '') {
+                            $category = explode(',', trim($post->post_tags, ','));
+            }
             $tax_field = 'name';

         }

 

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

-        if (empty($category))

-            return false;

+        if (empty($category)) {
+                    return false;
+        }
 

         $all_postypes = geodir_get_posttypes();

 

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

-            return false;

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

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

 

@@ -914,8 +929,9 @@ 
 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 = 'en';

+    if (empty($geodir_default_map_language)) {
+            $geodir_default_map_language = 'en';
+    }
     /**

      * Filter default map language.

      *

@@ -1093,42 +1109,33 @@ 
     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')){

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

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

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

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

 

-    }

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

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

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

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

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

     }

@@ -1336,8 +1343,9 @@ 
     $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 (array_key_exists($tab, $tabs_array)) {
+                            unset($tabs_array[$tab]);
+            }
         }

     }

     return $tabs_array;

@@ -1378,8 +1386,9 @@ 
         $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');
+        }
 

         $related_listing = '';

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

@@ -1428,11 +1437,13 @@ 
         $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)) {

geodirectory-functions/custom_taxonomy_hooks_actions.php

Doc Comments +3 added lines, -4 removed lines

@@ -325,7 +325,7 @@ 
  * @global wpdb $wpdb WordPress database abstraction object.

  * @deprecated 1.5.0 No longer required.

  * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess.

- * @return array Rewrite rules.

+ * @return string Rewrite rules.

  */

 function geodir_htaccess_contents($rules)

 {

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

  *

  * @param array $public_query_vars The array of query variables.

- * @return array Query variables.

+ * @return string[] Query variables.

  */

 function geodir_add_location_var($public_query_vars)

 {

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

  *

  * @param array $public_query_vars The array of query variables.

- * @return array Query variables.

+ * @return string[] Query variables.

  */

 function geodir_add_geodir_page_var($public_query_vars)

 {

@@ -793,7 +793,6 @@ 
  *

  * @since 1.0.0

  *

- * @param object $wp The WordPress object.

  */

 function geodir_custom_post_status()

 {

Indentation +147 added lines, -147 removed lines

@@ -1,10 +1,10 @@ 
 <?php

 /**

- * Geodirectory custom post types/taxonomies related functions.

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Geodirectory custom post types/taxonomies related functions.

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 /**

  * Register the texonomies.

@@ -101,7 +101,7 @@ 
 function geodir_post_type_args_modify($args, $post_type)

 {

     $geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix');

-	if (isset($_REQUEST['geodir_listing_prefix']) && $_REQUEST['geodir_listing_prefix'] != '' && geodir_strtolower($_REQUEST['geodir_listing_prefix']) != geodir_strtolower($geodir_location_prefix)) {

+    if (isset($_REQUEST['geodir_listing_prefix']) && $_REQUEST['geodir_listing_prefix'] != '' && geodir_strtolower($_REQUEST['geodir_listing_prefix']) != geodir_strtolower($geodir_location_prefix)) {

 

         $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));

 

@@ -198,7 +198,7 @@ 
     $taxonomies = get_option('geodir_taxonomies');

     $detail_url_seprator = get_option('geodir_detailurl_separator');

     

-	// create rules for post listing

+    // create rules for post listing

     if (is_array($taxonomies)):

         foreach ($taxonomies as $taxonomy => $args):

             $post_type = $args['object_type'];

@@ -224,47 +224,47 @@ 
     if (!isset($location_prefix))

         $location_prefix = 'location';

 

-	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

-	if ($location_manager) {

-		$hide_country_part = get_option('geodir_location_hide_country_part');

-		$hide_region_part = get_option('geodir_location_hide_region_part');

-	}

-	$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

+    $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

+    if ($location_manager) {

+        $hide_country_part = get_option('geodir_location_hide_country_part');

+        $hide_region_part = get_option('geodir_location_hide_region_part');

+    }

+    $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

 	

-	if ($location_manager && ($hide_country_part || $hide_region_part)) {

-		$matches2 = '';

-		$matches1 = '';

+    if ($location_manager && ($hide_country_part || $hide_region_part)) {

+        $matches2 = '';

+        $matches1 = '';

 		

-		if (!$hide_country_part && $hide_region_part) { // country/city

-			$matches1 = 'gd_country';

-			$matches2 = 'gd_city';

-		} else if ($hide_country_part && !$hide_region_part) { // region/city

-			$matches1 = 'gd_region';

-			$matches2 = 'gd_city';

-		} else { // city

-			$matches1 = 'gd_city';

-		}

+        if (!$hide_country_part && $hide_region_part) { // country/city

+            $matches1 = 'gd_country';

+            $matches2 = 'gd_city';

+        } else if ($hide_country_part && !$hide_region_part) { // region/city

+            $matches1 = 'gd_region';

+            $matches2 = 'gd_city';

+        } else { // city

+            $matches1 = 'gd_city';

+        }

 		

-		if ($matches2) {

-			if ($neighbourhood_active) {

-				$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]';

-			}

-			$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]';

-		} else {

-			if ($neighbourhood_active) {

-				$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]';

-			}

-		}

+        if ($matches2) {

+            if ($neighbourhood_active) {

+                $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]';

+            }

+            $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]';

+        } else {

+            if ($neighbourhood_active) {

+                $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]';

+            }

+        }

 		

-		$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]';

-	} else { // country/region/city

-		if ($neighbourhood_active) {

-			$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';

-		}

-		$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';

-		$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]';

-		$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]';

-	}

+        $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]';

+    } else { // country/region/city

+        if ($neighbourhood_active) {

+            $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';

+        }

+        $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';

+        $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]';

+        $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]';

+    }

 

     if ($location_page && function_exists('icl_object_id')) {

         foreach(icl_get_languages('skip_missing=N') as $lang){

@@ -273,40 +273,40 @@ 
             if($alt_page_id){

                 $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));

 

-				if ($location_manager && ($hide_country_part || $hide_region_part)) {

-					$matches2 = '';

-					$matches1 = '';

+                if ($location_manager && ($hide_country_part || $hide_region_part)) {

+                    $matches2 = '';

+                    $matches1 = '';

 					

-					if (!$hide_country_part && $hide_region_part) { // country/city

-						$matches1 = 'gd_country';

-						$matches2 = 'gd_city';

-					} else if ($hide_country_part && !$hide_region_part) { // region/city

-						$matches1 = 'gd_region';

-						$matches2 = 'gd_city';

-					} else { // city

-						$matches1 = 'gd_city';

-					}

+                    if (!$hide_country_part && $hide_region_part) { // country/city

+                        $matches1 = 'gd_country';

+                        $matches2 = 'gd_city';

+                    } else if ($hide_country_part && !$hide_region_part) { // region/city

+                        $matches1 = 'gd_region';

+                        $matches2 = 'gd_city';

+                    } else { // city

+                        $matches1 = 'gd_city';

+                    }

 					

-					if ($matches2) {

-						if ($neighbourhood_active) {

-							$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]';

-						}

-						$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]';

-					} else {

-						if ($neighbourhood_active) {

-							$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]';

-						}

-					}

+                    if ($matches2) {

+                        if ($neighbourhood_active) {

+                            $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]';

+                        }

+                        $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]';

+                    } else {

+                        if ($neighbourhood_active) {

+                            $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]';

+                        }

+                    }

 					

-					$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]';

-				} else { // country/region/city

-					if ($neighbourhood_active) {

-						$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';

-					}

-					$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';

-					$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]';

-					$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]';

-				}

+                    $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]';

+                } else { // country/region/city

+                    if ($neighbourhood_active) {

+                        $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';

+                    }

+                    $newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';

+                    $newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]';

+                    $newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]';

+                }

             }

         }

     }

@@ -409,7 +409,7 @@ 
  * @param object $wp The WordPress object.

  */

 function geodir_set_location_var_in_session_in_core($wp) {

-	global $gd_session;

+    global $gd_session;

 	

     // Fix for WPML removing page_id query var:

     if (isset($wp->query_vars['page']) && !isset($wp->query_vars['page_id']) && isset($wp->query_vars['pagename']) && !is_home()) {

@@ -426,16 +426,16 @@ 
         }

     }

 	

-	// Query Vars will have page_id parameter

-	// check if query var has page_id and that page id is location page

+    // Query Vars will have page_id parameter

+    // check if query var has page_id and that page id is location page

     geodir_set_is_geodir_page($wp);

-	// if is GD homepage set the page ID

-	if (geodir_is_page('home')) {

-		$wp->query_vars['page_id'] = get_option('page_on_front');

-	}

+    // if is GD homepage set the page ID

+    if (geodir_is_page('home')) {

+        $wp->query_vars['page_id'] = get_option('page_on_front');

+    }

 

-	// The location url format (all or country_city or region_city or city).

-	$geodir_show_location_url = get_option('geodir_show_location_url');

+    // The location url format (all or country_city or region_city or city).

+    $geodir_show_location_url = get_option('geodir_show_location_url');

 

     if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id()) {

         $gd_country = '';

@@ -494,7 +494,7 @@ 
                 $gd_session->set('gd_region', $gd_region);

                 $gd_session->set('gd_city', $gd_city);

                 

-				$wp->query_vars['gd_country'] = $gd_country;

+                $wp->query_vars['gd_country'] = $gd_country;

                 $wp->query_vars['gd_region'] = $gd_region;

                 $wp->query_vars['gd_city'] = $gd_city;

             } else {

@@ -510,7 +510,7 @@ 
             // check if this post type is geodirectory post types

             $post_type_array = geodir_get_posttypes();

             

-			if (in_array($requested_post_type, $post_type_array)) {

+            if (in_array($requested_post_type, $post_type_array)) {

                 // now u can apply geodirectory related manipulation.

             }

         }

@@ -520,17 +520,17 @@ 
         $gd_region = '';

         $gd_city = '';

         

-		$is_geodir_taxonomy = false;

+        $is_geodir_taxonomy = false;

         $is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not

         $is_geodir_location_found = false;

 		

-		$geodir_taxonomy = '';

+        $geodir_taxonomy = '';

         $geodir_post_type = '';

         $geodir_term = '';

         $geodir_set_location_session = true;

         $geodir_taxonomis = geodir_get_taxonomies('', true);

 		

-	    foreach ($geodir_taxonomis as $taxonomy) {

+        foreach ($geodir_taxonomis as $taxonomy) {

             if (array_key_exists($taxonomy, $wp->query_vars)) {

                 $is_geodir_taxonomy = true;

                 $geodir_taxonomy = $taxonomy;

@@ -547,52 +547,52 @@ 
         if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy

             $wp->query_vars['post_type'] = $geodir_post_type;

 

-			// now check if last term is a post of geodirectory post types

-			$geodir_post = get_posts(array(

-				'name' => $geodir_last_term,

-				'posts_per_page' => 1,

-				'post_type' => $geodir_post_type,

+            // now check if last term is a post of geodirectory post types

+            $geodir_post = get_posts(array(

+                'name' => $geodir_last_term,

+                'posts_per_page' => 1,

+                'post_type' => $geodir_post_type,

 

 

-			));

+            ));

 

-			if (empty($geodir_post)) {

-				$geodir_post = get_posts(array(

-					'name' => $geodir_last_term,

-					'posts_per_page' => 1,

-					'post_type' => $geodir_post_type,

-					'post_status' => 'draft',

-					'suppress_filters' => false,

+            if (empty($geodir_post)) {

+                $geodir_post = get_posts(array(

+                    'name' => $geodir_last_term,

+                    'posts_per_page' => 1,

+                    'post_type' => $geodir_post_type,

+                    'post_status' => 'draft',

+                    'suppress_filters' => false,

 

-				));

-			}

+                ));

+            }

 

-			if (!empty($geodir_post)) {

+            if (!empty($geodir_post)) {

 

-				if ($geodir_post[0]->post_status != 'publish') {

-					foreach ($wp->query_vars as $key => $vars) {

-						unset($wp->query_vars[$key]);

-					}

-					$wp->query_vars['error'] = '404';

-					// set it as 404 if post exists but its status is not published yet

+                if ($geodir_post[0]->post_status != 'publish') {

+                    foreach ($wp->query_vars as $key => $vars) {

+                        unset($wp->query_vars[$key]);

+                    }

+                    $wp->query_vars['error'] = '404';

+                    // set it as 404 if post exists but its status is not published yet

 

-				} else {

-					//$wp->query_vars[$geodir_taxonomy] = str_replace( '/'.$geodir_last_term , ''  , $geodir_term);

-					$wp->query_vars[$geodir_post_type] = $geodir_last_term;

-					$wp->query_vars['name'] = $geodir_last_term;

+                } else {

+                    //$wp->query_vars[$geodir_taxonomy] = str_replace( '/'.$geodir_last_term , ''  , $geodir_term);

+                    $wp->query_vars[$geodir_post_type] = $geodir_last_term;

+                    $wp->query_vars['name'] = $geodir_last_term;

 

-				}

+                }

 

 

-				$geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count);

-				if (!$post_title_replace_count)

-					$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);

-				$geodir_terms = explode('/', $geodir_term);

-				$geodir_last_term = end($geodir_terms);

+                $geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count);

+                if (!$post_title_replace_count)

+                    $geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);

+                $geodir_terms = explode('/', $geodir_term);

+                $geodir_last_term = end($geodir_terms);

 

-				$geodir_set_location_session = false;

-				//return ;

-			}

+                $geodir_set_location_session = false;

+                //return ;

+            }

 

             $geodir_location_terms = '';

             // if last term is not a post then check if last term is a term of the specific texonomy or not

@@ -605,9 +605,9 @@ 
 

             // now check if there is location parts in the url or not

             if (get_option('geodir_add_location_url')) {				

-				$default_location = geodir_get_default_location();

+                $default_location = geodir_get_default_location();

                 

-				if ($geodir_show_location_url == 'all') {

+                if ($geodir_show_location_url == 'all') {

                     if (count($geodir_terms) >= 3) {

                         $gd_country = urldecode($geodir_terms[0]);

                         $gd_region = urldecode($geodir_terms[1]);

@@ -658,7 +658,7 @@ 
                     if (!$is_geodir_location_found) {

                         $gd_city = '';

                         

-						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

+                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

                             $is_geodir_location_found = true;

                     }

                 }  else if ($geodir_show_location_url == 'region_city') {

@@ -676,7 +676,7 @@ 
                     if (!$is_geodir_location_found) {

                         $gd_city = '';

                         

-						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region))

+                        if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region))

                             $is_geodir_location_found = true;

                     }

                 } else {

@@ -697,14 +697,14 @@ 
                 }

 

                 if ($geodir_show_location_url == 'all') {

-				} else if ($geodir_show_location_url == 'country_city') {

-					$gd_region = '';

-				} else if ($geodir_show_location_url == 'region_city') {

-					$gd_country = '';

-				} else {

-					$gd_country = '';

+                } else if ($geodir_show_location_url == 'country_city') {

+                    $gd_region = '';

+                } else if ($geodir_show_location_url == 'region_city') {

+                    $gd_country = '';

+                } else {

+                    $gd_country = '';

                     $gd_region = '';

-				}

+                }

 

                 if ($is_geodir_location_found) {

                     $wp->query_vars['gd_country'] = $gd_country;

@@ -747,10 +747,10 @@ 
         }

     }

 	

-	// Unset location session if gd page and location not set.

-	if (isset($wp->query_vars['gd_is_geodir_page']) && !isset($wp->query_vars['gd_country'])) {

-		$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

-	}

+    // Unset location session if gd page and location not set.

+    if (isset($wp->query_vars['gd_is_geodir_page']) && !isset($wp->query_vars['gd_country'])) {

+        $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

+    }

 

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

         $wp->query_vars['gd_country'] = $gd_session->get('gd_country');

@@ -760,20 +760,20 @@ 
 

     // now check if there is location parts in the url or not

     if (get_option('geodir_add_location_url')) {        

-		if ($geodir_show_location_url == 'all') {

-		} else if ($geodir_show_location_url == 'country_city') {

-			 if (isset($wp->query_vars['gd_region']))

+        if ($geodir_show_location_url == 'all') {

+        } else if ($geodir_show_location_url == 'country_city') {

+                if (isset($wp->query_vars['gd_region']))

                 $wp->query_vars['gd_region'] = '';

-		} else if ($geodir_show_location_url == 'region_city') {

-			if (isset($wp->query_vars['gd_country']))

+        } else if ($geodir_show_location_url == 'region_city') {

+            if (isset($wp->query_vars['gd_country']))

                 $wp->query_vars['gd_country'] = '';

-		} else {

-			if (isset($wp->query_vars['gd_country']))

+        } else {

+            if (isset($wp->query_vars['gd_country']))

                 $wp->query_vars['gd_country'] = '';

 

             if (isset($wp->query_vars['gd_region']))

                 $wp->query_vars['gd_region'] = '';

-		}

+        }

     } else {

         if (isset($wp->query_vars['gd_country']))

             $wp->query_vars['gd_country'] = '';

Spacing +11 added lines, -11 removed lines

@@ -70,7 +70,7 @@ 
 

             if (!empty($args['labels'])) {

                 foreach ($args['labels'] as $key => $val) {

-                    $args['labels'][$key] = __($val, 'geodirectory');// allow translation

+                    $args['labels'][$key] = __($val, 'geodirectory'); // allow translation

                 }

             }

 

@@ -111,7 +111,7 @@ 
 

             if (array_key_exists('rewrite', $args)) {

                 if (array_key_exists('slug', $args['rewrite']))

-                    $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+                    $args['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%';

             }

 

             $geodir_post_types = get_option('geodir_post_types');

@@ -123,7 +123,7 @@ 
 

                 if (array_key_exists('rewrite', $geodir_post_types[$post_type]))

                     if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

-                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%';

 

                 update_option('geodir_post_types', $geodir_post_types);

 

@@ -209,7 +209,7 @@ 
                 $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';

             } else {

                 // use this loop to add paging for details page comments paging

-                $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';

+                $newrules[str_replace("/tags", "", $listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';

             }

         endforeach;

     endif;

@@ -217,7 +217,7 @@ 
     // create rules for location listing

     $location_page = get_option('geodir_location_page');

 	

-    if($location_page) {

+    if ($location_page) {

         global $wpdb;

         $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));

     }

@@ -267,10 +267,10 @@ 
 	}

 

     if ($location_page && function_exists('icl_object_id')) {

-        foreach(icl_get_languages('skip_missing=N') as $lang){

+        foreach (icl_get_languages('skip_missing=N') as $lang) {

             $alt_page_id = '';

-            $alt_page_id = icl_object_id($location_page, 'page', false,$lang['language_code']);

-            if($alt_page_id){

+            $alt_page_id = icl_object_id($location_page, 'page', false, $lang['language_code']);

+            if ($alt_page_id) {

                 $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));

 

 				if ($location_manager && ($hide_country_part || $hide_region_part)) {

@@ -416,12 +416,12 @@ 
         global $wpdb;

 

         $page_for_posts = get_option('page_for_posts');

-        $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));

+        $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s", $wp->query_vars['pagename']));

 

         if (function_exists('icl_object_id')) {

             $real_page_id = icl_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);

         }

-        if ($real_page_id && $real_page_id!=$page_for_posts) {

+        if ($real_page_id && $real_page_id != $page_for_posts) {

             $wp->query_vars['page_id'] = $real_page_id;

         }

     }

@@ -661,7 +661,7 @@ 
 						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

                             $is_geodir_location_found = true;

                     }

-                }  else if ($geodir_show_location_url == 'region_city') {

+                } else if ($geodir_show_location_url == 'region_city') {

                     if (count($geodir_terms) >= 2) {

                         $gd_region = urldecode($geodir_terms[0]);

                         $gd_city = urldecode($geodir_terms[1]);

Braces +103 added lines, -70 removed lines

@@ -106,24 +106,30 @@ 
         $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));

 

         if ($post_type == 'gd_place') {

-            if (array_key_exists('has_archive', $args))

-                $args['has_archive'] = $listing_slug;

+            if (array_key_exists('has_archive', $args)) {
+                            $args['has_archive'] = $listing_slug;
+            }
 

             if (array_key_exists('rewrite', $args)) {

-                if (array_key_exists('slug', $args['rewrite']))

-                    $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+                if (array_key_exists('slug', $args['rewrite'])) {
+                                    $args['rewrite']['slug'] = $listing_slug;
+                }
+                // . '/%gd_taxonomy%';

             }

 

             $geodir_post_types = get_option('geodir_post_types');

 

             if (array_key_exists($post_type, $geodir_post_types)) {

 

-                if (array_key_exists('has_archive', $geodir_post_types[$post_type]))

-                    $geodir_post_types[$post_type]['has_archive'] = $listing_slug;

+                if (array_key_exists('has_archive', $geodir_post_types[$post_type])) {
+                                    $geodir_post_types[$post_type]['has_archive'] = $listing_slug;
+                }
 

-                if (array_key_exists('rewrite', $geodir_post_types[$post_type]))

-                    if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

-                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+                if (array_key_exists('rewrite', $geodir_post_types[$post_type])) {
+                                    if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

+                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;
+                }
+                // . '/%gd_taxonomy%';

 

                 update_option('geodir_post_types', $geodir_post_types);

 

@@ -138,10 +144,11 @@ 
             if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {

                 $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;

 

-                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

+                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category'])) {
+                                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

                         if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))

-                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;

+                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;
+                }
 

                 update_option('geodir_taxonomies', $geodir_taxonomies);

 

@@ -152,10 +159,11 @@ 
             if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {

                 $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';

 

-                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

+                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags'])) {
+                                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

                         if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))

-                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';

+                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';
+                }
 

                 update_option('geodir_taxonomies', $geodir_taxonomies_tag);

 

@@ -221,8 +229,9 @@ 
         global $wpdb;

         $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));

     }

-    if (!isset($location_prefix))

-        $location_prefix = 'location';

+    if (!isset($location_prefix)) {
+            $location_prefix = 'location';
+    }
 

 	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

 	if ($location_manager) {

@@ -441,14 +450,17 @@ 
         $gd_country = '';

         $gd_region = '';

         $gd_city = '';

-        if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '')

-            $gd_country = urldecode($wp->query_vars['gd_country']);

+        if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') {
+                    $gd_country = urldecode($wp->query_vars['gd_country']);
+        }
 

-        if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '')

-            $gd_region = urldecode($wp->query_vars['gd_region']);

+        if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') {
+                    $gd_region = urldecode($wp->query_vars['gd_region']);
+        }
 

-        if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '')

-            $gd_city = urldecode($wp->query_vars['gd_city']);

+        if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') {
+                    $gd_city = urldecode($wp->query_vars['gd_city']);
+        }
 

         if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {

             $default_location = geodir_get_default_location();

@@ -456,17 +468,19 @@ 
             if (get_option('geodir_add_location_url')) {

                 if ($geodir_show_location_url != 'all') {

                     if ($gd_region == '') {

-                        if ($gd_ses_region = $gd_session->get('gd_region'))

-                            $gd_region = $gd_ses_region;

-                        else

-                            $gd_region = $default_location->region_slug;

+                        if ($gd_ses_region = $gd_session->get('gd_region')) {
+                                                    $gd_region = $gd_ses_region;
+                        } else {
+                                                    $gd_region = $default_location->region_slug;
+                        }
                     }

 

                     if ($gd_city == '') {

-                        if ($gd_ses_city = $gd_session->get('gd_city'))

-                            $gd_city = $gd_ses_city;

-                        else

-                            $gd_city = $default_location->city_slug;

+                        if ($gd_ses_city = $gd_session->get('gd_city')) {
+                                                    $gd_city = $gd_ses_city;
+                        } else {
+                                                    $gd_city = $default_location->city_slug;
+                        }
 

                         $base_location_link = geodir_get_location_link('base');

                         wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);

@@ -585,8 +599,9 @@ 
 

 

 				$geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count);

-				if (!$post_title_replace_count)

-					$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);

+				if (!$post_title_replace_count) {
+									$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);
+				}
 				$geodir_terms = explode('/', $geodir_term);

 				$geodir_last_term = end($geodir_terms);

 

@@ -622,8 +637,9 @@ 
                     if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

                         geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) &&

                         geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)

-                    )

-                        $is_geodir_location_found = true;

+                    ) {
+                                            $is_geodir_location_found = true;
+                    }
 

                     // if location has not been found for country , region and city then search for country and region only

 

@@ -631,8 +647,9 @@ 
                         $gd_city = '';

                         if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

                             geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)

-                        )

-                            $is_geodir_location_found = true;

+                        ) {
+                                                    $is_geodir_location_found = true;
+                        }
 

                     }

 

@@ -640,8 +657,9 @@ 
                     if (!$is_geodir_location_found) {

                         $gd_city = '';

                         $gd_region = '';

-                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

-                            $is_geodir_location_found = true;

+                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) {
+                                                    $is_geodir_location_found = true;
+                        }
                     }

                 } else if ($geodir_show_location_url == 'country_city') {

                     if (count($geodir_terms) >= 2) {

@@ -651,17 +669,19 @@ 
                         $gd_country = urldecode($geodir_terms[0]);

                     }

 

-                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

-                        $is_geodir_location_found = true;

+                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {
+                                            $is_geodir_location_found = true;
+                    }
 

                     // if location has not been found for country and city  then search for country only

                     if (!$is_geodir_location_found) {

                         $gd_city = '';

                         

-						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

-                            $is_geodir_location_found = true;

+						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) {
+						                            $is_geodir_location_found = true;
+						}
                     }

-                }  else if ($geodir_show_location_url == 'region_city') {

+                } else if ($geodir_show_location_url == 'region_city') {

                     if (count($geodir_terms) >= 2) {

                         $gd_region = urldecode($geodir_terms[0]);

                         $gd_city = urldecode($geodir_terms[1]);

@@ -669,15 +689,17 @@ 
                         $gd_region = urldecode($geodir_terms[0]);

                     }

 

-                    if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

-                        $is_geodir_location_found = true;

+                    if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {
+                                            $is_geodir_location_found = true;
+                    }
 

                     // if location has not been found for region and city  then search for region only

                     if (!$is_geodir_location_found) {

                         $gd_city = '';

                         

-						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region))

-                            $is_geodir_location_found = true;

+						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)) {
+						                            $is_geodir_location_found = true;
+						}
                     }

                 } else {

                     $gd_city = $geodir_terms[0];

@@ -719,14 +741,17 @@ 
 

             $wp->query_vars[$geodir_taxonomy] = $geodir_term;

             // eliminate location related terms from taxonomy term

-            if ($gd_country != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+            if ($gd_country != '') {
+                            $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
+            }
 

-            if ($gd_region != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+            if ($gd_region != '') {
+                            $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
+            }
 

-            if ($gd_city != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+            if ($gd_city != '') {
+                            $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
+            }
 

 

             $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);

@@ -762,27 +787,34 @@ 
     if (get_option('geodir_add_location_url')) {        

 		if ($geodir_show_location_url == 'all') {

 		} else if ($geodir_show_location_url == 'country_city') {

-			 if (isset($wp->query_vars['gd_region']))

-                $wp->query_vars['gd_region'] = '';

+			 if (isset($wp->query_vars['gd_region'])) {
+			                 $wp->query_vars['gd_region'] = '';
+			 }
 		} else if ($geodir_show_location_url == 'region_city') {

-			if (isset($wp->query_vars['gd_country']))

-                $wp->query_vars['gd_country'] = '';

+			if (isset($wp->query_vars['gd_country'])) {
+			                $wp->query_vars['gd_country'] = '';
+			}
 		} else {

-			if (isset($wp->query_vars['gd_country']))

-                $wp->query_vars['gd_country'] = '';

+			if (isset($wp->query_vars['gd_country'])) {
+			                $wp->query_vars['gd_country'] = '';
+			}
 

-            if (isset($wp->query_vars['gd_region']))

-                $wp->query_vars['gd_region'] = '';

+            if (isset($wp->query_vars['gd_region'])) {
+                            $wp->query_vars['gd_region'] = '';
+            }
 		}

     } else {

-        if (isset($wp->query_vars['gd_country']))

-            $wp->query_vars['gd_country'] = '';

+        if (isset($wp->query_vars['gd_country'])) {
+                    $wp->query_vars['gd_country'] = '';
+        }
 

-        if (isset($wp->query_vars['gd_region']))

-            $wp->query_vars['gd_region'] = '';

+        if (isset($wp->query_vars['gd_region'])) {
+                    $wp->query_vars['gd_region'] = '';
+        }
 

-        if (isset($wp->query_vars['gd_city']))

-            $wp->query_vars['gd_city'] = '';

+        if (isset($wp->query_vars['gd_city'])) {
+                    $wp->query_vars['gd_city'] = '';
+        }
     }

 }

 

@@ -894,8 +926,9 @@ 
 function geodir_exclude_page_where($where)

 {

     global $wpdb;

-    if (is_admin())

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

+    if (is_admin()) {
+            $where .= " AND $wpdb->posts.post_status != 'virtual'";
+    }
 

     return $where;

 }

geodirectory-functions/general_functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -1732,7 +1732,7 @@ 
  * @global string $plugin_prefix Geodirectory plugin table prefix.

  * @global string $table_prefix WordPress Database Table prefix.

  * @param array $query_args The query array.

- * @param  int|bool $count_only If true returns listings count only, otherwise returns array

+ * @param  boolean $count_only If true returns listings count only, otherwise returns array

  * @return mixed Result object.

  */

 function geodir_get_widget_listings($query_args = array(), $count_only = false)

@@ -3264,7 +3264,7 @@ 
  *

  * @since 1.0.0

  * @package GeoDirectory

- * @return bool

+ * @return null|boolean

  */

 function geodir_term_review_count_force_update($new_status, $old_status='', $post='')

 {

Indentation +50 added lines, -50 removed lines

@@ -1,10 +1,10 @@ 
 <?php

 /**

- * Plugin general functions

- *

- * @since 1.0.0

- * @package GeoDirectory

- */

+     * Plugin general functions

+     *

+     * @since 1.0.0

+     * @package GeoDirectory

+     */

 

 

 /**

@@ -304,11 +304,11 @@ 
             if (is_author() && isset($_REQUEST['geodir_dashbord']))

                 return true;

 			

-			if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int)bp_loggedin_user_id()) {

-				if (((bool)bp_is_current_component('listings') || (bool)bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int)bp_displayed_user_id()) {

-					return true;

-				}

-			}

+            if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int)bp_loggedin_user_id()) {

+                if (((bool)bp_is_current_component('listings') || (bool)bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int)bp_displayed_user_id()) {

+                    return true;

+                }

+            }

             break;

         case 'search':

             if (is_search() && isset($_REQUEST['geodir_search']))

@@ -664,13 +664,13 @@ 
             $message = get_option('geodir_post_published_email_content');

         }

 		

-		if (!empty($subject)) {

-			$subject = __(stripslashes_deep($subject),'geodirectory');

-		}

+        if (!empty($subject)) {

+            $subject = __(stripslashes_deep($subject),'geodirectory');

+        }

 		

-		if (!empty($message)) {

-			$message = __(stripslashes_deep($message),'geodirectory');

-		}

+        if (!empty($message)) {

+            $message = __(stripslashes_deep($message),'geodirectory');

+        }

 

         $to_message = nl2br($to_message);

         $sitefromEmail = get_option('site_email');

@@ -856,18 +856,18 @@ 
         if (geodir_is_page('detail') || geodir_is_page('listing')) {

             global $post;

             $location_manager = defined('POST_LOCATION_TABLE') ? true : false;

-			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

+            $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

 				

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

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

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

                     'gd_city' => $post->city_slug

                 );

 				

-				if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {

-					$location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

-				}

+                if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {

+                    $location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

+                }

             }

 

             $geodir_show_location_url = get_option('geodir_show_location_url');

@@ -3553,20 +3553,20 @@ 
             if (!empty($row->required_msg))

                 $translation_texts[] = stripslashes_deep($row->required_msg);

 			

-			if (!empty($row->default_value))

+            if (!empty($row->default_value))

                 $translation_texts[] = stripslashes_deep($row->default_value);

 			

-			if (!empty($row->option_values)) {

-				$option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values));

+            if (!empty($row->option_values)) {

+                $option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values));

 				

-				if (!empty($option_values)) {

-					foreach ($option_values as $option_value) {

-						if (!empty($option_value['label'])) {

-							$translation_texts[] = $option_value['label'];

-						}

-					}

-				}

-			}

+                if (!empty($option_values)) {

+                    foreach ($option_values as $option_value) {

+                        if (!empty($option_value['label'])) {

+                            $translation_texts[] = $option_value['label'];

+                        }

+                    }

+                }

+            }

         }

     }

 	

@@ -3587,24 +3587,24 @@ 
         }

     }

 	

-	// Advance search filter fields table

-	if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {

-		$sql = "SELECT field_site_name, front_search_title, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE;

-		$rows = $wpdb->get_results($sql);

-

-		if (!empty($rows)) {

-			foreach($rows as $row) {

-				if (!empty($row->field_site_name))

-					$translation_texts[] = stripslashes_deep($row->field_site_name);

-

-				if (!empty($row->front_search_title))

-					$translation_texts[] = stripslashes_deep($row->front_search_title);

-

-				if (!empty($row->field_desc))

-					$translation_texts[] = stripslashes_deep($row->field_desc);

-			}

-		}

-	}

+    // Advance search filter fields table

+    if (defined('GEODIR_ADVANCE_SEARCH_TABLE')) {

+        $sql = "SELECT field_site_name, front_search_title, field_desc FROM " . GEODIR_ADVANCE_SEARCH_TABLE;

+        $rows = $wpdb->get_results($sql);

+

+        if (!empty($rows)) {

+            foreach($rows as $row) {

+                if (!empty($row->field_site_name))

+                    $translation_texts[] = stripslashes_deep($row->field_site_name);

+

+                if (!empty($row->front_search_title))

+                    $translation_texts[] = stripslashes_deep($row->front_search_title);

+

+                if (!empty($row->field_desc))

+                    $translation_texts[] = stripslashes_deep($row->field_desc);

+            }

+        }

+    }

 

     $translation_texts = !empty($translation_texts) ? array_unique($translation_texts) : $translation_texts;

 

Braces +271 added lines, -190 removed lines

@@ -30,8 +30,10 @@ 
 

     if (is_ssl()) :

         return str_replace('http://', 'https://', WP_PLUGIN_URL) . "/" . plugin_basename(dirname(dirname(__FILE__)));

-    else :

-        return WP_PLUGIN_URL . "/" . plugin_basename(dirname(dirname(__FILE__)));

+    else {
+        :

+        return WP_PLUGIN_URL . "/" . plugin_basename(dirname(dirname(__FILE__)));
+    }
     endif;

 }

 

@@ -63,7 +65,9 @@ 
 {

     $active_plugins = get_option('active_plugins');

     foreach ($active_plugins as $key => $active_plugin) {

-        if (strstr($active_plugin, $plugin)) return true;

+        if (strstr($active_plugin, $plugin)) {
+            return true;
+        }
     }

     return false;

 }

@@ -114,12 +118,25 @@ 
  */

 function geodir_getlink($url, $params = array(), $use_existing_arguments = false)

 {

-    if ($use_existing_arguments) $params = $params + $_GET;

-    if (!$params) return $url;

+    if ($use_existing_arguments) {
+        $params = $params + $_GET;
+    }
+    if (!$params) {
+        return $url;
+    }
     $link = $url;

-    if (strpos($link, '?') === false) $link .= '?'; //If there is no '?' add one at the end

-    elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) $link .= '&'; //If there is no '&' at the END, add one.

-    elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) $link .= '&'; //If there is no '&' at the END, add one.

+    if (strpos($link, '?') === false) {
+        $link .= '?';
+    }
+    //If there is no '?' add one at the end

+    elseif (strpos($link, '//maps.google.com/maps/api/js?language=')) {
+        $link .= '&';
+    }
+    //If there is no '&' at the END, add one.

+    elseif (!preg_match('/(\?|\&(amp;)?)$/', $link)) {
+        $link .= '&';
+    }
+    //If there is no '&' at the END, add one.

 

     $params_arr = array();

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

@@ -157,9 +174,10 @@ 
         $add_listing_link = get_page_link(geodir_add_listing_page_id());

 

         return esc_url( add_query_arg(array('listing_type' => $post_type), $add_listing_link) );

-    } else

-        return get_bloginfo('url');

-}

+    } else {
+            return get_bloginfo('url');
+    }
+    }

 

 /**

  * Get the current page URL.

@@ -264,20 +282,24 @@ 
         case 'preview':

             if ((is_page() && get_query_var('page_id') == geodir_preview_page_id()) && isset($_REQUEST['listing_type'])

                 && in_array($_REQUEST['listing_type'], geodir_get_posttypes())

-            )

-                return true;

+            ) {
+                            return true;
+            }
             break;

         case 'listing-success':

-            if (is_page() && get_query_var('page_id') == geodir_success_page_id())

-                return true;

+            if (is_page() && get_query_var('page_id') == geodir_success_page_id()) {
+                            return true;
+            }
             break;

         case 'detail':

-            if (is_single() && in_array(get_query_var('post_type'), geodir_get_posttypes()))

-                return true;

+            if (is_single() && in_array(get_query_var('post_type'), geodir_get_posttypes())) {
+                            return true;
+            }
             break;

         case 'pt':

-            if (is_post_type_archive() && in_array(get_query_var('post_type'), geodir_get_posttypes()) && !is_tax())

-                return true;

+            if (is_post_type_archive() && in_array(get_query_var('post_type'), geodir_get_posttypes()) && !is_tax()) {
+                            return true;
+            }
 

             break;

         case 'listing':

@@ -286,23 +308,27 @@ 
 

                 return true;

             }

-            if (is_post_type_archive() && in_array(get_query_var('post_type'), geodir_get_posttypes()))

-                return true;

+            if (is_post_type_archive() && in_array(get_query_var('post_type'), geodir_get_posttypes())) {
+                            return true;
+            }
 

             break;

         case 'home':

 

-            if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home())

-                return true;

+            if ((is_page() && get_query_var('page_id') == geodir_home_page_id()) || is_page_geodir_home()) {
+                            return true;
+            }
 

             break;

         case 'location':

-            if (is_page() && get_query_var('page_id') == geodir_location_page_id())

-                return true;

+            if (is_page() && get_query_var('page_id') == geodir_location_page_id()) {
+                            return true;
+            }
             break;

         case 'author':

-            if (is_author() && isset($_REQUEST['geodir_dashbord']))

-                return true;

+            if (is_author() && isset($_REQUEST['geodir_dashbord'])) {
+                            return true;
+            }
 			

 			if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int)bp_loggedin_user_id()) {

 				if (((bool)bp_is_current_component('listings') || (bool)bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int)bp_displayed_user_id()) {

@@ -311,24 +337,29 @@ 
 			}

             break;

         case 'search':

-            if (is_search() && isset($_REQUEST['geodir_search']))

-                return true;

+            if (is_search() && isset($_REQUEST['geodir_search'])) {
+                            return true;
+            }
             break;

         case 'info':

-            if (is_page() && get_query_var('page_id') == geodir_info_page_id())

-                return true;

+            if (is_page() && get_query_var('page_id') == geodir_info_page_id()) {
+                            return true;
+            }
             break;

         case 'login':

-            if (is_page() && get_query_var('page_id') == geodir_login_page_id())

-                return true;

+            if (is_page() && get_query_var('page_id') == geodir_login_page_id()) {
+                            return true;
+            }
             break;

         case 'checkout':

-            if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id())

-                return true;

+            if (is_page() && function_exists('geodir_payment_checkout_page_id') && get_query_var('page_id') == geodir_payment_checkout_page_id()) {
+                            return true;
+            }
             break;

         case 'invoices':

-            if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id())

-                return true;

+            if (is_page() && function_exists('geodir_payment_invoices_page_id') && get_query_var('page_id') == geodir_payment_invoices_page_id()) {
+                            return true;
+            }
             break;

         default:

             return false;

@@ -356,8 +387,9 @@ 
         //$wp->query_vars['gd_is_geodir_page'] = false;

         //print_r()

         if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array('preview', 'page', 'paged', 'cpage'))) {

-            if (get_option('geodir_set_as_home'))

-                $wp->query_vars['gd_is_geodir_page'] = true;

+            if (get_option('geodir_set_as_home')) {
+                            $wp->query_vars['gd_is_geodir_page'] = true;
+            }
             if(geodir_is_page('home')){

                 $wp->query_vars['gd_is_geodir_page'] = true;

             }

@@ -376,8 +408,9 @@ 
                 || $wp->query_vars['page_id'] == geodir_login_page_id()

                 || (function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())

                 || (function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())

-            )

-                $wp->query_vars['gd_is_geodir_page'] = true;

+            ) {
+                            $wp->query_vars['gd_is_geodir_page'] = true;
+            }
         }

 

         if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['pagename'])) {

@@ -394,8 +427,9 @@ 
                     || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_checkout_page_id') && $wp->query_vars['page_id'] == geodir_payment_checkout_page_id())

                     || (isset($wp->query_vars['page_id']) && function_exists('geodir_payment_invoices_page_id') && $wp->query_vars['page_id'] == geodir_payment_invoices_page_id())

                 )

-            )

-                $wp->query_vars['gd_is_geodir_page'] = true;

+            ) {
+                            $wp->query_vars['gd_is_geodir_page'] = true;
+            }
         }

 

 

@@ -418,12 +452,14 @@ 
             }

         }

 

-        if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord']))

-            $wp->query_vars['gd_is_geodir_page'] = true;

+        if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($wp->query_vars['author_name']) && isset($_REQUEST['geodir_dashbord'])) {
+                    $wp->query_vars['gd_is_geodir_page'] = true;
+        }
 

 

-        if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search']))

-            $wp->query_vars['gd_is_geodir_page'] = true;

+        if (!isset($wp->query_vars['gd_is_geodir_page']) && isset($_REQUEST['geodir_search'])) {
+                    $wp->query_vars['gd_is_geodir_page'] = true;
+        }
 

 

 //check if homepage

@@ -453,11 +489,12 @@ 
 function geodir_is_geodir_page()

 {

     global $wp;

-    if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page'])

-        return true;

-    else

-        return false;

-}

+    if (isset($wp->query_vars['gd_is_geodir_page']) && $wp->query_vars['gd_is_geodir_page']) {
+            return true;
+    } else {
+            return false;
+    }
+    }

 

 if (!function_exists('geodir_get_imagesize')) {

     /**

@@ -754,20 +791,16 @@ 
             $subject .= ' - ADMIN BCC COPY';

             $admin_bcc = true;

 

-        }

-        elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {

+        } elseif ($message_type == 'registration' && get_option('geodir_bcc_new_user')) {

             $subject .= ' - ADMIN BCC COPY';

             $admin_bcc = true;

-        }

-        elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {

+        } elseif ($message_type == 'send_friend' && get_option('geodir_bcc_friend')) {

             $subject .= ' - ADMIN BCC COPY';

             $admin_bcc = true;

-        }

-        elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {

+        } elseif ($message_type == 'send_enquiry' && get_option('geodir_bcc_enquiry')) {

             $subject .= ' - ADMIN BCC COPY';

             $admin_bcc = true;

-        }

-        elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {

+        } elseif ($message_type == 'listing_published' && get_option('geodir_bcc_listing_published')) {

             $subject .= ' - ADMIN BCC COPY';

             $admin_bcc = true;

         }

@@ -936,21 +969,24 @@ 
             $is_location_last = '';

             $is_taxonomy_last = '';

             $breadcrumb .= '<li>';

-            if (get_query_var($gd_post_type . 'category'))

-                $gd_taxonomy = $gd_post_type . 'category';

-            elseif (get_query_var($gd_post_type . '_tags'))

-                $gd_taxonomy = $gd_post_type . '_tags';

+            if (get_query_var($gd_post_type . 'category')) {
+                            $gd_taxonomy = $gd_post_type . 'category';
+            } elseif (get_query_var($gd_post_type . '_tags')) {
+                            $gd_taxonomy = $gd_post_type . '_tags';
+            }
 

             $breadcrumb .= $separator . '<a href="' . $listing_link . '">' . __(ucfirst($post_type_info->label), 'geodirectory') . '</a>';

-            if (!empty($gd_taxonomy) || geodir_is_page('detail'))

-                $is_location_last = false;

-            else

-                $is_location_last = true;

-

-            if (!empty($gd_taxonomy) && geodir_is_page('listing'))

-                $is_taxonomy_last = true;

-            else

-                $is_taxonomy_last = false;

+            if (!empty($gd_taxonomy) || geodir_is_page('detail')) {
+                            $is_location_last = false;
+            } else {
+                            $is_location_last = true;
+            }
+

+            if (!empty($gd_taxonomy) && geodir_is_page('listing')) {
+                            $is_taxonomy_last = true;
+            } else {
+                            $is_taxonomy_last = false;
+            }
 

             if (!empty($location_terms)) {

                 $geodir_get_locations = function_exists('get_actual_location_name') ? true : false;

@@ -1032,8 +1068,9 @@ 
                 {

                     if (get_query_var($gd_post_type . '_tags')) {

                         $cat_link = $listing_link . 'tags/';

-                    } else

-                        $cat_link = $listing_link;

+                    } else {
+                                            $cat_link = $listing_link;
+                    }
 

                     foreach ($location_terms as $key => $location_term) {

                         if ($location_manager && in_array($key, $hide_url_part)) {

@@ -1060,9 +1097,9 @@ 
                             $term_link_text = geodir_ucwords(urldecode($term_link_text));

                         }

 

-                        if ($term_index == count($term_array) && $is_taxonomy_last)

-                            $breadcrumb .= $separator . $term_link_text;

-                        else {

+                        if ($term_index == count($term_array) && $is_taxonomy_last) {
+                                                    $breadcrumb .= $separator . $term_link_text;
+                        } else {

                             $cat_link .= $term . '/';

                             $breadcrumb .= $separator . '<a href="' . $cat_link . '">' . $term_link_text . '</a>';

                         }

@@ -1073,8 +1110,9 @@ 
 

             }

 

-            if (geodir_is_page('detail'))

-                $breadcrumb .= $separator . get_the_title();

+            if (geodir_is_page('detail')) {
+                            $breadcrumb .= $separator . get_the_title();
+            }
 

             $breadcrumb .= '</li>';

 

@@ -1111,8 +1149,9 @@ 
 

                 $breadcrumb .= $separator . '<a href="' . $author_link . '">' . __(ucfirst($post_type_info->label), 'geodirectory') . '</a>';

                 $breadcrumb .= $separator . ucfirst(__('My', 'geodirectory') . ' ' . $_REQUEST['list']);

-            } else

-                $breadcrumb .= $separator . __(ucfirst($post_type_info->label), 'geodirectory');

+            } else {
+                            $breadcrumb .= $separator . __(ucfirst($post_type_info->label), 'geodirectory');
+            }
 

             $breadcrumb .= '</li>';

         } elseif (is_category() || is_single()) {

@@ -1187,12 +1226,14 @@ 
     function geodir_allow_wpadmin()

     {

         global $wpdb;

-        if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!isset($_REQUEST['action']))) // checking action in request to allow ajax request go through

+        if (get_option('geodir_allow_wpadmin') == '0' && is_user_logged_in() && (!isset($_REQUEST['action']))) {
+            // checking action in request to allow ajax request go through

         {

             if (current_user_can('manage_options')) {

             } else {

 

-                wp_redirect(home_url());

+                wp_redirect(home_url());
+        }
                 exit;

             }

 

@@ -1224,8 +1265,9 @@ 
     $post_upload_date = isset($post['upload_date']) ? $post['upload_date'] : '';

 

     $upload = wp_upload_bits($file_name, 0, '', $post_upload_date);

-    if ($upload['error'])

-        return new WP_Error('upload_dir_error', $upload['error']);

+    if ($upload['error']) {
+            return new WP_Error('upload_dir_error', $upload['error']);
+    }
 

     // fetch the remote url and write it to the placeholder file

     $headers = wp_get_http($url, $upload['file']);

@@ -1239,11 +1281,9 @@ 
     // make sure the fetch was successful

     elseif ($headers['response'] != '200') {

         $log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));

-    }

-    elseif (isset($headers['content-length']) && $filesize != $headers['content-length']) {

+    } elseif (isset($headers['content-length']) && $filesize != $headers['content-length']) {

         $log_message =  __('Remote file is incorrect size', 'geodirectory');

-    }

-    elseif (0 == $filesize) {

+    } elseif (0 == $filesize) {

         $log_message = __('Zero size file downloaded', 'geodirectory');

     }

 

@@ -1295,10 +1335,11 @@ 
 function geodir_dummy_folder_exists()

 {

     $path = geodir_plugin_path() . '/geodirectory-admin/dummy/';

-    if (!is_dir($path))

-        return false;

-    else

-        return true;

+    if (!is_dir($path)) {
+            return false;
+    } else {
+            return true;
+    }
 

 }

 

@@ -1516,12 +1557,10 @@ 
         if ($message_type == 'registration' && get_option('bcc_new_user')) {

             $subject .= ' - ADMIN BCC COPY';

             $admin_bcc = true;

-        }

-        elseif ($message_type == 'send_friend' && get_option('bcc_friend')) {

+        } elseif ($message_type == 'send_friend' && get_option('bcc_friend')) {

             $subject .= ' - ADMIN BCC COPY';

             $admin_bcc = true;

-        }

-        elseif ($message_type == 'send_enquiry' && get_option('bcc_enquiry')) {

+        } elseif ($message_type == 'send_enquiry' && get_option('bcc_enquiry')) {

             $subject .= ' - ADMIN BCC COPY';

             $admin_bcc = true;

         }

@@ -1565,7 +1604,9 @@ 
         $res = array();

         foreach ($ids_array as $id) {

             $xlat = icl_object_id($id, $type, false);

-            if (!is_null($xlat)) $res[] = $xlat;

+            if (!is_null($xlat)) {
+                $res[] = $xlat;
+            }
         }

         return $res;

     } else {

@@ -1907,8 +1948,9 @@ 
         $limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);

 

         $page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1;

-        if ( !$page )

-            $page = 1;

+        if ( !$page ) {
+                    $page = 1;
+        }
 

         $limit = (int)$limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int)$limit ) . ", " . (int)$limit : "";

 

@@ -2252,7 +2294,7 @@ 
     $home_url = str_replace("www.", "", $home_url);

     if ( (strpos($home_url, $cur_url) !== false || strpos($home_url . '/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front')==get_option('geodir_home_page')) ) {

         return true;

-    }elseif(get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front')==get_option('geodir_home_page')){

+    } elseif(get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front')==get_option('geodir_home_page')){

         return true;

     } else {

         return false;

@@ -2746,8 +2788,9 @@ 
                         $name = $postobj->labels->name;

 

                         $selected = '';

-                        if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing'))

-                            $selected = 'selected="selected"';

+                        if (geodir_get_current_posttype() == $key && geodir_is_page('add-listing')) {
+                                                    $selected = 'selected="selected"';
+                        }
 

                         /**

                          * Filter add listing link.

@@ -3214,8 +3257,9 @@ 
             $geodir_is_widget_listing = false;

 

             $GLOBALS['post'] = $current_post;

-            if (!empty($current_post))

-                setup_postdata($current_post);

+            if (!empty($current_post)) {
+                            setup_postdata($current_post);
+            }
             $map_jason = $current_map_jason;

             $map_canvas_arr = $current_map_canvas_arr;

             ?>

@@ -3531,11 +3575,15 @@ 
 

     $language_file = geodir_plugin_path() . '/db-language.php';

 

-    if(is_file($language_file) && !is_writable($language_file))

-        return false; // Not possible to create.

+    if(is_file($language_file) && !is_writable($language_file)) {
+            return false;
+    }
+    // Not possible to create.

 

-    if(!is_file($language_file) && !is_writable(dirname($language_file)))

-        return false; // Not possible to create.

+    if(!is_file($language_file) && !is_writable(dirname($language_file))) {
+            return false;
+    }
+    // Not possible to create.

 

     $contents_strings = array();

 

@@ -3578,8 +3626,10 @@ 
 

     $contents .= implode(PHP_EOL, $contents_foot);

 

-    if($wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE))

-        return false; // Failure; could not write file.

+    if($wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE)) {
+            return false;
+    }
+    // Failure; could not write file.

 

     return true;

 }

@@ -3605,23 +3655,29 @@ 
 

     if (!empty($rows)) {

         foreach($rows as $row) {

-            if (!empty($row->admin_title))

-                $translation_texts[] = stripslashes_deep($row->admin_title);

+            if (!empty($row->admin_title)) {
+                            $translation_texts[] = stripslashes_deep($row->admin_title);
+            }
 			

-            if (!empty($row->admin_desc))

-                $translation_texts[] = stripslashes_deep($row->admin_desc);

+            if (!empty($row->admin_desc)) {
+                            $translation_texts[] = stripslashes_deep($row->admin_desc);
+            }
 

-            if (!empty($row->site_title))

-                $translation_texts[] = stripslashes_deep($row->site_title);

+            if (!empty($row->site_title)) {
+                            $translation_texts[] = stripslashes_deep($row->site_title);
+            }
 

-            if (!empty($row->clabels))

-                $translation_texts[] = stripslashes_deep($row->clabels);

+            if (!empty($row->clabels)) {
+                            $translation_texts[] = stripslashes_deep($row->clabels);
+            }
 

-            if (!empty($row->required_msg))

-                $translation_texts[] = stripslashes_deep($row->required_msg);

+            if (!empty($row->required_msg)) {
+                            $translation_texts[] = stripslashes_deep($row->required_msg);
+            }
 			

-			if (!empty($row->default_value))

-                $translation_texts[] = stripslashes_deep($row->default_value);

+			if (!empty($row->default_value)) {
+			                $translation_texts[] = stripslashes_deep($row->default_value);
+			}
 			

 			if (!empty($row->option_values)) {

 				$option_values = geodir_string_values_to_options(stripslashes_deep($row->option_values));

@@ -3643,14 +3699,17 @@ 
 

     if (!empty($rows)) {

         foreach($rows as $row) {

-            if (!empty($row->site_title))

-                $translation_texts[] = stripslashes_deep($row->site_title);

+            if (!empty($row->site_title)) {
+                            $translation_texts[] = stripslashes_deep($row->site_title);
+            }
 

-            if (!empty($row->asc_title))

-                $translation_texts[] = stripslashes_deep($row->asc_title);

+            if (!empty($row->asc_title)) {
+                            $translation_texts[] = stripslashes_deep($row->asc_title);
+            }
 

-            if (!empty($row->desc_title))

-                $translation_texts[] = stripslashes_deep($row->desc_title);

+            if (!empty($row->desc_title)) {
+                            $translation_texts[] = stripslashes_deep($row->desc_title);
+            }
         }

     }

 	

@@ -3661,14 +3720,17 @@ 
 

 		if (!empty($rows)) {

 			foreach($rows as $row) {

-				if (!empty($row->field_site_name))

-					$translation_texts[] = stripslashes_deep($row->field_site_name);

+				if (!empty($row->field_site_name)) {
+									$translation_texts[] = stripslashes_deep($row->field_site_name);
+				}
 

-				if (!empty($row->front_search_title))

-					$translation_texts[] = stripslashes_deep($row->front_search_title);

+				if (!empty($row->front_search_title)) {
+									$translation_texts[] = stripslashes_deep($row->front_search_title);
+				}
 

-				if (!empty($row->field_desc))

-					$translation_texts[] = stripslashes_deep($row->field_desc);

+				if (!empty($row->field_desc)) {
+									$translation_texts[] = stripslashes_deep($row->field_desc);
+				}
 			}

 		}

 	}

@@ -3986,7 +4048,7 @@ 
             if(isset($geodir_post_types[$spt]['labels']['singular_name'])){

                 $single_name = __($geodir_post_types[$spt]['labels']['singular_name'],'geodirectory');

             }

-        }elseif($gd_page=='add-listing'){

+        } elseif($gd_page=='add-listing'){

             $geodir_post_types = get_option('geodir_post_types');

             $spt = isset($_REQUEST['listing_type']) ? esc_attr($_REQUEST['listing_type']) : '';

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

@@ -3996,8 +4058,7 @@ 
             if(isset($geodir_post_types[$spt]['labels']['singular_name'])){

                 $single_name = __($geodir_post_types[$spt]['labels']['singular_name'],'geodirectory');

             }

-        }

-        elseif($post->post_type){

+        } elseif($post->post_type){

             $geodir_post_types = get_option('geodir_post_types');

             if(isset($geodir_post_types[$post->post_type]['labels']['singular_name'])){

                 $single_name = __($geodir_post_types[$post->post_type]['labels']['singular_name'],'geodirectory');

@@ -4016,15 +4077,14 @@ 
             if(isset($geodir_post_types[$spt]['labels']['name'])){

                 $plural_name = __($geodir_post_types[$spt]['labels']['name'],'geodirectory');

             }

-        }elseif($gd_page=='add-listing'){

+        } elseif($gd_page=='add-listing'){

             $geodir_post_types = get_option('geodir_post_types');

             $spt = esc_attr($_REQUEST['listing_type']);

             if(!$spt){$spt='gd_place';}

             if(isset($geodir_post_types[$spt]['labels']['name'])){

                 $plural_name = __($geodir_post_types[$spt]['labels']['name'],'geodirectory');

             }

-        }

-        elseif(isset($post->post_type) && $post->post_type){

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

             $geodir_post_types = get_option('geodir_post_types');

             if(isset($geodir_post_types[$post->post_type]['labels']['name'])){

                 $plural_name = __($geodir_post_types[$post->post_type]['labels']['name'],'geodirectory');

@@ -4044,7 +4104,7 @@ 
                 $cat = get_term($post->default_category, $post->post_type . 'category');

                 $cat_name = (isset($cat->name)) ? $cat->name : '';

             }

-        }elseif($gd_page=='listing'){

+        } elseif($gd_page=='listing'){

             $queried_object = get_queried_object();

             if(isset($queried_object->name)){

                 $cat_name = $queried_object->name;

@@ -4061,7 +4121,7 @@ 
                 $cat = get_term($post->default_category, $post->post_type . 'category');

                 $cat_name = (isset($cat->name)) ? $cat->name : '';

             }

-        }elseif($gd_page=='listing'){

+        } elseif($gd_page=='listing'){

             $queried_object = get_queried_object();

             if(isset($queried_object->name)){

                 $cat_name = $queried_object->name;

@@ -4229,8 +4289,7 @@ 
 

     if(strpos($title,'%%name%%') !== false){

         $author_name = '';

-        if($author_name = get_the_author()){}

-        else{

+        if($author_name = get_the_author()){} else{

             $queried_object = get_queried_object();

             if(isset($queried_object->data->user_nicename)){

                 $author_name = $queried_object->data->user_nicename;

@@ -4276,38 +4335,54 @@ 
             $seo = isset($cpt_info['seo']) ? $cpt_info['seo'] : '';

 

             if (!empty($labels)) {

-                if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts))

-                    $translation_texts[] = $labels['name'];

-                if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts))

-                    $translation_texts[] = $labels['singular_name'];

-                if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts))

-                    $translation_texts[] = $labels['add_new'];

-                if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts))

-                    $translation_texts[] = $labels['add_new_item'];

-                if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts))

-                    $translation_texts[] = $labels['edit_item'];

-                if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts))

-                    $translation_texts[] = $labels['new_item'];

-                if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts))

-                    $translation_texts[] = $labels['view_item'];

-                if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts))

-                    $translation_texts[] = $labels['search_items'];

-                if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts))

-                    $translation_texts[] = $labels['not_found'];

-                if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts))

-                    $translation_texts[] = $labels['not_found_in_trash'];

-                if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts))

-                    $translation_texts[] = $labels['label_post_profile'];

-                if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts))

-                    $translation_texts[] = $labels['label_post_info'];

-                if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts))

-                    $translation_texts[] = $labels['label_post_images'];

-                if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts))

-                    $translation_texts[] = $labels['label_post_map'];

-                if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts))

-                    $translation_texts[] = $labels['label_reviews'];

-                if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts))

-                    $translation_texts[] = $labels['label_related_listing'];

+                if ($labels['name'] != '' && !in_array($labels['name'], $translation_texts)) {
+                                    $translation_texts[] = $labels['name'];
+                }
+                if ($labels['singular_name'] != '' && !in_array($labels['singular_name'], $translation_texts)) {
+                                    $translation_texts[] = $labels['singular_name'];
+                }
+                if ($labels['add_new'] != '' && !in_array($labels['add_new'], $translation_texts)) {
+                                    $translation_texts[] = $labels['add_new'];
+                }
+                if ($labels['add_new_item'] != '' && !in_array($labels['add_new_item'], $translation_texts)) {
+                                    $translation_texts[] = $labels['add_new_item'];
+                }
+                if ($labels['edit_item'] != '' && !in_array($labels['edit_item'], $translation_texts)) {
+                                    $translation_texts[] = $labels['edit_item'];
+                }
+                if ($labels['new_item'] != '' && !in_array($labels['new_item'], $translation_texts)) {
+                                    $translation_texts[] = $labels['new_item'];
+                }
+                if ($labels['view_item'] != '' && !in_array($labels['view_item'], $translation_texts)) {
+                                    $translation_texts[] = $labels['view_item'];
+                }
+                if ($labels['search_items'] != '' && !in_array($labels['search_items'], $translation_texts)) {
+                                    $translation_texts[] = $labels['search_items'];
+                }
+                if ($labels['not_found'] != '' && !in_array($labels['not_found'], $translation_texts)) {
+                                    $translation_texts[] = $labels['not_found'];
+                }
+                if ($labels['not_found_in_trash'] != '' && !in_array($labels['not_found_in_trash'], $translation_texts)) {
+                                    $translation_texts[] = $labels['not_found_in_trash'];
+                }
+                if (isset($labels['label_post_profile']) && $labels['label_post_profile'] != '' && !in_array($labels['label_post_profile'], $translation_texts)) {
+                                    $translation_texts[] = $labels['label_post_profile'];
+                }
+                if (isset($labels['label_post_info']) && $labels['label_post_info'] != '' && !in_array($labels['label_post_info'], $translation_texts)) {
+                                    $translation_texts[] = $labels['label_post_info'];
+                }
+                if (isset($labels['label_post_images']) && $labels['label_post_images'] != '' && !in_array($labels['label_post_images'], $translation_texts)) {
+                                    $translation_texts[] = $labels['label_post_images'];
+                }
+                if (isset($labels['label_post_map']) && $labels['label_post_map'] != '' && !in_array($labels['label_post_map'], $translation_texts)) {
+                                    $translation_texts[] = $labels['label_post_map'];
+                }
+                if (isset($labels['label_reviews']) && $labels['label_reviews'] != '' && !in_array($labels['label_reviews'], $translation_texts)) {
+                                    $translation_texts[] = $labels['label_reviews'];
+                }
+                if (isset($labels['label_related_listing']) && $labels['label_related_listing'] != '' && !in_array($labels['label_related_listing'], $translation_texts)) {
+                                    $translation_texts[] = $labels['label_related_listing'];
+                }
             }

 

             if ($description != '' && !in_array($description, $translation_texts)) {

@@ -4315,11 +4390,13 @@ 
             }

 

             if (!empty($seo)) {

-                if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts))

-                    $translation_texts[] = normalize_whitespace($seo['meta_keyword']);

+                if (isset($seo['meta_keyword']) && $seo['meta_keyword'] != '' && !in_array($seo['meta_keyword'], $translation_texts)) {
+                                    $translation_texts[] = normalize_whitespace($seo['meta_keyword']);
+                }
 

-                if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts))

-                    $translation_texts[] = normalize_whitespace($seo['meta_description']);

+                if (isset($seo['meta_description']) && $seo['meta_description'] != '' && !in_array($seo['meta_description'], $translation_texts)) {
+                                    $translation_texts[] = normalize_whitespace($seo['meta_description']);
+                }
             }

         }

     }

@@ -4345,16 +4422,20 @@ 
         $hide_region_part = get_option('geodir_location_hide_region_part');

 

         if ($hide_region_part && $hide_country_part) {

-            if (isset($location_terms['gd_country']))

-                unset($location_terms['gd_country']);

-            if (isset($location_terms['gd_region']))

-                unset($location_terms['gd_region']);

+            if (isset($location_terms['gd_country'])) {
+                            unset($location_terms['gd_country']);
+            }
+            if (isset($location_terms['gd_region'])) {
+                            unset($location_terms['gd_region']);
+            }
         } else if ($hide_region_part && !$hide_country_part) {

-            if (isset($location_terms['gd_region']))

-                unset($location_terms['gd_region']);

+            if (isset($location_terms['gd_region'])) {
+                            unset($location_terms['gd_region']);
+            }
         } else if (!$hide_region_part && $hide_country_part) {

-            if (isset($location_terms['gd_country']))

-                unset($location_terms['gd_country']);

+            if (isset($location_terms['gd_country'])) {
+                            unset($location_terms['gd_country']);
+            }
         }

     }

 

Spacing +223 added lines, -223 removed lines

@@ -156,7 +156,7 @@ 
 

         $add_listing_link = get_page_link(geodir_add_listing_page_id());

 

-        return esc_url( add_query_arg(array('listing_type' => $post_type), $add_listing_link) );

+        return esc_url(add_query_arg(array('listing_type' => $post_type), $add_listing_link));

     } else

         return get_bloginfo('url');

 }

@@ -248,7 +248,7 @@ 
 function geodir_is_page($gdpage = '')

 {

 

-    global $wp_query, $post,$wp;

+    global $wp_query, $post, $wp;

     //if(!is_admin()):

 

     switch ($gdpage):

@@ -304,8 +304,8 @@ 
             if (is_author() && isset($_REQUEST['geodir_dashbord']))

                 return true;

 			

-			if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int)bp_loggedin_user_id()) {

-				if (((bool)bp_is_current_component('listings') || (bool)bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int)bp_displayed_user_id()) {

+			if (function_exists('bp_loggedin_user_id') && function_exists('bp_displayed_user_id') && $my_id = (int) bp_loggedin_user_id()) {

+				if (((bool) bp_is_current_component('listings') || (bool) bp_is_current_component('favorites')) && $my_id > 0 && $my_id == (int) bp_displayed_user_id()) {

 					return true;

 				}

 			}

@@ -358,7 +358,7 @@ 
         if (empty($wp->query_vars) || !array_diff(array_keys($wp->query_vars), array('preview', 'page', 'paged', 'cpage'))) {

             if (get_option('geodir_set_as_home'))

                 $wp->query_vars['gd_is_geodir_page'] = true;

-            if(geodir_is_page('home')){

+            if (geodir_is_page('home')) {

                 $wp->query_vars['gd_is_geodir_page'] = true;

             }

 

@@ -427,10 +427,10 @@ 
 

 

 //check if homepage

-        if(!isset($wp->query_vars['gd_is_geodir_page'])

+        if (!isset($wp->query_vars['gd_is_geodir_page'])

             && !isset($wp->query_vars['page_id'])

             && !isset($wp->query_vars['pagename'])

-            && is_page_geodir_home()){

+            && is_page_geodir_home()) {

             $wp->query_vars['gd_is_geodir_page'] = true;

         }

         //echo $wp->query_vars['gd_is_geodir_page'] ;

@@ -531,7 +531,7 @@ 
     function createRandomString()

     {

         $chars = "abcdefghijkmlnopqrstuvwxyz1023456789";

-        srand((double)microtime() * 1000000);

+        srand((double) microtime() * 1000000);

         $i = 0;

         $rstring = '';

         while ($i <= 25) {

@@ -665,11 +665,11 @@ 
         }

 		

 		if (!empty($subject)) {

-			$subject = __(stripslashes_deep($subject),'geodirectory');

+			$subject = __(stripslashes_deep($subject), 'geodirectory');

 		}

 		

 		if (!empty($message)) {

-			$message = __(stripslashes_deep($message),'geodirectory');

+			$message = __(stripslashes_deep($message), 'geodirectory');

 		}

 

         $to_message = nl2br($to_message);

@@ -704,12 +704,12 @@ 
             $fromEmailName = get_option('site_email_name');

         }

 

-        $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]', '[#posted_date#]','[#from_email#]','[#user_login#]','[#username#]');

-        $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $to_message, $loginurl_link, $login_details, $toEmailName, $posted_date,$fromEmail, $user_login, $user_login);

+        $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]', '[#posted_date#]', '[#from_email#]', '[#user_login#]', '[#username#]');

+        $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $to_message, $loginurl_link, $login_details, $toEmailName, $posted_date, $fromEmail, $user_login, $user_login);

         $message = str_replace($search_array, $replace_array, $message);

 

-        $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]', '[#posted_date#]','[#from_email#]','[#user_login#]','[#username#]');

-        $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $toEmailName, $posted_date,$fromEmail, $user_login, $user_login);

+        $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]', '[#posted_date#]', '[#from_email#]', '[#user_login#]', '[#username#]');

+        $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $toEmailName, $posted_date, $fromEmail, $user_login, $user_login);

         $subject = str_replace($search_array, $replace_array, $subject);

 

         $headers = 'MIME-Version: 1.0' . "\r\n";

@@ -720,18 +720,18 @@ 
         $to = $toEmail;

         $sent = wp_mail($to, $subject, $message, $headers);

 

-        if( ! $sent ) {

-            if ( is_array( $to ) ) {

-                $to = implode( ',', $to );

+        if (!$sent) {

+            if (is_array($to)) {

+                $to = implode(',', $to);

             }

             $log_message = sprintf(

-                __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+                __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

                 $message_type,

-                date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+                date_i18n('F j Y H:i:s', current_time('timestamp')),

                 $to,

                 $subject

             );

-            geodir_error_log( $log_message );

+            geodir_error_log($log_message);

         }

 

         ///////// ADMIN BCC EMIALS

@@ -743,11 +743,11 @@ 
             $subject = __(stripslashes_deep(get_option('geodir_post_submited_success_email_subject_admin')), 'geodirectory');

             $message = __(stripslashes_deep(get_option('geodir_post_submited_success_email_content_admin')), 'geodirectory');

 

-            $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]', '[#posted_date#]','[#user_login#]','[#username#]');

+            $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#comments#]', '[#login_url#]', '[#login_details#]', '[#client_name#]', '[#posted_date#]', '[#user_login#]', '[#username#]');

             $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $to_message, $loginurl_link, $login_details, $toEmailName, $posted_date, $user_login, $user_login);

             $message = str_replace($search_array, $replace_array, $message);

 

-            $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]', '[#posted_date#]','[#user_login#]','[#username#]');

+            $search_array = array('[#listing_link#]', '[#site_name_url#]', '[#post_id#]', '[#site_name#]', '[#to_name#]', '[#from_name#]', '[#subject#]', '[#client_name#]', '[#posted_date#]', '[#user_login#]', '[#username#]');

             $replace_array = array($listingLink, $siteurl_link, $post_id, $sitefromEmailName, $toEmailName, $fromEmailName, $to_subject, $toEmailName, $posted_date, $user_login, $user_login);

             $subject = str_replace($search_array, $replace_array, $subject);

 

@@ -772,21 +772,21 @@ 
             $admin_bcc = true;

         }

 

-        if($admin_bcc===true){

+        if ($admin_bcc === true) {

             $sent = wp_mail($to, $subject, $message, $headers);

 

-            if( ! $sent ) {

-                if ( is_array( $to ) ) {

-                    $to = implode( ',', $to );

+            if (!$sent) {

+                if (is_array($to)) {

+                    $to = implode(',', $to);

                 }

                 $log_message = sprintf(

-                    __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+                    __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

                     $message_type,

-                    date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+                    date_i18n('F j Y H:i:s', current_time('timestamp')),

                     $to,

                     $subject

                 );

-                geodir_error_log( $log_message );

+                geodir_error_log($log_message);

             }

         }

 

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

@@ -1136,7 +1136,7 @@ 
             $breadcrumb .= stripslashes_deep($page_title);

             $breadcrumb .= '</li>';

         } else if (is_tag()) {

-            $breadcrumb .=  "<li> " . $separator . single_tag_title('',false) . '</li>';

+            $breadcrumb .= "<li> " . $separator . single_tag_title('', false) . '</li>';

         } else if (is_day()) {

             $breadcrumb .= "<li> " . $separator . __(" Archive for", 'geodirectory') . " ";

             the_time('F jS, Y');

@@ -1241,16 +1241,16 @@ 
         $log_message = sprintf(__('Remote server returned error response %1$d %2$s', 'geodirectory'), esc_html($headers['response']), get_status_header_desc($headers['response']));

     }

     elseif (isset($headers['content-length']) && $filesize != $headers['content-length']) {

-        $log_message =  __('Remote file is incorrect size', 'geodirectory');

+        $log_message = __('Remote file is incorrect size', 'geodirectory');

     }

     elseif (0 == $filesize) {

         $log_message = __('Zero size file downloaded', 'geodirectory');

     }

 

-    if($log_message){

+    if ($log_message) {

         $del = unlink($upload['file']);

-        if(!$del){geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory'));}

-        return new WP_Error('import_file_error',$log_message );

+        if (!$del) {geodir_error_log(__('GeoDirectory: fetch_remote_file() failed to delete temp file.', 'geodirectory')); }

+        return new WP_Error('import_file_error', $log_message);

     }

 

 

@@ -1266,10 +1266,10 @@ 
  */

 function geodir_max_upload_size()

 {

-    $max_filesize = (float)get_option('geodir_upload_max_filesize', 2);

+    $max_filesize = (float) get_option('geodir_upload_max_filesize', 2);

 

     if ($max_filesize > 0 && $max_filesize < 1) {

-        $max_filesize = (int)($max_filesize * 1024) . 'kb';

+        $max_filesize = (int) ($max_filesize * 1024) . 'kb';

     } else {

         $max_filesize = $max_filesize > 0 ? $max_filesize . 'mb' : '2mb';

     }

@@ -1338,35 +1338,35 @@ 
     {

         global $wpdb;

         if ($message_type == 'expiration') {

-            $subject = stripslashes(__(get_option('renew_email_subject'),'geodirectory'));

-            $client_message = stripslashes(__(get_option('renew_email_content'),'geodirectory'));

+            $subject = stripslashes(__(get_option('renew_email_subject'), 'geodirectory'));

+            $client_message = stripslashes(__(get_option('renew_email_content'), 'geodirectory'));

         } elseif ($message_type == 'post_submited') {

-            $subject = __(get_option('post_submited_success_email_subject_admin'),'geodirectory');

-            $client_message = __(get_option('post_submited_success_email_content_admin'),'geodirectory');

+            $subject = __(get_option('post_submited_success_email_subject_admin'), 'geodirectory');

+            $client_message = __(get_option('post_submited_success_email_content_admin'), 'geodirectory');

         } elseif ($message_type == 'renew') {

-            $subject = __(get_option('post_renew_success_email_subject_admin'),'geodirectory');

-            $client_message = __(get_option('post_renew_success_email_content_admin'),'geodirectory');

+            $subject = __(get_option('post_renew_success_email_subject_admin'), 'geodirectory');

+            $client_message = __(get_option('post_renew_success_email_content_admin'), 'geodirectory');

         } elseif ($message_type == 'upgrade') {

-            $subject = __(get_option('post_upgrade_success_email_subject_admin'),'geodirectory');

-            $client_message = __(get_option('post_upgrade_success_email_content_admin'),'geodirectory');

+            $subject = __(get_option('post_upgrade_success_email_subject_admin'), 'geodirectory');

+            $client_message = __(get_option('post_upgrade_success_email_content_admin'), 'geodirectory');

         } elseif ($message_type == 'claim_approved') {

-            $subject = __(get_option('claim_approved_email_subject'),'geodirectory');

-            $client_message = __(get_option('claim_approved_email_content'),'geodirectory');

+            $subject = __(get_option('claim_approved_email_subject'), 'geodirectory');

+            $client_message = __(get_option('claim_approved_email_content'), 'geodirectory');

         } elseif ($message_type == 'claim_rejected') {

-            $subject = __(get_option('claim_rejected_email_subject'),'geodirectory');

-            $client_message = __(get_option('claim_rejected_email_content'),'geodirectory');

+            $subject = __(get_option('claim_rejected_email_subject'), 'geodirectory');

+            $client_message = __(get_option('claim_rejected_email_content'), 'geodirectory');

         } elseif ($message_type == 'claim_requested') {

-            $subject = __(get_option('claim_email_subject_admin'),'geodirectory');

-            $client_message = __(get_option('claim_email_content_admin'),'geodirectory');

+            $subject = __(get_option('claim_email_subject_admin'), 'geodirectory');

+            $client_message = __(get_option('claim_email_content_admin'), 'geodirectory');

         } elseif ($message_type == 'auto_claim') {

-            $subject = __(get_option('auto_claim_email_subject'),'geodirectory');

-            $client_message = __(get_option('auto_claim_email_content'),'geodirectory');

+            $subject = __(get_option('auto_claim_email_subject'), 'geodirectory');

+            $client_message = __(get_option('auto_claim_email_content'), 'geodirectory');

         } elseif ($message_type == 'payment_success') {

-            $subject = __(get_option('post_payment_success_admin_email_subject'),'geodirectory');

-            $client_message = __(get_option('post_payment_success_admin_email_content'),'geodirectory');

+            $subject = __(get_option('post_payment_success_admin_email_subject'), 'geodirectory');

+            $client_message = __(get_option('post_payment_success_admin_email_content'), 'geodirectory');

         } elseif ($message_type == 'payment_fail') {

-            $subject = __(get_option('post_payment_fail_admin_email_subject'),'geodirectory');

-            $client_message = __(get_option('post_payment_fail_admin_email_content'),'geodirectory');

+            $subject = __(get_option('post_payment_fail_admin_email_subject'), 'geodirectory');

+            $client_message = __(get_option('post_payment_fail_admin_email_content'), 'geodirectory');

         }

         $transaction_details = $custom_1;

         $fromEmail = get_option('site_email');

@@ -1407,18 +1407,18 @@ 
         $to = $fromEmail;

         $message = $client_message;

         $sent = wp_mail($to, $subject, $message, $headers);

-        if( ! $sent ) {

-            if ( is_array( $to ) ) {

-                $to = implode( ',', $to );

+        if (!$sent) {

+            if (is_array($to)) {

+                $to = implode(',', $to);

             }

             $log_message = sprintf(

-                __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+                __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

                 $message_type,

-                date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+                date_i18n('F j Y H:i:s', current_time('timestamp')),

                 $to,

                 $subject

             );

-            geodir_error_log( $log_message );

+            geodir_error_log($log_message);

         }

     }

 }

@@ -1444,18 +1444,18 @@ 
     {

         $login_details = '';

         if ($message_type == 'send_friend') {

-            $subject = stripslashes(__(get_option('email_friend_subject'),'geodirectory'));

-            $message = stripslashes(__(get_option('email_friend_content'),'geodirectory'));

+            $subject = stripslashes(__(get_option('email_friend_subject'), 'geodirectory'));

+            $message = stripslashes(__(get_option('email_friend_content'), 'geodirectory'));

         } elseif ($message_type == 'send_enquiry') {

-            $subject = __(get_option('email_enquiry_subject'),'geodirectory');

-            $message = __(get_option('email_enquiry_content'),'geodirectory');

+            $subject = __(get_option('email_enquiry_subject'), 'geodirectory');

+            $message = __(get_option('email_enquiry_content'), 'geodirectory');

         } elseif ($message_type == 'forgot_password') {

-            $subject = __(get_option('forgot_password_subject'),'geodirectory');

-            $message = __(get_option('forgot_password_content'),'geodirectory');

+            $subject = __(get_option('forgot_password_subject'), 'geodirectory');

+            $message = __(get_option('forgot_password_content'), 'geodirectory');

             $login_details = $to_message;

         } elseif ($message_type == 'registration') {

-            $subject = __(get_option('registration_success_email_subject'),'geodirectory');

-            $message = __(get_option('registration_success_email_content'),'geodirectory');

+            $subject = __(get_option('registration_success_email_subject'), 'geodirectory');

+            $message = __(get_option('registration_success_email_content'), 'geodirectory');

             $login_details = $to_message;

         }

         $to_message = nl2br($to_message);

@@ -1489,18 +1489,18 @@ 
         $to = $toEmail;

 

         $sent = wp_mail($to, $subject, $message, $headers);

-        if( ! $sent ) {

-            if ( is_array( $to ) ) {

-                $to = implode( ',', $to );

+        if (!$sent) {

+            if (is_array($to)) {

+                $to = implode(',', $to);

             }

             $log_message = sprintf(

-                __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+                __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

                 $message_type,

-                date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+                date_i18n('F j Y H:i:s', current_time('timestamp')),

                 $to,

                 $subject

             );

-            geodir_error_log( $log_message );

+            geodir_error_log($log_message);

         }

 

         ///////// ADMIN BCC EMIALS

@@ -1526,20 +1526,20 @@ 
             $admin_bcc = true;

         }

 

-        if($admin_bcc === true){

+        if ($admin_bcc === true) {

             $sent = wp_mail($to, $subject, $message, $headers);

-            if( ! $sent ) {

-                if ( is_array( $to ) ) {

-                    $to = implode( ',', $to );

+            if (!$sent) {

+                if (is_array($to)) {

+                    $to = implode(',', $to);

                 }

                 $log_message = sprintf(

-                    __( "Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory' ),

+                    __("Email from GeoDirectory failed to send.\nMessage type: %s\nSend time: %s\nTo: %s\nSubject: %s\n\n", 'geodirectory'),

                     $message_type,

-                    date_i18n( 'F j Y H:i:s', current_time( 'timestamp' ) ),

+                    date_i18n('F j Y H:i:s', current_time('timestamp')),

                     $to,

                     $subject

                 );

-                geodir_error_log( $log_message );

+                geodir_error_log($log_message);

             }

         }

 

@@ -1587,7 +1587,7 @@ 
 function geodir_custom_posts_body_class($classes) {

     global $wpdb, $wp;

     $post_types = geodir_get_posttypes('object');

-    if (!empty($post_types) && count((array)$post_types) > 1) {

+    if (!empty($post_types) && count((array) $post_types) > 1) {

         $classes[] = 'geodir_custom_posts';

     }

 

@@ -1881,7 +1881,7 @@ 
         $sql = "SELECT COUNT(" . $wpdb->posts . ".ID) AS total FROM " . $wpdb->posts . "

 			" . $join . "

 			" . $where;

-        $rows = (int)$wpdb->get_var($sql);

+        $rows = (int) $wpdb->get_var($sql);

     } else {

         $orderby = geodir_widget_listings_get_order($query_args);

         /**

@@ -1907,10 +1907,10 @@ 
         $limit = apply_filters('geodir_filter_widget_listings_limit', $limit, $post_type);

 

         $page = !empty($query_args['pageno']) ? absint($query_args['pageno']) : 1;

-        if ( !$page )

+        if (!$page)

             $page = 1;

 

-        $limit = (int)$limit > 0 ? " LIMIT " . absint( ( $page - 1 ) * (int)$limit ) . ", " . (int)$limit : "";

+        $limit = (int) $limit > 0 ? " LIMIT " . absint(($page - 1) * (int) $limit) . ", " . (int) $limit : "";

 

         $sql = "SELECT SQL_CALC_FOUND_ROWS " . $fields . " FROM " . $wpdb->posts . "

 			" . $join . "

@@ -2107,7 +2107,7 @@ 
     }

 

     if (!empty($query_args) && !empty($query_args['posts_per_page'])) {

-        $limit = (int)$query_args['posts_per_page'];

+        $limit = (int) $query_args['posts_per_page'];

     }

 

     return $limit;

@@ -2250,9 +2250,9 @@ 
         add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

     }

     $home_url = str_replace("www.", "", $home_url);

-    if ( (strpos($home_url, $cur_url) !== false || strpos($home_url . '/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front')==get_option('geodir_home_page')) ) {

+    if ((strpos($home_url, $cur_url) !== false || strpos($home_url . '/', $cur_url) !== false) && ('page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page'))) {

         return true;

-    }elseif(get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front')==get_option('geodir_home_page')){

+    }elseif (get_query_var('page_id') == get_option('page_on_front') && 'page' == get_option('show_on_front') && get_option('page_on_front') && get_option('page_on_front') == get_option('geodir_home_page')) {

         return true;

     } else {

         return false;

@@ -2335,7 +2335,7 @@ 
 

     $gd_post_type = geodir_get_current_posttype();

 

-    $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int)$instance['category_limit'] : 15;

+    $category_limit = isset($instance['category_limit']) && $instance['category_limit'] > 0 ? (int) $instance['category_limit'] : 15;

     $default_post_type = !empty($gd_post_type) ? $gd_post_type : (isset($instance['default_post_type']) && gdsc_is_post_type_valid($instance['default_post_type']) ? $instance['default_post_type'] : '');

 

     $taxonomy = array();

@@ -2368,14 +2368,14 @@ 
             foreach ($b_terms as $key => $val) {

                 $ptype = get_post_type_object(str_replace("category", "", $key));

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

-                $tax_change_output .= "<option value='$key' ". selected($key, $default_taxonomy, false) .">" . sprintf(__('%s Categories', 'geodirectory'),$cpt_name) . "</option>";

+                $tax_change_output .= "<option value='$key' " . selected($key, $default_taxonomy, false) . ">" . sprintf(__('%s Categories', 'geodirectory'), $cpt_name) . "</option>";

             }

             $tax_change_output .= "</select>";

         }

 

         if (!empty($b_terms)) {

-            $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms);// get the first array

-            global $cat_count;//make global so we can change via function

+            $terms = $default_taxonomy != '' && isset($b_terms[$default_taxonomy]) ? $b_terms[$default_taxonomy] : reset($b_terms); // get the first array

+            global $cat_count; //make global so we can change via function

             $cat_count = 0;

             ?>

             <div class="geodir-category-list-in clearfix">

@@ -2439,7 +2439,7 @@ 
         $class_row = $cat_count > $category_limit ? 'geodir-pcat-hide geodir-hide' : 'geodir-pcat-show';

         $total_post = $cat->count;

 

-        $term_link = get_term_link( $cat, $cat->taxonomy );

+        $term_link = get_term_link($cat, $cat->taxonomy);

         /**

          * Filer the category term link.

          *

@@ -2448,7 +2448,7 @@ 
          * @param int    $cat->term_id The term id.

          * @param string $post_type Wordpress post type.

          */

-        $term_link = apply_filters( 'geodir_category_term_link', $term_link, $cat->term_id, $post_type );

+        $term_link = apply_filters('geodir_category_term_link', $term_link, $cat->term_id, $post_type);

 

         echo '<li class="' . $class_row . '"><a href="' . $term_link . '">';

         echo '<img alt="' . esc_attr($cat->name) . ' icon" style="height:20px;vertical-align:middle;" src="' . $term_icon_url . '"/> <span class="cat-link">'; echo geodir_ucwords($cat->name) . '</span> <span class="geodir_term_class geodir_link_span geodir_category_class_' . $post_type . '_' . $cat->term_id . '">(' . $total_post . ')</span> ';

@@ -2582,28 +2582,28 @@ 
                 itemWidth: 75,

                 itemMargin: 5,

                 asNavFor: '#geodir_widget_slider',

-                rtl: <?php echo ( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>

+                rtl: <?php echo (is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>

             });

 

             jQuery('#geodir_widget_slider').flexslider({

-                animation: "<?php echo $animation;?>",

+                animation: "<?php echo $animation; ?>",

                 selector: ".geodir-slides > li",

                 namespace: "geodir-",

                 controlNav: true,

-                animationLoop: <?php echo $animationLoop;?>,

-                slideshow: <?php echo $slideshow;?>,

-                slideshowSpeed: <?php echo $slideshowSpeed;?>,

-                animationSpeed: <?php echo $animationSpeed;?>,

-                directionNav: <?php echo $directionNav;?>,

-                maxItems: <?php echo $max_show;?>,

-                <?php if($slide_width){ echo "itemWidth: ".$slide_width.",";}?>

+                animationLoop: <?php echo $animationLoop; ?>,

+                slideshow: <?php echo $slideshow; ?>,

+                slideshowSpeed: <?php echo $slideshowSpeed; ?>,

+                animationSpeed: <?php echo $animationSpeed; ?>,

+                directionNav: <?php echo $directionNav; ?>,

+                maxItems: <?php echo $max_show; ?>,

+                <?php if ($slide_width) { echo "itemWidth: " . $slide_width . ","; }?>

                 sync: "#geodir_widget_carousel",

                 start: function (slider) {

                     jQuery('.geodir-listing-flex-loader').hide();

                     jQuery('#geodir_widget_slider').css({'visibility': 'visible'});

                     jQuery('#geodir_widget_carousel').css({'visibility': 'visible'});

                 },

-                rtl: <?php echo ( is_rtl() ? 'true' : 'false' ); /* fix rtl issue */ ?>

+                rtl: <?php echo (is_rtl() ? 'true' : 'false'); /* fix rtl issue */ ?>

             });

         });

     </script>

@@ -2644,7 +2644,7 @@ 
 

         global $post;

 

-        $current_post = $post;// keep current post info

+        $current_post = $post; // keep current post info

 

         $widget_main_slides = '';

         $nav_slides = '';

@@ -3087,7 +3087,7 @@ 
             $geodir_add_location_url = '1';

         }

 

-        $viewall_url = get_term_link((int)$category[0], $post_type . 'category');

+        $viewall_url = get_term_link((int) $category[0], $post_type . 'category');

 

         $geodir_add_location_url = NULL;

     }

@@ -3095,7 +3095,7 @@ 
         $gd_session->set('gd_multi_location', 1);

     }

 

-    if(is_wp_error( $viewall_url  )){$viewall_url = '';}

+    if (is_wp_error($viewall_url)) {$viewall_url = ''; }

 

     $query_args = array(

         'posts_per_page' => $post_number,

@@ -3333,14 +3333,14 @@ 
  * @package GeoDirectory

  * @return bool

  */

-function geodir_term_review_count_force_update($new_status, $old_status='', $post='')

+function geodir_term_review_count_force_update($new_status, $old_status = '', $post = '')

 {

-    if(isset($_REQUEST['action']) && $_REQUEST['action']=='geodir_import_export'){return;}//do not run if importing listings

+    if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'geodir_import_export') {return; }//do not run if importing listings

 

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

     }

-    if($new_status!=$old_status) {

+    if ($new_status != $old_status) {

         geodir_count_reviews_by_terms(true);

     }

     return true;

@@ -3505,7 +3505,7 @@ 
          */

         try {

             require_once($language_file);

-        } catch(Exception $e) {

+        } catch (Exception $e) {

             error_log('Language Error: ' . $e->getMessage());

         }

     }

@@ -3523,18 +3523,18 @@ 
  */

 function geodirectory_load_db_language() {

     global $wp_filesystem;

-    if( empty( $wp_filesystem ) ) {

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

+    if (empty($wp_filesystem)) {

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

         WP_Filesystem();

         global $wp_filesystem;

     }

 

     $language_file = geodir_plugin_path() . '/db-language.php';

 

-    if(is_file($language_file) && !is_writable($language_file))

+    if (is_file($language_file) && !is_writable($language_file))

         return false; // Not possible to create.

 

-    if(!is_file($language_file) && !is_writable(dirname($language_file)))

+    if (!is_file($language_file) && !is_writable(dirname($language_file)))

         return false; // Not possible to create.

 

     $contents_strings = array();

@@ -3568,7 +3568,7 @@ 
     $contents = implode(PHP_EOL, $contents_head);

 

     if (!empty($contents_strings)) {

-        foreach ( $contents_strings as $string ) {

+        foreach ($contents_strings as $string) {

             if (is_scalar($string) && $string != '') {

                 $string = str_replace("'", "\'", $string);

                 $contents .= PHP_EOL . "__('" . $string . "', 'geodirectory');";

@@ -3578,7 +3578,7 @@ 
 

     $contents .= implode(PHP_EOL, $contents_foot);

 

-    if($wp_filesystem->put_contents( $language_file, $contents, FS_CHMOD_FILE))

+    if ($wp_filesystem->put_contents($language_file, $contents, FS_CHMOD_FILE))

         return false; // Failure; could not write file.

 

     return true;

@@ -3604,7 +3604,7 @@ 
     $rows = $wpdb->get_results($sql);

 

     if (!empty($rows)) {

-        foreach($rows as $row) {

+        foreach ($rows as $row) {

             if (!empty($row->admin_title))

                 $translation_texts[] = stripslashes_deep($row->admin_title);

 			

@@ -3642,7 +3642,7 @@ 
     $rows = $wpdb->get_results($sql);

 

     if (!empty($rows)) {

-        foreach($rows as $row) {

+        foreach ($rows as $row) {

             if (!empty($row->site_title))

                 $translation_texts[] = stripslashes_deep($row->site_title);

 

@@ -3660,7 +3660,7 @@ 
 		$rows = $wpdb->get_results($sql);

 

 		if (!empty($rows)) {

-			foreach($rows as $row) {

+			foreach ($rows as $row) {

 				if (!empty($row->field_site_name))

 					$translation_texts[] = stripslashes_deep($row->field_site_name);

 

@@ -3695,7 +3695,7 @@ 
      *

      * @param array $geodir_allowed_mime_types and file extensions.

      */

-    return apply_filters( 'geodir_allowed_mime_types', array(

+    return apply_filters('geodir_allowed_mime_types', array(

             'Image' => array( // Image formats.

                 'jpg' => 'image/jpeg',

                 'jpe' => 'image/jpeg',

@@ -3784,13 +3784,13 @@ 
 

 

 

-add_filter('wpseo_replacements','geodir_wpseo_replacements',10,1);

+add_filter('wpseo_replacements', 'geodir_wpseo_replacements', 10, 1);

 /*

  * Add location variables to wpseo replacements.

  *

  * @since 1.5.4

  */

-function geodir_wpseo_replacements($vars){

+function geodir_wpseo_replacements($vars) {

 

     global $wp;

     $title = '';

@@ -3805,12 +3805,12 @@ 
      * @param array $location_array The array of location variables.

      * @param array $vars The page title variables.

      */

-    $location_array = apply_filters('geodir_filter_title_variables_location_arr_seo',$location_array, $vars);

+    $location_array = apply_filters('geodir_filter_title_variables_location_arr_seo', $location_array, $vars);

     $location_titles = array();

-    if(get_query_var( 'gd_country_full' )){

-        if(get_query_var( 'gd_country_full' )){$location_array['gd_country'] = get_query_var( 'gd_country_full' );}

-        if(get_query_var( 'gd_region_full' )){$location_array['gd_region'] = get_query_var( 'gd_region_full' );}

-        if(get_query_var( 'gd_city_full' )){$location_array['gd_city'] = get_query_var( 'gd_city_full' );}

+    if (get_query_var('gd_country_full')) {

+        if (get_query_var('gd_country_full')) {$location_array['gd_country'] = get_query_var('gd_country_full'); }

+        if (get_query_var('gd_region_full')) {$location_array['gd_region'] = get_query_var('gd_region_full'); }

+        if (get_query_var('gd_city_full')) {$location_array['gd_city'] = get_query_var('gd_city_full'); }

     }

     $location_single = '';

     $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

@@ -3882,23 +3882,23 @@ 
     }

 

 

-    if(!empty($location_titles)) {

+    if (!empty($location_titles)) {

         $vars['%%location%%'] = implode(", ", $location_titles);

     }

 

 

-    if(!empty($location_titles)) {

+    if (!empty($location_titles)) {

         $vars['%%in_location%%'] = __('in ', 'geodirectory') . implode(", ", $location_titles);

     }

 

 

 

-    if($location_single) {

-        $vars['%%in_location_single%%'] = __('in', 'geodirectory') . ' ' .$location_single;

+    if ($location_single) {

+        $vars['%%in_location_single%%'] = __('in', 'geodirectory') . ' ' . $location_single;

     }

 

 

-    if($location_single) {

+    if ($location_single) {

         $vars['%%location_single%%'] = $location_single;

     }

 

@@ -3910,17 +3910,17 @@ 
      * @param string $vars The title with variables.

      * @param array $location_array The array of location variables.

      */

-    return apply_filters('geodir_wpseo_replacements_vars',$vars,$location_array);

+    return apply_filters('geodir_wpseo_replacements_vars', $vars, $location_array);

 }

 

 

-add_filter('geodir_seo_meta_title','geodir_filter_title_variables',10,3);

-add_filter('geodir_seo_page_title','geodir_filter_title_variables',10,2);

-add_filter('geodir_seo_meta_description_pre','geodir_filter_title_variables',10,3);

-function geodir_filter_title_variables($title, $gd_page, $sep=''){

+add_filter('geodir_seo_meta_title', 'geodir_filter_title_variables', 10, 3);

+add_filter('geodir_seo_page_title', 'geodir_filter_title_variables', 10, 2);

+add_filter('geodir_seo_meta_description_pre', 'geodir_filter_title_variables', 10, 3);

+function geodir_filter_title_variables($title, $gd_page, $sep = '') {

 

 

-    if(!$gd_page || !$title){return $title;}// if no a GD page then bail.

+    if (!$gd_page || !$title) {return $title; }// if no a GD page then bail.

     global $post;

     //print_r($post);

     /*

@@ -3962,119 +3962,119 @@ 
     }

 

 

-    if(strpos($title,'%%title%%') !== false){

-        $title = str_replace("%%title%%",$post->post_title,$title);

+    if (strpos($title, '%%title%%') !== false) {

+        $title = str_replace("%%title%%", $post->post_title, $title);

     }

 

-    if(strpos($title,'%%sitename%%') !== false){

-        $title = str_replace("%%sitename%%",get_bloginfo('name'),$title);

+    if (strpos($title, '%%sitename%%') !== false) {

+        $title = str_replace("%%sitename%%", get_bloginfo('name'), $title);

     }

 

-    if(strpos($title,'%%sitedesc%%') !== false){

-        $title = str_replace("%%sitedesc%%",get_bloginfo('description'),$title);

+    if (strpos($title, '%%sitedesc%%') !== false) {

+        $title = str_replace("%%sitedesc%%", get_bloginfo('description'), $title);

     }

 

-    if(strpos($title,'%%excerpt%%') !== false){

-        $title = str_replace("%%excerpt%%",strip_tags(get_the_excerpt()),$title);

+    if (strpos($title, '%%excerpt%%') !== false) {

+        $title = str_replace("%%excerpt%%", strip_tags(get_the_excerpt()), $title);

     }

 

-    if(strpos($title,'%%pt_single%%') !== false){

+    if (strpos($title, '%%pt_single%%') !== false) {

         $single_name = '';

-        if($gd_page=='search' || $gd_page=='author'){

+        if ($gd_page == 'search' || $gd_page == 'author') {

             $geodir_post_types = get_option('geodir_post_types');

             $spt = esc_attr($_REQUEST['stype']);

-            if(isset($geodir_post_types[$spt]['labels']['singular_name'])){

-                $single_name = __($geodir_post_types[$spt]['labels']['singular_name'],'geodirectory');

+            if (isset($geodir_post_types[$spt]['labels']['singular_name'])) {

+                $single_name = __($geodir_post_types[$spt]['labels']['singular_name'], 'geodirectory');

             }

-        }elseif($gd_page=='add-listing'){

+        }elseif ($gd_page == 'add-listing') {

             $geodir_post_types = get_option('geodir_post_types');

             $spt = isset($_REQUEST['listing_type']) ? esc_attr($_REQUEST['listing_type']) : '';

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

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

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

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

             }

-            if(!$spt){$spt='gd_place';}

-            if(isset($geodir_post_types[$spt]['labels']['singular_name'])){

-                $single_name = __($geodir_post_types[$spt]['labels']['singular_name'],'geodirectory');

+            if (!$spt) {$spt = 'gd_place'; }

+            if (isset($geodir_post_types[$spt]['labels']['singular_name'])) {

+                $single_name = __($geodir_post_types[$spt]['labels']['singular_name'], 'geodirectory');

             }

         }

-        elseif($post->post_type){

+        elseif ($post->post_type) {

             $geodir_post_types = get_option('geodir_post_types');

-            if(isset($geodir_post_types[$post->post_type]['labels']['singular_name'])){

-                $single_name = __($geodir_post_types[$post->post_type]['labels']['singular_name'],'geodirectory');

+            if (isset($geodir_post_types[$post->post_type]['labels']['singular_name'])) {

+                $single_name = __($geodir_post_types[$post->post_type]['labels']['singular_name'], 'geodirectory');

             }

 

 

         }

-        $title = str_replace("%%pt_single%%",$single_name,$title);

+        $title = str_replace("%%pt_single%%", $single_name, $title);

     }

 

-    if(strpos($title,'%%pt_plural%%') !== false){

+    if (strpos($title, '%%pt_plural%%') !== false) {

         $plural_name = '';

-        if($gd_page=='search' || $gd_page=='author'){

+        if ($gd_page == 'search' || $gd_page == 'author') {

             $geodir_post_types = get_option('geodir_post_types');

             $spt = esc_attr($_REQUEST['stype']);

-            if(isset($geodir_post_types[$spt]['labels']['name'])){

-                $plural_name = __($geodir_post_types[$spt]['labels']['name'],'geodirectory');

+            if (isset($geodir_post_types[$spt]['labels']['name'])) {

+                $plural_name = __($geodir_post_types[$spt]['labels']['name'], 'geodirectory');

             }

-        }elseif($gd_page=='add-listing'){

+        }elseif ($gd_page == 'add-listing') {

             $geodir_post_types = get_option('geodir_post_types');

             $spt = esc_attr($_REQUEST['listing_type']);

-            if(!$spt){$spt='gd_place';}

-            if(isset($geodir_post_types[$spt]['labels']['name'])){

-                $plural_name = __($geodir_post_types[$spt]['labels']['name'],'geodirectory');

+            if (!$spt) {$spt = 'gd_place'; }

+            if (isset($geodir_post_types[$spt]['labels']['name'])) {

+                $plural_name = __($geodir_post_types[$spt]['labels']['name'], 'geodirectory');

             }

         }

-        elseif(isset($post->post_type) && $post->post_type){

+        elseif (isset($post->post_type) && $post->post_type) {

             $geodir_post_types = get_option('geodir_post_types');

-            if(isset($geodir_post_types[$post->post_type]['labels']['name'])){

-                $plural_name = __($geodir_post_types[$post->post_type]['labels']['name'],'geodirectory');

+            if (isset($geodir_post_types[$post->post_type]['labels']['name'])) {

+                $plural_name = __($geodir_post_types[$post->post_type]['labels']['name'], 'geodirectory');

             }

 

         }

-        $title = str_replace("%%pt_plural%%",$plural_name,$title);

+        $title = str_replace("%%pt_plural%%", $plural_name, $title);

     }

 

 

 

-    if(strpos($title,'%%category%%') !== false){

+    if (strpos($title, '%%category%%') !== false) {

         $cat_name = '';

 

-        if($gd_page=='detail') {

+        if ($gd_page == 'detail') {

             if ($post->default_category) {

                 $cat = get_term($post->default_category, $post->post_type . 'category');

                 $cat_name = (isset($cat->name)) ? $cat->name : '';

             }

-        }elseif($gd_page=='listing'){

+        }elseif ($gd_page == 'listing') {

             $queried_object = get_queried_object();

-            if(isset($queried_object->name)){

+            if (isset($queried_object->name)) {

                 $cat_name = $queried_object->name;

             }

         }

-        $title = str_replace("%%category%%",$cat_name,$title);

+        $title = str_replace("%%category%%", $cat_name, $title);

     }

 

-    if(strpos($title,'%%tag%%') !== false){

+    if (strpos($title, '%%tag%%') !== false) {

         $cat_name = '';

 

-        if($gd_page=='detail') {

+        if ($gd_page == 'detail') {

             if ($post->default_category) {

                 $cat = get_term($post->default_category, $post->post_type . 'category');

                 $cat_name = (isset($cat->name)) ? $cat->name : '';

             }

-        }elseif($gd_page=='listing'){

+        }elseif ($gd_page == 'listing') {

             $queried_object = get_queried_object();

-            if(isset($queried_object->name)){

+            if (isset($queried_object->name)) {

                 $cat_name = $queried_object->name;

             }

         }

-        $title = str_replace("%%tag%%",$cat_name,$title);

+        $title = str_replace("%%tag%%", $cat_name, $title);

     }

 

 

 

-    if(strpos($title,'%%id%%') !== false){

+    if (strpos($title, '%%id%%') !== false) {

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

-        $title = str_replace("%%id%%",$ID,$title);

+        $title = str_replace("%%id%%", $ID, $title);

     }

 

     /*

@@ -4087,8 +4087,8 @@ 
         }

     */

 

-    if(strpos($title,'%%sep%%') !== false){

-        $title = str_replace("%%sep%%",$sep,$title);

+    if (strpos($title, '%%sep%%') !== false) {

+        $title = str_replace("%%sep%%", $sep, $title);

     }

 

 

@@ -4106,12 +4106,12 @@ 
      * @param string $gd_page The page being filtered.

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

      */

-    $location_array = apply_filters('geodir_filter_title_variables_location_arr',$location_array,$title, $gd_page, $sep);

+    $location_array = apply_filters('geodir_filter_title_variables_location_arr', $location_array, $title, $gd_page, $sep);

     $location_titles = array();

-    if($gd_page=='location' && get_query_var( 'gd_country_full' )){

-        if(get_query_var( 'gd_country_full' )){$location_array['gd_country'] = get_query_var( 'gd_country_full' );}

-        if(get_query_var( 'gd_region_full' )){$location_array['gd_region'] = get_query_var( 'gd_region_full' );}

-        if(get_query_var( 'gd_city_full' )){$location_array['gd_city'] = get_query_var( 'gd_city_full' );}

+    if ($gd_page == 'location' && get_query_var('gd_country_full')) {

+        if (get_query_var('gd_country_full')) {$location_array['gd_country'] = get_query_var('gd_country_full'); }

+        if (get_query_var('gd_region_full')) {$location_array['gd_region'] = get_query_var('gd_region_full'); }

+        if (get_query_var('gd_city_full')) {$location_array['gd_city'] = get_query_var('gd_city_full'); }

     }

     $location_single = '';

     $gd_country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

@@ -4183,65 +4183,65 @@ 
     }

 

 

-    if(strpos($title,'%%location%%') !== false){

+    if (strpos($title, '%%location%%') !== false) {

         $location = '';

-        if($location_titles) {

+        if ($location_titles) {

             $location = implode(", ", $location_titles);

         }

-        $title = str_replace("%%location%%",$location,$title);

+        $title = str_replace("%%location%%", $location, $title);

     }

 

-    if(strpos($title,'%%in_location%%') !== false){

+    if (strpos($title, '%%in_location%%') !== false) {

         $location = '';

-        if($location_titles) {

+        if ($location_titles) {

             $location = __('in ', 'geodirectory') . implode(", ", $location_titles);

         }

-        $title = str_replace("%%in_location%%",$location,$title);

+        $title = str_replace("%%in_location%%", $location, $title);

     }

 

-    if(strpos($title,'%%in_location_single%%') !== false){

-        if($location_single) {

-            $location_single = __('in', 'geodirectory') . ' ' .$location_single;

+    if (strpos($title, '%%in_location_single%%') !== false) {

+        if ($location_single) {

+            $location_single = __('in', 'geodirectory') . ' ' . $location_single;

         }

-        $title = str_replace("%%in_location_single%%",$location_single,$title);

+        $title = str_replace("%%in_location_single%%", $location_single, $title);

     }

 

-    if(strpos($title,'%%location_single%%') !== false){

-        $title = str_replace("%%location_single%%",$location_single,$title);

+    if (strpos($title, '%%location_single%%') !== false) {

+        $title = str_replace("%%location_single%%", $location_single, $title);

     }

 

 

-    if(strpos($title,'%%search_term%%') !== false){

+    if (strpos($title, '%%search_term%%') !== false) {

         $search_term = '';

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

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

             $search_term = esc_attr($_REQUEST['s']);

         }

-        $title = str_replace("%%search_term%%",$search_term,$title);

+        $title = str_replace("%%search_term%%", $search_term, $title);

     }

 

-    if(strpos($title,'%%search_near%%') !== false){

+    if (strpos($title, '%%search_near%%') !== false) {

         $search_term = '';

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

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

             $search_term = esc_attr($_REQUEST['snear']);

         }

-        $title = str_replace("%%search_near%%",$search_term,$title);

+        $title = str_replace("%%search_near%%", $search_term, $title);

     }

 

-    if(strpos($title,'%%name%%') !== false){

+    if (strpos($title, '%%name%%') !== false) {

         $author_name = '';

-        if($author_name = get_the_author()){}

-        else{

+        if ($author_name = get_the_author()) {}

+        else {

             $queried_object = get_queried_object();

-            if(isset($queried_object->data->user_nicename)){

+            if (isset($queried_object->data->user_nicename)) {

                 $author_name = $queried_object->data->user_nicename;

             }

         }

-        $title = str_replace("%%name%%",$author_name,$title);

+        $title = str_replace("%%name%%", $author_name, $title);

     }

 

-    $title = wptexturize( $title );

-    $title = convert_chars( $title );

-    $title = esc_html( $title );

+    $title = wptexturize($title);

+    $title = convert_chars($title);

+    $title = esc_html($title);

 

     /**

      * Filter the title variables after standard ones have been filtered.

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

      */

 

-    return apply_filters('geodir_filter_title_variables_vars',$title,$location_array, $gd_page, $sep);

+    return apply_filters('geodir_filter_title_variables_vars', $title, $location_array, $gd_page, $sep);

 }

 

 /**

geodirectory-functions/geodir-class-session.php

Doc Comments +2 added lines, -4 removed lines

@@ -151,8 +151,7 @@ 
 	 * @since 1.5.7
 	 *
 	 * @param string|array $key Session key.
-	 * @param integer $value Session variable.
-	 * @return string Session variable.
+	 * @return boolean Session variable.
 	 */
 	public function un_set( $key ) {
 		if ( empty( $key ) ) {
@@ -188,8 +187,7 @@ 
 	 * @since 1.5.7
 	 *
 	 * @param string $key Session key.
-	 * @param integer $value Session variable.
-	 * @return string Session variable.
+	 * @return boolean Session variable.
 	 */
 	public function is_set( $key ) {
 		$key = sanitize_key( $key );

Indentation +279 added lines, -279 removed lines

@@ -8,294 +8,294 @@
  * @since 1.5.7
  */
 class Geodir_Session {
-	/**
-	 * Holds our session data.
-	 *
-	 * @var array
-	 * @access private
-	 * @since 1.5.7
-	 */
-	private $session;
-
-	/**
-	 * Whether to use PHP $_SESSION or WP_Session.
-	 *
-	 * @var bool
-	 * @access private
-	 * @since 1.5.7
-	 */
-	private $use_php_sessions = false;
-
-	/**
-	 * Session index prefix.
-	 *
-	 * @var string
-	 * @access private
-	 * @since 1.5.7
-	 */
-	private $prefix = '';
-
-	/**
-	 * Get things started.
-	 *
-	 * Defines our WP_Session constants, includes the necessary libraries and
-	 * retrieves the WP Session instance.
-	 *
-	 * @since 1.5.7
-	 */
-	public function __construct() {
-		$this->use_php_sessions = $this->use_php_sessions();
-
-		if ( $this->use_php_sessions ) {
-			if ( is_multisite() ) {
-				$this->prefix = '_' . get_current_blog_id();
-			}
-
-			// Use PHP SESSION (must be enabled via the GEODIR_USE_PHP_SESSIONS constant)
-			add_action( 'init', array( $this, 'maybe_start_session' ), -2 );
-		} else {
-			// Use WP_Session (default)
-			if ( !defined( 'WP_SESSION_COOKIE' ) ) {
-				define( 'WP_SESSION_COOKIE', 'geodir_wp_session' );
-			}
-
-			if ( !class_exists( 'Recursive_ArrayAccess' ) ) {
-				require_once GEODIRECTORY_PLUGIN_DIR . 'wp-session/class-recursive-arrayaccess.php';
-			}
-
-			if ( !class_exists( 'WP_Session' ) ) {
-				require_once GEODIRECTORY_PLUGIN_DIR . 'wp-session/class-wp-session.php';
-				require_once GEODIRECTORY_PLUGIN_DIR . 'wp-session/wp-session.php';
-			}
-
-			add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
-			add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
-		}
-
-		if ( empty( $this->session ) && ! $this->use_php_sessions ) {
-			add_action( 'plugins_loaded', array( $this, 'init' ), -1 );
-		} else {
-			add_action( 'init', array( $this, 'init' ), -1 );
-		}
-	}
-
-	/**
-	 * Setup the WP_Session instance.
-	 *
-	 * @access public
-	 * @since 1.5.7
-	 * @return void
-	 */
-	public function init() {
-		if ( $this->use_php_sessions ) {
-			$this->session = isset( $_SESSION['gd' . $this->prefix ] ) && is_array( $_SESSION['gd' . $this->prefix ] ) ? $_SESSION['gd' . $this->prefix ] : array();
-		} else {
-			$this->session = WP_Session::get_instance();
-		}
-
-		return $this->session;
-	}
-
-	/**
-	 * Retrieve session ID.
-	 *
-	 * @access public
-	 * @since 1.5.7
-	 * @return string Session ID
-	 */
-	public function get_id() {
-		return $this->session->session_id;
-	}
-
-	/**
-	 * Retrieve a session variable.
-	 *
-	 * @access public
-	 * @since 1.5.7
-	 * @param string $key Session key
-	 * @return string Session variable
-	 */
-	public function get( $key ) {
-		$key = sanitize_key( $key );
-		return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
-	}
-
-	/**
-	 * Set a session variable
-	 *
-	 * @since 1.5.7
-	 *
-	 * @param string $key Session key
-	 * @param integer $value Session variable
-	 * @return string Session variable
-	 */
-	public function set( $key, $value ) {
-		$key = sanitize_key( $key );
-
-		if ( is_array( $value ) ) {
-			$this->session[ $key ] = maybe_serialize( $value );
-		} else {
-			$this->session[ $key ] = $value;
-		}
-
-		if ( $this->use_php_sessions ) {
-			$_SESSION['gd' . $this->prefix ] = $this->session;
-		}
-
-		return $this->session[ $key ];
-	}
+    /**
+     * Holds our session data.
+     *
+     * @var array
+     * @access private
+     * @since 1.5.7
+     */
+    private $session;
+
+    /**
+     * Whether to use PHP $_SESSION or WP_Session.
+     *
+     * @var bool
+     * @access private
+     * @since 1.5.7
+     */
+    private $use_php_sessions = false;
+
+    /**
+     * Session index prefix.
+     *
+     * @var string
+     * @access private
+     * @since 1.5.7
+     */
+    private $prefix = '';
+
+    /**
+     * Get things started.
+     *
+     * Defines our WP_Session constants, includes the necessary libraries and
+     * retrieves the WP Session instance.
+     *
+     * @since 1.5.7
+     */
+    public function __construct() {
+        $this->use_php_sessions = $this->use_php_sessions();
+
+        if ( $this->use_php_sessions ) {
+            if ( is_multisite() ) {
+                $this->prefix = '_' . get_current_blog_id();
+            }
+
+            // Use PHP SESSION (must be enabled via the GEODIR_USE_PHP_SESSIONS constant)
+            add_action( 'init', array( $this, 'maybe_start_session' ), -2 );
+        } else {
+            // Use WP_Session (default)
+            if ( !defined( 'WP_SESSION_COOKIE' ) ) {
+                define( 'WP_SESSION_COOKIE', 'geodir_wp_session' );
+            }
+
+            if ( !class_exists( 'Recursive_ArrayAccess' ) ) {
+                require_once GEODIRECTORY_PLUGIN_DIR . 'wp-session/class-recursive-arrayaccess.php';
+            }
+
+            if ( !class_exists( 'WP_Session' ) ) {
+                require_once GEODIRECTORY_PLUGIN_DIR . 'wp-session/class-wp-session.php';
+                require_once GEODIRECTORY_PLUGIN_DIR . 'wp-session/wp-session.php';
+            }
+
+            add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
+            add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
+        }
+
+        if ( empty( $this->session ) && ! $this->use_php_sessions ) {
+            add_action( 'plugins_loaded', array( $this, 'init' ), -1 );
+        } else {
+            add_action( 'init', array( $this, 'init' ), -1 );
+        }
+    }
+
+    /**
+     * Setup the WP_Session instance.
+     *
+     * @access public
+     * @since 1.5.7
+     * @return void
+     */
+    public function init() {
+        if ( $this->use_php_sessions ) {
+            $this->session = isset( $_SESSION['gd' . $this->prefix ] ) && is_array( $_SESSION['gd' . $this->prefix ] ) ? $_SESSION['gd' . $this->prefix ] : array();
+        } else {
+            $this->session = WP_Session::get_instance();
+        }
+
+        return $this->session;
+    }
+
+    /**
+     * Retrieve session ID.
+     *
+     * @access public
+     * @since 1.5.7
+     * @return string Session ID
+     */
+    public function get_id() {
+        return $this->session->session_id;
+    }
+
+    /**
+     * Retrieve a session variable.
+     *
+     * @access public
+     * @since 1.5.7
+     * @param string $key Session key
+     * @return string Session variable
+     */
+    public function get( $key ) {
+        $key = sanitize_key( $key );
+        return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
+    }
+
+    /**
+     * Set a session variable
+     *
+     * @since 1.5.7
+     *
+     * @param string $key Session key
+     * @param integer $value Session variable
+     * @return string Session variable
+     */
+    public function set( $key, $value ) {
+        $key = sanitize_key( $key );
+
+        if ( is_array( $value ) ) {
+            $this->session[ $key ] = maybe_serialize( $value );
+        } else {
+            $this->session[ $key ] = $value;
+        }
+
+        if ( $this->use_php_sessions ) {
+            $_SESSION['gd' . $this->prefix ] = $this->session;
+        }
+
+        return $this->session[ $key ];
+    }
 	
-	/**
-	 * Unset a session variable.
-	 *
-	 * @since 1.5.7
-	 *
-	 * @param string|array $key Session key.
-	 * @param integer $value Session variable.
-	 * @return string Session variable.
-	 */
-	public function un_set( $key ) {
-		if ( empty( $key ) ) {
-			return false;
-		}
+    /**
+     * Unset a session variable.
+     *
+     * @since 1.5.7
+     *
+     * @param string|array $key Session key.
+     * @param integer $value Session variable.
+     * @return string Session variable.
+     */
+    public function un_set( $key ) {
+        if ( empty( $key ) ) {
+            return false;
+        }
 		
-		if ( is_array( $key ) ) {
-			foreach ($key as $index) {
-				$index = sanitize_key( $index );
+        if ( is_array( $key ) ) {
+            foreach ($key as $index) {
+                $index = sanitize_key( $index );
 			
-				if ( $index && isset( $this->session[ $index ] ) ) {
-					unset( $this->session[ $index ] );
-				}
-			}
-		} else {
-			$key = sanitize_key( $key );
+                if ( $index && isset( $this->session[ $index ] ) ) {
+                    unset( $this->session[ $index ] );
+                }
+            }
+        } else {
+            $key = sanitize_key( $key );
 			
-			if ( isset( $this->session[ $key ] ) ) {
-				unset( $this->session[ $key ] );
-			}
-		}
+            if ( isset( $this->session[ $key ] ) ) {
+                unset( $this->session[ $key ] );
+            }
+        }
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['gd' . $this->prefix ] = $this->session;
-		}
+        if ( $this->use_php_sessions ) {
+            $_SESSION['gd' . $this->prefix ] = $this->session;
+        }
 
-		return true;
-	}
+        return true;
+    }
 	
-	/**
-	 * Check a session variable is set or not.
-	 *
-	 * @since 1.5.7
-	 *
-	 * @param string $key Session key.
-	 * @param integer $value Session variable.
-	 * @return string Session variable.
-	 */
-	public function is_set( $key ) {
-		$key = sanitize_key( $key );
+    /**
+     * Check a session variable is set or not.
+     *
+     * @since 1.5.7
+     *
+     * @param string $key Session key.
+     * @param integer $value Session variable.
+     * @return string Session variable.
+     */
+    public function is_set( $key ) {
+        $key = sanitize_key( $key );
 		
-		if ( empty( $key ) ) {
-			return false;
-		}
-
-		if ( isset( $this->session[ $key ] ) ) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Force the cookie expiration variant time to 23 hours
-	 *
-	 * @access public
-	 * @since 1.5.7
-	 * @param int $exp Default expiration (1 hour)
-	 * @return int
-	 */
-	public function set_expiration_variant_time( $exp ) {
-		return ( 30 * 60 * 23 );
-	}
-
-	/**
-	 * Force the cookie expiration time to 24 hours
-	 *
-	 * @access public
-	 * @since 1.5.7
-	 * @param int $exp Default expiration (1 hour)
-	 * @return int
-	 */
-	public function set_expiration_time( $exp ) {
-		return ( 30 * 60 * 24 );
-	}
-
-	/**
-	 * Starts a new session if one hasn't started yet.
-	 *
-	 * @return boolean
-	 * Checks to see if the server supports PHP sessions
-	 * or if the GEODIR_USE_PHP_SESSIONS constant is defined
-	 *
-	 * @access public
-	 * @since 1.5.7
-	 * @return boolean $ret True if we are using PHP sessions, false otherwise
-	 */
-	public function use_php_sessions() {
-		$ret = false;
-
-		// If the database variable is already set, no need to run autodetection
-		$geodir_use_php_sessions = (bool)get_option( 'geodir_use_php_sessions' );
-
-		if (!$geodir_use_php_sessions ) {
-			// Attempt to detect if the server supports PHP sessions
-			if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
-				$this->set( 'geodir_use_php_sessions', 1 );
+        if ( empty( $key ) ) {
+            return false;
+        }
+
+        if ( isset( $this->session[ $key ] ) ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Force the cookie expiration variant time to 23 hours
+     *
+     * @access public
+     * @since 1.5.7
+     * @param int $exp Default expiration (1 hour)
+     * @return int
+     */
+    public function set_expiration_variant_time( $exp ) {
+        return ( 30 * 60 * 23 );
+    }
+
+    /**
+     * Force the cookie expiration time to 24 hours
+     *
+     * @access public
+     * @since 1.5.7
+     * @param int $exp Default expiration (1 hour)
+     * @return int
+     */
+    public function set_expiration_time( $exp ) {
+        return ( 30 * 60 * 24 );
+    }
+
+    /**
+     * Starts a new session if one hasn't started yet.
+     *
+     * @return boolean
+     * Checks to see if the server supports PHP sessions
+     * or if the GEODIR_USE_PHP_SESSIONS constant is defined
+     *
+     * @access public
+     * @since 1.5.7
+     * @return boolean $ret True if we are using PHP sessions, false otherwise
+     */
+    public function use_php_sessions() {
+        $ret = false;
+
+        // If the database variable is already set, no need to run autodetection
+        $geodir_use_php_sessions = (bool)get_option( 'geodir_use_php_sessions' );
+
+        if (!$geodir_use_php_sessions ) {
+            // Attempt to detect if the server supports PHP sessions
+            if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
+                $this->set( 'geodir_use_php_sessions', 1 );
 				
-				if ( $this->get( 'geodir_use_php_sessions' ) ) {
-					$ret = true;
-
-					// Set the database option
-					update_option( 'geodir_use_php_sessions', true );
-				}
-			}
-		} else {
-			$ret = $geodir_use_php_sessions;
-		}
-
-		// Enable or disable PHP Sessions based on the GEODIR_USE_PHP_SESSIONS constant
-		if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && GEODIR_USE_PHP_SESSIONS ) {
-			$ret = true;
-		} else if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && ! GEODIR_USE_PHP_SESSIONS ) {
-			$ret = false;
-		}
-
-		return (bool) apply_filters( 'geodir_use_php_sessions', $ret );
-	}
-
-	/**
-	 * Starts a new session if one hasn't started yet.
-	 */
-	public function maybe_start_session() {
-		if ( !session_id() && !headers_sent() ) {
-			session_start();
-		}
-	}
-
-	/**
-	 * Determines if a user has set the GEODIR_USE_CART_COOKIE
-	 *
-	 * @since  1.5.7
-	 * @return bool If the store should use the geodir_items_in_cart cookie to help avoid caching
-	 */
-	public function use_cart_cookie() {
-		$ret = true;
-
-		if ( defined( 'GEODIR_USE_CART_COOKIE' ) && ! GEODIR_USE_CART_COOKIE ) {
-			$ret = false;
-		}
-
-		return (bool) apply_filters( 'geodir_use_cart_cookie', $ret );
-	}
+                if ( $this->get( 'geodir_use_php_sessions' ) ) {
+                    $ret = true;
+
+                    // Set the database option
+                    update_option( 'geodir_use_php_sessions', true );
+                }
+            }
+        } else {
+            $ret = $geodir_use_php_sessions;
+        }
+
+        // Enable or disable PHP Sessions based on the GEODIR_USE_PHP_SESSIONS constant
+        if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && GEODIR_USE_PHP_SESSIONS ) {
+            $ret = true;
+        } else if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && ! GEODIR_USE_PHP_SESSIONS ) {
+            $ret = false;
+        }
+
+        return (bool) apply_filters( 'geodir_use_php_sessions', $ret );
+    }
+
+    /**
+     * Starts a new session if one hasn't started yet.
+     */
+    public function maybe_start_session() {
+        if ( !session_id() && !headers_sent() ) {
+            session_start();
+        }
+    }
+
+    /**
+     * Determines if a user has set the GEODIR_USE_CART_COOKIE
+     *
+     * @since  1.5.7
+     * @return bool If the store should use the geodir_items_in_cart cookie to help avoid caching
+     */
+    public function use_cart_cookie() {
+        $ret = true;
+
+        if ( defined( 'GEODIR_USE_CART_COOKIE' ) && ! GEODIR_USE_CART_COOKIE ) {
+            $ret = false;
+        }
+
+        return (bool) apply_filters( 'geodir_use_cart_cookie', $ret );
+    }
 }
 
 global $gd_session;

Spacing +57 added lines, -57 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * Geodir_Session Class.
@@ -46,36 +46,36 @@ 
 	public function __construct() {
 		$this->use_php_sessions = $this->use_php_sessions();
 
-		if ( $this->use_php_sessions ) {
-			if ( is_multisite() ) {
+		if ($this->use_php_sessions) {
+			if (is_multisite()) {
 				$this->prefix = '_' . get_current_blog_id();
 			}
 
 			// Use PHP SESSION (must be enabled via the GEODIR_USE_PHP_SESSIONS constant)
-			add_action( 'init', array( $this, 'maybe_start_session' ), -2 );
+			add_action('init', array($this, 'maybe_start_session'), -2);
 		} else {
 			// Use WP_Session (default)
-			if ( !defined( 'WP_SESSION_COOKIE' ) ) {
-				define( 'WP_SESSION_COOKIE', 'geodir_wp_session' );
+			if (!defined('WP_SESSION_COOKIE')) {
+				define('WP_SESSION_COOKIE', 'geodir_wp_session');
 			}
 
-			if ( !class_exists( 'Recursive_ArrayAccess' ) ) {
+			if (!class_exists('Recursive_ArrayAccess')) {
 				require_once GEODIRECTORY_PLUGIN_DIR . 'wp-session/class-recursive-arrayaccess.php';
 			}
 
-			if ( !class_exists( 'WP_Session' ) ) {
+			if (!class_exists('WP_Session')) {
 				require_once GEODIRECTORY_PLUGIN_DIR . 'wp-session/class-wp-session.php';
 				require_once GEODIRECTORY_PLUGIN_DIR . 'wp-session/wp-session.php';
 			}
 
-			add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
-			add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
+			add_filter('wp_session_expiration_variant', array($this, 'set_expiration_variant_time'), 99999);
+			add_filter('wp_session_expiration', array($this, 'set_expiration_time'), 99999);
 		}
 
-		if ( empty( $this->session ) && ! $this->use_php_sessions ) {
-			add_action( 'plugins_loaded', array( $this, 'init' ), -1 );
+		if (empty($this->session) && !$this->use_php_sessions) {
+			add_action('plugins_loaded', array($this, 'init'), -1);
 		} else {
-			add_action( 'init', array( $this, 'init' ), -1 );
+			add_action('init', array($this, 'init'), -1);
 		}
 	}
 
@@ -87,8 +87,8 @@ 
 	 * @return void
 	 */
 	public function init() {
-		if ( $this->use_php_sessions ) {
-			$this->session = isset( $_SESSION['gd' . $this->prefix ] ) && is_array( $_SESSION['gd' . $this->prefix ] ) ? $_SESSION['gd' . $this->prefix ] : array();
+		if ($this->use_php_sessions) {
+			$this->session = isset($_SESSION['gd' . $this->prefix]) && is_array($_SESSION['gd' . $this->prefix]) ? $_SESSION['gd' . $this->prefix] : array();
 		} else {
 			$this->session = WP_Session::get_instance();
 		}
@@ -115,9 +115,9 @@ 
 	 * @param string $key Session key
 	 * @return string Session variable
 	 */
-	public function get( $key ) {
-		$key = sanitize_key( $key );
-		return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
+	public function get($key) {
+		$key = sanitize_key($key);
+		return isset($this->session[$key]) ? maybe_unserialize($this->session[$key]) : false;
 	}
 
 	/**
@@ -129,20 +129,20 @@ 
 	 * @param integer $value Session variable
 	 * @return string Session variable
 	 */
-	public function set( $key, $value ) {
-		$key = sanitize_key( $key );
+	public function set($key, $value) {
+		$key = sanitize_key($key);
 
-		if ( is_array( $value ) ) {
-			$this->session[ $key ] = maybe_serialize( $value );
+		if (is_array($value)) {
+			$this->session[$key] = maybe_serialize($value);
 		} else {
-			$this->session[ $key ] = $value;
+			$this->session[$key] = $value;
 		}
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['gd' . $this->prefix ] = $this->session;
+		if ($this->use_php_sessions) {
+			$_SESSION['gd' . $this->prefix] = $this->session;
 		}
 
-		return $this->session[ $key ];
+		return $this->session[$key];
 	}
 	
 	/**
@@ -154,29 +154,29 @@ 
 	 * @param integer $value Session variable.
 	 * @return string Session variable.
 	 */
-	public function un_set( $key ) {
-		if ( empty( $key ) ) {
+	public function un_set($key) {
+		if (empty($key)) {
 			return false;
 		}
 		
-		if ( is_array( $key ) ) {
+		if (is_array($key)) {
 			foreach ($key as $index) {
-				$index = sanitize_key( $index );
+				$index = sanitize_key($index);
 			
-				if ( $index && isset( $this->session[ $index ] ) ) {
-					unset( $this->session[ $index ] );
+				if ($index && isset($this->session[$index])) {
+					unset($this->session[$index]);
 				}
 			}
 		} else {
-			$key = sanitize_key( $key );
+			$key = sanitize_key($key);
 			
-			if ( isset( $this->session[ $key ] ) ) {
-				unset( $this->session[ $key ] );
+			if (isset($this->session[$key])) {
+				unset($this->session[$key]);
 			}
 		}
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['gd' . $this->prefix ] = $this->session;
+		if ($this->use_php_sessions) {
+			$_SESSION['gd' . $this->prefix] = $this->session;
 		}
 
 		return true;
@@ -191,14 +191,14 @@ 
 	 * @param integer $value Session variable.
 	 * @return string Session variable.
 	 */
-	public function is_set( $key ) {
-		$key = sanitize_key( $key );
+	public function is_set($key) {
+		$key = sanitize_key($key);
 		
-		if ( empty( $key ) ) {
+		if (empty($key)) {
 			return false;
 		}
 
-		if ( isset( $this->session[ $key ] ) ) {
+		if (isset($this->session[$key])) {
 			return true;
 		}
 
@@ -213,8 +213,8 @@ 
 	 * @param int $exp Default expiration (1 hour)
 	 * @return int
 	 */
-	public function set_expiration_variant_time( $exp ) {
-		return ( 30 * 60 * 23 );
+	public function set_expiration_variant_time($exp) {
+		return (30 * 60 * 23);
 	}
 
 	/**
@@ -225,8 +225,8 @@ 
 	 * @param int $exp Default expiration (1 hour)
 	 * @return int
 	 */
-	public function set_expiration_time( $exp ) {
-		return ( 30 * 60 * 24 );
+	public function set_expiration_time($exp) {
+		return (30 * 60 * 24);
 	}
 
 	/**
@@ -244,18 +244,18 @@ 
 		$ret = false;
 
 		// If the database variable is already set, no need to run autodetection
-		$geodir_use_php_sessions = (bool)get_option( 'geodir_use_php_sessions' );
+		$geodir_use_php_sessions = (bool) get_option('geodir_use_php_sessions');
 
-		if (!$geodir_use_php_sessions ) {
+		if (!$geodir_use_php_sessions) {
 			// Attempt to detect if the server supports PHP sessions
-			if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
-				$this->set( 'geodir_use_php_sessions', 1 );
+			if (function_exists('session_start') && !ini_get('safe_mode')) {
+				$this->set('geodir_use_php_sessions', 1);
 				
-				if ( $this->get( 'geodir_use_php_sessions' ) ) {
+				if ($this->get('geodir_use_php_sessions')) {
 					$ret = true;
 
 					// Set the database option
-					update_option( 'geodir_use_php_sessions', true );
+					update_option('geodir_use_php_sessions', true);
 				}
 			}
 		} else {
@@ -263,20 +263,20 @@ 
 		}
 
 		// Enable or disable PHP Sessions based on the GEODIR_USE_PHP_SESSIONS constant
-		if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && GEODIR_USE_PHP_SESSIONS ) {
+		if (defined('GEODIR_USE_PHP_SESSIONS') && GEODIR_USE_PHP_SESSIONS) {
 			$ret = true;
-		} else if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && ! GEODIR_USE_PHP_SESSIONS ) {
+		} else if (defined('GEODIR_USE_PHP_SESSIONS') && !GEODIR_USE_PHP_SESSIONS) {
 			$ret = false;
 		}
 
-		return (bool) apply_filters( 'geodir_use_php_sessions', $ret );
+		return (bool) apply_filters('geodir_use_php_sessions', $ret);
 	}
 
 	/**
 	 * Starts a new session if one hasn't started yet.
 	 */
 	public function maybe_start_session() {
-		if ( !session_id() && !headers_sent() ) {
+		if (!session_id() && !headers_sent()) {
 			session_start();
 		}
 	}
@@ -290,11 +290,11 @@ 
 	public function use_cart_cookie() {
 		$ret = true;
 
-		if ( defined( 'GEODIR_USE_CART_COOKIE' ) && ! GEODIR_USE_CART_COOKIE ) {
+		if (defined('GEODIR_USE_CART_COOKIE') && !GEODIR_USE_CART_COOKIE) {
 			$ret = false;
 		}
 
-		return (bool) apply_filters( 'geodir_use_cart_cookie', $ret );
+		return (bool) apply_filters('geodir_use_cart_cookie', $ret);
 	}
 }
 

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 /**
  * Geodir_Session Class.