GeoDirectory / geodirectory

geodirectory-admin/admin_functions.php

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

 		}

 	}

geodirectory-admin/admin_hooks_actions.php

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

geodirectory-admin/admin_template_tags.php

Spacing +97 added lines, -97 removed lines

@@ -52,7 +52,7 @@ 
                          * @param array $tabs The array of tabs to display.

                          */

                         $tabs = apply_filters('geodir_settings_tabs_array', $tabs);

-                        update_option('geodir_tabs', $tabs);// Important to show settings menu dropdown

+                        update_option('geodir_tabs', $tabs); // Important to show settings menu dropdown

 

                         foreach ($tabs as $name => $args) :

                             $label = $args['label'];

@@ -200,7 +200,7 @@ 
                      return false;*/

                 });

 

-                <?php if (isset($_GET['subtab']) && $_GET['subtab']) echo 'jQuery("ul.subsubsub li a[href=#'.$_GET['subtab'].']").click();'; ?>

+                <?php if (isset($_GET['subtab']) && $_GET['subtab']) echo 'jQuery("ul.subsubsub li a[href=#' . $_GET['subtab'] . ']").click();'; ?>

 

                 // Countries

                 jQuery('select#geodirectory_allowed_countries').change(function () {

@@ -234,7 +234,7 @@ 
                     jQuery('.geodirectory-nav-tab-wrapper a').click(function () {

                         if (changed) {

                             window.onbeforeunload = function () {

-                                return '<?php echo __( 'The changes you made will be lost if you navigate away from this page.', 'geodirectory'); ?>';

+                                return '<?php echo __('The changes you made will be lost if you navigate away from this page.', 'geodirectory'); ?>';

                             }

                         } else {

                             window.onbeforeunload = '';

@@ -339,7 +339,7 @@ 
             ?>

 

             <p class="submit">

-            <input <?php echo $hide_save_button;?> name="save" class="button-primary" type="submit" value="<?php _e('Save changes', 'geodirectory'); ?>" />

+            <input <?php echo $hide_save_button; ?> name="save" class="button-primary" type="submit" value="<?php _e('Save changes', 'geodirectory'); ?>" />

             <input type="hidden" name="subtab" id="last_tab" />

             </p>

             

@@ -408,7 +408,7 @@ 
 

                     ?>

 

-                    <h3><?php _e('Set Default Location', 'geodirectory');?></h3>

+                    <h3><?php _e('Set Default Location', 'geodirectory'); ?></h3>

 

                     <input type="hidden" name="add_location" value="location">

 

@@ -416,16 +416,16 @@ 
                         echo $location_result->location_id;

                     } ?>">

 

-                    <input type="hidden" name="address" id="<?php echo $prefix;?>address" value="">

+                    <input type="hidden" name="address" id="<?php echo $prefix; ?>address" value="">

 

                     <table class="form-table default_location_form">

                         <tbody>

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

-                            <th class="titledesc" scope="row"><?php _e('City', 'geodirectory');?></th>

+                            <th class="titledesc" scope="row"><?php _e('City', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required">

                                     <input class="require" type="text" size="80" style="width:440px"

-                                           id="<?php echo $prefix;?>city" name="city"

+                                           id="<?php echo $prefix; ?>city" name="city"

                                            value="<?php if (isset($location_result->city)) {

                                                echo $location_result->city;

                                            } ?>"/>

@@ -437,11 +437,11 @@ 
                             </td>

                         </tr>

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

-                            <th class="titledesc" scope="row"><?php _e('Region', 'geodirectory');?></th>

+                            <th class="titledesc" scope="row"><?php _e('Region', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required">

                                     <input class="require" type="text" size="80" style="width:440px"

-                                           id="<?php echo $prefix;?>region" name="region"

+                                           id="<?php echo $prefix; ?>region" name="region"

                                            value="<?php if (isset($location_result->region)) {

                                                echo $location_result->region;

                                            } ?>"/>

@@ -453,7 +453,7 @@ 
                             </td>

                         </tr>

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

-                            <th class="titledesc" scope="row"><?php _e('Country', 'geodirectory');?></th>

+                            <th class="titledesc" scope="row"><?php _e('Country', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required" style="padding-top:10px;">

                                     <?php

@@ -462,7 +462,7 @@ 
                                     ?>

                                     <select id="<?php echo $prefix ?>country" class="chosen_select"

                                             data-location_type="country" name="<?php echo $prefix ?>country"

-                                            data-placeholder="<?php _e('Choose a country.', 'geodirectory');?>"

+                                            data-placeholder="<?php _e('Choose a country.', 'geodirectory'); ?>"

                                             data-addsearchtermonnorecord="1" data-ajaxchosen="0" data-autoredirect="0"

                                             data-showeverywhere="0">

                                         <?php geodir_get_country_dl($country, $prefix); ?>

@@ -479,7 +479,7 @@ 
                         </tr>

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

                             <th class="titledesc"

-                                scope="row"><?php _e('Set Location on Map', 'geodirectory');?></th>

+                                scope="row"><?php _e('Set Location on Map', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <?php

                                 /**

@@ -487,15 +487,15 @@ 
                                  *

                                  * @since 1.0.0

                                  */

-                                include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php");?>

+                                include(geodir_plugin_path() . "/geodirectory-functions/map-functions/map_on_add_listing_page.php"); ?>

                             </td>

                         </tr>

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

-                            <th class="titledesc" scope="row"><?php _e('City Latitude', 'geodirectory');?></th>

+                            <th class="titledesc" scope="row"><?php _e('City Latitude', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required" style="padding-top:10px;">

                                     <input type="text" class="require" size="80" style="width:440px"

-                                           id="<?php echo $prefix;?>latitude" name="latitude"

+                                           id="<?php echo $prefix; ?>latitude" name="latitude"

                                            value="<?php if (isset($location_result->city_latitude)) {

                                                echo $location_result->city_latitude;

                                            } ?>"/>

@@ -508,11 +508,11 @@ 
                         </tr>

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

                             <th class="titledesc"

-                                scope="row"><?php _e('City Longitude', 'geodirectory');?></th>

+                                scope="row"><?php _e('City Longitude', 'geodirectory'); ?></th>

                             <td class="forminp">

                                 <div class="gtd-formfeild required" style="padding-top:10px;">

                                     <input type="text" class="require" size="80" style="width:440px"

-                                           id="<?php echo $prefix;?>longitude" name="longitude"

+                                           id="<?php echo $prefix; ?>longitude" name="longitude"

                                            value="<?php if (isset($location_result->city_longitude)) {

                                                echo $location_result->city_longitude;

                                            } ?>"/>

@@ -788,7 +788,7 @@ 
         <div class="gd-content-heading">

 

 

-            <h3><?php _e('Theme Compatability Settings', 'geodirectory');?></h3>

+            <h3><?php _e('Theme Compatability Settings', 'geodirectory'); ?></h3>

             <style>

                 .gd-theme-compat-table {

                     width: 100%;

@@ -819,11 +819,11 @@ 
                 </div>

             <?php }?>

 

-            <h4><?php _e('Select Theme Compatibility Pack', 'geodirectory');?></h4>

+            <h4><?php _e('Select Theme Compatibility Pack', 'geodirectory'); ?></h4>

 

             <select name="gd_theme_compat" id="gd_theme_compat">

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

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

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

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

                 <?php

                 $theme_arr = get_option('gd_theme_compats');

                 $theme_active = get_option('gd_theme_compat');

@@ -842,20 +842,20 @@ 
                 ?>

             </select>

             <button onclick="gd_comp_export();" type="button"

-                    class="button-primary"><?php _e('Export', 'geodirectory');?></button>

+                    class="button-primary"><?php _e('Export', 'geodirectory'); ?></button>

             <button onclick="gd_comp_import();" type="button"

-                    class="button-primary"><?php _e('Import', 'geodirectory');?></button>

+                    class="button-primary"><?php _e('Import', 'geodirectory'); ?></button>

 

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

                 <textarea id="gd-import-export-theme-comp"

-                          placeholder="<?php _e('Paste the JSON code here and then click import again', 'geodirectory');?>"></textarea>

+                          placeholder="<?php _e('Paste the JSON code here and then click import again', 'geodirectory'); ?>"></textarea>

             </div>

             <script>

 

                 function gd_comp_export() {

                     theme = jQuery('#gd_theme_compat').val();

                     if (theme == '' || theme == 'custom') {

-                        alert("<?php _e('Please select a theme to export','geodirectory');?>");

+                        alert("<?php _e('Please select a theme to export', 'geodirectory'); ?>");

                         return false;

                     }

                     jQuery('.gd-comp-import-export').show();

@@ -889,9 +889,9 @@ 
 

                     jQuery.post(ajaxurl, data, function (response) {

                         if (response == '0') {

-                            alert("<?php _e('Something went wrong','geodirectory');?>");

+                            alert("<?php _e('Something went wrong', 'geodirectory'); ?>");

                         } else {

-                            alert("<?php _e('Theme Compatibility Imported','geodirectory');?>");

+                            alert("<?php _e('Theme Compatibility Imported', 'geodirectory'); ?>");

                             jQuery('#gd-import-export-theme-comp').val('');

                             jQuery('.gd-comp-import-export').hide();

                             jQuery('#gd_theme_compat').append(new Option(response, response));

@@ -932,14 +932,14 @@ 
 

             </script>

 

-            <h4><?php _e('Main Wrapper Actions', 'geodirectory');?></h4>

+            <h4><?php _e('Main Wrapper Actions', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

                 <tr>

-                    <td><strong><?php _e('Hook', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('ID', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Class', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Hook', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('ID', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Class', 'geodirectory'); ?></strong></td>

                 </tr>

 

 

@@ -957,7 +957,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_wrapper_open_replace"

                                   placeholder='<div id="[id]" class="[class]">'><?php if (isset($tc['geodir_wrapper_open_replace'])) {

                                 echo $tc['geodir_wrapper_open_replace'];

@@ -971,14 +971,14 @@ 
                         <small>geodir_wrapper_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_wrapper_open_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_wrapper_open_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_wrapper_close_replace"

                                   placeholder='</div><!-- wrapper ends here-->'><?php if (isset($tc['geodir_wrapper_close_replace'])) {

                                 echo $tc['geodir_wrapper_close_replace'];

@@ -1002,7 +1002,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_wrapper_content_open_replace"

                                   placeholder='<div id="[id]" class="[class]" role="main" [width_css]>'><?php if (isset($tc['geodir_wrapper_content_open_replace'])) {

                                 echo $tc['geodir_wrapper_content_open_replace'];

@@ -1016,14 +1016,14 @@ 
                         <small>geodir_wrapper_content_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_wrapper_content_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_wrapper_content_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_wrapper_content_close_replace"

                                   placeholder='</div><!-- content ends here-->'><?php if (isset($tc['geodir_wrapper_content_close_replace'])) {

                                 echo $tc['geodir_wrapper_content_close_replace'];

@@ -1045,7 +1045,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_article_open_replace"

                                   placeholder='<article  id="[id]" class="[class]" itemscope itemtype="[itemtype]">'><?php if (isset($tc['geodir_article_open_replace'])) {

                                 echo $tc['geodir_article_open_replace'];

@@ -1058,14 +1058,14 @@ 
                         <small>geodir_article_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_article_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_article_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_article_close_replace"

                                   placeholder='</article><!-- article ends here-->'><?php if (isset($tc['geodir_article_close_replace'])) {

                                 echo $tc['geodir_article_close_replace'];

@@ -1088,7 +1088,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_sidebar_right_open_replace"

                                   placeholder='<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'><?php if (isset($tc['geodir_sidebar_right_open_replace'])) {

                                 echo $tc['geodir_sidebar_right_open_replace'];

@@ -1101,14 +1101,14 @@ 
                         <small>geodir_sidebar_right_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_sidebar_right_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_sidebar_right_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_sidebar_right_close_replace"

                                   placeholder='</aside><!-- sidebar ends here-->'><?php if (isset($tc['geodir_sidebar_right_close_replace'])) {

                                 echo $tc['geodir_sidebar_right_close_replace'];

@@ -1132,7 +1132,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_sidebar_left_open_replace"

                                   placeholder='<aside  id="[id]" class="[class]" role="complementary" itemscope itemtype="[itemtype]" [width_css]>'><?php if (isset($tc['geodir_sidebar_left_open_replace'])) {

                                 echo $tc['geodir_sidebar_left_open_replace'];

@@ -1145,14 +1145,14 @@ 
                         <small>geodir_sidebar_left_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_sidebar_left_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_sidebar_left_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_sidebar_left_close_replace"

                                   placeholder='</aside><!-- sidebar ends here-->'><?php if (isset($tc['geodir_sidebar_left_close_replace'])) {

                                 echo $tc['geodir_sidebar_left_close_replace'];

@@ -1174,7 +1174,7 @@ 
 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_main_content_open_replace"

                                   placeholder='<main  id="[id]" class="[class]"  role="main">'><?php if (isset($tc['geodir_main_content_open_replace'])) {

                                 echo $tc['geodir_main_content_open_replace'];

@@ -1187,14 +1187,14 @@ 
                         <small>geodir_main_content_close</small>

                     </td>

                     <td><input disabled="disabled" type="text" name="geodir_main_content_close_id"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                     <td><input disabled="disabled" type="text" name="geodir_main_content_close_class"

-                               placeholder="<?php _e('Not used', 'geodirectory');?>"/></td>

+                               placeholder="<?php _e('Not used', 'geodirectory'); ?>"/></td>

                 </tr>

 

                 <tr class="gd-theme-comp-out">

                     <td colspan="3">

-                        <span><?php _e('Output:', 'geodirectory');?></span>

+                        <span><?php _e('Output:', 'geodirectory'); ?></span>

                         <textarea name="geodir_main_content_close_replace"

                                   placeholder='</main><!-- main ends here-->'><?php if (isset($tc['geodir_main_content_close_replace'])) {

                                 echo $tc['geodir_main_content_close_replace'];

@@ -1206,13 +1206,13 @@ 
                 </tbody>

             </table>

 

-            <h4><?php _e('Other Actions', 'geodirectory');?></h4>

+            <h4><?php _e('Other Actions', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

                 <tr>

-                    <td><strong><?php _e('Hook', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Content', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Hook', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Content', 'geodirectory'); ?></strong></td>

                 </tr>

 

 

@@ -1241,13 +1241,13 @@ 
             </table>

 

 

-            <h4><?php _e('Other Filters', 'geodirectory');?></h4>

+            <h4><?php _e('Other Filters', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

                 <tr>

-                    <td><strong><?php _e('Filter', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Content', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Filter', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Content', 'geodirectory'); ?></strong></td>

                 </tr>

 

                 <tr>

@@ -1401,13 +1401,13 @@ 
                  *

                  * @since 1.4.0

                  */

-                do_action('gd_compat_other_filters');?>

+                do_action('gd_compat_other_filters'); ?>

 

                 </tbody>

             </table>

 

 

-            <h4><?php _e('Required CSS', 'geodirectory');?></h4>

+            <h4><?php _e('Required CSS', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

@@ -1422,7 +1422,7 @@ 
                 </tbody>

             </table>

 

-            <h4><?php _e('Required JS', 'geodirectory');?></h4>

+            <h4><?php _e('Required JS', 'geodirectory'); ?></h4>

 

             <table class="form-table gd-theme-compat-table">

                 <tbody>

@@ -1440,7 +1440,7 @@ 
 

             <p class="submit">

                 <input name="save" class="button-primary" type="submit"

-                       value="<?php _e('Save changes', 'geodirectory');?>">

+                       value="<?php _e('Save changes', 'geodirectory'); ?>">

             </p>

 

         </div>

@@ -1474,7 +1474,7 @@ 
          * @param string $listing_type Post type.

          */

         ?>

-        <h3><?php echo apply_filters('geodir_custom_fields_panel_head', '', $sub_tab, $listing_type);?></h3>

+        <h3><?php echo apply_filters('geodir_custom_fields_panel_head', '', $sub_tab, $listing_type); ?></h3>

     </div>

     <div id="container_general" class="clearfix">

         <div class="general-form-builder-frame">

@@ -1489,7 +1489,7 @@ 
                  * @param string $listing_type Post type.

                  */

                 ?>

-                <h3 class="hndle"><span><?php echo apply_filters('geodir_cf_panel_available_fields_head', '', $sub_tab, $listing_type);?>

+                <h3 class="hndle"><span><?php echo apply_filters('geodir_cf_panel_available_fields_head', '', $sub_tab, $listing_type); ?>

 							</span></h3>

                 <?php

                 /**

@@ -1500,7 +1500,7 @@ 
                  * @param string $listing_type Post type.

                  */

                 ?>

-                <p><?php echo apply_filters('geodir_cf_panel_available_fields_note', '', $sub_tab, $listing_type);?></p>

+                <p><?php echo apply_filters('geodir_cf_panel_available_fields_note', '', $sub_tab, $listing_type); ?></p>

 

                 <div class="inside">

 

@@ -1534,7 +1534,7 @@ 
                      * @param string $listing_type Post type.

                      */

                     ?>

-                    <span><?php echo apply_filters('geodir_cf_panel_selected_fields_head', '', $sub_tab, $listing_type);?></span>

+                    <span><?php echo apply_filters('geodir_cf_panel_selected_fields_head', '', $sub_tab, $listing_type); ?></span>

                 </h3>

                 <?php

                 /**

@@ -1545,7 +1545,7 @@ 
                  * @param string $listing_type Post type.

                  */

                 ?>

-                <p><?php echo apply_filters('geodir_cf_panel_selected_fields_note', '', $sub_tab, $listing_type);?></p>

+                <p><?php echo apply_filters('geodir_cf_panel_selected_fields_note', '', $sub_tab, $listing_type); ?></p>

 

                 <div class="inside">

 

@@ -1586,7 +1586,7 @@ 
         <div class="gd-content-heading">

 

 

-            <h3><?php _e('GD Diagnostic Tools', 'geodirectory');?></h3>

+            <h3><?php _e('GD Diagnostic Tools', 'geodirectory'); ?></h3>

             <style>

                 .gd-tools-table {

                     width: 100%;

@@ -1605,81 +1605,81 @@ 
             <table class="form-table gd-tools-table">

                 <tbody>

                 <tr>

-                    <td><strong><?php _e('Tool', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Description', 'geodirectory');?></strong></td>

-                    <td><strong><?php _e('Action', 'geodirectory');?></strong></td>

+                    <td><strong><?php _e('Tool', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Description', 'geodirectory'); ?></strong></td>

+                    <td><strong><?php _e('Action', 'geodirectory'); ?></strong></td>

                 </tr>

 

 

                 <tr>

-                    <td><?php _e('GD pages check', 'geodirectory');?></td>

+                    <td><?php _e('GD pages check', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('Checks if the GD pages are installed correctly or not.', 'geodirectory');?></small>

+                        <small><?php _e('Checks if the GD pages are installed correctly or not.', 'geodirectory'); ?></small>

                     </td>

                     <td>

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

+                        <input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="default_pages"/>

                     </td>

                 </tr>

 

 

                 <tr>

-                    <td><?php _e('Multisite DB conversion check', 'geodirectory');?></td>

+                    <td><?php _e('Multisite DB conversion check', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('Checks if the GD database tables have been converted to use multisite correctly.', 'geodirectory');?></small>

+                        <small><?php _e('Checks if the GD database tables have been converted to use multisite correctly.', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="multisite_conversion"/>

                     </td>

                 </tr>

 

                 <tr>

-                    <td><?php _e('Ratings check', 'geodirectory');?></td>

+                    <td><?php _e('Ratings check', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('Checks ratings for correct location and content settings', 'geodirectory');?></small>

+                        <small><?php _e('Checks ratings for correct location and content settings', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="ratings"/>

                     </td>

                 </tr>

 

                 <tr>

-                    <td><?php _e('Sync GD tags', 'geodirectory');?></td>

+                    <td><?php _e('Sync GD tags', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('This tool can be used when tags are showing in the backend but missing from the front end.', 'geodirectory');?></small>

+                        <small><?php _e('This tool can be used when tags are showing in the backend but missing from the front end.', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="tags_sync"/>

                     </td>

                 </tr>

 

                 <tr>

-                    <td><?php _e('Sync GD Categories', 'geodirectory');?></td>

+                    <td><?php _e('Sync GD Categories', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('This tool can be used when categories are missing from the details table but showing in other places in the backend (only checks posts with missing category info in details table)', 'geodirectory');?></small>

+                        <small><?php _e('This tool can be used when categories are missing from the details table but showing in other places in the backend (only checks posts with missing category info in details table)', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="cats_sync"/>

                     </td>

                 </tr>

 

 

                 <tr>

-                    <td><?php _e('Clear all GD version numbers', 'geodirectory');?></td>

+                    <td><?php _e('Clear all GD version numbers', 'geodirectory'); ?></td>

                     <td>

-                        <small><?php _e('This tool will clear all GD version numbers so any upgrade functions will run again.', 'geodirectory');?></small>

+                        <small><?php _e('This tool will clear all GD version numbers so any upgrade functions will run again.', 'geodirectory'); ?></small>

                     </td>

-                    <td><input type="button" value="<?php _e('Run', 'geodirectory');?>"

+                    <td><input type="button" value="<?php _e('Run', 'geodirectory'); ?>"

                                class="button-primary geodir_diagnosis_button" data-diagnose="version_clear"/>

                     </td>

                 </tr>

 				<tr>

-					<td><?php _e('Load custom fields translation', 'geodirectory');?></td>

+					<td><?php _e('Load custom fields translation', 'geodirectory'); ?></td>

 					<td>

-						<small><?php _e('This tool will load strings from the database into a file to translate via po editor.Ex: custom fields', 'geodirectory');?></small>

+						<small><?php _e('This tool will load strings from the database into a file to translate via po editor.Ex: custom fields', 'geodirectory'); ?></small>

 					</td>

 					<td>

-						<input type="button" value="<?php _e('Run', 'geodirectory');?>" class="button-primary geodir_diagnosis_button" data-diagnose="load_db_language"/>

+						<input type="button" value="<?php _e('Run', 'geodirectory'); ?>" class="button-primary geodir_diagnosis_button" data-diagnose="load_db_language"/>

 					</td>

 				</tr>

                 <?php

@@ -1689,7 +1689,7 @@ 
                  * Called after the last setting on the GD>Tools page.

                  * @since 1.0.0

                  */

-                do_action('geodir_diagnostic_tool');?>

+                do_action('geodir_diagnostic_tool'); ?>

 

                 </tbody>

             </table>

geodirectory-admin/option-pages/general_settings_array.php

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 

     array('type' => 'sectionend', 'id' => 'general_options'),

 

-));/* General Options End*/

+)); /* General Options End*/

 

 /**

  * Filter GD Google Analytic Settings array.

geodirectory-admin/option-pages/notifications_settings_array.php

Spacing +9 added lines, -9 removed lines

@@ -129,7 +129,7 @@ 
         'id' => 'geodir_post_submited_success_email_subject_admin',

         'type' => 'text',

         'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+        'std' => __('Post Submitted Successfully', 'geodirectory') // Default value for the page title - changed in settings

     ),

     array(

         'name' => '',

@@ -137,7 +137,7 @@ 
         'id' => 'geodir_post_submited_success_email_content_admin',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>','geodirectory')

+        'std' => __('<p>Dear Admin,</p><p>A new  listing has been published [#listing_link#]. This email is just for your information.</p><br><p>[#site_name#]</p>', 'geodirectory')

     ),

 

 

@@ -154,7 +154,7 @@ 
         'id' => 'geodir_post_submited_success_email_subject',

         'type' => 'text',

         'css' => 'min-width:300px;',

-        'std' => __('Post Submitted Successfully','geodirectory') // Default value for the page title - changed in settings

+        'std' => __('Post Submitted Successfully', 'geodirectory') // Default value for the page title - changed in settings

     ),

     array(

         'name' => '',

@@ -162,7 +162,7 @@ 
         'id' => 'geodir_post_submited_success_email_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>','geodirectory')

+        'std' => __('<p>Dear [#client_name#],</p><p>You submitted the below listing information. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>', 'geodirectory')

     ),

 

 

@@ -180,7 +180,7 @@ 
         'id' => 'geodir_forgot_password_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#client_name#],<p><p>You requested a new password for [#site_name_url#]</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

 

     array(

@@ -197,7 +197,7 @@ 
         'id' => 'geodir_registration_success_email_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#client_name#],</p><p>You can log in  with the following information:</p><p>[#login_details#]</p><p>You can login here: [#login_url#]</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

     array(

         'name' => __('Listing published email', 'geodirectory'),

@@ -236,7 +236,7 @@ 
         'id' => 'geodir_email_friend_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#to_name#],<p><p>Your friend has sent you a message from <b>[#site_name#]</b> </p><p>===============================</p><p><b>Subject : [#subject#]</b></p><p>[#comments#] [#listing_link#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name#].</p>", 'geodirectory')

     ),

 

     array(

@@ -253,7 +253,7 @@ 
         'id' => 'geodir_email_enquiry_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>",'geodirectory')

+        'std' => __("<p>Dear [#to_name#],<p><p>An enquiry has been sent from <b>[#listing_link#]</b></p><p>===============================</p><p>[#comments#]</p><p>===============================</p><p>Thank you,<br /><br />[#site_name_url#].</p>", 'geodirectory')

     ),

 

     array('type' => 'sectionend', 'id' => 'other_emails'),

@@ -269,7 +269,7 @@ 
         'id' => 'geodir_post_added_success_msg_content',

         'css' => 'width:500px; height: 150px;',

         'type' => 'textarea',

-        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>','geodirectory')

+        'std' => __('<p>Thank you, your information has been successfully received.</p><p><a href="[#submited_information_link#]" >View your submitted information &raquo;</a></p><p>Thank you for visiting us at [#site_name#].</p>', 'geodirectory')

     ),

 

 

geodirectory-admin/option-pages/title_meta_settings_array.php

Spacing +2 added lines, -2 removed lines

@@ -10,7 +10,7 @@ 
 
 $gd_wpseo_use = '';
 if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {
-    $gd_wpseo_use = "<b style='color:red;'>".__('Please use the WPSEO settings instead.','geodirectory')."</b><br />";
+    $gd_wpseo_use = "<b style='color:red;'>" . __('Please use the WPSEO settings instead.', 'geodirectory') . "</b><br />";
 }
 
 /**
@@ -27,7 +27,7 @@ 
 
 
 
-    array('name' => $gd_wpseo_use.__('Available Variables', 'geodirectory'),
+    array('name' => $gd_wpseo_use . __('Available Variables', 'geodirectory'),
         'desc' => __('%%title%%, %%sitename%%, %%sitedesc%%, %%excerpt%%, %%pt_single%%, %%pt_plural%%, %%category%%, %%id%%, %%sep%%, %%location%%, %%in_location%%, %%in_location_single%%, %%location_single%%, %%search_term%%, %%search_near%%, %%name%%', 'geodirectory'),
         'type' => 'sectionstart',
         'id' => 'geodir_meta_vars'),

geodirectory-functions/ajax_handler_functions.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
  */

 function geodir_on_wp()

 {

-    if(geodir_is_page('login')) {

+    if (geodir_is_page('login')) {

         geodir_user_signup();

     }

 

geodirectory-functions/cat-meta-functions/Tax-meta-class.php

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

geodirectory-functions/cat-meta-functions/cat_meta.php

Spacing +11 added lines, -11 removed lines

@@ -24,12 +24,12 @@ 
      */
 
     $config = array(
-        'id' => 'demo_meta_box',                    // meta box id, unique per meta box
-        'title' => __('Demo Meta Box', 'geodirectory'),                    // meta box title
-        'pages' => geodir_get_taxonomies(),            // taxonomy name, accept categories, post_tag and custom taxonomies
-        'context' => 'normal',                        // where the meta box appear: normal (default), advanced, side; optional
-        'fields' => array(),                        // list of meta fields (can be added by field arrays)
-        'local_images' => false,                    // Use local or hosted images (meta box images for add/remove)
+        'id' => 'demo_meta_box', // meta box id, unique per meta box
+        'title' => __('Demo Meta Box', 'geodirectory'), // meta box title
+        'pages' => geodir_get_taxonomies(), // taxonomy name, accept categories, post_tag and custom taxonomies
+        'context' => 'normal', // where the meta box appear: normal (default), advanced, side; optional
+        'fields' => array(), // list of meta fields (can be added by field arrays)
+        'local_images' => false, // Use local or hosted images (meta box images for add/remove)
         'use_with_theme' => true                    //change path if used with theme set to true, false for a plugin or anything else for a custom path(default false).
     );
 
@@ -49,7 +49,7 @@ 
      *
      * @since 1.5.7
      */
-        apply_filters('geodir_cat_schemas',array(
+        apply_filters('geodir_cat_schemas', array(
             '' => __('Default (LocalBusiness)', 'geodirectory'),
             'AccountingService' => 'AccountingService',
             'Attorney' => 'Attorney',
@@ -214,9 +214,9 @@ 
 
             $file_info = pathinfo($term_icon_url['src']);
 
-            if (isset($file_info['dirname'] ) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..')
+            if (isset($file_info['dirname']) && $file_info['dirname'] != '.' && $file_info['dirname'] != '..')
                 $sub_dir = $file_info['dirname'];
-            else{$sub_dir = '';}
+            else {$sub_dir = ''; }
 
             $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs
             $uploads_baseurl = $uploads['baseurl'];
@@ -268,8 +268,8 @@ 
                             jQuery("#addtag iframe").contents().find("body").html('');
                             jQuery('#addtag [rel="ct_cat_default_img"]').removeClass('at-delete_image_button').addClass('at-upload_image_button');
                             jQuery('#addtag [rel="ct_cat_icon"]').removeClass('at-delete_image_button').addClass('at-upload_image_button');
-                            jQuery('#addtag [rel="ct_cat_default_img"]').val('<?php _e('Upload Image','geodirectory');?>');
-                            jQuery('#addtag [rel="ct_cat_icon"]').val('<?php _e('Upload Image','geodirectory');?>');
+                            jQuery('#addtag [rel="ct_cat_default_img"]').val('<?php _e('Upload Image', 'geodirectory'); ?>');
+                            jQuery('#addtag [rel="ct_cat_icon"]').val('<?php _e('Upload Image', 'geodirectory'); ?>');
                         }
                     }, 1000);