GeoDirectory / geodirectory

geodirectory-admin/admin_functions.php

Doc Comments +2 added lines, -2 removed lines

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

  * @since 1.5.0

  *

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

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

  */

 function geodir_is_wpml() {

 	if (function_exists('icl_object_id')) {

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

  * @param int $tr_post_id Translation Post ID.

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

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

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

  */

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

 	global $sitepress, $wpdb;

Braces +231 added lines, -127 removed lines

@@ -202,8 +202,9 @@ 
 

         $thumb_img_arr = array();

 

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

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

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

         $totImg = '';

         $image_limit = '';

@@ -254,7 +255,9 @@ 
     {

         global $menu, $geodirectory;

 

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

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

         add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

 

@@ -318,7 +321,9 @@ 
      */

     function geodir_admin_custom_menu_order()

     {

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

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

     }

 }

@@ -349,10 +354,11 @@ 
 			case 'fail':

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

 				

-				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

-				else

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

+				if ($gderr == 21) {
+							    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';
+				} else {
+									echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';
+				}
                 break;

         }

     }

@@ -389,8 +395,12 @@ 
         include_once('option-pages/' . $current_tab . '_array.php');

     }

     if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

-        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) {
+        	die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
+        }
+        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) {
+        	die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));
+        }
 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -402,8 +412,9 @@ 
 		 */

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

 		

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

-            geodir_update_options($geodir_settings[$current_tab]);

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

         /**

          * Called after GeoDirectory options settings are updated.

@@ -471,8 +482,9 @@ 
                 $options_list = '';

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

                     $selected = '';

-                    if ($option == 10)

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

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

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

                 }

@@ -672,10 +684,11 @@ 
                     }

 

 

-                    if (geodir_dummy_folder_exists())

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

-                    else

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

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

                     $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

 

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

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

 

-                if (geodir_dummy_folder_exists())

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

-                else

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

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

                 $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

 

@@ -771,11 +785,14 @@ 
  * @return bool Returns true if saved.

  */

 function geodir_update_options($options, $dummy = false) {

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

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

     foreach ($options as $value) {

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

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

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

 

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

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

             } else {

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

-            }

-

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

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

 

             if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

                 update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

                 update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

                 if (isset($_POST[$value['id'] . '_crop'])) :

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

-                else :

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

+                else {
+                	:

+                    update_option($value['id'] . '_crop', 0);
+                }
                 endif;

             } else {

                 update_option($value['id'] . '_width', $value['std']);

                 update_option($value['id'] . '_height', $value['std']);

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

-            }

-

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

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

             $post_types = array();

             $categories = array();

 

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

                     $noimg_name = end($image_name_arr);

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

-                    if (file_exists($img_path))

-                        unlink($img_path);

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

 

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

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

                     if ($key == 'name'):

                         $uplaods[$key] = $filename;

-                    else :

-                        $uplaods[$key] = $uplaod;

+                    else {
+                    	:

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

                 endforeach;

 

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

                     $noimg_name = end($image_name_arr);

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

-                    if (file_exists($img_path))

-                        unlink($img_path);

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

 

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

@@ -891,10 +910,12 @@ 
             endif;

 

 

-        else :

+        else {
+        	:

             // same menu setting per theme.

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

-                $theme = wp_get_theme();

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

             }

 

@@ -906,8 +927,9 @@ 
 

         endif;

     }

-    if ($dummy)

-        $_POST = array();

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

 

 }

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

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

 

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

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

         {

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

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

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

         }

 

@@ -1114,11 +1139,13 @@ 
                     $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

                 }

                 /* If no expire_date is found, output a default message. */

-                if (empty($expire_date))

-                    echo __('Unknown', 'geodirectory');

+                if (empty($expire_date)) {
+                                    echo __('Unknown', 'geodirectory');
+                }
                 /* If there is a expire_date, append 'days left' to the text string. */

-                else

-                    echo $expire_date . $date_diff_text;

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

 

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

@@ -1191,21 +1218,26 @@ 
 

     $geodir_posttypes = geodir_get_posttypes();

 

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

-        return;

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

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

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

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

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

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

-            return;

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

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

-            return;

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

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

-            return;

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

         geodir_save_listing($_REQUEST);

     }

@@ -1230,10 +1262,18 @@ 
     $tab_id = '';

     $i = 0;

     foreach ($options as $value) :

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

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

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

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

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

         switch ($value['type']) :

             case 'dummy_installer':

@@ -1249,11 +1289,13 @@ 
 

                 $i++;

 

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

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

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

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

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

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

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

                     if ($first_title === true) {

@@ -1284,10 +1326,12 @@ 
                 break;

 

             case 'sectionstart':

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

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

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

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

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

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

                  *

@@ -1295,7 +1339,9 @@ 
                  *

                  * @since 1.0.0

                  */

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

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

 

                 break;

@@ -1307,7 +1353,9 @@ 
                  *

                  * @since 1.0.0

                  */

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

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');
+                }
                 echo '</table>';

                 /**

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

@@ -1316,7 +1364,9 @@ 
                  *

                  * @since 1.0.0

                  */

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

+                if (isset($value['id']) && $value['id']) {
+                	do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');
+                }
                 break;

             case 'text':

                 ?>

@@ -1388,17 +1438,32 @@ 
                     <?php _e('Width', 'geodirectory'); ?> <input

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

                         id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'] . '_width')) {
+	echo stripslashes($size);
+} else {
+	echo $value['std'];
+}
+?>"/>

 

                     <?php _e('Height', 'geodirectory'); ?> <input

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

                         id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'] . '_height')) {
+	echo stripslashes($size);
+} else {
+	echo $value['std'];
+}
+?>"/>

 

                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input

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

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

-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>

+                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') {
+	checked(get_option($value['id'] . '_crop'), 1);
+} else {
+	checked(1);
+}
+?> /></label>

 

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

                 </tr><?php

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

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

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

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

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

                                             option-ajaxchosen="false">

                         <?php

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

                             $geodir_select_value = '';

                             if ($option_value != '') {

-                                if ($option_value != '' && $option_value == $key)

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

+                                if ($option_value != '' && $option_value == $key) {
+                                                                    $geodir_select_value = ' selected="selected" ';
+                                }
                             } else {

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

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

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

                             ?>

                             <option

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

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

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

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

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

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

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

                                             option-ajaxchosen="false">

                         <?php

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

@@ -1475,7 +1551,10 @@ 
                 <td class="forminp">

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

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

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

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

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

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

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

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

                             );

                             $geodir_default_map_language = get_option('geodir_default_map_language');

-                            if (empty($geodir_default_map_language))

-                                $geodir_default_map_language = 'en';

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

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

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

-                                else

-                                    $geodir_default_language_selected = '';

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

                                 ?>

                                 <option

@@ -1582,14 +1663,16 @@ 
                             <?php

                             $post_types = geodir_get_posttypes('array');

                             $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-                            if (empty($geodir_default_map_search_pt))

-                                $geodir_default_map_search_pt = 'gd_place';

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

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

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

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

-                                    else

-                                        $geodir_search_pt_selected = '';

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

                                     ?>

                                     <option

@@ -1709,7 +1792,7 @@ 
                                id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

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

                             echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+                        } elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

@@ -1729,10 +1812,18 @@ 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

                     <textarea

-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"

+                        <?php if (isset($value['args'])) {
+	echo $value['args'] . ' ';
+}
+?>name="<?php echo esc_attr($value['id']); ?>"

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

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

-                        style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span

+                        style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) {
+	echo esc_textarea(stripslashes(get_option($value['id'])));
+} else {
+	echo esc_textarea($value['std']);
+}
+?></textarea><span

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

 

                 </td>

@@ -1744,10 +1835,11 @@ 
                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><?php

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

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

-                    else

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

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

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

 

@@ -1787,7 +1879,9 @@ 
                     'echo' => false,

                     'selected' => $page_setting);

 

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

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

                 ?>

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

@@ -1806,8 +1900,10 @@ 
                 if (strstr($country_setting, ':')) :

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

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

-                else :

-                    $country = $country_setting;

+                else {
+                	:

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

                 endif;

                 ?>

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

                             title="Country" class="chosen_select">

                         <?php

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

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

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

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

                         ?>

                     </select>

@@ -2086,8 +2184,9 @@ 
         endforeach;

     endif;

 

-    if (!empty($place_img_array))

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

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

 

     // adjust values here

@@ -2433,16 +2532,17 @@ 
 	global $post, $typenow, $current_screen;

 	

 	$post_type = NULL;

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

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

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

-		$post_type = $post->post_type;

-	elseif ($typenow)

-		$post_type = $typenow;

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

-		$post_type = $current_screen->post_type;

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

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

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

 

 	return $post_type;

@@ -2502,9 +2602,10 @@ 
 function geodir_hide_admin_preview_button() {

     global $post_type;

     $post_types = geodir_get_posttypes();

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

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

-}

+    if(in_array($post_type, $post_types)) {
+            echo '<style type="text/css">#post-preview, #view-post-btn{display: none;}</style>';
+    }
+    }

 add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

 add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

 

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

     global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

-        return new stdClass;

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

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

 

@@ -6438,7 +6540,9 @@ 
 

     if ($page_found) :

         // Page exists

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

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

     endif;

 

Indentation +2910 added lines, -2910 removed lines

@@ -15,11 +15,11 @@ 
 function geodir_deactivation()

 {

 

-    // Update installed variable

-    update_option("geodir_installed", 0);

+	// Update installed variable

+	update_option("geodir_installed", 0);

 

-    // Remove rewrite rules and then recreate rewrite rules.

-    flush_rewrite_rules();

+	// Remove rewrite rules and then recreate rewrite rules.

+	flush_rewrite_rules();

 }

 

 

@@ -32,125 +32,125 @@ 
 function geodir_uninstall()

 {

 

-    delete_option('geodir_default_data_installed');

+	delete_option('geodir_default_data_installed');

 

 }

 

 if (!function_exists('geodir_admin_styles')) {

-    /**

-     * Enqueue Admin Styles.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_styles()

-    {

+	/**

+	 * Enqueue Admin Styles.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_styles()

+	{

 

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

-        wp_enqueue_style('geodirectory-admin-css');

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

+		wp_enqueue_style('geodirectory-admin-css');

 

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

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

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

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

 

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

-        wp_enqueue_style('geodir-chosen-style');

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

+		wp_enqueue_style('geodir-chosen-style');

 

-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

+		wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

 

-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-jquery-ui-css');

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

+		wp_enqueue_style('geodirectory-jquery-ui-css');

 

-        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-custom-fields-css');

+		wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodirectory-custom-fields-css');

 

-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodirectory-pluplodar-css');

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

+		wp_enqueue_style('geodirectory-pluplodar-css');

 

-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('geodir-rating-style');

+		wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('geodir-rating-style');

 

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

-        wp_enqueue_style('geodir-rtl-style');

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

+		wp_enqueue_style('geodir-rtl-style');

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_styles_req')) {

-    /**

-     * Loads stylesheets from CDN.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_styles_req()

-    {

+	/**

+	 * Loads stylesheets from CDN.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_styles_req()

+	{

 

-        wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

-        wp_enqueue_style('font-awesome');

+		wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

+		wp_enqueue_style('font-awesome');

 

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

-        wp_enqueue_script('geodirectory-admin');

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

+		wp_enqueue_script('geodirectory-admin');

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_scripts')) {

-    /**

-     * Enqueue Admin Scripts.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_admin_scripts()

-    {

-        $geodir_map_name = geodir_map_name();

+	/**

+	 * Enqueue Admin Scripts.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_admin_scripts()

+	{

+		$geodir_map_name = geodir_map_name();

         

-        wp_enqueue_script('jquery');

+		wp_enqueue_script('jquery');

 

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

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

 

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

-        wp_enqueue_script('chosen');

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

+		wp_enqueue_script('chosen');

 

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

-        wp_enqueue_script('geodirectory-choose-ajax');

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

+		wp_enqueue_script('geodirectory-choose-ajax');

 

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

-            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

-        }

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

+			wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

+		}

 

-        wp_enqueue_script('geodirectory-custom-fields-script');

-        $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

+		wp_enqueue_script('geodirectory-custom-fields-script');

+		$plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

 

-        wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

+		wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

 

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

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

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

-            /** This filter is documented in geodirectory_template_tags.php */

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

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

-        }

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

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

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

+			/** This filter is documented in geodirectory_template_tags.php */

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

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

+		}

         

-        if ($geodir_map_name == 'osm') {

-            // Leaflet OpenStreetMap

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

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

+		if ($geodir_map_name == 'osm') {

+			// Leaflet OpenStreetMap

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

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

                 

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

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

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

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

             

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

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

-        }

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

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

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

+		}

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

         

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

-        wp_enqueue_script('geodirectory-goMap-script');

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

+		wp_enqueue_script('geodirectory-goMap-script');

 

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

-        wp_enqueue_script('geodirectory-goMap-script');

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

+		wp_enqueue_script('geodirectory-goMap-script');

 

 		// font awesome rating script

 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

@@ -161,167 +161,167 @@ 
 			wp_enqueue_script('geodir-jRating-js');

 		}

 

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

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

-

-

-        // SCRIPT FOR UPLOAD

-        wp_enqueue_script('plupload-all');

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

-

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

-        wp_enqueue_script('geodirectory-plupload-script');

-

-        // SCRIPT FOR UPLOAD END

-

-

-        // place js config array for plupload

-        $plupload_init = array(

-            'runtimes' => 'html5,silverlight,flash,html4',

-            'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

-            'container' => 'plupload-upload-ui', // will be adjusted per uploader

-            'drop_element' => 'dropbox', // will be adjusted per uploader

-            'file_data_name' => 'async-upload', // will be adjusted per uploader

-            'multiple_queues' => true,

-            'max_file_size' => geodir_max_upload_size(),

-            'url' => admin_url('admin-ajax.php'),

-            'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

-            'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

-            'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

-            'multipart' => true,

-            'urlstream_upload' => true,

-            'multi_selection' => false, // will be added per uploader

-            // additional post data to send to our ajax hook

-            'multipart_params' => array(

-                '_ajax_nonce' => "", // will be added per uploader

-                'action' => 'plupload_action', // the ajax action name

-                'imgid' => 0 // will be added per uploader

-            )

-        );

-        $base_plupload_config = json_encode($plupload_init);

-

-

-        $thumb_img_arr = array();

-

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

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

-

-        $totImg = '';

-        $image_limit = '';

-        if (!empty($thumb_img_arr)) {

-            $totImg = count($thumb_img_arr);

-        }

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

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

+

+

+		// SCRIPT FOR UPLOAD

+		wp_enqueue_script('plupload-all');

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

+

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

+		wp_enqueue_script('geodirectory-plupload-script');

+

+		// SCRIPT FOR UPLOAD END

+

+

+		// place js config array for plupload

+		$plupload_init = array(

+			'runtimes' => 'html5,silverlight,flash,html4',

+			'browse_button' => 'plupload-browse-button', // will be adjusted per uploader

+			'container' => 'plupload-upload-ui', // will be adjusted per uploader

+			'drop_element' => 'dropbox', // will be adjusted per uploader

+			'file_data_name' => 'async-upload', // will be adjusted per uploader

+			'multiple_queues' => true,

+			'max_file_size' => geodir_max_upload_size(),

+			'url' => admin_url('admin-ajax.php'),

+			'flash_swf_url' => includes_url('js/plupload/plupload.flash.swf'),

+			'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),

+			'filters' => array(array('title' => __('Allowed Files', 'geodirectory'), 'extensions' => '*')),

+			'multipart' => true,

+			'urlstream_upload' => true,

+			'multi_selection' => false, // will be added per uploader

+			// additional post data to send to our ajax hook

+			'multipart_params' => array(

+				'_ajax_nonce' => "", // will be added per uploader

+				'action' => 'plupload_action', // the ajax action name

+				'imgid' => 0 // will be added per uploader

+			)

+		);

+		$base_plupload_config = json_encode($plupload_init);

+

+

+		$thumb_img_arr = array();

+

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

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

+

+		$totImg = '';

+		$image_limit = '';

+		if (!empty($thumb_img_arr)) {

+			$totImg = count($thumb_img_arr);

+		}

 

-        $gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

-            'totalImg' => $totImg,

-            'image_limit' => $image_limit,

-            'upload_img_size' => geodir_max_upload_size());

+		$gd_plupload_init = array('base_plupload_config' => $base_plupload_config,

+			'totalImg' => $totImg,

+			'image_limit' => $image_limit,

+			'upload_img_size' => geodir_max_upload_size());

 

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

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

 

-        $ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));

-        wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

+		$ajax_cons_data = array('url' => __(admin_url('admin-ajax.php')));

+		wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

 

 

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

-        wp_enqueue_script('geodirectory-admin-script');

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

+		wp_enqueue_script('geodirectory-admin-script');

 

-        wp_enqueue_style('farbtastic');

-        wp_enqueue_script('farbtastic');

+		wp_enqueue_style('farbtastic');

+		wp_enqueue_script('farbtastic');

 

-        $screen = get_current_screen();

-        if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

-            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

-        }

+		$screen = get_current_screen();

+		if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

+			wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

+		}

 

-        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));

-        wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

+		$ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));

+		wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_menu')) {

-    /**

-     * Admin Menus

-     *

-     * Sets up the admin menus in wordpress.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global array $menu Menu array.

-     * @global object $geodirectory GeoDirectory plugin object.

-     */

-    function geodir_admin_menu()

-    {

-        global $menu, $geodirectory;

+	/**

+	 * Admin Menus

+	 *

+	 * Sets up the admin menus in wordpress.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global array $menu Menu array.

+	 * @global object $geodirectory GeoDirectory plugin object.

+	 */

+	function geodir_admin_menu()

+	{

+		global $menu, $geodirectory;

 

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

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

 

-        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

+		add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

 

 

-    }

+	}

 }

 

 if (!function_exists('geodir_admin_menu_order')) {

-    /**

-     * Order admin menus.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $menu_order Menu order array.

-     * @return array Modified menu order array.

-     */

-    function geodir_admin_menu_order($menu_order)

-    {

-

-        // Initialize our custom order array

-        $geodir_menu_order = array();

-

-        // Get the index of our custom separator

-        $geodir_separator = array_search('separator-geodirectory', $menu_order);

-

-        // Get index of posttype menu

-        $post_types = geodir_get_posttypes();

-

-        // Loop through menu order and do some rearranging

-        foreach ($menu_order as $index => $item) :

-

-            if ((('geodirectory') == $item)) :

-                $geodir_menu_order[] = 'separator-geodirectory';

-                if (!empty($post_types)) {

-                    foreach ($post_types as $post_type) {

-                        $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

-                    }

-                }

-                $geodir_menu_order[] = $item;

+	/**

+	 * Order admin menus.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $menu_order Menu order array.

+	 * @return array Modified menu order array.

+	 */

+	function geodir_admin_menu_order($menu_order)

+	{

 

-                unset($menu_order[$geodir_separator]);

-            //unset( $menu_order[$geodir_places] );

-            elseif (!in_array($item, array('separator-geodirectory'))) :

-                $geodir_menu_order[] = $item;

-            endif;

+		// Initialize our custom order array

+		$geodir_menu_order = array();

 

-        endforeach;

+		// Get the index of our custom separator

+		$geodir_separator = array_search('separator-geodirectory', $menu_order);

 

-        // Return order

-        return $geodir_menu_order;

-    }

+		// Get index of posttype menu

+		$post_types = geodir_get_posttypes();

+

+		// Loop through menu order and do some rearranging

+		foreach ($menu_order as $index => $item) :

+

+			if ((('geodirectory') == $item)) :

+				$geodir_menu_order[] = 'separator-geodirectory';

+				if (!empty($post_types)) {

+					foreach ($post_types as $post_type) {

+						$geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

+					}

+				}

+				$geodir_menu_order[] = $item;

+

+				unset($menu_order[$geodir_separator]);

+			//unset( $menu_order[$geodir_places] );

+			elseif (!in_array($item, array('separator-geodirectory'))) :

+				$geodir_menu_order[] = $item;

+			endif;

+

+		endforeach;

+

+		// Return order

+		return $geodir_menu_order;

+	}

 }

 

 if (!function_exists('geodir_admin_custom_menu_order')) {

-    /**

-     * Enables custom menu order.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return bool

-     */

-    function geodir_admin_custom_menu_order()

-    {

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

-        return true;

-    }

+	/**

+	 * Enables custom menu order.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return bool

+	 */

+	function geodir_admin_custom_menu_order()

+	{

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

+		return true;

+	}

 }

 

 /**

@@ -332,51 +332,51 @@ 
  */

 function geodir_before_admin_panel()

 {

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

-        echo '<div id="message" class="updated fade">

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

+		echo '<div id="message" class="updated fade">

                         <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>

                         <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>

                 </div>';

 

-    }

+	}

 

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

-        switch ($_REQUEST['msg']) {

-            case 'success':

-                echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

-                flush_rewrite_rules(false);

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

+		switch ($_REQUEST['msg']) {

+			case 'success':

+				echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

+				flush_rewrite_rules(false);

 

-                break;

+				break;

 			case 'fail':

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

 				

 				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

+					echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

 				else

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

-                break;

-        }

-    }

+				break;

+		}

+	}

 

-    $geodir_load_map = get_option('geodir_load_map');

-    $need_map_key = false;

-    if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

-        $need_map_key = true;

-    }

+	$geodir_load_map = get_option('geodir_load_map');

+	$need_map_key = false;

+	if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

+		$need_map_key = true;

+	}

 

-    if (!geodir_get_map_api_key() && $need_map_key) {

-        echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

-    }

+	if (!geodir_get_map_api_key() && $need_map_key) {

+		echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

+	}

 

-    if (!geodir_is_default_location_set()) {

-        echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+	if (!geodir_is_default_location_set()) {

+		echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

 

-    }

+	}

 

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

-        echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

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

+		echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

 

-    }

+	}

 

 

 

@@ -393,19 +393,19 @@ 
  */

 function geodir_handle_option_form_submit($current_tab)

 {

-    global $geodir_settings;

-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

-        /**

-         * Contains settings array for current tab.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        include_once('option-pages/' . $current_tab . '_array.php');

-    }

-    if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

-        if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+	global $geodir_settings;

+	if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

+		/**

+		 * Contains settings array for current tab.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		include_once('option-pages/' . $current_tab . '_array.php');

+	}

+	if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

+		if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+		if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -417,96 +417,96 @@ 
 		 */

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

 		

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

-            geodir_update_options($geodir_settings[$current_tab]);

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

+			geodir_update_options($geodir_settings[$current_tab]);

 

-        /**

-         * Called after GeoDirectory options settings are updated.

-         *

-         * @since 1.0.0

-         * @param array $geodir_settings The array of GeoDirectory settings.

-         * @see 'geodir_before_update_options'

-         */

-        do_action('geodir_update_options', $geodir_settings);

+		/**

+		 * Called after GeoDirectory options settings are updated.

+		 *

+		 * @since 1.0.0

+		 * @param array $geodir_settings The array of GeoDirectory settings.

+		 * @see 'geodir_before_update_options'

+		 */

+		do_action('geodir_update_options', $geodir_settings);

 

-        /**

-         * Called after GeoDirectory options settings are updated.

-         *

-         * Provides tab specific settings.

-         *

-         * @since 1.0.0

-         * @param string $current_tab The current settings tab name.

-         * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

-         */

-        do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

+		/**

+		 * Called after GeoDirectory options settings are updated.

+		 *

+		 * Provides tab specific settings.

+		 *

+		 * @since 1.0.0

+		 * @param string $current_tab The current settings tab name.

+		 * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

+		 */

+		do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

 

-        flush_rewrite_rules(false);

+		flush_rewrite_rules(false);

 

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

+		$current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

 

-        $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

+		$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

 

-        wp_redirect($redirect_url);

-        exit();

-    endif;

+		wp_redirect($redirect_url);

+		exit();

+	endif;

 

 

 }

 

 

 if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {

-    /**

-     * GeoDirectory dummy data installation.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global string $plugin_prefix Geodirectory plugin table prefix.

-     * @param string $post_type The post type.

-     */

-    function geodir_autoinstall_admin_header($post_type = 'gd_place')

-    {

+	/**

+	 * GeoDirectory dummy data installation.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global string $plugin_prefix Geodirectory plugin table prefix.

+	 * @param string $post_type The post type.

+	 */

+	function geodir_autoinstall_admin_header($post_type = 'gd_place')

+	{

 

-        global $wpdb, $plugin_prefix;

+		global $wpdb, $plugin_prefix;

 

-        if (!geodir_is_default_location_set()) {

-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

-        } else {

+		if (!geodir_is_default_location_set()) {

+			echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+		} else {

 

-            $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=';

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

 

-            $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");

+			$post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");

 

-            if ($post_counts > 0) {

-                $nonce = wp_create_nonce('geodir_dummy_posts_delete_noncename');

+			if ($post_counts > 0) {

+				$nonce = wp_create_nonce('geodir_dummy_posts_delete_noncename');

 

-                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . SAMPLE_DATA_SHOW_MSG . '</b><br /><a id="geodir_dummy_delete" class="button_delete" onclick="geodir_autoinstall(this,\'geodir_dummy_delete\',\'' . $nonce . '\',\'' . $post_type . '\')" href="javascript:void(0);" redirect_to="' . $geodir_url . '"  >' . DELETE_BTN_SAMPLE_MSG . '</a></p></div>';

-                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_DELETE_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /></p></div>';

-            } else {

-                $options_list = '';

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

-                    $selected = '';

-                    if ($option == 10)

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

+				$dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . SAMPLE_DATA_SHOW_MSG . '</b><br /><a id="geodir_dummy_delete" class="button_delete" onclick="geodir_autoinstall(this,\'geodir_dummy_delete\',\'' . $nonce . '\',\'' . $post_type . '\')" href="javascript:void(0);" redirect_to="' . $geodir_url . '"  >' . DELETE_BTN_SAMPLE_MSG . '</a></p></div>';

+				$dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_DELETE_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /></p></div>';

+			} else {

+				$options_list = '';

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

+					$selected = '';

+					if ($option == 10)

+						$selected = 'selected="selected"';

 

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

-                }

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

+				}

 

-                $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');

+				$nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');

 

-                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . AUTO_INSATALL_MSG . '</b><br /><select class="selected_sample_data">' . $options_list . '</select><a id="geodir_dummy_insert" class="button_insert" href="javascript:void(0);" onclick="geodir_autoinstall(this,\'geodir_dummy_insert\',\'' . $nonce . '\',\'' . $post_type . '\')"   redirect_to="' . $geodir_url . '" >' . INSERT_BTN_SAMPLE_MSG . '</a></p></div>';

-                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_IMPORT_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /><br><span class="dummy_post_inserted"></span></div>';

+				$dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . AUTO_INSATALL_MSG . '</b><br /><select class="selected_sample_data">' . $options_list . '</select><a id="geodir_dummy_insert" class="button_insert" href="javascript:void(0);" onclick="geodir_autoinstall(this,\'geodir_dummy_insert\',\'' . $nonce . '\',\'' . $post_type . '\')"   redirect_to="' . $geodir_url . '" >' . INSERT_BTN_SAMPLE_MSG . '</a></p></div>';

+				$dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_IMPORT_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /><br><span class="dummy_post_inserted"></span></div>';

 

-            }

-            echo $dummy_msg;

+			}

+			echo $dummy_msg;

             

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

-            ?>

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

+			?>

             <script type="text/javascript">

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

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

@@ -599,8 +599,8 @@ 
                 }

             </script>

         <?php

-        }

-    }

+		}

+	}

 }

 

 /**

@@ -613,20 +613,20 @@ 
  */

 function geodir_insert_dummy_posts()

 {

-    geodir_default_taxonomies();

+	geodir_default_taxonomies();

 

-    ini_set('max_execution_time', 999999); //300 seconds = 5 minutes

+	ini_set('max_execution_time', 999999); //300 seconds = 5 minutes

 

-    global $wpdb, $current_user;

+	global $wpdb, $current_user;

 

-    /**

-     * Contains dummy post content.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    include_once('place_dummy_post.php');

-    delete_transient( 'cached_dummy_images' );

+	/**

+	 * Contains dummy post content.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	include_once('place_dummy_post.php');

+	delete_transient( 'cached_dummy_images' );

 

 }

 

@@ -640,18 +640,18 @@ 
  */

 function geodir_delete_dummy_posts()

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

 

-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

+	$post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

 

 

-    foreach ($post_ids as $post_ids_obj) {

-        wp_delete_post($post_ids_obj->post_id);

-    }

+	foreach ($post_ids as $post_ids_obj) {

+		wp_delete_post($post_ids_obj->post_id);

+	}

 

-    //double check posts are deleted

-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

+	//double check posts are deleted

+	$wpdb->get_results("DELETE FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

 }

 

 /**

@@ -665,114 +665,114 @@ 
  * @global string $dummy_image_path The dummy image path.

  */

 function geodir_default_taxonomies() {

-    global $wpdb, $dummy_image_path;

+	global $wpdb, $dummy_image_path;

 

-    $category_array = array('Attractions', 'Hotels', 'Restaurants', 'Food Nightlife', 'Festival', 'Videos', 'Feature');

+	$category_array = array('Attractions', 'Hotels', 'Restaurants', 'Food Nightlife', 'Festival', 'Videos', 'Feature');

 

-    $last_catid = '';

+	$last_catid = '';

 

-    $uploads = wp_upload_dir(); // Array of key => value pairs

+	$uploads = wp_upload_dir(); // Array of key => value pairs

 

-    for ($i = 0; $i < count($category_array); $i++) {

-        $parent_catid = 0;

-        if (is_array($category_array[$i])) {

-            $cat_name_arr = $category_array[$i];

-            for ($j = 0; $j < count($cat_name_arr); $j++) {

-                $catname = $cat_name_arr[$j];

+	for ($i = 0; $i < count($category_array); $i++) {

+		$parent_catid = 0;

+		if (is_array($category_array[$i])) {

+			$cat_name_arr = $category_array[$i];

+			for ($j = 0; $j < count($cat_name_arr); $j++) {

+				$catname = $cat_name_arr[$j];

 

-                if (!term_exists($catname, 'gd_placecategory')) {

-                    $last_catid = wp_insert_term($catname, 'gd_placecategory', $args = array('parent' => $parent_catid));

+				if (!term_exists($catname, 'gd_placecategory')) {

+					$last_catid = wp_insert_term($catname, 'gd_placecategory', $args = array('parent' => $parent_catid));

 

-                    if ($j == 0) {

-                        $parent_catid = $last_catid;

-                    }

+					if ($j == 0) {

+						$parent_catid = $last_catid;

+					}

 

 

-                    if (geodir_dummy_folder_exists())

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

-                    else

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

+					if (geodir_dummy_folder_exists())

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

+					else

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

 

-                    $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

+					$dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

 

-                    $catname = str_replace(' ', '_', $catname);

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

+					$catname = str_replace(' ', '_', $catname);

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

 

-                    if (empty($uploaded['error'])) {

-                        $new_path = $uploaded['file'];

-                        $new_url = $uploaded['url'];

-                    }

+					if (empty($uploaded['error'])) {

+						$new_path = $uploaded['file'];

+						$new_url = $uploaded['url'];

+					}

 

-                    $wp_filetype = wp_check_filetype(basename($new_path), null);

-

-                    $attachment = array(

-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),

-                        'post_mime_type' => $wp_filetype['type'],

-                        'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

-                        'post_content' => '',

-                        'post_status' => 'inherit'

-                    );

-                    $attach_id = wp_insert_attachment($attachment, $new_path);

-

-                    // you must first include the image.php file

-                    // for the function wp_generate_attachment_metadata() to work

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

-                    $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

-                    wp_update_attachment_metadata($attach_id, $attach_data);

-

-                    if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, 'gd_place')) {

-                        update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), 'gd_place');

-                    }

-                }

-            }

+					$wp_filetype = wp_check_filetype(basename($new_path), null);

+

+					$attachment = array(

+						'guid' => $uploads['baseurl'] . '/' . basename($new_path),

+						'post_mime_type' => $wp_filetype['type'],

+						'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

+						'post_content' => '',

+						'post_status' => 'inherit'

+					);

+					$attach_id = wp_insert_attachment($attachment, $new_path);

+

+					// you must first include the image.php file

+					// for the function wp_generate_attachment_metadata() to work

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

+					$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

+					wp_update_attachment_metadata($attach_id, $attach_data);

+

+					if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, 'gd_place')) {

+						update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => 'icon', 'src' => $new_url), 'gd_place');

+					}

+				}

+			}

 

-        } else {

-            $catname = $category_array[$i];

+		} else {

+			$catname = $category_array[$i];

 

-            if (!term_exists($catname, 'gd_placecategory')) {

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

+			if (!term_exists($catname, 'gd_placecategory')) {

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

 

-                if (geodir_dummy_folder_exists())

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

-                else

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

+				if (geodir_dummy_folder_exists())

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

+				else

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

 

-                $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

+				$dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

 

-                $catname = str_replace(' ', '_', $catname);

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

+				$catname = str_replace(' ', '_', $catname);

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

 

-                if (empty($uploaded['error'])) {

-                    $new_path = $uploaded['file'];

-                    $new_url = $uploaded['url'];

-                }

+				if (empty($uploaded['error'])) {

+					$new_path = $uploaded['file'];

+					$new_url = $uploaded['url'];

+				}

 

-                $wp_filetype = wp_check_filetype(basename($new_path), null);

+				$wp_filetype = wp_check_filetype(basename($new_path), null);

 

-                $attachment = array(

-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),

-                    'post_mime_type' => $wp_filetype['type'],

-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

-                    'post_content' => '',

-                    'post_status' => 'inherit'

-                );

+				$attachment = array(

+					'guid' => $uploads['baseurl'] . '/' . basename($new_path),

+					'post_mime_type' => $wp_filetype['type'],

+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

+					'post_content' => '',

+					'post_status' => 'inherit'

+				);

 

-                $attach_id = wp_insert_attachment($attachment, $new_path);

+				$attach_id = wp_insert_attachment($attachment, $new_path);

 

 

-                // you must first include the image.php file

-                // for the function wp_generate_attachment_metadata() to work

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

-                $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

-                wp_update_attachment_metadata($attach_id, $attach_data);

+				// you must first include the image.php file

+				// for the function wp_generate_attachment_metadata() to work

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

+				$attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

+				wp_update_attachment_metadata($attach_id, $attach_data);

 

-                if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, 'gd_place')) {

-                    update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), 'gd_place');

-                }

-            }

-        }

+				if (!get_tax_meta($last_catid['term_id'], 'ct_cat_icon', false, 'gd_place')) {

+					update_tax_meta($last_catid['term_id'], 'ct_cat_icon', array('id' => $attach_id, 'src' => $new_url), 'gd_place');

+				}

+			}

+		}

 

-    }

+	}

 }

 

 /**

@@ -787,144 +787,144 @@ 
  * @return bool Returns true if saved.

  */

 function geodir_update_options($options, $dummy = false) {

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

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

 

-    foreach ($options as $value) {

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

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

+	foreach ($options as $value) {

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

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

 

 

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

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

 

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

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

-            } else {

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

-            }

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

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

+			} else {

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

+			}

 

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

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

 

-            if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

-                update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

-                update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

-                if (isset($_POST[$value['id'] . '_crop'])) :

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

-                else :

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

-                endif;

-            } else {

-                update_option($value['id'] . '_width', $value['std']);

-                update_option($value['id'] . '_height', $value['std']);

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

-            }

+			if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

+				update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

+				update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

+				if (isset($_POST[$value['id'] . '_crop'])) :

+					update_option($value['id'] . '_crop', 1);

+				else :

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

+				endif;

+			} else {

+				update_option($value['id'] . '_width', $value['std']);

+				update_option($value['id'] . '_height', $value['std']);

+				update_option($value['id'] . '_crop', 1);

+			}

 

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

-            $post_types = array();

-            $categories = array();

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

+			$post_types = array();

+			$categories = array();

 

-            if (!empty($_POST['home_map_post_types'])) :

-                foreach ($_POST['home_map_post_types'] as $post_type) :

-                    $post_types[] = $post_type;

-                endforeach;

-            endif;

+			if (!empty($_POST['home_map_post_types'])) :

+				foreach ($_POST['home_map_post_types'] as $post_type) :

+					$post_types[] = $post_type;

+				endforeach;

+			endif;

 

-            update_option('geodir_exclude_post_type_on_map', $post_types);

+			update_option('geodir_exclude_post_type_on_map', $post_types);

 

-            if (!empty($_POST['post_category'])) :

-                foreach ($_POST['post_category'] as $texonomy => $cat_arr) :

-                    $categories[$texonomy] = array();

-                    foreach ($cat_arr as $category) :

-                        $categories[$texonomy][] = $category;

-                    endforeach;

-                    $categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();

-                endforeach;

-            endif;

-            update_option('geodir_exclude_cat_on_map', $categories);

-            update_option('geodir_exclude_cat_on_map_upgrade', 1);

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

+			if (!empty($_POST['post_category'])) :

+				foreach ($_POST['post_category'] as $texonomy => $cat_arr) :

+					$categories[$texonomy] = array();

+					foreach ($cat_arr as $category) :

+						$categories[$texonomy][] = $category;

+					endforeach;

+					$categories[$texonomy] = !empty($categories[$texonomy]) ? array_unique($categories[$texonomy]) : array();

+				endforeach;

+			endif;

+			update_option('geodir_exclude_cat_on_map', $categories);

+			update_option('geodir_exclude_cat_on_map_upgrade', 1);

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

 

 

-            if (!empty($_POST['geodir_default_map_language'])):

-                update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);

-            endif;

+			if (!empty($_POST['geodir_default_map_language'])):

+				update_option('geodir_default_map_language', $_POST['geodir_default_map_language']);

+			endif;

 

 

-            if (!empty($_POST['geodir_default_map_search_pt'])):

-                update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);

-            endif;

+			if (!empty($_POST['geodir_default_map_search_pt'])):

+				update_option('geodir_default_map_search_pt', $_POST['geodir_default_map_search_pt']);

+			endif;

 

 

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

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

 

 

-            if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

+			if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

 

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

-                    $image_name_arr = explode('/', get_option($value['id']));

-                    $noimg_name = end($image_name_arr);

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

-                    if (file_exists($img_path))

-                        unlink($img_path);

-                }

+				if (get_option($value['id'])) {

+					$image_name_arr = explode('/', get_option($value['id']));

+					$noimg_name = end($image_name_arr);

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

+					if (file_exists($img_path))

+						unlink($img_path);

+				}

 

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

-            }

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

+			}

 

-            $uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';

-            $filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';

-

-            if (!empty($filename)):

-                $ext = pathinfo($filename, PATHINFO_EXTENSION);

-                $uplaods = array();

-

-                foreach ($uploadedfile as $key => $uplaod):

-                    if ($key == 'name'):

-                        $uplaods[$key] = $filename;

-                    else :

-                        $uplaods[$key] = $uplaod;

-                    endif;

-                endforeach;

-

-                $uploads = wp_upload_dir();

-

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

-                    $image_name_arr = explode('/', get_option($value['id']));

-                    $noimg_name = end($image_name_arr);

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

-                    if (file_exists($img_path))

-                        unlink($img_path);

-                }

+			$uploadedfile = isset($_FILES[$value['id']]) ? $_FILES[$value['id']] : '';

+			$filename = isset($_FILES[$value['id']]['name']) ? $_FILES[$value['id']]['name'] : '';

+

+			if (!empty($filename)):

+				$ext = pathinfo($filename, PATHINFO_EXTENSION);

+				$uplaods = array();

+

+				foreach ($uploadedfile as $key => $uplaod):

+					if ($key == 'name'):

+						$uplaods[$key] = $filename;

+					else :

+						$uplaods[$key] = $uplaod;

+					endif;

+				endforeach;

+

+				$uploads = wp_upload_dir();

+

+				if (get_option($value['id'])) {

+					$image_name_arr = explode('/', get_option($value['id']));

+					$noimg_name = end($image_name_arr);

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

+					if (file_exists($img_path))

+						unlink($img_path);

+				}

 

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

-                $movefile = wp_handle_upload($uplaods, $upload_overrides);

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

+				$movefile = wp_handle_upload($uplaods, $upload_overrides);

 

-                update_option($value['id'], $movefile['url']);

+				update_option($value['id'], $movefile['url']);

 

-            endif;

+			endif;

 

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

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

-            endif;

+			if (!get_option($value['id']) && isset($value['value'])):

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

+			endif;

 

 

-        else :

-            // same menu setting per theme.

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

-                $theme = wp_get_theme();

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

-            }

+		else :

+			// same menu setting per theme.

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

+				$theme = wp_get_theme();

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

+			}

 

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

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

-            } else {

-                delete_option($value['id']);

-            }

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

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

+			} else {

+				delete_option($value['id']);

+			}

 

-        endif;

-    }

-    if ($dummy)

-        $_POST = array();

-    return true;

+		endif;

+	}

+	if ($dummy)

+		$_POST = array();

+	return true;

 

 }

 

@@ -973,33 +973,33 @@ 
 function places_custom_fields_tab($tabs)

 {

 

-    $geodir_post_types = get_option('geodir_post_types');

+	$geodir_post_types = get_option('geodir_post_types');

 

-    if (!empty($geodir_post_types)) {

+	if (!empty($geodir_post_types)) {

 

-        foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):

+		foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info):

 

-            $listing_slug = $geodir_posttype_info['labels']['singular_name'];

+			$listing_slug = $geodir_posttype_info['labels']['singular_name'];

 

-            $tabs[$geodir_post_type . '_fields_settings'] = array(

-                'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

-                'subtabs' => array(

-                    array('subtab' => 'custom_fields',

-                        'label' => __('Custom Fields', 'geodirectory'),

-                        'request' => array('listing_type' => $geodir_post_type)),

-                    array('subtab' => 'sorting_options',

-                        'label' => __('Sorting Options', 'geodirectory'),

-                        'request' => array('listing_type' => $geodir_post_type)),

-                ),

-                'tab_index' => 9,

-                'request' => array('listing_type' => $geodir_post_type)

-            );

+			$tabs[$geodir_post_type . '_fields_settings'] = array(

+				'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

+				'subtabs' => array(

+					array('subtab' => 'custom_fields',

+						'label' => __('Custom Fields', 'geodirectory'),

+						'request' => array('listing_type' => $geodir_post_type)),

+					array('subtab' => 'sorting_options',

+						'label' => __('Sorting Options', 'geodirectory'),

+						'request' => array('listing_type' => $geodir_post_type)),

+				),

+				'tab_index' => 9,

+				'request' => array('listing_type' => $geodir_post_type)

+			);

 

-        endforeach;

+		endforeach;

 

-    }

+	}

 

-    return $tabs;

+	return $tabs;

 }

 

 

@@ -1015,9 +1015,9 @@ 
  */

 function geodir_tools_setting_tab($tabs)

 {

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

-    $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

-    return $tabs;

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

+	$tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

+	return $tabs;

 }

 

 /**

@@ -1032,8 +1032,8 @@ 
  */

 function geodir_compatibility_setting_tab($tabs)

 {

-    $tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));

-    return $tabs;

+	$tabs['compatibility_settings'] = array('label' => __('Theme Compatibility', 'geodirectory'));

+	return $tabs;

 }

 

 

@@ -1049,144 +1049,144 @@ 
  */

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

-    return $tabs;

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

+	return $tabs;

 }

 

 

 if (!function_exists('geodir_edit_post_columns')) {

-    /**

-     * Modify admin post listing page columns.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $columns The column array.

-     * @return array Altered column array.

-     */

-    function geodir_edit_post_columns($columns)

-    {

-

-        $new_columns = array('location' => __('Location (ID)', 'geodirectory'),

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

-

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

-        {

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

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

-        }

+	/**

+	 * Modify admin post listing page columns.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $columns The column array.

+	 * @return array Altered column array.

+	 */

+	function geodir_edit_post_columns($columns)

+	{

+

+		$new_columns = array('location' => __('Location (ID)', 'geodirectory'),

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

 

-        $columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));

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

+		{

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

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

+		}

 

-        $columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));

+		$columns = array_merge(array_slice($columns, 0, $offset), $new_columns, array_slice($columns, $offset));

 

-        return $columns;

-    }

+		$columns = array_merge($columns, array('expire' => __('Expires', 'geodirectory')));

+

+		return $columns;

+	}

 }

 

 

 if (!function_exists('geodir_manage_post_columns')) {

-    /**

-     * Adds content to our custom post listing page columns.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post WordPress Post object.

-     * @param string $column The column name.

-     * @param int $post_id The post ID.

-     */

-    function geodir_manage_post_columns($column, $post_id)

-    {

-        global $post, $wpdb;

-

-        switch ($column):

-            /* If displaying the 'city' column. */

-            case 'location' :

-                $location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);

-                $location = geodir_get_location($location_id);

-                /* If no city is found, output a default message. */

-                if (empty($location)) {

-                    _e('Unknown', 'geodirectory');

-                } else {

-                    /* If there is a city id, append 'city name' to the text string. */

-                    $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

-                    echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

-                }

-                break;

-

-            /* If displaying the 'expire' column. */

-            case 'expire' :

-                $expire_date = geodir_get_post_meta($post->ID, 'expire_date', true);

-                $d1 = $expire_date; // get expire_date

-                $d2 = date('Y-m-d'); // get current date

-                $state = __('days left', 'geodirectory');

-                $date_diff_text = '';

-                $expire_class = 'expire_left';

-                if ($expire_date != 'Never') {

-                    if (strtotime($d1) < strtotime($d2)) {

-                        $state = __('days overdue', 'geodirectory');

-                        $expire_class = 'expire_over';

-                    }

-                    $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

-                    $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

-                }

-                /* If no expire_date is found, output a default message. */

-                if (empty($expire_date))

-                    echo __('Unknown', 'geodirectory');

-                /* If there is a expire_date, append 'days left' to the text string. */

-                else

-                    echo $expire_date . $date_diff_text;

-                break;

-

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

-            case 'categorys' :

-

-                /* Get the categorys for the post. */

-

-

-                $terms = wp_get_object_terms($post_id, get_object_taxonomies($post));

-

-                /* If terms were found. */

-                if (!empty($terms)) {

-                    $out = array();

-                    /* Loop through each term, linking to the 'edit posts' page for the specific term. */

-                    foreach ($terms as $term) {

-                        if (!strstr($term->taxonomy, 'tag')) {

-                            $out[] = sprintf('<a href="%s">%s</a>',

-                                esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),

-                                esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))

-                            );

-                        }

-                    }

-                    /* Join the terms, separating them with a comma. */

-                    echo(join(', ', $out));

-                } /* If no terms were found, output a default message. */

-                else {

-                    _e('No Categories', 'geodirectory');

-                }

-                break;

+	/**

+	 * Adds content to our custom post listing page columns.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post WordPress Post object.

+	 * @param string $column The column name.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_manage_post_columns($column, $post_id)

+	{

+		global $post, $wpdb;

+

+		switch ($column):

+			/* If displaying the 'city' column. */

+			case 'location' :

+				$location_id = geodir_get_post_meta($post->ID, 'post_location_id', true);

+				$location = geodir_get_location($location_id);

+				/* If no city is found, output a default message. */

+				if (empty($location)) {

+					_e('Unknown', 'geodirectory');

+				} else {

+					/* If there is a city id, append 'city name' to the text string. */

+					$add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

+					echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

+				}

+				break;

+

+			/* If displaying the 'expire' column. */

+			case 'expire' :

+				$expire_date = geodir_get_post_meta($post->ID, 'expire_date', true);

+				$d1 = $expire_date; // get expire_date

+				$d2 = date('Y-m-d'); // get current date

+				$state = __('days left', 'geodirectory');

+				$date_diff_text = '';

+				$expire_class = 'expire_left';

+				if ($expire_date != 'Never') {

+					if (strtotime($d1) < strtotime($d2)) {

+						$state = __('days overdue', 'geodirectory');

+						$expire_class = 'expire_over';

+					}

+					$date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

+					$date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

+				}

+				/* If no expire_date is found, output a default message. */

+				if (empty($expire_date))

+					echo __('Unknown', 'geodirectory');

+				/* If there is a expire_date, append 'days left' to the text string. */

+				else

+					echo $expire_date . $date_diff_text;

+				break;

 

-        endswitch;

-    }

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

+			case 'categorys' :

+

+				/* Get the categorys for the post. */

+

+

+				$terms = wp_get_object_terms($post_id, get_object_taxonomies($post));

+

+				/* If terms were found. */

+				if (!empty($terms)) {

+					$out = array();

+					/* Loop through each term, linking to the 'edit posts' page for the specific term. */

+					foreach ($terms as $term) {

+						if (!strstr($term->taxonomy, 'tag')) {

+							$out[] = sprintf('<a href="%s">%s</a>',

+								esc_url(add_query_arg(array('post_type' => $post->post_type, $term->taxonomy => $term->slug), 'edit.php')),

+								esc_html(sanitize_term_field('name', $term->name, $term->term_id, $term->taxonomy, 'display'))

+							);

+						}

+					}

+					/* Join the terms, separating them with a comma. */

+					echo(join(', ', $out));

+				} /* If no terms were found, output a default message. */

+				else {

+					_e('No Categories', 'geodirectory');

+				}

+				break;

+

+		endswitch;

+	}

 }

 

 

 if (!function_exists('geodir_post_sortable_columns')) {

-    /**

-     * Makes admin post listing page columns sortable.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $columns The column array.

-     * @return array Altered column array.

-     */

-    function geodir_post_sortable_columns($columns)

-    {

-

-        $columns['expire'] = 'expire';

-

-        return $columns;

-    }

+	/**

+	 * Makes admin post listing page columns sortable.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $columns The column array.

+	 * @return array Altered column array.

+	 */

+	function geodir_post_sortable_columns($columns)

+	{

+

+		$columns['expire'] = 'expire';

+

+		return $columns;

+	}

 }

 

 /**

@@ -1200,32 +1200,32 @@ 
  * @param int $post_id The post ID.

  */

 function geodir_post_information_save($post_id, $post) {

-    global $wpdb, $current_user;

+	global $wpdb, $current_user;

 

-    if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

-        return;

-    }

+	if (isset($post->post_type) && ($post->post_type=='nav_menu_item' || $post->post_type=='page' || $post->post_type=='post')) {

+		return;

+	}

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

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

-        return;

+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)

+		return;

 

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

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

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

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

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

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

 

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

-            return;

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

+			return;

 

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

-            return;

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

+			return;

 

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

-            return;

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

+			return;

 

-        geodir_save_listing($_REQUEST);

-    }

+		geodir_save_listing($_REQUEST);

+	}

 }

 

 /**

@@ -1241,102 +1241,102 @@ 
  */

 function geodir_admin_fields($options)

 {

-    global $geodirectory;

-

-    $first_title = true;

-    $tab_id = '';

-    $i = 0;

-    foreach ($options as $value) :

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

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

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

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

-        $desc = '';

-        switch ($value['type']) :

-            case 'dummy_installer':

-                $post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';

-                geodir_autoinstall_admin_header($post_type);

-                break;

-            case 'title':

-

-                if ($i == 0) {

-                    echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';

-                    echo '<div class="inner_content_tab_main">';

-                }

+	global $geodirectory;

+

+	$first_title = true;

+	$tab_id = '';

+	$i = 0;

+	foreach ($options as $value) :

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

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

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

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

+		$desc = '';

+		switch ($value['type']) :

+			case 'dummy_installer':

+				$post_type = isset($value['post_type']) ? $value['post_type'] : 'gd_place';

+				geodir_autoinstall_admin_header($post_type);

+				break;

+			case 'title':

+

+				if ($i == 0) {

+					echo '<dl id="geodir_oiption_tabs" class="gd-tab-head"></dl>';

+					echo '<div class="inner_content_tab_main">';

+				}

 

-                $i++;

+				$i++;

 

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

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

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

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

 

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

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

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

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

 

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

-                    if ($first_title === true) {

-                        $first_title = false;

-                    } else {

-                        echo '</div>';

-                    }

-                    echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

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

+					if ($first_title === true) {

+						$first_title = false;

+					} else {

+						echo '</div>';

+					}

+					echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

 

-                    echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

-                }

+					echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+				}

 

-                /**

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

-                 *

-                 * The action is called dynamically geodir_settings_$value['id'].

-                 *

-                 * @since 1.0.0

-                 */

-                do_action('geodir_settings_' . sanitize_title($value['id']));

-                break;

-

-            case 'no_tabs':

-

-                echo '<div class="inner_content_tab_main">';

-                echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

-

-                break;

-

-            case 'sectionstart':

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

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

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

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

-                /**

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

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_start.

-                 *

-                 * @since 1.0.0

-                 */

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

-                echo '<table class="form-table">' . "\n\n";

-

-                break;

-            case 'sectionend':

-                /**

-                 * Called before a GeoDirectory settings sectionend is output in the GD settings page.

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_end.

-                 *

-                 * @since 1.0.0

-                 */

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

-                echo '</table>';

-                /**

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

-                 *

-                 * The action is called dynamically geodir_settings_$value['id']_end.

-                 *

-                 * @since 1.0.0

-                 */

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

-                break;

-            case 'text':

-                ?>

+				/**

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

+				 *

+				 * The action is called dynamically geodir_settings_$value['id'].

+				 *

+				 * @since 1.0.0

+				 */

+				do_action('geodir_settings_' . sanitize_title($value['id']));

+				break;

+

+			case 'no_tabs':

+

+				echo '<div class="inner_content_tab_main">';

+				echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+

+				break;

+

+			case 'sectionstart':

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

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

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

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

+				/**

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

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_start.

+				 *

+				 * @since 1.0.0

+				 */

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

+				echo '<table class="form-table">' . "\n\n";

+

+				break;

+			case 'sectionend':

+				/**

+				 * Called before a GeoDirectory settings sectionend is output in the GD settings page.

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_end.

+				 *

+				 * @since 1.0.0

+				 */

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

+				echo '</table>';

+				/**

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

+				 *

+				 * The action is called dynamically geodir_settings_$value['id']_end.

+				 *

+				 * @since 1.0.0

+				 */

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

+				break;

+			case 'text':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -1345,15 +1345,15 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

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

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

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

-                                           } else {

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

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

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

+										   } else {

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

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

                 </tr><?php

-                break;

+				break;

 

-            case 'password':

-                ?>

+			case 'password':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

@@ -1362,42 +1362,42 @@ 
                                            <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

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

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

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

-                                           } else {

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

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

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

+										   } else {

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

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

                 </tr><?php

-                break;

+				break;

 

-            case 'html_content':

-                ?>

+			case 'html_content':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

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

                 </tr><?php

-                break;

+				break;

 

-            case 'color' :

-                ?>

+			case 'color' :

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><input name="<?php echo esc_attr($value['id']); ?>"

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

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

                                            value="<?php if (get_option($value['id']) !== false && get_option($value['id']) !== null) {

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

-                                           } else {

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

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

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

+										   } else {

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

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

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

 

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

                          style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"></div>

                 </td>

                 </tr><?php

-                break;

-            case 'image_width' :

-                ?>

+				break;

+			case 'image_width' :

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1419,11 +1419,11 @@ 
 

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

                 </tr><?php

-                break;

-            case 'select':

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

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

-                ?>

+				break;

+			case 'select':

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

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

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

@@ -1432,33 +1432,33 @@ 
                                             class="<?php if (isset($value['class'])) echo $value['class']; ?>"

                                             option-ajaxchosen="false">

                         <?php

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

-                            $geodir_select_value = '';

-                            if ($option_value != '') {

-                                if ($option_value != '' && $option_value == $key)

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

-                            } else {

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

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

-                            }

-                            ?>

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

+							$geodir_select_value = '';

+							if ($option_value != '') {

+								if ($option_value != '' && $option_value == $key)

+									$geodir_select_value = ' selected="selected" ';

+							} else {

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

+									$geodir_select_value = ' selected="selected" ';

+							}

+							?>

                             <option

                                 value="<?php echo esc_attr($key); ?>" <?php echo $geodir_select_value; ?> ><?php echo ucfirst($val) ?></option>

                         <?php

-                        }

-                        ?>

+						}

+						?>

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

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'multiselect':

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

-                if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {

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

-                }

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

-                ?>

+			case 'multiselect':

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

+				if ($option_values === '' && !empty($value['std']) && is_array($value['std'])) {

+				   $option_values = $value['std'];

+				}

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

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp"><select multiple="multiple" name="<?php echo esc_attr($value['id']); ?>[]"

@@ -1468,25 +1468,25 @@ 
                                             data-placeholder="<?php if (isset($value['placeholder_text'])) echo $value['placeholder_text'];?>"

                                             option-ajaxchosen="false">

                         <?php

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

-                            if (strpos($key, 'optgroup_start-') === 0) {

-                                ?><optgroup label="<?php echo ucfirst($val); ?>"><?php

-                            } else if (strpos($key, 'optgroup_end-') === 0) {

-                                ?></optgroup><?php

-                            } else {

-                                ?>

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

+							if (strpos($key, 'optgroup_start-') === 0) {

+								?><optgroup label="<?php echo ucfirst($val); ?>"><?php

+							} else if (strpos($key, 'optgroup_end-') === 0) {

+								?></optgroup><?php

+							} else {

+								?>

                                 <option

                                     value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>><?php echo ucfirst($val) ?></option>

                             <?php

-                            }

-                        }

-                        ?>

+							}

+						}

+						?>

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

                 </td>

                 </tr><?php

-                break;

-            case 'file':

-                ?>

+				break;

+			case 'file':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name']; ?></th>

                 <td class="forminp">

@@ -1506,87 +1506,87 @@ 
                     <?php } ?>

                 </td>

                 </tr><?php

-                break;

-            case 'map_default_settings' :

-                ?>

+				break;

+			case 'map_default_settings' :

+				?>

 

                 <tr valign="top">

                     <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

-                            $arr_map_langages = array(

-                                'ar' => __('ARABIC', 'geodirectory'),

-                                'eu' => __('BASQUE', 'geodirectory'),

-                                'bg' => __('BULGARIAN', 'geodirectory'),

-                                'bn' => __('BENGALI', 'geodirectory'),

-                                'ca' => __('CATALAN', 'geodirectory'),

-                                'cs' => __('CZECH', 'geodirectory'),

-                                'da' => __('DANISH', 'geodirectory'),

-                                'de' => __('GERMAN', 'geodirectory'),

-                                'el' => __('GREEK', 'geodirectory'),

-                                'en' => __('ENGLISH', 'geodirectory'),

-                                'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),

-                                'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),

-                                'es' => __('SPANISH', 'geodirectory'),

-                                'eu' => __('BASQUE', 'geodirectory'),

-                                'fa' => __('FARSI', 'geodirectory'),

-                                'fi' => __('FINNISH', 'geodirectory'),

-                                'fil' => __('FILIPINO', 'geodirectory'),

-                                'fr' => __('FRENCH', 'geodirectory'),

-                                'gl' => __('GALICIAN', 'geodirectory'),

-                                'gu' => __('GUJARATI', 'geodirectory'),

-                                'hi' => __('HINDI', 'geodirectory'),

-                                'hr' => __('CROATIAN', 'geodirectory'),

-                                'hu' => __('HUNGARIAN', 'geodirectory'),

-                                'id' => __('INDONESIAN', 'geodirectory'),

-                                'it' => __('ITALIAN', 'geodirectory'),

-                                'iw' => __('HEBREW', 'geodirectory'),

-                                'ja' => __('JAPANESE', 'geodirectory'),

-                                'kn' => __('KANNADA', 'geodirectory'),

-                                'ko' => __('KOREAN', 'geodirectory'),

-                                'lt' => __('LITHUANIAN', 'geodirectory'),

-                                'lv' => __('LATVIAN', 'geodirectory'),

-                                'ml' => __('MALAYALAM', 'geodirectory'),

-                                'mr' => __('MARATHI', 'geodirectory'),

-                                'nl' => __('DUTCH', 'geodirectory'),

-                                'no' => __('NORWEGIAN', 'geodirectory'),

-                                'pl' => __('POLISH', 'geodirectory'),

-                                'pt' => __('PORTUGUESE', 'geodirectory'),

-                                'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),

-                                'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),

-                                'ro' => __('ROMANIAN', 'geodirectory'),

-                                'ru' => __('RUSSIAN', 'geodirectory'),

-                                'ru' => __('RUSSIAN', 'geodirectory'),

-                                'sk' => __('SLOVAK', 'geodirectory'),

-                                'sl' => __('SLOVENIAN', 'geodirectory'),

-                                'sr' => __('SERBIAN', 'geodirectory'),

-                                'sv' => __('	SWEDISH', 'geodirectory'),

-                                'tl' => __('TAGALOG', 'geodirectory'),

-                                'ta' => __('TAMIL', 'geodirectory'),

-                                'te' => __('TELUGU', 'geodirectory'),

-                                'th' => __('THAI', 'geodirectory'),

-                                'tr' => __('TURKISH', 'geodirectory'),

-                                'uk' => __('UKRAINIAN', 'geodirectory'),

-                                'vi' => __('VIETNAMESE', 'geodirectory'),

-                                'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),

-                                'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

-                            );

-                            $geodir_default_map_language = get_option('geodir_default_map_language');

-                            if (empty($geodir_default_map_language))

-                                $geodir_default_map_language = 'en';

-                            foreach ($arr_map_langages as $language_key => $language_txt) {

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

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

-                                else

-                                    $geodir_default_language_selected = '';

-

-                                ?>

+							$arr_map_langages = array(

+								'ar' => __('ARABIC', 'geodirectory'),

+								'eu' => __('BASQUE', 'geodirectory'),

+								'bg' => __('BULGARIAN', 'geodirectory'),

+								'bn' => __('BENGALI', 'geodirectory'),

+								'ca' => __('CATALAN', 'geodirectory'),

+								'cs' => __('CZECH', 'geodirectory'),

+								'da' => __('DANISH', 'geodirectory'),

+								'de' => __('GERMAN', 'geodirectory'),

+								'el' => __('GREEK', 'geodirectory'),

+								'en' => __('ENGLISH', 'geodirectory'),

+								'en-AU' => __('ENGLISH (AUSTRALIAN)', 'geodirectory'),

+								'en-GB' => __('ENGLISH (GREAT BRITAIN)', 'geodirectory'),

+								'es' => __('SPANISH', 'geodirectory'),

+								'eu' => __('BASQUE', 'geodirectory'),

+								'fa' => __('FARSI', 'geodirectory'),

+								'fi' => __('FINNISH', 'geodirectory'),

+								'fil' => __('FILIPINO', 'geodirectory'),

+								'fr' => __('FRENCH', 'geodirectory'),

+								'gl' => __('GALICIAN', 'geodirectory'),

+								'gu' => __('GUJARATI', 'geodirectory'),

+								'hi' => __('HINDI', 'geodirectory'),

+								'hr' => __('CROATIAN', 'geodirectory'),

+								'hu' => __('HUNGARIAN', 'geodirectory'),

+								'id' => __('INDONESIAN', 'geodirectory'),

+								'it' => __('ITALIAN', 'geodirectory'),

+								'iw' => __('HEBREW', 'geodirectory'),

+								'ja' => __('JAPANESE', 'geodirectory'),

+								'kn' => __('KANNADA', 'geodirectory'),

+								'ko' => __('KOREAN', 'geodirectory'),

+								'lt' => __('LITHUANIAN', 'geodirectory'),

+								'lv' => __('LATVIAN', 'geodirectory'),

+								'ml' => __('MALAYALAM', 'geodirectory'),

+								'mr' => __('MARATHI', 'geodirectory'),

+								'nl' => __('DUTCH', 'geodirectory'),

+								'no' => __('NORWEGIAN', 'geodirectory'),

+								'pl' => __('POLISH', 'geodirectory'),

+								'pt' => __('PORTUGUESE', 'geodirectory'),

+								'pt-BR' => __('PORTUGUESE (BRAZIL)', 'geodirectory'),

+								'pt-PT' => __('PORTUGUESE (PORTUGAL)', 'geodirectory'),

+								'ro' => __('ROMANIAN', 'geodirectory'),

+								'ru' => __('RUSSIAN', 'geodirectory'),

+								'ru' => __('RUSSIAN', 'geodirectory'),

+								'sk' => __('SLOVAK', 'geodirectory'),

+								'sl' => __('SLOVENIAN', 'geodirectory'),

+								'sr' => __('SERBIAN', 'geodirectory'),

+								'sv' => __('	SWEDISH', 'geodirectory'),

+								'tl' => __('TAGALOG', 'geodirectory'),

+								'ta' => __('TAMIL', 'geodirectory'),

+								'te' => __('TELUGU', 'geodirectory'),

+								'th' => __('THAI', 'geodirectory'),

+								'tr' => __('TURKISH', 'geodirectory'),

+								'uk' => __('UKRAINIAN', 'geodirectory'),

+								'vi' => __('VIETNAMESE', 'geodirectory'),

+								'zh-CN' => __('CHINESE (SIMPLIFIED)', 'geodirectory'),

+								'zh-TW' => __('CHINESE (TRADITIONAL)', 'geodirectory'),

+							);

+							$geodir_default_map_language = get_option('geodir_default_map_language');

+							if (empty($geodir_default_map_language))

+								$geodir_default_map_language = 'en';

+							foreach ($arr_map_langages as $language_key => $language_txt) {

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

+									$geodir_default_language_selected = "selected='selected'";

+								else

+									$geodir_default_language_selected = '';

+

+								?>

                                 <option

                                     value="<?php echo $language_key?>" <?php echo $geodir_default_language_selected; ?>><?php echo $language_txt; ?></option>

 

                             <?php }

-                            ?>

+							?>

                         </select>

                     </td>

                 </tr>

@@ -1597,46 +1597,46 @@ 
                     <td width="60%">

                         <select name="geodir_default_map_search_pt" style="width:60%">

                             <?php

-                            $post_types = geodir_get_posttypes('array');

-                            $geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

-                            if (empty($geodir_default_map_search_pt))

-                                $geodir_default_map_search_pt = 'gd_place';

-                            if (is_array($post_types)) {

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

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

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

-                                    else

-                                        $geodir_search_pt_selected = '';

-

-                                    ?>

+							$post_types = geodir_get_posttypes('array');

+							$geodir_default_map_search_pt = get_option('geodir_default_map_search_pt');

+							if (empty($geodir_default_map_search_pt))

+								$geodir_default_map_search_pt = 'gd_place';

+							if (is_array($post_types)) {

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

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

+										$geodir_search_pt_selected = "selected='selected'";

+									else

+										$geodir_search_pt_selected = '';

+

+									?>

                                     <option

                                         value="<?php echo $key?>" <?php echo $geodir_search_pt_selected; ?>><?php echo $post_types_obj['labels']['singular_name']; ?></option>

 

                                 <?php }

 

-                            }

+							}

 

-                            ?>

+							?>

                         </select>

                     </td>

                 </tr>

 

                 <?php

-                break;

+				break;

 

-            case 'map':

-                ?>

+			case 'map':

+				?>

                 <tr valign="top">

                     <td class="forminp">

                         <?php

-                        global $post_cat, $cat_display;

-                        $post_types = geodir_get_posttypes('object');

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

-                        $count = 1;

-                        ?>

+						global $post_cat, $cat_display;

+						$post_types = geodir_get_posttypes('object');

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

+						$count = 1;

+						?>

                         <table width="70%" class="widefat">

                             <thead>

                             <tr>

@@ -1645,18 +1645,18 @@ 
                                 <th><b><?php echo DESIGN_POST_TYPE_CAT; ?></b></th>

                             </tr>

                             <?php

-                            $gd_categs = $gd_cats;

-                            foreach ($post_types as $key => $post_types_obj) :

-                                $checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';

-                                $gd_taxonomy = geodir_get_taxonomies($key);

-                                if ($gd_cats_upgrade) {

-                                    $gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : '';

-                                    $gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();

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

-                                }

-                                $post_cat = implode(',', $gd_cats);

-                                $gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);

-                                ?>

+							$gd_categs = $gd_cats;

+							foreach ($post_types as $key => $post_types_obj) :

+								$checked = is_array($gd_post_types) && in_array($key, $gd_post_types) ? 'checked="checked"' : '';

+								$gd_taxonomy = geodir_get_taxonomies($key);

+								if ($gd_cats_upgrade) {

+									$gd_cat_taxonomy = isset($gd_taxonomy[0]) ? $gd_taxonomy[0] : '';

+									$gd_cats = isset($gd_categs[$gd_cat_taxonomy]) ? $gd_categs[$gd_cat_taxonomy] : array();

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

+								}

+								$post_cat = implode(',', $gd_cats);

+								$gd_taxonomy_list = geodir_custom_taxonomy_walker($gd_taxonomy);

+								?>

                                 <tr>

                                     <td valign="top" width="5%"><?php echo $count; ?></td>

                                     <td valign="top" width="25%" id="td_post_types"><input type="checkbox"

@@ -1677,19 +1677,19 @@ 
                     </td>

                 </tr>

                 <?php

-                break;

+				break;

 

-            case 'checkbox' :

+			case 'checkbox' :

 

-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :

-                    ?>

+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'start')) :

+					?>

                     <tr valign="top">

                     <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                     <td class="forminp">

                 <?php

-                endif;

+				endif;

 

-                ?>

+				?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

                     <label for="<?php echo $value['id'] ?>">

@@ -1699,49 +1699,49 @@ 
                 </fieldset>

                 <?php

 

-                if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :

-                    ?>

+				if (!isset($value['checkboxgroup']) || (isset($value['checkboxgroup']) && $value['checkboxgroup'] == 'end')) :

+					?>

                     </td>

                     </tr>

                 <?php

-                endif;

+				endif;

 

-                break;

+				break;

 

-            case 'radio' :

+			case 'radio' :

 

-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :

-                    ?>

+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'start')) :

+					?>

                     <tr valign="top">

                     <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                     <td class="forminp">

                 <?php

-                endif;

+				endif;

 

-                ?>

+				?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

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

+							echo 'checked="checked"';

+						}elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

 

-                if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :

-                    ?>

+				if (!isset($value['radiogroup']) || (isset($value['radiogroup']) && $value['radiogroup'] == 'end')) :

+					?>

                     </td>

                     </tr>

                 <?php

-                endif;

+				endif;

 

-                break;

+				break;

 

-            case 'textarea':

-                ?>

+			case 'textarea':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1754,30 +1754,30 @@ 
 

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'editor':

-                ?>

+			case 'editor':

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><?php

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

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

-                    else

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

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

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

+					else

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

 

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

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

 

-                    wp_editor($content, esc_attr($value['id']), $editor_settings);

+					wp_editor($content, esc_attr($value['id']), $editor_settings);

 

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

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

 

                 </td>

                 </tr><?php

-                break;

+				break;

 

-            case 'single_select_page' :

-                // WPML

+			case 'single_select_page' :

+				// WPML

 				$switch_lang = false;

 				$disabled = '';

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

@@ -1795,18 +1795,18 @@ 
 				//

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

 

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

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

-                    'sort_column' => 'menu_order',

-                    'sort_order' => 'ASC',

-                    'show_option_none' => ' ',

-                    'class' => $value['class'],

-                    'echo' => false,

-                    'selected' => $page_setting);

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

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

+					'sort_column' => 'menu_order',

+					'sort_order' => 'ASC',

+					'show_option_none' => ' ',

+					'class' => $value['class'],

+					'echo' => false,

+					'selected' => $page_setting);

 

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

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

 

-                ?>

+				?>

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

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1817,17 +1817,17 @@ 
 				if ($switch_lang) {

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

 				}

-                break;

-            case 'single_select_country' :

-                $country_setting = (string)get_option($value['id']);

-                if (strstr($country_setting, ':')) :

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

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

-                else :

-                    $country = $country_setting;

-                    $state = '*';

-                endif;

-                ?>

+				break;

+			case 'single_select_country' :

+				$country_setting = (string)get_option($value['id']);

+				if (strstr($country_setting, ':')) :

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

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

+				else :

+					$country = $country_setting;

+					$state = '*';

+				endif;

+				?>

                 <tr valign="top">

                 <th scope="rpw" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp"><select name="<?php echo esc_attr($value['id']); ?>"

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

                 </td>

                 </tr><?php

-                break;

-            case 'multi_select_countries' :

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

-                asort($countries);

-                $selections = (array)get_option($value['id']);

-                ?>

+				break;

+			case 'multi_select_countries' :

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

+				asort($countries);

+				$selections = (array)get_option($value['id']);

+				?>

                 <tr valign="top">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

@@ -1851,22 +1851,22 @@ 
                             data-placeholder="<?php _e('Choose countries&hellip;', 'geodirectory'); ?>"

                             title="Country" class="chosen_select">

                         <?php

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

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

-                        endforeach;

-                        ?>

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

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

+						endforeach;

+						?>

                     </select>

                 </td>

                 </tr>

 

                 <?php

 

-                break;

+				break;

 

-            case 'google_analytics' :

-                $selections = (array)get_option($value['id']);

-                if(get_option('geodir_ga_client_id') && get_option('geodir_ga_client_secret') ) {

-                    ?>

+			case 'google_analytics' :

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

                         <td class="forminp">

@@ -1874,19 +1874,19 @@ 
 

                             <?php

 

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

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

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

-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

-                            $response_type = "&response_type=code";

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

-                            $access_type = "&access_type=offline";

-                            $approval_prompt = "&approval_prompt=force";

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

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

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

+							$redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+							$response_type = "&response_type=code";

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

+							$access_type = "&access_type=offline";

+							$approval_prompt = "&approval_prompt=force";

 

-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

+							$auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

 

 

-                            ?>

+							?>

                             <script>

                                 function gd_ga_popup() {

                                     var win = window.open("<?php echo $auth_url;?>", "Google Analytics", "");

@@ -1901,47 +1901,47 @@ 
                             </script>

 

                             <?php

-                            if (get_option('gd_ga_refresh_token')) {

-                                ?>

+							if (get_option('gd_ga_refresh_token')) {

+								?>

                                 <span class="button-primary"

                                       onclick="gd_ga_popup();"><?php _e('Re-authorize', 'geodirectory'); ?></span>

                                 <span

                                     style="color: green; font-weight: bold;"><?php _e('Authorized', 'geodirectory'); ?></span>

                             <?php

-                            } else {

-                                ?>

+							} else {

+								?>

                                 <span class="button-primary"

                                       onclick="gd_ga_popup();"><?php _e('Authorize', 'geodirectory');?></span>

                             <?php

-                            }

-                            ?>

+							}

+							?>

                         </td>

                     </tr>

 

                 <?php

-                }

+				}

 

-                break;

+				break;

 

-            case 'field_seperator' :

+			case 'field_seperator' :

 

-                ?>

+				?>

                 <tr valign="top">

                     <td colspan="2" class="forminp geodir_line_seperator"></td>

                 </tr>

                 <?php

 

-                break;

+				break;

 

-        endswitch;

+		endswitch;

 

-    endforeach;

+	endforeach;

 

-    if ($first_title === false) {

-        echo "</div>";

-    }

+	if ($first_title === false) {

+		echo "</div>";

+	}

 

-    ?>

+	?>

 

     <script type="text/javascript">

 

@@ -2001,33 +2001,33 @@ 
  */

 function geodir_post_info_setting()

 {

-    global $post, $post_id;

-

-    $post_type = get_post_type();

-

-    $package_info = array();

-

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

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');

-    echo '<div id="geodir_wrapper">';

-    /**

-     * Called before the GD custom fields are output in the wp-admin area.

-     *

-     * @since 1.0.0

-     * @see 'geodir_after_default_field_in_meta_box'

-     */

-    do_action('geodir_before_default_field_in_meta_box');

-    //geodir_get_custom_fields_html($package_info->pid,'default',$post_type);

-    // to display all fields in one information box

-    geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);

-    /**

-     * Called after the GD custom fields are output in the wp-admin area.

-     *

-     * @since 1.0.0

-     * @see 'geodir_before_default_field_in_meta_box'

-     */

-    do_action('geodir_after_default_field_in_meta_box');

-    echo '</div>';

+	global $post, $post_id;

+

+	$post_type = get_post_type();

+

+	$package_info = array();

+

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

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_info_noncename');

+	echo '<div id="geodir_wrapper">';

+	/**

+	 * Called before the GD custom fields are output in the wp-admin area.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_after_default_field_in_meta_box'

+	 */

+	do_action('geodir_before_default_field_in_meta_box');

+	//geodir_get_custom_fields_html($package_info->pid,'default',$post_type);

+	// to display all fields in one information box

+	geodir_get_custom_fields_html($package_info->pid, 'all', $post_type);

+	/**

+	 * Called after the GD custom fields are output in the wp-admin area.

+	 *

+	 * @since 1.0.0

+	 * @see 'geodir_before_default_field_in_meta_box'

+	 */

+	do_action('geodir_after_default_field_in_meta_box');

+	echo '</div>';

 }

 

 /**

@@ -2040,18 +2040,18 @@ 
  */

 function geodir_post_addinfo_setting()

 {

-    global $post, $post_id;

+	global $post, $post_id;

 

-    $post_type = get_post_type();

+	$post_type = get_post_type();

 

-    $package_info = array();

+	$package_info = array();

 

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

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

 

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');

-    echo '<div id="geodir_wrapper">';

-    geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);

-    echo '</div>';

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_addinfo_noncename');

+	echo '<div id="geodir_wrapper">';

+	geodir_get_custom_fields_html($package_info->pid, 'custom', $post_type);

+	echo '</div>';

 

 }

 

@@ -2065,60 +2065,60 @@ 
  */

 function geodir_post_attachments()

 {

-    global $post, $post_id;

+	global $post, $post_id;

 

-    wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

+	wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

 

-    if (geodir_get_featured_image($post_id, 'thumbnail')) {

-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

-        geodir_show_featured_image($post_id, 'thumbnail');

-    }

+	if (geodir_get_featured_image($post_id, 'thumbnail')) {

+		echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

+		geodir_show_featured_image($post_id, 'thumbnail');

+	}

 

-    $image_limit = 0;

+	$image_limit = 0;

 

-    ?>

+	?>

 

 

     <h5 class="form_title">

         <?php if ($image_limit != 0 && $image_limit == 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+		} ?>

         <?php if ($image_limit != 0 && $image_limit > 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+		} ?>

         <?php if ($image_limit == 0) {

-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

-        } ?>

+			echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+		} ?>

     </h5>

 

 

     <?php

 

-    $curImages = geodir_get_images($post_id);

-    $place_img_array = array();

+	$curImages = geodir_get_images($post_id);

+	$place_img_array = array();

 

-    if (!empty($curImages)):

-        foreach ($curImages as $p_img):

-            $place_img_array[] = $p_img->src;

-        endforeach;

-    endif;

+	if (!empty($curImages)):

+		foreach ($curImages as $p_img):

+			$place_img_array[] = $p_img->src;

+		endforeach;

+	endif;

 

-    if (!empty($place_img_array))

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

+	if (!empty($place_img_array))

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

 

 

-    // adjust values here

-    $id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

+	// adjust values here

+	$id = "post_images"; // this will be the name of form field. Image url(s) will be submitted in $_POST using this key. So if $id == �img1� then $_POST[�img1�] will have all the image urls

 

-    $svalue = $curImages; // this will be initial value of the above form field. Image urls.

+	$svalue = $curImages; // this will be initial value of the above form field. Image urls.

 

-    $multiple = true; // allow multiple files upload

+	$multiple = true; // allow multiple files upload

 

-    $width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

+	$width = geodir_media_image_large_width(); // If you want to automatically resize all uploaded images then provide width here (in pixels)

 

-    $height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

+	$height = geodir_media_image_large_height(); // If you want to automatically resize all uploaded images then provide height here (in pixels)

 

-    ?>

+	?>

 

     <div class="gtd-form_row clearfix" id="<?php echo $id; ?>dropbox" style="border:1px solid #999999;padding:5px;text-align:center;">

         <input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $svalue; ?>"/>

@@ -2160,13 +2160,13 @@ 
  */

 function geodir_action_post_updated($post_ID, $post_after, $post_before)

 {

-    $post_type = get_post_type($post_ID);

+	$post_type = get_post_type($post_ID);

 

-    if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

-        if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {

-            geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);

-        }

-    }

+	if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

+		if ($post_type != '' && in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_ID) && !empty($post_after->post_title) && $post_after->post_title != $post_before->post_title) {

+			geodir_save_post_meta($post_ID, 'post_title', $post_after->post_title);

+		}

+	}

 }

 

 /**

@@ -2181,39 +2181,39 @@ 
  */

 function geodir_notification_add_bcc_option($settings)

 {

-    if (!empty($settings)) {

-        $new_settings = array();

-        foreach ($settings as $setting) {

-            if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {

-                $geodir_bcc_listing_published_yes = array(

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

-                    'desc' => __('Yes', 'geodirectory'),

-                    'id' => 'geodir_bcc_listing_published',

-                    'std' => 'yes',

-                    'type' => 'radio',

-                    'value' => '1',

-                    'radiogroup' => 'start'

-                );

-

-                $geodir_bcc_listing_published_no = array(

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

-                    'desc' => __('No', 'geodirectory'),

-                    'id' => 'geodir_bcc_listing_published',

-                    'std' => 'yes',

-                    'type' => 'radio',

-                    'value' => '0',

-                    'radiogroup' => 'end'

-                );

-

-                $new_settings[] = $geodir_bcc_listing_published_yes;

-                $new_settings[] = $geodir_bcc_listing_published_no;

-            }

-            $new_settings[] = $setting;

-        }

-        $settings = $new_settings;

-    }

+	if (!empty($settings)) {

+		$new_settings = array();

+		foreach ($settings as $setting) {

+			if (isset($setting['id']) && $setting['id'] == 'site_bcc_options' && isset($setting['type']) && $setting['type'] == 'sectionend') {

+				$geodir_bcc_listing_published_yes = array(

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

+					'desc' => __('Yes', 'geodirectory'),

+					'id' => 'geodir_bcc_listing_published',

+					'std' => 'yes',

+					'type' => 'radio',

+					'value' => '1',

+					'radiogroup' => 'start'

+				);

+

+				$geodir_bcc_listing_published_no = array(

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

+					'desc' => __('No', 'geodirectory'),

+					'id' => 'geodir_bcc_listing_published',

+					'std' => 'yes',

+					'type' => 'radio',

+					'value' => '0',

+					'radiogroup' => 'end'

+				);

+

+				$new_settings[] = $geodir_bcc_listing_published_yes;

+				$new_settings[] = $geodir_bcc_listing_published_no;

+			}

+			$new_settings[] = $setting;

+		}

+		$settings = $new_settings;

+	}

 

-    return $settings;

+	return $settings;

 }

 

 

@@ -2228,19 +2228,19 @@ 
  */

 function get_gd_theme_compat_callback()

 {

-    global $wpdb;

-    $themes = get_option('gd_theme_compats');

-

-    if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {

-        if (isset($_POST['export'])) {

-            echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));

-        } else {

-            echo json_encode($themes[$_POST['theme']]);

-        }

+	global $wpdb;

+	$themes = get_option('gd_theme_compats');

 

-    }

+	if (isset($_POST['theme']) && isset($themes[$_POST['theme']]) && !empty($themes[$_POST['theme']])) {

+		if (isset($_POST['export'])) {

+			echo json_encode(array($_POST['theme'] => $themes[$_POST['theme']]));

+		} else {

+			echo json_encode($themes[$_POST['theme']]);

+		}

 

-    die();

+	}

+

+	die();

 }

 

 add_action('wp_ajax_get_gd_theme_compat_import_callback', 'get_gd_theme_compat_import_callback');

@@ -2254,20 +2254,20 @@ 
  */

 function get_gd_theme_compat_import_callback()

 {

-    global $wpdb;

-    $themes = get_option('gd_theme_compats');

-    if (isset($_POST['theme']) && !empty($_POST['theme'])) {

-        $json = json_decode(stripslashes($_POST['theme']), true);

-        if (!empty($json) && is_array($json)) {

-            $key = sanitize_text_field(key($json));

-            $themes[$key] = $json[$key];

-            update_option('gd_theme_compats', $themes);

-            echo $key;

-            die();

-        }

-    }

-    echo '0';

-    die();

+	global $wpdb;

+	$themes = get_option('gd_theme_compats');

+	if (isset($_POST['theme']) && !empty($_POST['theme'])) {

+		$json = json_decode(stripslashes($_POST['theme']), true);

+		if (!empty($json) && is_array($json)) {

+			$key = sanitize_text_field(key($json));

+			$themes[$key] = $json[$key];

+			update_option('gd_theme_compats', $themes);

+			echo $key;

+			die();

+		}

+	}

+	echo '0';

+	die();

 }

 

 

@@ -2280,39 +2280,39 @@ 
  */

 function gd_set_theme_compat()

 {

-    global $wpdb;

-    $theme = wp_get_theme();

+	global $wpdb;

+	$theme = wp_get_theme();

 

-    if ($theme->parent()) {

-        $theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

-    } else {

-        $theme_name = str_replace(" ", "_", $theme->get('Name'));

-    }

+	if ($theme->parent()) {

+		$theme_name = str_replace(" ", "_", $theme->parent()->get('Name'));

+	} else {

+		$theme_name = str_replace(" ", "_", $theme->get('Name'));

+	}

 

-    $theme_compats = get_option('gd_theme_compats');

-    $current_compat = get_option('gd_theme_compat');

-    $current_compat = str_replace("_custom", "", $current_compat);

+	$theme_compats = get_option('gd_theme_compats');

+	$current_compat = get_option('gd_theme_compat');

+	$current_compat = str_replace("_custom", "", $current_compat);

 

-    if ($current_compat == $theme_name && strpos("_custom", get_option('gd_theme_compat')) !== false) {

-        return;

-    }// if already running correct compat then bail

+	if ($current_compat == $theme_name && strpos("_custom", get_option('gd_theme_compat')) !== false) {

+		return;

+	}// if already running correct compat then bail

 

-    if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it

-        update_option('gd_theme_compat', $theme_name);

-        update_option('theme_compatibility_setting', $theme_compats[$theme_name]);

+	if (isset($theme_compats[$theme_name])) {// if there is a compat avail then set it

+		update_option('gd_theme_compat', $theme_name);

+		update_option('theme_compatibility_setting', $theme_compats[$theme_name]);

 

-        // if there are default options to set then set them

-        if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {

+		// if there are default options to set then set them

+		if (isset($theme_compats[$theme_name]['geodir_theme_compat_default_options']) && !empty($theme_compats[$theme_name]['geodir_theme_compat_default_options'])) {

 

-            foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {

-                update_option($key, $val);

-            }

-        }

+			foreach ($theme_compats[$theme_name]['geodir_theme_compat_default_options'] as $key => $val) {

+				update_option($key, $val);

+			}

+		}

 

-    } else {

-        update_option('gd_theme_compat', '');

-        update_option('theme_compatibility_setting', '');

-    }

+	} else {

+		update_option('gd_theme_compat', '');

+		update_option('theme_compatibility_setting', '');

+	}

 

 

 }

@@ -2327,9 +2327,9 @@ 
  */

 function gd_check_avada_compat()

 {

-    if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {

-        add_action('admin_notices', 'gd_avada_compat_warning');

-    }

+	if (function_exists('avada_load_textdomain') && !get_option('avada_nag')) {

+		add_action('admin_notices', 'gd_avada_compat_warning');

+	}

 }

 

 

@@ -2342,22 +2342,22 @@ 
 function gd_avada_compat_warning()

 {

 

-    /*

+	/*

     $msg_type = error

     $msg_type = updated fade

     $msg_type = update-nag

     */

 

-    $plugin = 'avada-nag';

-    $timestamp = 'avada-nag1234';

-    $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

-    echo '<div id="' . $timestamp . '"  class="error">';

-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

-    echo "<p>$message</p>";

-    echo "</div>";

+	$plugin = 'avada-nag';

+	$timestamp = 'avada-nag1234';

+	$message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

+	echo '<div id="' . $timestamp . '"  class="error">';

+	echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

+	echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

+	echo "<p>$message</p>";

+	echo "</div>";

 

-    ?>

+	?>

     <script>

         function gdRemoveANotification($plugin, $timestamp) {

 

@@ -2425,10 +2425,10 @@ 
  */

 function geodir_avada_remove_notification()

 {

-    update_option('avada_nag', TRUE);

+	update_option('avada_nag', TRUE);

 

-    // Always die in functions echoing ajax content

-    die();

+	// Always die in functions echoing ajax content

+	die();

 }

 

 

@@ -2450,9 +2450,9 @@ 
 	global $post, $typenow, $current_screen;

 	

 	$post_type = NULL;

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

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

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

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

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

 		$post_type = $post->post_type;

 	elseif ($typenow)

 		$post_type = $typenow;

@@ -2487,7 +2487,7 @@ 
 		// Don't allow same slug url for listing and location

 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

 			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

-        	wp_redirect($redirect_url);

+			wp_redirect($redirect_url);

 			exit;

 		}

 		

@@ -2517,10 +2517,10 @@ 
  * @package GeoDirectory

  */

 function geodir_hide_admin_preview_button() {

-    global $post_type;

-    $post_types = geodir_get_posttypes();

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

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

+	global $post_type;

+	$post_types = geodir_get_posttypes();

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

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

 }

 add_action( 'admin_head-post-new.php', 'geodir_hide_admin_preview_button' );

 add_action( 'admin_head-post.php', 'geodir_hide_admin_preview_button' );

@@ -2535,7 +2535,7 @@ 
  */

 function geodir_import_export_tab( $tabs ) {

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

-    return $tabs;

+	return $tabs;

 }

 

 /**

@@ -2550,26 +2550,26 @@ 
 function geodir_import_export_page() {

 	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

 	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

-    /**

-     * Filter sample category data csv file url.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $gd_cats_sample_csv Sample category data csv file url.

-     */

+	/**

+	 * Filter sample category data csv file url.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @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_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

-    /**

-     * Filter sample post data csv file url.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

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

+	/**

+	 * Filter sample post data csv file url.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @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_posttypes = geodir_get_posttypes( 'array' );

 	

@@ -2592,14 +2592,14 @@ 
 	$gd_chunksize_options[100000] = 100000;

 	 

 	 /**

-     * Filter max entries per export csv file.

-     *

-     * @since 1.5.6

-     * @package GeoDirectory

-     *

-     * @param string $gd_chunksize_options Entries options.

-     */

-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

+	  * Filter max entries per export csv file.

+	  *

+	  * @since 1.5.6

+	  * @package GeoDirectory

+	  *

+	  * @param string $gd_chunksize_options Entries options.

+	  */

+	$gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

 	

 	$gd_chunksize_option = '';

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

@@ -2615,12 +2615,12 @@ 
   <div class="gd-content-heading">

 

   <?php

-    ini_set('max_execution_time', 999999);

-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );

-    ini_restore('max_execution_time');

+	ini_set('max_execution_time', 999999);

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

@@ -2793,7 +2793,7 @@ 
 						 * Called just after the sample CSV download link.

 						 *

 						 * @since 1.0.0

-                         * @package GeoDirectory

+						 * @package GeoDirectory

 						 */

 						do_action('geodir_sample_cats_csv_download_link');

 						?>

@@ -2878,11 +2878,11 @@ 
 	 *

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

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

 	 *

 	 * @param array $gd_posttypes GD post types.

-     * @param array $gd_chunksize_options File chunk size options.

-     * @param string $nonce Wordpress security token for GD import & export.

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

 	?>

@@ -3569,44 +3569,44 @@ 
 function geodir_init_filesystem()

 {

 

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

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

-    }

-    $access_type = get_filesystem_method();

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

-        /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

-

-        /* initialize the API */

-        if (!WP_Filesystem($creds)) {

-            /* any problems and we exit */

-            //return '@@@3';

-            return false;

-        }

-

-        global $wp_filesystem;

-        return $wp_filesystem;

-        /* do our file manipulations below */

-    } elseif (defined('FTP_USER')) {

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

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

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

+	}

+	$access_type = get_filesystem_method();

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

+		/* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+

+		/* initialize the API */

+		if (!WP_Filesystem($creds)) {

+			/* any problems and we exit */

+			//return '@@@3';

+			return false;

+		}

 

-        /* initialize the API */

-        if (!WP_Filesystem($creds)) {

-            /* any problems and we exit */

-            //return '@@@33';

-            return false;

-        }

+		global $wp_filesystem;

+		return $wp_filesystem;

+		/* do our file manipulations below */

+	} elseif (defined('FTP_USER')) {

+		$creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+

+		/* initialize the API */

+		if (!WP_Filesystem($creds)) {

+			/* any problems and we exit */

+			//return '@@@33';

+			return false;

+		}

 

-        global $wp_filesystem;

-        //return '@@@1';

-        return $wp_filesystem;

+		global $wp_filesystem;

+		//return '@@@1';

+		return $wp_filesystem;

 

-    } else {

-        //return '@@@2';

-        /* don't have direct write access. Prompt user with our notice */

-        add_action('admin_notice', 'geodir_filesystem_notice');

-        return false;

-    }

+	} else {

+		//return '@@@2';

+		/* don't have direct write access. Prompt user with our notice */

+		add_action('admin_notice', 'geodir_filesystem_notice');

+		return false;

+	}

 

 }

 

@@ -3624,10 +3624,10 @@ 
  */

 function geodir_filesystem_notice()

 {   if ( defined( 'DOING_AJAX' ) ){return;}

-    $access_type = get_filesystem_method();

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

-    } elseif (!defined('FTP_USER')) {

-        ?>

+	$access_type = get_filesystem_method();

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

+	} elseif (!defined('FTP_USER')) {

+		?>

         <div class="error">

             <p><?php _e('GeoDirectory does not have access to your filesystem, thing like import/export will not work. Please define your details in wp-config.php as explained here', 'geodirectory'); ?>

                 <a target="_blank" href="http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants">http://codex.wordpress.org/Editing_wp-config.php#WordPress_Upgrade_Constants</a>

@@ -3653,1251 +3653,1251 @@ 
  * @return string Json data.

  */

 function geodir_ajax_import_export() {

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

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

     

-    error_reporting(0);

+	error_reporting(0);

 

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

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

 

-    if(!$max_input_time || $max_input_time<3000){

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

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

-            ini_set('memory_limit', '256M');

-        }

-    }

+	if($memory_limit && str_replace('M','',$memory_limit)){

+		if(str_replace('M','',$memory_limit)<256){

+			ini_set('memory_limit', '256M');

+		}

+	}

 

-    $json = array();

+	$json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

-    }

+	if ( !current_user_can( 'manage_options' ) ) {

+		wp_send_json( $json );

+	}

 

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

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+	$task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

+	$nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

+	$stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

-    }

+	if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

+		wp_send_json( $json );

+	}

 

-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

-    $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+	$post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

+	$chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+	$chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

+	$chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

 

-    $wp_filesystem = geodir_init_filesystem();

-    if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

-    }

+	$wp_filesystem = geodir_init_filesystem();

+	if (!$wp_filesystem) {

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

-    }

+	if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

+		$json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

+		wp_send_json( $json );

+	}

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

-        }

-    }

+	$csv_file_dir = geodir_path_import_export( false );

+	if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

+		if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

+			$json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

+			wp_send_json( $json );

+		}

+	}

     

-    $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

-    $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

-

-    switch ( $task ) {

-        case 'export_posts': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

+	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

+	$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

+

+	switch ( $task ) {

+		case 'export_posts': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

                 

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

-            }

-            // WPML

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

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

-            }

-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

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

+			}

+			// WPML

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

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

+			}

+			$filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

             

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

-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

-            }

-            $posts_count = geodir_get_posts_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

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

+			if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

+				$file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

+			}

+			$posts_count = geodir_get_posts_count( $post_type );

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

             

-            $chunk_file_paths = array();

+			$chunk_file_paths = array();

 

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

-                $json['total'] = $posts_count;

-                // WPML

-                if ($is_wpml) {

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

-                }

-                // WPML

-                wp_send_json( $json );

-                gd_die();

-            } else if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$json['total'] = $posts_count;

+				// WPML

+				if ($is_wpml) {

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

+				}

+				// WPML

+				wp_send_json( $json );

+				gd_die();

+			} else if ( isset( $_REQUEST['_st'] ) ) {

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

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

-                // WPML

-                if ($is_wpml) {

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

-                }

-                // WPML

-                wp_send_json( $json );

-                gd_die();

-            } else {

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $total_posts = $posts_count;

-                    if ($chunk_per_page > $total_posts) {

-                        $chunk_per_page = $total_posts;

-                    }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

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

+				// WPML

+				if ($is_wpml) {

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

+				}

+				// WPML

+				wp_send_json( $json );

+				gd_die();

+			} else {

+				if ( !$posts_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$total_posts = $posts_count;

+					if ($chunk_per_page > $total_posts) {

+						$chunk_per_page = $total_posts;

+					}

+					$chunk_total_pages = ceil( $total_posts / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    if ($per_page > $chunk_per_page) {

-                        $per_page = $chunk_per_page;

-                    }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					if ($per_page > $chunk_per_page) {

+						$per_page = $chunk_per_page;

+					}

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+					}

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $posts_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        if ($j > 1) {

-                            $json['total'] = $posts_count;

-                            $json['files'] = array();

-                        } else {

-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-                        }

-                    }

-                }

-                // WPML

-                if ($is_wpml) {

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

-                }

-                // WPML

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_cats': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $posts_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						if ($j > 1) {

+							$json['total'] = $posts_count;

+							$json['files'] = array();

+						} else {

+							$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+						}

+					}

+				}

+				// WPML

+				if ($is_wpml) {

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

+				}

+				// WPML

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_cats': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

                 

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

-            }

-            // WPML

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

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

+			}

+			// WPML

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

             

-            $terms_count = geodir_get_terms_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

+			$terms_count = geodir_get_terms_count( $post_type );

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

             

-            $chunk_file_paths = array();

+			$chunk_file_paths = array();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

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

-                // WPML

-                if ($is_wpml) {

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

-                }

-                // WPML

-                wp_send_json( $json );

-            } else {

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $total_terms = $terms_count;

-                    if ($chunk_per_page > $terms_count) {

-                        $chunk_per_page = $terms_count;

-                    }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

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

+				// WPML

+				if ($is_wpml) {

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

+				}

+				// WPML

+				wp_send_json( $json );

+			} else {

+				if ( !$terms_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$total_terms = $terms_count;

+					if ($chunk_per_page > $terms_count) {

+						$chunk_per_page = $terms_count;

+					}

+					$chunk_total_pages = ceil( $total_terms / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    if ($per_page > $chunk_per_page) {

-                        $per_page = $chunk_per_page;

-                    }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					if ($per_page > $chunk_per_page) {

+						$per_page = $chunk_per_page;

+					}

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $terms_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

-                    }

-                }

-                // WPML

-                if ($is_wpml) {

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

-                }

-                // WPML

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_locations': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $terms_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+					}

+				}

+				// WPML

+				if ($is_wpml) {

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

+				}

+				// WPML

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_locations': {

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_name = 'gd_locations_' . date( 'dmyHi' );

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+			$items_count = (int)geodir_location_imex_count_locations();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

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

-                wp_send_json( $json );

-            } else {

-                $chunk_file_paths = array();

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

+				wp_send_json( $json );

+			} else {

+				$chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+				if ( !$items_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$chunk_per_page = min( $chunk_per_page, $items_count );

+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					$per_page = min( $per_page, $chunk_per_page );

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $items_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

-                    }

-                }

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'export_hoods': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $items_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+					}

+				}

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'export_hoods': {

+			$file_url_base = geodir_path_import_export() . '/';

+			$file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

+			$file_url = $file_url_base . $file_name . '.csv';

+			$file_path = $csv_file_dir . '/' . $file_name . '.csv';

+			$file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

             

-            $items_count = (int)geodir_location_imex_count_neighbourhoods();

+			$items_count = (int)geodir_location_imex_count_neighbourhoods();

             

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

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

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

+				$line_count = (int)geodir_import_export_line_count( $file_path_temp );

+				$percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

+				$percentage = min( $percentage, 100 );

                 

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

-                wp_send_json( $json );

-            } else {

-                $chunk_file_paths = array();

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

+				wp_send_json( $json );

+			} else {

+				$chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

-                } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+				if ( !$items_count > 0 ) {

+					$json['error'] = __( 'No records to export.', 'geodirectory' );

+				} else {

+					$chunk_per_page = min( $chunk_per_page, $items_count );

+					$chunk_total_pages = ceil( $items_count / $chunk_per_page );

                     

-                    $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

+					$j = $chunk_page_no;

+					$chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

                     

-                    $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+					$per_page = 500;

+					$per_page = min( $per_page, $chunk_per_page );

+					$total_pages = ceil( $chunk_per_page / $per_page );

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+					for ( $i = 0; $i <= $total_pages; $i++ ) {

+						$save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

                         

-                        $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

-                    }

+						$clear = $i == 0 ? true : false;

+						geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+					}

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+					if ( $wp_filesystem->exists( $file_path_temp ) ) {

+						$chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

+						$chunk_file_name = $file_name . $chunk_page_no . '.csv';

+						$file_path = $csv_file_dir . '/' . $chunk_file_name;

+						$wp_filesystem->move( $file_path_temp, $file_path, true );

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

-                    }

+						$file_url = $file_url_base . $chunk_file_name;

+						$chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+					}

                     

-                    if ( !empty($chunk_file_paths) ) {

-                        $json['total'] = $items_count;

-                        $json['files'] = $chunk_file_paths;

-                    } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

-                    }

-                }

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'prepare_import':

-        case 'import_cat':

-        case 'import_post':

-        case 'import_loc':

-        case 'import_hood': {

-            // WPML

-            $is_wpml = geodir_is_wpml();

-            if ($is_wpml) {

-                global $sitepress;

-                $active_lang = ICL_LANGUAGE_CODE;

-            }

-            // WPML

+					if ( !empty($chunk_file_paths) ) {

+						$json['total'] = $items_count;

+						$json['files'] = $chunk_file_paths;

+					} else {

+						$json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+					}

+				}

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'prepare_import':

+		case 'import_cat':

+		case 'import_post':

+		case 'import_loc':

+		case 'import_hood': {

+			// WPML

+			$is_wpml = geodir_is_wpml();

+			if ($is_wpml) {

+				global $sitepress;

+				$active_lang = ICL_LANGUAGE_CODE;

+			}

+			// WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+			ini_set( 'auto_detect_line_endings', true );

             

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

-            $uploads_subdir = $uploads['subdir'];

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

+			$uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+			$csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

+			$import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

+			$csv_file_arr = explode( '/', $csv_file );

+			$csv_filename = end( $csv_file_arr );

+			$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

             

-            $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

-            $file = array();

+			$json['file'] = $csv_file;

+			$json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+			$file = array();

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+			if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

+				$wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

                 

-                if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

-                    $json['error'] = NULL;

-                    $json['rows'] = 0;

+				if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

+					$json['error'] = NULL;

+					$json['rows'] = 0;

                     

-                    $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

-                    setlocale(LC_ALL, 'en_US.UTF-8');

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

-                                $file[] = $data;

-                            }

-                        }

-                        fclose($handle);

-                    }

-                    setlocale(LC_ALL, $lc_all);

+					$lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

+					setlocale(LC_ALL, 'en_US.UTF-8');

+					if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

+						while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

+							if ( !empty( $data ) ) {

+								$file[] = $data;

+							}

+						}

+						fclose($handle);

+					}

+					setlocale(LC_ALL, $lc_all);

 

-                    $json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

+					$json['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

                     

-                    if (!$json['rows'] > 0) {

-                        $json['error'] = __('No data found in csv file.', 'geodirectory');

-                    }

-                } else {

-                    wp_send_json( $json );

-                }

-            } else {

-                wp_send_json( $json );

-            }

+					if (!$json['rows'] > 0) {

+						$json['error'] = __('No data found in csv file.', 'geodirectory');

+					}

+				} else {

+					wp_send_json( $json );

+				}

+			} else {

+				wp_send_json( $json );

+			}

             

-            if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

-                wp_send_json( $json );

-            }

+			if ( $task == 'prepare_import' || !empty( $json['error'] ) ) {

+				wp_send_json( $json );

+			}

             

-            $total = $json['rows'];

-            $limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

-            $processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

+			$total = $json['rows'];

+			$limit = isset($_POST['limit']) ? (int)$_POST['limit'] : 1;

+			$processed = isset($_POST['processed']) ? (int)$_POST['processed'] : 0;

             

-            $count = $limit;

+			$count = $limit;

             

-            if ($count < $total) {

-                $count = $processed + $count;

-                if ($count > $total) {

-                    $count = $total;

-                }

-            } else {

-                $count = $total;

-            }

+			if ($count < $total) {

+				$count = $processed + $count;

+				if ($count > $total) {

+					$count = $total;

+				}

+			} else {

+				$count = $total;

+			}

             

-            $created = 0;

-            $updated = 0;

-            $skipped = 0;

-            $invalid = 0;

-            $invalid_addr = 0;

-            $images = 0;

+			$created = 0;

+			$updated = 0;

+			$skipped = 0;

+			$invalid = 0;

+			$invalid_addr = 0;

+			$images = 0;

             

-            $gd_post_info = array();

-            $countpost = 0;

+			$gd_post_info = array();

+			$countpost = 0;

             

-            $post_types = geodir_get_posttypes();

+			$post_types = geodir_get_posttypes();

 

-            if ( $task == 'import_cat' ) {

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+			if ( $task == 'import_cat' ) {

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

-                        exit;

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = CSV_INVAILD_FILE;

+						wp_send_json( $json );

+						exit;

+					}

                     

-                    $gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');

+					$gd_error_log = __('GD IMPORT CATEGORIES [ROW %d]:', 'geodirectory');

                     

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

-                        $index = $processed + $i;

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

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            //$row = array_map( 'utf8_encode', $row );

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							//$row = array_map( 'utf8_encode', $row );

                             

-                            $cat_id = '';

-                            $cat_name = '';

-                            $cat_slug = '';

-                            $cat_posttype = '';

-                            $cat_parent = '';

-                            $cat_description = '';

-                            $cat_schema = '';

-                            $cat_top_description = '';

-                            $cat_image = '';

-                            $cat_icon = '';

-                            $cat_language = '';

-                            $cat_id_original = '';

+							$cat_id = '';

+							$cat_name = '';

+							$cat_slug = '';

+							$cat_posttype = '';

+							$cat_parent = '';

+							$cat_description = '';

+							$cat_schema = '';

+							$cat_top_description = '';

+							$cat_image = '';

+							$cat_icon = '';

+							$cat_language = '';

+							$cat_id_original = '';

                             

-                            $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

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

-                                    $cat_name = $row[$c];

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

-                                    $cat_slug = $row[$c];

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

-                                    $cat_posttype = $row[$c];

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

-                                    $cat_parent = trim($row[$c]);

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

-                                    $cat_schema = $row[$c];

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

-                                    $cat_description = $row[$c];

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

-                                    $cat_top_description = $row[$c];

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

-                                    $cat_image = $row[$c];

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

-                                    $cat_icon = $row[$c];

-                                }

-                                // WPML

-                                if ( $is_wpml ) {

-                                    if ( $column == 'cat_language' ) {

-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );

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

-                                        $cat_id_original = (int)$row[$c];

-                                    }

-                                }

-                                // WPML

-                                $c++;

-                            }

+							$c = 0;

+							foreach ($columns as $column ) {

+								if ( $column == 'cat_id' ) {

+									$cat_id = (int)$row[$c];

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

+									$cat_name = $row[$c];

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

+									$cat_slug = $row[$c];

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

+									$cat_posttype = $row[$c];

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

+									$cat_parent = trim($row[$c]);

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

+									$cat_schema = $row[$c];

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

+									$cat_description = $row[$c];

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

+									$cat_top_description = $row[$c];

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

+									$cat_image = $row[$c];

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

+									$cat_icon = $row[$c];

+								}

+								// WPML

+								if ( $is_wpml ) {

+									if ( $column == 'cat_language' ) {

+										$cat_language = geodir_strtolower( trim( $row[$c] ) );

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

+										$cat_id_original = (int)$row[$c];

+									}

+								}

+								// WPML

+								$c++;

+							}

                             

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

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

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

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

                                 

-                                $invalid++;

-                                continue;

-                            }

+								$invalid++;

+								continue;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $cat_language != '') {

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

-                            }

-                            // WPML

+							// WPML

+							if ($is_wpml && $cat_language != '') {

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

+							}

+							// WPML

                                                         

-                            $term_data = array();

-                            $term_data['name'] = $cat_name;

-                            $term_data['slug'] = $cat_slug;

-                            $term_data['description'] = $cat_description;

-                            $term_data['cat_schema'] = $cat_schema;

-                            $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+							$term_data = array();

+							$term_data['name'] = $cat_name;

+							$term_data['slug'] = $cat_slug;

+							$term_data['description'] = $cat_description;

+							$term_data['cat_schema'] = $cat_schema;

+							$term_data['top_description'] = $cat_top_description;

+							$term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

+							$term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

                             

-                            //$term_data = array_map( 'utf8_encode', $term_data );

+							//$term_data = array_map( 'utf8_encode', $term_data );

                             

-                            $taxonomy = $cat_posttype . 'category';

+							$taxonomy = $cat_posttype . 'category';

                             

-                            $term_data['taxonomy'] = $taxonomy;

+							$term_data['taxonomy'] = $taxonomy;

 

-                            $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

-                                $term_parent = '';

+							$term_parent_id = 0;

+							if ($cat_parent != "" || (int)$cat_parent > 0) {

+								$term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

-                                    //

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

-                                    //

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

-                                    //

-                                } else {

-                                    $term_parent_data = array();

-                                    $term_parent_data['name'] = $cat_parent;

-                                    //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

-                                    $term_parent_data['taxonomy'] = $taxonomy;

+								if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+									//

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

+									//

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

+									//

+								} else {

+									$term_parent_data = array();

+									$term_parent_data['name'] = $cat_parent;

+									//$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

+									$term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

-                                }

+									$term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+								}

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

-                                }

-                            }

-                            $term_data['parent'] = (int)$term_parent_id;

+								if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

+									$term_parent_id = (int)$term_parent->term_id;

+								}

+							}

+							$term_data['parent'] = (int)$term_parent_id;

 

-                            $term_id = NULL;

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

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-                                    $term_data['term_id'] = $term['term_id'];

+							$term_id = NULL;

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

+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+									$term_data['term_id'] = $term['term_id'];

                                     

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

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-                                    $term_data['term_id'] = $term['term_id'];

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

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+									$term_data['term_id'] = $term['term_id'];

                                     

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

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                } else {

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

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

-                                    $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

-                                    $skipped++;

-                                } else {

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

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

-                            }

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

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								} else {

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

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								}

+							} else if ( $import_choice == 'skip' ) {

+								if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+									$skipped++;

+								} else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+									$skipped++;

+								} else {

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

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+							}

                             

-                            if ( $term_id ) {

-                                // WPML

-                                if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

-                                    $wpml_element_type = 'tax_' . $taxonomy;

-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

-

-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

+							if ( $term_id ) {

+								// WPML

+								if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

+									$wpml_element_type = 'tax_' . $taxonomy;

+									$source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

+

+									$trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

                                     

-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

-                                }

-                                // WPML

+									$sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

+								}

+								// WPML

                                 

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

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

-                                }

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

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

+								}

                                 

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

-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

-                                }

+								if ( isset( $term_data['cat_schema'] ) ) {

+									update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+								}

             

-                                $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+								$attachment = false;

+								if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

+									$cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

+									$cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

-                                        $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

-                                    }

-                                }

+									if ( basename($cat_image) != $term_data['image'] ) {

+										$attachment = true;

+										update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+									}

+								}

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+								if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

+									$cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

+									$cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

                                         

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

-                                        $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

-                                    }

-                                }

+									if ( basename($cat_icon) != $term_data['icon'] ) {

+										$attachment = true;

+										update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+									}

+								}

                                 

-                                if ( $attachment ) {

-                                    $images++;

-                                }

-                            }

+								if ( $attachment ) {

+									$images++;

+								}

+							}

                             

-                            // WPML

-                            if ($is_wpml && $cat_language != '') {

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

-                            }

-                            // WPML

-                        }

-                    }

-                }

+							// WPML

+							if ($is_wpml && $cat_language != '') {

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

+							}

+							// WPML

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

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

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

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

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

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

                 

-                wp_send_json( $json );

-                exit;

-            } else if ( $task == 'import_post' ) {

-                //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

-

-                //remove_all_actions('publish_post');

-                //remove_all_actions('transition_post_status');

-                //remove_all_actions('publish_future_post');

-

-                if (!empty($file)) {

-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

-                    $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

-                    $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+				wp_send_json( $json );

+				exit;

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

+

+				//remove_all_actions('publish_post');

+				//remove_all_actions('transition_post_status');

+				//remove_all_actions('publish_future_post');

+

+				if (!empty($file)) {

+					$is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+					$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

+					$default_status = 'publish';

+					$current_date = date_i18n( 'Y-m-d', time() );

                     

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

-                        exit;

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = CSV_INVAILD_FILE;

+						wp_send_json( $json );

+						exit;

+					}

 

-                    $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

-                    $processed_actual = 0;

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

-                        $index = $processed + $i;

-                        $gd_post = array();

+					$gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

+					$wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

+					$processed_actual = 0;

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

+						$index = $processed + $i;

+						$gd_post = array();

                         

-                        if (isset($file[$index])) {

-                            $processed_actual++;

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+						if (isset($file[$index])) {

+							$processed_actual++;

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							//$row = array_map( 'utf8_encode', $row );

+							$row = array_map( 'addslashes_gpc', $row );

                             

-                            $post_id = '';

-                            $post_title = '';

-                            $post_author = '';

-                            $post_content = '';

-                            $post_category_arr = array();

-                            $default_category = '';

-                            $post_tags = array();

-                            $post_type = '';

-                            $post_status = '';

-                            $geodir_video = '';

-                            $post_address = '';

-                            $post_city = '';

-                            $post_region = '';

-                            $post_country = '';

-                            $post_zip = '';

-                            $post_latitude = '';

-                            $post_longitude = '';

-                            $post_neighbourhood = '';

-                            $neighbourhood_latitude = '';

-                            $neighbourhood_longitude = '';

-                            $geodir_timing = '';

-                            $geodir_contact = '';

-                            $geodir_email = '';

-                            $geodir_website = '';

-                            $geodir_twitter = '';

-                            $geodir_facebook = '';

-                            $geodir_twitter = '';

-                            $post_images = array();

+							$post_id = '';

+							$post_title = '';

+							$post_author = '';

+							$post_content = '';

+							$post_category_arr = array();

+							$default_category = '';

+							$post_tags = array();

+							$post_type = '';

+							$post_status = '';

+							$geodir_video = '';

+							$post_address = '';

+							$post_city = '';

+							$post_region = '';

+							$post_country = '';

+							$post_zip = '';

+							$post_latitude = '';

+							$post_longitude = '';

+							$post_neighbourhood = '';

+							$neighbourhood_latitude = '';

+							$neighbourhood_longitude = '';

+							$geodir_timing = '';

+							$geodir_contact = '';

+							$geodir_email = '';

+							$geodir_website = '';

+							$geodir_twitter = '';

+							$geodir_facebook = '';

+							$geodir_twitter = '';

+							$post_images = array();

                             

-                            $expire_date = 'Never';

+							$expire_date = 'Never';

                             

-                            $language = '';

-                            $original_post_id = '';

+							$language = '';

+							$original_post_id = '';

                             

-                            $c = 0;

-                            foreach ($columns as $column ) {

-                                $gd_post[$column] = $row[$c];

+							$c = 0;

+							foreach ($columns as $column ) {

+								$gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

-                                    $post_id = $row[$c];

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

-                                    $post_title = sanitize_text_field($row[$c]);

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

-                                    $post_author = $row[$c];

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

-                                    $post_content = $row[$c];

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

-                                    $post_category_arr = explode( ',', $row[$c] );

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

-                                    $default_category = wp_kses_normalize_entities($row[$c]);

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

-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );

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

-                                    $post_type = $row[$c];

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

-                                    $post_status = sanitize_key( $row[$c] );

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

-                                    $is_featured = (int)$row[$c];

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

-                                    $geodir_video = $row[$c];

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

-                                    $post_address = sanitize_text_field($row[$c]);

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

-                                    $post_city = sanitize_text_field($row[$c]);

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

-                                    $post_region = sanitize_text_field($row[$c]);

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

-                                    $post_country = sanitize_text_field($row[$c]);

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

-                                    $post_zip = sanitize_text_field($row[$c]);

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

-                                    $post_latitude = sanitize_text_field($row[$c]);

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

-                                    $post_longitude = sanitize_text_field($row[$c]);

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

-                                    $post_neighbourhood = sanitize_text_field($row[$c]);

-                                    unset($gd_post[$column]);

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

-                                    $neighbourhood_latitude = sanitize_text_field($row[$c]);

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

-                                    $neighbourhood_longitude = sanitize_text_field($row[$c]);

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

-                                    $geodir_timing = sanitize_text_field($row[$c]);

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

-                                    $geodir_contact = sanitize_text_field($row[$c]);

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

-                                    $geodir_email = sanitize_email($row[$c]);

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

-                                    $geodir_website = sanitize_text_field($row[$c]);

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

-                                    $geodir_twitter = sanitize_text_field($row[$c]);

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

-                                    $geodir_facebook = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

-                                    $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

-                                    $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

-                                }

-                                // WPML

-                                if ($is_wpml) {

-                                    if ($column == 'language') {

-                                        $language = geodir_strtolower(trim($row[$c]));

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

-                                        $original_post_id = (int)$row[$c];

-                                    }

-                                }

-                                // WPML

-                                $c++;

-                            }

-                            // listing claimed or not

-                            if ($is_claim_active && isset($gd_post['claimed'])) {

-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

-                            }

+								if ( $column == 'post_id' ) {

+									$post_id = $row[$c];

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

+									$post_title = sanitize_text_field($row[$c]);

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

+									$post_author = $row[$c];

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

+									$post_content = $row[$c];

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

+									$post_category_arr = explode( ',', $row[$c] );

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

+									$default_category = wp_kses_normalize_entities($row[$c]);

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

+									$post_tags = explode( ',', sanitize_text_field($row[$c]) );

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

+									$post_type = $row[$c];

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

+									$post_status = sanitize_key( $row[$c] );

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

+									$is_featured = (int)$row[$c];

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

+									$geodir_video = $row[$c];

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

+									$post_address = sanitize_text_field($row[$c]);

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

+									$post_city = sanitize_text_field($row[$c]);

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

+									$post_region = sanitize_text_field($row[$c]);

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

+									$post_country = sanitize_text_field($row[$c]);

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

+									$post_zip = sanitize_text_field($row[$c]);

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

+									$post_latitude = sanitize_text_field($row[$c]);

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

+									$post_longitude = sanitize_text_field($row[$c]);

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

+									$post_neighbourhood = sanitize_text_field($row[$c]);

+									unset($gd_post[$column]);

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

+									$neighbourhood_latitude = sanitize_text_field($row[$c]);

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

+									$neighbourhood_longitude = sanitize_text_field($row[$c]);

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

+									$geodir_timing = sanitize_text_field($row[$c]);

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

+									$geodir_contact = sanitize_text_field($row[$c]);

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

+									$geodir_email = sanitize_email($row[$c]);

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

+									$geodir_website = sanitize_text_field($row[$c]);

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

+									$geodir_twitter = sanitize_text_field($row[$c]);

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

+									$geodir_facebook = sanitize_text_field($row[$c]);

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

+									$post_images[] = $row[$c];

+								} else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

+									$expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

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

+									$row[$c] = str_replace('/', '-', $row[$c]);

+									$expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

+								}

+								// WPML

+								if ($is_wpml) {

+									if ($column == 'language') {

+										$language = geodir_strtolower(trim($row[$c]));

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

+										$original_post_id = (int)$row[$c];

+									}

+								}

+								// WPML

+								$c++;

+							}

+							// listing claimed or not

+							if ($is_claim_active && isset($gd_post['claimed'])) {

+								$gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

+							}

                             

-                            // WPML

-                            if ($is_wpml && $language != '') {

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

-                            }

-                            // WPML

+							// WPML

+							if ($is_wpml && $language != '') {

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

+							}

+							// WPML

 

-                            $gd_post['IMAGE'] = $post_images;

+							$gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+							$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

+							$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

                                                                                                                 

-                            $valid = true;

+							$valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

-                                $invalid++;

-                                $valid = false;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

-                            }

+							if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+								$invalid++;

+								$valid = false;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+							}

                             

-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-                            if ( $location_allowed ) {

-                                $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

-                                    $invalid_addr++;

-                                    $valid = false;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

-                                        $invalid_addr++;

-                                        $valid = false;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                    } else {

-                                        if (!$location_manager) {

-                                            $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

-                                        }

-                                    }

-                                }

-                            }

+							$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+							if ( $location_allowed ) {

+								$location_result = geodir_get_default_location();

+								if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+									$invalid_addr++;

+									$valid = false;

+									geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+								} else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

+									if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+										$invalid_addr++;

+										$valid = false;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+									} else {

+										if (!$location_manager) {

+											$gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

+										}

+									}

+								}

+							}

                             

-                            if ( !$valid ) {

-                                continue;

-                            }

+							if ( !$valid ) {

+								continue;

+							}

 

-                            $cat_taxonomy = $post_type . 'category';

-                            $tags_taxonomy = $post_type . '_tags';

+							$cat_taxonomy = $post_type . 'category';

+							$tags_taxonomy = $post_type . '_tags';

                             

-                            if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

-                                $post_category_arr = array_merge(array($default_category), $post_category_arr);

-                            }

+							if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

+								$post_category_arr = array_merge(array($default_category), $post_category_arr);

+							}

 

-                            $post_category = array();

-                            $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+							$post_category = array();

+							$default_category_id = NULL;

+							if ( !empty( $post_category_arr ) ) {

+								foreach ( $post_category_arr as $value ) {

+									$category_name = wp_kses_normalize_entities( trim( $value ) );

                                     

-                                    if ( $category_name != '' ) {

-                                        $term_category = array();

+									if ( $category_name != '' ) {

+										$term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

-                                            $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

-                                            $term_category = $term;

-                                        } else {

-                                            $term_data = array();

-                                            $term_data['name'] = $category_name;

-                                            $term_data['taxonomy'] = $cat_taxonomy;

+										if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+											$term_category = $term;

+										} else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+											$term_category = $term;

+										} else {

+											$term_data = array();

+											$term_data['name'] = $category_name;

+											$term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

-                                            }

-                                        }

+											$term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

+											if ( $term_id ) {

+												$term_category = get_term( $term_id, $cat_taxonomy );

+											}

+										}

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

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

+										if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

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

                                             

-                                            if ($category_name == $default_category) {

-                                                $default_category_id = intval($term_category->term_id);

-                                            }

-                                        }

-                                    }

-                                }

-                            }

+											if ($category_name == $default_category) {

+												$default_category_id = intval($term_category->term_id);

+											}

+										}

+									}

+								}

+							}

 

-                            $save_post = array();

-                            $save_post['post_title'] = $post_title;

-                            $save_post['post_content'] = $post_content;

-                            $save_post['post_type'] = $post_type;

-                            $save_post['post_author'] = $post_author;

-                            $save_post['post_status'] = $post_status;

-                            $save_post['post_category'] = $post_category;

-                            $save_post['post_tags'] = $post_tags;

-

-                            $saved_post_id = NULL;

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

-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

+							$save_post = array();

+							$save_post['post_title'] = $post_title;

+							$save_post['post_content'] = $post_content;

+							$save_post['post_type'] = $post_type;

+							$save_post['post_author'] = $post_author;

+							$save_post['post_status'] = $post_status;

+							$save_post['post_category'] = $post_category;

+							$save_post['post_tags'] = $post_tags;

+

+							$saved_post_id = NULL;

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

+								$gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

                                 

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

-                                    $save_post['ID'] = $post_id;

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

+									$save_post['ID'] = $post_id;

                                     

-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $saved_post_id = $post_id;

-                                            $updated++;

-                                        }

-                                    }

-                                } else {

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

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $created++;

-                                        }

-                                    }

-                                }

+									if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

+										if ( is_wp_error( $saved_post_id ) ) {

+											$gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+											$saved_post_id = 0;

+										} else {

+											$saved_post_id = $post_id;

+											$updated++;

+										}

+									}

+								} else {

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

+										if ( is_wp_error( $saved_post_id ) ) {

+											$gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+											$saved_post_id = 0;

+										} else {

+											$created++;

+										}

+									}

+								}

                                 

-                                if ( !$saved_post_id > 0 ) {

-                                    $invalid++;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

-                                }

-                            } else if ( $import_choice == 'skip' ) {

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

-                                    $skipped++;	

-                                } else {

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

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $invalid++;

+								if ( !$saved_post_id > 0 ) {

+									$invalid++;

+									geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

+								}

+							} else if ( $import_choice == 'skip' ) {

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

+									$skipped++;	

+								} else {

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

+										if ( is_wp_error( $saved_post_id ) ) {

+											$invalid++;

                                             

-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

-                                            $saved_post_id = 0;

-                                        } else {

-                                            $created++;

-                                        }

-                                    } else {

-                                        $invalid++;

+											geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

+											$saved_post_id = 0;

+										} else {

+											$created++;

+										}

+									} else {

+										$invalid++;

                                         

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+									}

+								}

+							} else {

+								$invalid++;

                                 

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

-                            }

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+							}

 

-                            if ( (int)$saved_post_id > 0 ) {

-                                // WPML

-                                if ($is_wpml && $original_post_id > 0 && $language != '') {

-                                    $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

-                                    $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

+							if ( (int)$saved_post_id > 0 ) {

+								// WPML

+								if ($is_wpml && $original_post_id > 0 && $language != '') {

+									$wpml_post_type = 'post_' . $post_type;

+									$source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+									$source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+									$trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

-                                }

-                                // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+									$sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+								}

+								// WPML

+								$gd_post_info = geodir_get_post_info( $saved_post_id );

                                 

-                                $gd_post['post_id'] = $saved_post_id;

-                                $gd_post['ID'] = $saved_post_id;

-                                $gd_post['post_tags'] = $post_tags;

-                                $gd_post['post_title'] = $post_title;

-                                $gd_post['post_status'] = $post_status;

-                                $gd_post['submit_time'] = time();

-                                $gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

+								$gd_post['post_id'] = $saved_post_id;

+								$gd_post['ID'] = $saved_post_id;

+								$gd_post['post_tags'] = $post_tags;

+								$gd_post['post_title'] = $post_title;

+								$gd_post['post_status'] = $post_status;

+								$gd_post['submit_time'] = time();

+								$gd_post['submit_ip'] = $_SERVER['REMOTE_ADDR'];

                                                     

-                                // post location

-                                $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

-                                    $gd_post['post_neighbourhood'] = '';

+								// post location

+								$post_location_id = 0;

+								if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+									$gd_post['post_neighbourhood'] = '';

                                     

-                                    $post_location_info = array(

-                                                                'city' => $post_city,

-                                                                'region' => $post_region,

-                                                                'country' => $post_country,

-                                                                'geo_lat' => $post_latitude,

-                                                                'geo_lng' => $post_longitude

-                                                            );

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

-                                        $post_location_id = $location_id;

-                                    }

+									$post_location_info = array(

+																'city' => $post_city,

+																'region' => $post_region,

+																'country' => $post_country,

+																'geo_lat' => $post_latitude,

+																'geo_lng' => $post_longitude

+															);

+									if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+										$post_location_id = $location_id;

+									}

                                     

-                                    if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {

-                                        $neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id);

+									if ($post_location_id > 0 && $neighbourhood_active && !empty($post_neighbourhood)) {

+										$neighbourhood_info = geodir_location_neighbourhood_by_name_loc_id($post_neighbourhood, $post_location_id);

 

-                                        $hood_data = array();

-                                        $hood_data['hood_location_id'] = $post_location_id;

-                                        $hood_data['hood_name'] = $post_neighbourhood;

+										$hood_data = array();

+										$hood_data['hood_location_id'] = $post_location_id;

+										$hood_data['hood_name'] = $post_neighbourhood;

                                         

-                                        if (!empty($neighbourhood_info)) {

-                                            $hood_data['hood_id'] = $neighbourhood_info->hood_id;

-                                            $hood_data['hood_slug'] = $neighbourhood_info->hood_slug;

+										if (!empty($neighbourhood_info)) {

+											$hood_data['hood_id'] = $neighbourhood_info->hood_id;

+											$hood_data['hood_slug'] = $neighbourhood_info->hood_slug;

                                             

-                                            if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

-                                                $neighbourhood_latitude = $neighbourhood_info->hood_latitude;

-                                                $neighbourhood_longitude = $neighbourhood_info->hood_longitude;

-                                            }

-                                        }

+											if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

+												$neighbourhood_latitude = $neighbourhood_info->hood_latitude;

+												$neighbourhood_longitude = $neighbourhood_info->hood_longitude;

+											}

+										}

                                         

-                                        if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

-                                            $neighbourhood_latitude = $neighbourhood_info->hood_latitude;

-                                            $neighbourhood_longitude = $neighbourhood_info->hood_longitude;

-                                        }

+										if (empty($neighbourhood_latitude) || empty($neighbourhood_longitude)) {

+											$neighbourhood_latitude = $neighbourhood_info->hood_latitude;

+											$neighbourhood_longitude = $neighbourhood_info->hood_longitude;

+										}

                                         

-                                        $hood_data['hood_latitude'] = $post_latitude;

-                                        $hood_data['hood_longitude'] = $post_longitude;

+										$hood_data['hood_latitude'] = $post_latitude;

+										$hood_data['hood_longitude'] = $post_longitude;

 

-                                        $neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data);

-                                        if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {

-                                            $gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug;

-                                        }

-                                    }

-                                }

-                                $gd_post['post_location_id'] = $post_location_id;

+										$neighbourhood_info = geodir_location_insert_update_neighbourhood($hood_data);

+										if (!empty($neighbourhood_info) && isset($neighbourhood_info->hood_slug)) {

+											$gd_post['post_neighbourhood'] = $neighbourhood_info->hood_slug;

+										}

+									}

+								}

+								$gd_post['post_location_id'] = $post_location_id;

                                 

-                                // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

-                                if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

-                                    $package_id = $gd_post_info->package_id;

-                                }

+								// post package info

+								$package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+								if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

+									$package_id = $gd_post_info->package_id;

+								}

                                 

-                                $package_info = array();

-                                if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+								$package_info = array();

+								if ($package_id && function_exists('geodir_get_package_info_by_id')) {

+									$package_info = (array)geodir_get_package_info_by_id($package_id);

                                     

-                                    if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

-                                        $package_info = array();

-                                    }

-                                }

+									if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

+										$package_info = array();

+									}

+								}

                                 

-                                if (empty($package_info)) {

-                                    $package_info = (array)geodir_post_package_info( array(), '', $post_type );

-                                }

+								if (empty($package_info)) {

+									$package_info = (array)geodir_post_package_info( array(), '', $post_type );

+								}

                                  

-                                if (!empty($package_info))	 {

-                                    $package_id = $package_info['pid'];

+								if (!empty($package_info))	 {

+									$package_id = $package_info['pid'];

                                     

-                                    if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

-                                        $gd_post['expire_date'] = $expire_date;

-                                    } else {

-                                        if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

-                                            $gd_post['alive_days'] = (int)$package_info['days'];

-                                            $gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

-                                        } else {

-                                            $gd_post['expire_date'] = 'Never';

-                                        }

-                                    }

+									if (isset($gd_post['alive_days']) || isset($gd_post['expire_date'])) {

+										$gd_post['expire_date'] = $expire_date;

+									} else {

+										if ( isset( $package_info['days'] ) && (int)$package_info['days'] > 0 ) {

+											$gd_post['alive_days'] = (int)$package_info['days'];

+											$gd_post['expire_date'] = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$package_info['days'] . ' days' ) );

+										} else {

+											$gd_post['expire_date'] = 'Never';

+										}

+									}

                                     

-                                    $gd_post['package_id'] = $package_id;

-                                }

+									$gd_post['package_id'] = $package_id;

+								}

 

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

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

                                 

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

-                                    $gd_post = geodir_imex_process_event_data($gd_post);

-                                }

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

+									$gd_post = geodir_imex_process_event_data($gd_post);

+								}

                                 

-                                if (isset($gd_post['post_id'])) {

-                                    unset($gd_post['post_id']);

-                                }

+								if (isset($gd_post['post_id'])) {

+									unset($gd_post['post_id']);

+								}

 

-                                // Export franchise fields

-                                $is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

-                                if ($is_franchise_active) {

-                                    if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

-                                        $gd_franchise_lock = array();

+								// Export franchise fields

+								$is_franchise_active = is_plugin_active( 'geodir_franchise/geodir_franchise.php' ) && geodir_franchise_enabled( $post_type ) ? true : false;

+								if ($is_franchise_active) {

+									if ( isset( $gd_post['gd_is_franchise'] ) && (int)$gd_post['gd_is_franchise'] == 1 ) {

+										$gd_franchise_lock = array();

                                         

-                                        if ( isset( $gd_post['gd_franchise_lock'] ) ) {

-                                            $gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

-                                            $gd_franchise_lock = trim( $gd_franchise_lock );

-                                            $gd_franchise_lock = explode( ",", $gd_franchise_lock );

-                                        }

+										if ( isset( $gd_post['gd_franchise_lock'] ) ) {

+											$gd_franchise_lock = str_replace(" ", "", $gd_post['gd_franchise_lock'] );

+											$gd_franchise_lock = trim( $gd_franchise_lock );

+											$gd_franchise_lock = explode( ",", $gd_franchise_lock );

+										}

                                         

-                                        update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

-                                        update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

-                                    } else {

-                                        if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

-                                            geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

-                                        }

-                                    }

-                                }

+										update_post_meta( $saved_post_id, 'gd_is_franchise', 1 );

+										update_post_meta( $saved_post_id, 'gd_franchise_lock', $gd_franchise_lock );

+									} else {

+										if ( isset( $gd_post['franchise'] ) && (int)$gd_post['franchise'] > 0 && geodir_franchise_check( (int)$gd_post['franchise'] ) ) {

+											geodir_save_post_meta( $saved_post_id, 'franchise', (int)$gd_post['franchise'] );

+										}

+									}

+								}

                                 

-                                if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

-                                    $save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

-                                    if ($default_category_id) {

-                                        $save_post['post_default_category'] = $default_category_id;

-                                        $gd_post['default_category'] = $default_category_id;

-                                    }

-                                    $gd_post[$cat_taxonomy] = $save_post['post_category'];

-                                }

+								if (!empty($save_post['post_category']) && is_array($save_post['post_category'])) {

+									$save_post['post_category'] = array_unique( array_map( 'intval', $save_post['post_category'] ) );

+									if ($default_category_id) {

+										$save_post['post_default_category'] = $default_category_id;

+										$gd_post['default_category'] = $default_category_id;

+									}

+									$gd_post[$cat_taxonomy] = $save_post['post_category'];

+								}

                                 

-                                // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

-                                // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+								// Save post info

+								geodir_save_post_info( $saved_post_id, $gd_post );

+								// post taxonomies

+								if ( !empty( $save_post['post_category'] ) ) {

+									wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

-                                    if ($default_category_id) {

-                                        $post_default_category = $default_category_id;

-                                    }

-                                    $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

-                                    $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

+									$post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+									if ($default_category_id) {

+										$post_default_category = $default_category_id;

+									}

+									$post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

+									$save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

+									$post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

                                     

-                                    if ($post_category_str != '' && $post_default_category) {

-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

-                                    }

+									if ($post_category_str != '' && $post_default_category) {

+										$post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

+									}

                                     

-                                    $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

+									$post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

-                                }

+									geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+								}

 

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

-                                }

+								if ( !empty( $save_post['post_tags'] ) ) {

+									wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+								}

 

-                                // Post images

-                                if ( !empty( $post_images ) ) {

-                                    $post_images = array_unique($post_images);

+								// Post images

+								if ( !empty( $post_images ) ) {

+									$post_images = array_unique($post_images);

                                     

-                                    $old_post_images_arr = array();

-                                    $saved_post_images_arr = array();

+									$old_post_images_arr = array();

+									$saved_post_images_arr = array();

                                     

-                                    $order = 1;

+									$order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

-                                    if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

-                                            if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

-                                                $old_post_images_arr[] = $old_post_image->file;

-                                            }

-                                        }

-                                    }

+									$old_post_images = geodir_get_images( $saved_post_id );

+									if (!empty($old_post_images)) {

+										foreach( $old_post_images as $old_post_image ) {

+											if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

+												$old_post_images_arr[] = $old_post_image->file;

+											}

+										}

+									}

 

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

-                                        $saved_post_images_arr[] = $image_name;

+									foreach ( $post_images as $post_image ) {

+										$image_name = basename( $post_image );

+										$saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

-                                            continue; // Skip if image already exists.

-                                        }

+										if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+											continue; // Skip if image already exists.

+										}

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

+										$image_name_parts = explode( '.', $image_name );

+										array_pop( $image_name_parts );

+										$proper_image_name = implode( '.', $image_name_parts );

                                         

-                                        $arr_file_type = wp_check_filetype( $image_name );

+										$arr_file_type = wp_check_filetype( $image_name );

                                         

-                                        if ( !empty( $arr_file_type ) ) {

-                                            $uploaded_file_type = $arr_file_type['type'];

+										if ( !empty( $arr_file_type ) ) {

+											$uploaded_file_type = $arr_file_type['type'];

                                             

-                                            $attachment = array();

-                                            $attachment['post_id'] = $saved_post_id;

-                                            $attachment['title'] = $proper_image_name;

-                                            $attachment['content'] = '';

-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;

-                                            $attachment['mime_type'] = $uploaded_file_type;

-                                            $attachment['menu_order'] = $order;

-                                            $attachment['is_featured'] = 0;

-

-                                            $attachment_set = '';

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

-                                                if ( $val != '' ) {

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

-                                                }

-                                            }

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

+											$attachment = array();

+											$attachment['post_id'] = $saved_post_id;

+											$attachment['title'] = $proper_image_name;

+											$attachment['content'] = '';

+											$attachment['file'] = $uploads_subdir . '/' . $image_name;

+											$attachment['mime_type'] = $uploaded_file_type;

+											$attachment['menu_order'] = $order;

+											$attachment['is_featured'] = 0;

+

+											$attachment_set = '';

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

+												if ( $val != '' ) {

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

+												}

+											}

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

                                                                                         

-                                            // Add new attachment

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+											// Add new attachment

+											$wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

                                                                                         

-                                            $order++;

-                                        }

-                                    }

+											$order++;

+										}

+									}

 

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

-                                    // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

+									$saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+									// Remove previous attachment

+									$wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

                                     

-                                    if ( !empty( $saved_post_images_arr ) ) {

-                                        geodir_set_wp_featured_image($saved_post_id);

-                                        /*

+									if ( !empty( $saved_post_images_arr ) ) {

+										geodir_set_wp_featured_image($saved_post_id);

+										/*

                                         $menu_order = 1;

                                         

                                         foreach ( $saved_post_images_arr as $img_name ) {

@@ -4910,281 +4910,281 @@ 
                                             }

                                             $menu_order++;

                                         }*/

-                                    }

+									}

                                     

-                                    if ( $order > 1 ) {

-                                        $images++;

-                                    }

-                                }

+									if ( $order > 1 ) {

+										$images++;

+									}

+								}

 

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

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

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

+								do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

                                 

-                                if (isset($is_featured)) {

-                                    geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

-                                }

-                                if (isset($gd_post['expire_date'])) {

-                                    geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

-                                }

-                            }

+								if (isset($is_featured)) {

+									geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

+								}

+								if (isset($gd_post['expire_date'])) {

+									geodir_save_post_meta($saved_post_id, 'expire_date', $gd_post['expire_date']);

+								}

+							}

                             

-                            // WPML

-                            if ($is_wpml && $language != '') {

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

-                            }

-                            // WPML

-                        }

-                    }

-                }

+							// WPML

+							if ($is_wpml && $language != '') {

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

+							}

+							// WPML

+						}

+					}

+				}

 

-                //undo some stuff to make the import quicker

-                wp_defer_term_counting( false );

-                wp_defer_comment_counting( false );

-                $wpdb->query( 'COMMIT;' );

-                $wpdb->query( 'SET autocommit = 1;' );

-

-                $json = array();

-                $json['processed'] = $processed_actual;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['invalid_addr'] = $invalid_addr;

-                $json['images'] = $images;

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

+

+				$json = array();

+				$json['processed'] = $processed_actual;

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

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

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

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

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

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

                 

-                wp_send_json( $json );

-                exit;

-            } else if ( $task == 'import_loc' ) {

-                global $gd_post_types;

-                $gd_post_types = $post_types;

+				wp_send_json( $json );

+				exit;

+			} else if ( $task == 'import_loc' ) {

+				global $gd_post_types;

+				$gd_post_types = $post_types;

                 

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

-                    }

+					if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+						$json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

+						wp_send_json( $json );

+					}

                     

-                    $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

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

-                        $index = $processed + $i;

+					$gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

+					$gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

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

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            $data = array();

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							$data = array();

                             

-                            foreach ($columns as $c => $column ) {

-                                if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta', 'city_desc', 'region_meta', 'region_desc', 'country_meta', 'country_desc'))) {

-                                    $data[$column] = $row[$c];

-                                }

-                            }

+							foreach ($columns as $c => $column ) {

+								if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta', 'city_desc', 'region_meta', 'region_desc', 'country_meta', 'country_desc'))) {

+									$data[$column] = $row[$c];

+								}

+							}

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                continue;

-                            }

+							if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+								continue;

+							}

                             

-                            $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

+							$data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

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

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

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

+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+									$data['location_id'] = (int)$location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    }

+									if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									} else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

+										$data['location_id'] = (int)$location->location_id;

+									}

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                } else {

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

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $skipped++;

-                                } else {

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

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

-                            }

-                        }

-                    }

-                }

+									if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								} else {

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

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								}

+							} elseif ( $import_choice == 'skip' ) {

+								if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+									$skipped++;

+								} else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+									$skipped++;

+								} else {

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

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+							}

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

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

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

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

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

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

                 

-                wp_send_json( $json );

-            } else if ( $task == 'import_hood' ) {               

-                if (!empty($file)) {

-                    $columns = isset($file[0]) ? $file[0] : NULL;

+				wp_send_json( $json );

+			} else if ( $task == 'import_hood' ) {               

+				if (!empty($file)) {

+					$columns = isset($file[0]) ? $file[0] : NULL;

                     

-                    if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-                        $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

-                    }

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

+					}

                     

-                    $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

-                    $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

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

-                        $index = $processed + $i;

+					$gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

+					$gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

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

+						$index = $processed + $i;

                         

-                        if (isset($file[$index])) {

-                            $row = $file[$index];

-                            $row = array_map( 'trim', $row );

-                            $data = array();

+						if (isset($file[$index])) {

+							$row = $file[$index];

+							$row = array_map( 'trim', $row );

+							$data = array();

                             

-                            foreach ($columns as $c => $column) {

-                                if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {

-                                    $data[$column] = sanitize_text_field($row[$c]);

-                                }

-                            }

+							foreach ($columns as $c => $column) {

+								if (in_array($column, array('neighbourhood_id', 'neighbourhood_name', 'neighbourhood_slug', 'latitude', 'longitude', 'location_id', 'city', 'region', 'country'))) {

+									$data[$column] = sanitize_text_field($row[$c]);

+								}

+							}

 

-                            if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                continue;

-                            }

+							if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+								continue;

+							}

                             

-                            $location_info = array();

-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);

-                            } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

-                                $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

-                            }

+							$location_info = array();

+							if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

+								$location_info = geodir_get_location_by_id('', (int)$data['location_id']);

+							} else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

+								$location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

+							}

 

-                            if (empty($location_info)) {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                continue;

-                            }

+							if (empty($location_info)) {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+								continue;

+							}

                             

-                            $location_id = $location_info->location_id;

+							$location_id = $location_info->location_id;

 

-                            $data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0;

+							$data['neighbourhood_id'] = isset($data['neighbourhood_id']) ? absint($data['neighbourhood_id']) : 0;

                             

-                            $hood_data = array();

-                            $hood_data['hood_name'] = $data['neighbourhood_name'];

-                            $hood_data['hood_slug'] = $data['neighbourhood_slug'];

-                            $hood_data['hood_latitude'] = $data['latitude'];

-                            $hood_data['hood_longitude'] = $data['longitude'];

-                            $hood_data['hood_location_id'] = $location_id;

+							$hood_data = array();

+							$hood_data['hood_name'] = $data['neighbourhood_name'];

+							$hood_data['hood_slug'] = $data['neighbourhood_slug'];

+							$hood_data['hood_latitude'] = $data['latitude'];

+							$hood_data['hood_longitude'] = $data['longitude'];

+							$hood_data['hood_location_id'] = $location_id;

                                     

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

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];

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

+								if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+									$hood_data['hood_id'] = (int)$data['neighbourhood_id'];

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

+									$hood_data['hood_id'] = (int)$neighbourhood->hood_id;

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $updated++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                } else {

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $skipped++;

-                                } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $skipped++;

-                                } else {

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$updated++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								} else {

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								}

+							} elseif ( $import_choice == 'skip' ) {

+								if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+									$skipped++;

+								} else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

+									$skipped++;

+								} else {

                                     

-                                    if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

-                                        $created++;

-                                    } else {

-                                        $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                                    }

-                                }

-                            } else {

-                                $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

-                            }

-                        }

-                    }

-                }

+									if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

+										$created++;

+									} else {

+										$invalid++;

+										geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+									}

+								}

+							} else {

+								$invalid++;

+								geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+							}

+						}

+					}

+				}

                 

-                $json = array();

-                $json['processed'] = $limit;

-                $json['created'] = $created;

-                $json['updated'] = $updated;

-                $json['skipped'] = $skipped;

-                $json['invalid'] = $invalid;

-                $json['images'] = $images;

+				$json = array();

+				$json['processed'] = $limit;

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

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

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

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

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

                 

-                wp_send_json( $json );

-            }

-        }

-        break;

-        case 'import_finish':{

-            /**

-             * Run an action when an import finishes.

-             *

-             * This action can be used to fire functions after an import ends.

-             *

-             * @since 1.5.3

-             * @package GeoDirectory

-             */

-            do_action('geodir_import_finished');

-        }

-        break;

+				wp_send_json( $json );

+			}

+		}

+		break;

+		case 'import_finish':{

+			/**

+			 * Run an action when an import finishes.

+			 *

+			 * This action can be used to fire functions after an import ends.

+			 *

+			 * @since 1.5.3

+			 * @package GeoDirectory

+			 */

+			do_action('geodir_import_finished');

+		}

+		break;

 

-    }

-    echo '0';

-    gd_die();

+	}

+	echo '0';

+	gd_die();

 }

 

 /**

@@ -5228,12 +5228,12 @@ 
 		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

 	}

 	

-    if( !empty( $term ) ) {

+	if( !empty( $term ) ) {

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

-        if( !is_wp_error( $result ) ) {

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

-        }

-    }

+		if( !is_wp_error( $result ) ) {

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

+		}

+	}

 	

 	return false;

 }

@@ -5279,16 +5279,16 @@ 
 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

 		if( !is_wp_error( $result ) ) {

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

-        }

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

+		}

 	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

 		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

 		

 		if( !is_wp_error( $result ) ) {

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

-        }

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

+		}

 	} else {

 		return geodir_imex_insert_term( $taxonomy, $term_data );

 	}

@@ -5310,47 +5310,47 @@ 
  * @return int Posts count.

  */

 function geodir_get_posts_count( $post_type ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( !post_type_exists( $post_type ) ) {

-        return 0;

-    }

+	if ( !post_type_exists( $post_type ) ) {

+		return 0;

+	}

         

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

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

 

-    // Skip listing with statuses trash, auto-draft etc...

-    $skip_statuses = geodir_imex_export_skip_statuses();

-    $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-    }

+	// Skip listing with statuses trash, auto-draft etc...

+	$skip_statuses = geodir_imex_export_skip_statuses();

+	$where_statuses = '';

+	if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

+		$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+	}

     

-    /**

-     * Filter the SQL where clause part to filter posts count in import/export.

-     *

-     * @since 1.6.4

-     * @package GeoDirectory

-     *

-     * @param string $where SQL where clause part.

-     */

-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

-

-    $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

-

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

+	/**

+	 * Filter the SQL where clause part to filter posts count in import/export.

+	 *

+	 * @since 1.6.4

+	 * @package GeoDirectory

+	 *

+	 * @param string $where SQL where clause part.

+	 */

+	$where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

+

+	$query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

+

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

     

-    /**

-     * Modify returned post counts for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param int $posts_count Post counts.

-     * @param string $post_type Post type.

-     */

-    $posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

-

-    return $posts_count;

+	/**

+	 * Modify returned post counts for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param int $posts_count Post counts.

+	 * @param string $post_type Post type.

+	 */

+	$posts_count = apply_filters( 'geodir_imex_count_posts', $posts_count, $post_type );

+

+	return $posts_count;

 }

 

 /**

@@ -5378,10 +5378,10 @@ 
 	

 	if ( !empty( $posts ) ) {

 		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

-        $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

-        $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-        $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;

-        $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+		$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

+		$location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+		$neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;

+		$is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

 		

 		$csv_row = array();

 		$csv_row[] = 'post_id';

@@ -5413,7 +5413,7 @@ 
 		}

 		$csv_row[] = 'post_status';

 		$csv_row[] = 'is_featured';

-        // Export claim listing field

+		// Export claim listing field

 		if ($is_claim_active) {

 			$csv_row[] = 'claimed';

 		}

@@ -5421,7 +5421,7 @@ 
 			$csv_row[] = 'package_id';

 			$csv_row[] = 'expire_date';

 		}

-        $csv_row[] = 'post_date';

+		$csv_row[] = 'post_date';

 		$csv_row[] = 'post_address';

 		$csv_row[] = 'post_city';

 		$csv_row[] = 'post_region';

@@ -5429,11 +5429,11 @@ 
 		$csv_row[] = 'post_zip';

 		$csv_row[] = 'post_latitude';

 		$csv_row[] = 'post_longitude';

-        if ($neighbourhood_active) {

-            $csv_row[] = 'post_neighbourhood';

-            $csv_row[] = 'neighbourhood_latitude';

-            $csv_row[] = 'neighbourhood_longitude';

-        }

+		if ($neighbourhood_active) {

+			$csv_row[] = 'post_neighbourhood';

+			$csv_row[] = 'neighbourhood_latitude';

+			$csv_row[] = 'neighbourhood_longitude';

+		}

 		$csv_row[] = 'geodir_timing';

 		$csv_row[] = 'geodir_contact';

 		$csv_row[] = 'geodir_email';

@@ -5465,21 +5465,21 @@ 
 			$csv_row[] = 'franchise';

 		}

         

-        /**

-         * Filter columns field names of gd export listings csv.

-         *

-         * @since 1.6.5

-         * @package GeoDirectory

-         *

-         * @param array $csv_row Column names being exported in csv.

-         * @param string $post_type The post type.

-         */

-        $csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);

+		/**

+		 * Filter columns field names of gd export listings csv.

+		 *

+		 * @since 1.6.5

+		 * @package GeoDirectory

+		 *

+		 * @param array $csv_row Column names being exported in csv.

+		 * @param string $post_type The post type.

+		 */

+		$csv_row = apply_filters('geodir_export_listing_csv_column_names', $csv_row, $post_type);

 		

 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

+		$xx=0;

 		foreach ( $posts as $post ) {$xx++;

 			$post_id = $post['ID'];

 			

@@ -5610,14 +5610,14 @@ 
 			}

 			$csv_row[] = $post_info['post_status']; // post_status

 			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

-            if ($is_claim_active) {

-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

-            }

+			if ($is_claim_active) {

+				$csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

+			}

 			if ($is_payment_plugin) {

 				$csv_row[] = (int)$post_info['package_id']; // package_id

 				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

 			}

-            $csv_row[] = $post_info['post_date']; // post_date

+			$csv_row[] = $post_info['post_date']; // post_date

 			$csv_row[] = $post_info['post_address']; // post_address

 			$csv_row[] = $post_info['post_city']; // post_city

 			$csv_row[] = $post_info['post_region']; // post_region

@@ -5625,21 +5625,21 @@ 
 			$csv_row[] = $post_info['post_zip']; // post_zip

 			$csv_row[] = $post_info['post_latitude']; // post_latitude

 			$csv_row[] = $post_info['post_longitude']; // post_longitude

-            if ($neighbourhood_active) {

-                $post_neighbourhood = '';

-                $neighbourhood_latitude = '';

-                $neighbourhood_longitude = '';

-                if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {

-                    if (!empty($hood_info)) {

-                        $post_neighbourhood = $hood_info->hood_name;

-                        $neighbourhood_latitude = $hood_info->hood_latitude;

-                        $neighbourhood_longitude = $hood_info->hood_longitude;

-                    }

-                }

-                $csv_row[] = $post_neighbourhood; // post_neighbourhood

-                $csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude

-                $csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude

-            }

+			if ($neighbourhood_active) {

+				$post_neighbourhood = '';

+				$neighbourhood_latitude = '';

+				$neighbourhood_longitude = '';

+				if (!empty($post_info['post_neighbourhood']) && ($hood_info = geodir_location_get_neighbourhood_by_id($post_info['post_neighbourhood'], true, $post_info['post_location_id']))) {

+					if (!empty($hood_info)) {

+						$post_neighbourhood = $hood_info->hood_name;

+						$neighbourhood_latitude = $hood_info->hood_latitude;

+						$neighbourhood_longitude = $hood_info->hood_longitude;

+					}

+				}

+				$csv_row[] = $post_neighbourhood; // post_neighbourhood

+				$csv_row[] = $neighbourhood_latitude; // neighbourhood_latitude

+				$csv_row[] = $neighbourhood_longitude; // neighbourhood_longitude

+			}

 			$csv_row[] = $post_info['geodir_timing']; // geodir_timing

 			$csv_row[] = $post_info['geodir_contact']; // geodir_contact

 			$csv_row[] = $post_info['geodir_email']; // geodir_email

@@ -5679,16 +5679,16 @@ 
 				$csv_row[] = (int)$franchise; // franchise id

 			}

             

-            /**

-             * Filter columns values of gd export listings csv file

-             *

-             * @since 1.6.5

-             * @package GeoDirectory

-             *

-             * @param array $csv_row Field values being exported in csv.

-             * @param array $post_info The post info.

-             */

-            $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

+			/**

+			 * Filter columns values of gd export listings csv file

+			 *

+			 * @since 1.6.5

+			 * @package GeoDirectory

+			 *

+			 * @param array $csv_row Field values being exported in csv.

+			 * @param array $post_info The post info.

+			 */

+			$csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

 			

 			for ( $c = 0; $c < $images_count; $c++ ) {

 				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

@@ -5721,64 +5721,64 @@ 
  * @return array Array of posts data.

  */

 function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

-        return new stdClass;

+	if ( ! post_type_exists( $post_type ) )

+		return new stdClass;

         

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

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

 

-    $limit = '';

-    if ( $per_page > 0 && $page_no > 0 ) {

-        $offset = ( $page_no - 1 ) * $per_page;

+	$limit = '';

+	if ( $per_page > 0 && $page_no > 0 ) {

+		$offset = ( $page_no - 1 ) * $per_page;

         

-        if ( $offset > 0 ) {

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

-        } else {

-            $limit = " LIMIT " . $per_page;

-        }

-    }

+		if ( $offset > 0 ) {

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

+		} else {

+			$limit = " LIMIT " . $per_page;

+		}

+	}

 

-    // Skip listing with statuses trash, auto-draft etc...

-    $skip_statuses = geodir_imex_export_skip_statuses();

-    $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-    }

+	// Skip listing with statuses trash, auto-draft etc...

+	$skip_statuses = geodir_imex_export_skip_statuses();

+	$where_statuses = '';

+	if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

+		$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+	}

     

-    /**

-     * Filter the SQL where clause part to filter posts in import/export.

-     *

-     * @since 1.6.4

-     * @package GeoDirectory

-     *

-     * @param string $where SQL where clause part.

-     */

-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

-

-    $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

-    /**

-     * Modify returned posts SQL query for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param int $query The SQL query.

-     * @param string $post_type Post type.

-     */

-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

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

-

-    /**

-     * Modify returned post results for the current post type.

-     *

-     * @since 1.4.6

-     * @package GeoDirectory

-     *

-     * @param object $results An object containing all post ids.

-     * @param string $post_type Post type.

-     */

-    return apply_filters( 'geodir_export_posts', $results, $post_type );

+	/**

+	 * Filter the SQL where clause part to filter posts in import/export.

+	 *

+	 * @since 1.6.4

+	 * @package GeoDirectory

+	 *

+	 * @param string $where SQL where clause part.

+	 */

+	$where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+

+	$query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

+	/**

+	 * Modify returned posts SQL query for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param int $query The SQL query.

+	 * @param string $post_type Post type.

+	 */

+	$query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

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

+

+	/**

+	 * Modify returned post results for the current post type.

+	 *

+	 * @since 1.4.6

+	 * @package GeoDirectory

+	 *

+	 * @param object $results An object containing all post ids.

+	 * @param string $post_type Post type.

+	 */

+	return apply_filters( 'geodir_export_posts', $results, $post_type );

 }

 

 /**

@@ -5797,26 +5797,26 @@ 
  * @return string The SQL query.

  */

 function geodir_imex_get_events_query( $query, $post_type ) {

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

-        global $wpdb, $plugin_prefix;

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

+		global $wpdb, $plugin_prefix;

         

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

-        $schedule_table = EVENT_SCHEDULE;

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

+		$schedule_table = EVENT_SCHEDULE;

         

-        // Skip listing with statuses trash, auto-draft etc...

-        $skip_statuses = geodir_imex_export_skip_statuses();

-        $where_statuses = '';

-        if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

-        }

+		// Skip listing with statuses trash, auto-draft etc...

+		$skip_statuses = geodir_imex_export_skip_statuses();

+		$where_statuses = '';

+		if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

+			$where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+		}

         

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

-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

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

+		$where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

 

-        $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

-    }

+		$query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

+	}

 

-    return $query;

+	return $query;

 }

 

 /**

@@ -5838,36 +5838,36 @@ 
  * @return int Total terms count.

  */

 function geodir_get_terms_count( $post_type ) {

-    $args = array( 'hide_empty' => 0 );

+	$args = array( 'hide_empty' => 0 );

 

-    remove_all_filters( 'get_terms' );

+	remove_all_filters( 'get_terms' );

 

-    $taxonomy = $post_type . 'category';

+	$taxonomy = $post_type . 'category';

 

-    // WPML

-    $is_wpml = geodir_is_wpml();

-    $active_lang = 'all';

-    if ( $is_wpml ) {

-        global $sitepress;

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

+	// WPML

+	$is_wpml = geodir_is_wpml();

+	$active_lang = 'all';

+	if ( $is_wpml ) {

+		global $sitepress;

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

         

-        if ( $active_lang != 'all' ) {

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

-        }

-    }

-    // WPML

+		if ( $active_lang != 'all' ) {

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

+		}

+	}

+	// WPML

             

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

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

 

-    // WPML

-    if ( $is_wpml && $active_lang !== 'all' ) {

-        global $sitepress;

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

-    }

-    // WPML

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

+	// WPML

+	if ( $is_wpml && $active_lang !== 'all' ) {

+		global $sitepress;

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

+	}

+	// WPML

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

      

-    return $count_terms;

+	return $count_terms;

 }

 

 /**

@@ -5906,11 +5906,11 @@ 
 		$csv_row[] = 'cat_posttype';

 		$csv_row[] = 'cat_parent';

 		$csv_row[] = 'cat_schema';

-        // WPML

+		// WPML

 		$is_wpml = geodir_is_wpml();

 		if ($is_wpml) {

 			$csv_row[] = 'cat_language';

-            $csv_row[] = 'cat_id_original';

+			$csv_row[] = 'cat_id_original';

 		}

 		// WPML

 		$csv_row[] = 'cat_description';

@@ -5940,10 +5940,10 @@ 
 			$csv_row[] = $post_type;

 			$csv_row[] = $cat_parent;

 			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

-            // WPML

+			// WPML

 			if ($is_wpml) {

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

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

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

 			}

 			// WPML

 			$csv_row[] = $term->description;

@@ -6539,43 +6539,43 @@ 
  * @param string $status Post status.

  */

 function geodir_create_page($slug, $option, $page_title = '', $page_content = '', $post_parent = 0, $status = 'publish') {

-    global $wpdb, $current_user;

-

-    $option_value = get_option($option);

-

-    if ($option_value > 0) :

-        if (get_post($option_value)) :

-            // Page exists

-            return;

-        endif;

-    endif;

-

-    $page_found = $wpdb->get_var(

-        $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

-            array($slug)

-        )

-    );

-

-    if ($page_found) :

-        // Page exists

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

-        return;

-    endif;

-

-    $page_data = array(

-        'post_status' => $status,

-        'post_type' => 'page',

-        'post_author' => $current_user->ID,

-        'post_name' => $slug,

-        'post_title' => $page_title,

-        'post_content' => $page_content,

-        'post_parent' => $post_parent,

-        'comment_status' => 'closed'

-    );

-    $page_id = wp_insert_post($page_data);

-

-    add_option($option, $page_id);

+	global $wpdb, $current_user;

+

+	$option_value = get_option($option);

+

+	if ($option_value > 0) :

+		if (get_post($option_value)) :

+			// Page exists

+			return;

+		endif;

+	endif;

+

+	$page_found = $wpdb->get_var(

+		$wpdb->prepare(

+			"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+			array($slug)

+		)

+	);

+

+	if ($page_found) :

+		// Page exists

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

+		return;

+	endif;

+

+	$page_data = array(

+		'post_status' => $status,

+		'post_type' => 'page',

+		'post_author' => $current_user->ID,

+		'post_name' => $slug,

+		'post_title' => $page_title,

+		'post_content' => $page_content,

+		'post_parent' => $post_parent,

+		'comment_status' => 'closed'

+	);

+	$page_id = wp_insert_post($page_data);

+

+	add_option($option, $page_id);

 

 }

 

@@ -6606,9 +6606,9 @@ 
  * @package GeoDirectory

  */

 function geodir_admin_upgrade_notice() {

-    $class = "error";

-    $message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

-    echo"<div class=\"$class\"> <p>$message</p></div>";

+	$class = "error";

+	$message = __("Please update core GeoDirectory or some addons may not function correctly.","geodirectory");

+	echo"<div class=\"$class\"> <p>$message</p></div>";

 }

 

 /**

@@ -6621,18 +6621,18 @@ 
  */

 function geodire_admin_upgrade_notice( $plugin_data, $r )

 {

-    // readme contents

-    $args = array(

-        'timeout'     => 15,

-        'redirection' => 5

-    );

-    $url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

-    $data       = wp_remote_get( $url, $args );

+	// readme contents

+	$args = array(

+		'timeout'     => 15,

+		'redirection' => 5

+	);

+	$url = "http://plugins.svn.wordpress.org/geodirectory/trunk/readme.txt";

+	$data       = wp_remote_get( $url, $args );

 

-    if (!is_wp_error($data) && $data['response']['code'] == 200) {

+	if (!is_wp_error($data) && $data['response']['code'] == 200) {

 

-        geodir_in_plugin_update_message($data['body']);

-    }

+		geodir_in_plugin_update_message($data['body']);

+	}

 }

 

 

@@ -6640,28 +6640,28 @@ 
 * @param string $content http response body

 */

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

-    $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

-

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

-

-

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

-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

-            $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

-            }

-            $upgrade_notice .= '</div> ';

-        }

-        }

-    }

-    echo $upgrade_notice;

+	// Output Upgrade Notice

+	$matches        = null;

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

+

+		$version = trim( $matches[1] );

+		if($version && $version>GEODIRECTORY_VERSION){

+

+

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

+		if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

+			$upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

+			foreach ( $notices as $index => $line ) {

+				$upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+			}

+			$upgrade_notice .= '</div> ';

+		}

+		}

+	}

+	echo $upgrade_notice;

 }

 

 /**

@@ -6694,19 +6694,19 @@ 
  * @param array Listing statuses to be skipped.

  */

 function geodir_imex_export_skip_statuses() {

-    $statuses = array( 'trash', 'auto-draft' );

+	$statuses = array( 'trash', 'auto-draft' );

     

-    /**

-     * Filter the statuses to skip during GD export listings.

-     *

-     * @since 1.6.0

-     * @package GeoDirectory

-     *

-     * @param array $statuses Listing statuses to be skipped.

-     */

-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

+	/**

+	 * Filter the statuses to skip during GD export listings.

+	 *

+	 * @since 1.6.0

+	 * @package GeoDirectory

+	 *

+	 * @param array $statuses Listing statuses to be skipped.

+	 */

+	$statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

      

-    return $statuses;

+	return $statuses;

 }

 

 /**

@@ -6718,15 +6718,15 @@ 
  * @since 1.6.3

  */

 function geodir_admin_dequeue_scripts() {

-    // EDD

-    if (wp_script_is('jquery-chosen', 'enqueued')) {

-        wp_dequeue_script('jquery-chosen');

-    }

+	// EDD

+	if (wp_script_is('jquery-chosen', 'enqueued')) {

+		wp_dequeue_script('jquery-chosen');

+	}

     

-    // Ultimate Addons for Visual Composer

-    if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {

-        wp_dequeue_script('ultimate-vc-backend-script');

-    }

+	// Ultimate Addons for Visual Composer

+	if (wp_script_is('ultimate-vc-backend-script', 'enqueued')) {

+		wp_dequeue_script('ultimate-vc-backend-script');

+	}

 }

 

 /**

@@ -6742,24 +6742,24 @@ 
  * @return string SQL where clause part.

  */

 function geodir_imex_get_filter_where($where = '', $post_type = '') {

-    global $wpdb;

+	global $wpdb;

     

-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+	$filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

     

-    if ( !empty( $filters ) ) {

-        foreach ( $filters as $field => $value ) {

-            switch ($field) {

-                case 'start_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

-                break;

-                case 'end_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

-                break;

-            }

-        }

-    }

+	if ( !empty( $filters ) ) {

+		foreach ( $filters as $field => $value ) {

+			switch ($field) {

+				case 'start_date':

+					$where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

+				break;

+				case 'end_date':

+					$where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

+				break;

+			}

+		}

+	}

     

-    return $where;

+	return $where;

 }

 add_filter('geodir_get_posts_count', 'geodir_imex_get_filter_where', 10, 2);

 add_filter('geodir_get_export_posts', 'geodir_imex_get_filter_where', 10, 2);

Spacing +917 added lines, -917 removed lines

@@ -46,31 +46,31 @@ 
     function geodir_admin_styles()

     {

 

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

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

         wp_enqueue_style('geodirectory-admin-css');

 

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

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

         wp_enqueue_style('geodirectory-frontend-style');

 

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

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

         wp_enqueue_style('geodir-chosen-style');

 

-        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-jquery-ui-timepicker-css', geodir_plugin_url().'/geodirectory-assets/css/jquery.ui.timepicker.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-jquery-ui-timepicker-css');

 

-        wp_register_style('geodirectory-jquery-ui-css', geodir_plugin_url() . '/geodirectory-assets/css/jquery-ui.css', array(), GEODIRECTORY_VERSION);

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

         wp_enqueue_style('geodirectory-jquery-ui-css');

 

-        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url() . '/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodirectory-custom-fields-css', geodir_plugin_url().'/geodirectory-assets/css/custom_field.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodirectory-custom-fields-css');

 

-        wp_register_style('geodirectory-pluplodar-css', geodir_plugin_url() . '/geodirectory-assets/css/pluploader.css', array(), GEODIRECTORY_VERSION);

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

         wp_enqueue_style('geodirectory-pluplodar-css');

 

-        wp_register_style('geodir-rating-style', geodir_plugin_url() . '/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

+        wp_register_style('geodir-rating-style', geodir_plugin_url().'/geodirectory-assets/css/jRating.jquery.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-rating-style');

 

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

+        wp_register_style('geodir-rtl-style', geodir_plugin_url().'/geodirectory-assets/css/rtl.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('geodir-rtl-style');

 

     }

@@ -89,7 +89,7 @@ 
         wp_register_style('font-awesome', '//netdna.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css', array(), GEODIRECTORY_VERSION);

         wp_enqueue_style('font-awesome');

 

-        wp_register_script('geodirectory-admin', geodir_plugin_url() . '/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-admin', geodir_plugin_url().'/geodirectory-assets/js/admin-req.min.js', array('jquery'), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-admin');

 

     }

@@ -108,60 +108,60 @@ 
         

         wp_enqueue_script('jquery');

 

-        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

+        wp_enqueue_script('geodirectory-jquery-ui-timepicker-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.ui.timepicker.js', array('jquery-ui-datepicker', 'jquery-ui-slider'), '', true);

 

-        wp_register_script('chosen', geodir_plugin_url() . '/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

+        wp_register_script('chosen', geodir_plugin_url().'/geodirectory-assets/js/chosen.jquery.js', array('jquery'), GEODIRECTORY_VERSION);

         wp_enqueue_script('chosen');

 

-        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url() . '/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-choose-ajax', geodir_plugin_url().'/geodirectory-assets/js/ajax-chosen.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-choose-ajax');

 

         if (isset($_REQUEST['listing_type'])) {

-            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url() . '/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-custom-fields-script', geodir_plugin_url().'/geodirectory-assets/js/custom_fields.js', array(), GEODIRECTORY_VERSION);

         }

 

         wp_enqueue_script('geodirectory-custom-fields-script');

-        $plugin_path = geodir_plugin_url() . '/geodirectory-functions/cat-meta-functions';

+        $plugin_path = geodir_plugin_url().'/geodirectory-functions/cat-meta-functions';

 

-        wp_enqueue_script('tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array('jquery'), null, true);

+        wp_enqueue_script('tax-meta-clss', $plugin_path.'/js/tax-meta-clss.js', array('jquery'), null, true);

 

         if (in_array($geodir_map_name, array('auto', 'google'))) {

-            $map_lang = "&language=" . geodir_get_map_default_language();

-            $map_key = "&key=" . geodir_get_map_api_key();

+            $map_lang = "&language=".geodir_get_map_default_language();

+            $map_key = "&key=".geodir_get_map_api_key();

             /** This filter is documented in geodirectory_template_tags.php */

             $map_extra = apply_filters('geodir_googlemap_script_extra', '');

-            wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?' . $map_lang . $map_key . $map_extra, '', NULL);

+            wp_enqueue_script('geodirectory-googlemap-script', 'https://maps.google.com/maps/api/js?'.$map_lang.$map_key.$map_extra, '', NULL);

         }

         

         if ($geodir_map_name == 'osm') {

             // Leaflet OpenStreetMap

-            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

+            wp_register_style('geodirectory-leaflet-style', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.css', array(), GEODIRECTORY_VERSION);

             wp_enqueue_style('geodirectory-leaflet-style');

                 

-            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-script', geodir_plugin_url().'/geodirectory-assets/leaflet/leaflet.min.js', array(), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-script');

             

-            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url() . '/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

+            wp_register_script('geodirectory-leaflet-geo-script', geodir_plugin_url().'/geodirectory-assets/leaflet/osm.geocode.js', array('geodirectory-leaflet-script'), GEODIRECTORY_VERSION);

             wp_enqueue_script('geodirectory-leaflet-geo-script');

         }

-        wp_enqueue_script( 'jquery-ui-autocomplete' );

+        wp_enqueue_script('jquery-ui-autocomplete');

         

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION,true);

+        wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.min.js', array(), GEODIRECTORY_VERSION, true);

         wp_enqueue_script('geodirectory-goMap-script');

 

-        wp_register_script('geodirectory-goMap-script', geodir_plugin_url() . '/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-goMap-script', geodir_plugin_url().'/geodirectory-assets/js/goMap.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-goMap-script');

 

 		// font awesome rating script

 		if (get_option('geodir_reviewrating_enable_font_awesome')) {

-			wp_register_script('geodir-barrating-js', geodir_plugin_url() . '/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);

+			wp_register_script('geodir-barrating-js', geodir_plugin_url().'/geodirectory-assets/js/jquery.barrating.min.js', array(), GEODIRECTORY_VERSION);

 			wp_enqueue_script('geodir-barrating-js');

 		} else { // default rating script

-			wp_register_script('geodir-jRating-js', geodir_plugin_url() . '/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);

+			wp_register_script('geodir-jRating-js', geodir_plugin_url().'/geodirectory-assets/js/jRating.jquery.js', array(), GEODIRECTORY_VERSION);

 			wp_enqueue_script('geodir-jRating-js');

 		}

 

-        wp_register_script('geodir-on-document-load', geodir_plugin_url() . '/geodirectory-assets/js/on_document_load.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodir-on-document-load', geodir_plugin_url().'/geodirectory-assets/js/on_document_load.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodir-on-document-load');

 

 

@@ -169,7 +169,7 @@ 
         wp_enqueue_script('plupload-all');

         wp_enqueue_script('jquery-ui-sortable');

 

-        wp_register_script('geodirectory-plupload-script', geodir_plugin_url() . '/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-plupload-script', geodir_plugin_url().'/geodirectory-assets/js/geodirectory-plupload.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-plupload-script');

 

         // SCRIPT FOR UPLOAD END

@@ -223,7 +223,7 @@ 
         wp_localize_script('geodirectory-custom-fields-script', 'geodir_admin_ajax', $ajax_cons_data);

 

 

-        wp_register_script('geodirectory-admin-script', geodir_plugin_url() . '/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

+        wp_register_script('geodirectory-admin-script', geodir_plugin_url().'/geodirectory-assets/js/admin.js', array(), GEODIRECTORY_VERSION);

         wp_enqueue_script('geodirectory-admin-script');

 

         wp_enqueue_style('farbtastic');

@@ -231,10 +231,10 @@ 
 

         $screen = get_current_screen();

         if ($screen->base == 'post' && in_array($screen->post_type, geodir_get_posttypes())) {

-            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url() . '/geodirectory-assets/js/listing_validation_admin.js');

+            wp_enqueue_script('geodirectory-listing-validation-script', geodir_plugin_url().'/geodirectory-assets/js/listing_validation_admin.js');

         }

 

-        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl') . '?geodir_ajax=true')));

+        $ajax_cons_data = array('url' => esc_url(__(get_option('siteurl').'?geodir_ajax=true')));

         wp_localize_script('geodirectory-admin-script', 'geodir_ajax', $ajax_cons_data);

 

     }

@@ -257,7 +257,7 @@ 
 

         if (current_user_can('manage_options')) $menu[] = array('', 'read', 'separator-geodirectory', '', 'wp-menu-separator geodirectory');

 

-        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico', '55.1984');

+        add_menu_page(__('Geodirectory', 'geodirectory'), __('Geodirectory', 'geodirectory'), 'manage_options', 'geodirectory', 'geodir_admin_panel', geodir_plugin_url().'/geodirectory-assets/images/favicon.ico', '55.1984');

 

 

     }

@@ -291,7 +291,7 @@ 
                 $geodir_menu_order[] = 'separator-geodirectory';

                 if (!empty($post_types)) {

                     foreach ($post_types as $post_type) {

-                        $geodir_menu_order[] = 'edit.php?post_type=' . $post_type;

+                        $geodir_menu_order[] = 'edit.php?post_type='.$post_type;

                     }

                 }

                 $geodir_menu_order[] = $item;

@@ -334,8 +334,8 @@ 
 {

     if (isset($_REQUEST['installed']) && $_REQUEST['installed'] != '') {

         echo '<div id="message" class="updated fade">

-                        <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory') . ' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">' . __('Support us by leaving a rating!', 'geodirectory') . '</a></p>

-                        <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory') . '</strong></p>

+                        <p style="float:right;">' . __('Like Geodirectory?', 'geodirectory').' <a href="http://wordpress.org/extend/plugins/Geodirectory/" target="_blank">'.__('Support us by leaving a rating!', 'geodirectory').'</a></p>

+                        <p><strong>' . __('Geodirectory has been installed and setup. Enjoy :)', 'geodirectory').'</strong></p>

                 </div>';

 

     }

@@ -343,7 +343,7 @@ 
     if (isset($_REQUEST['msg']) && $_REQUEST['msg'] != '') {

         switch ($_REQUEST['msg']) {

             case 'success':

-                echo '<div id="message" class="updated fade"><p><strong>' . __('Your settings have been saved.', 'geodirectory') . '</strong></p></div>';

+                echo '<div id="message" class="updated fade"><p><strong>'.__('Your settings have been saved.', 'geodirectory').'</strong></p></div>';

                 flush_rewrite_rules(false);

 

                 break;

@@ -351,30 +351,30 @@ 
 				$gderr = isset($_REQUEST['gderr']) ? $_REQUEST['gderr'] : '';

 				

 				if ($gderr == 21)

-			    	echo '<div id="message" class="error fade"><p><strong>' . __('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory') . '</strong></p></div>';

+			    	echo '<div id="message" class="error fade"><p><strong>'.__('Error: You can not add same permalinks for both Listing and Location, please try again.', 'geodirectory').'</strong></p></div>';

 				else

-					echo '<div id="message" class="error fade"><p><strong>' . __('Error: Your settings have not been saved, please try again.', 'geodirectory') . '</strong></p></div>';

+					echo '<div id="message" class="error fade"><p><strong>'.__('Error: Your settings have not been saved, please try again.', 'geodirectory').'</strong></p></div>';

                 break;

         }

     }

 

     $geodir_load_map = get_option('geodir_load_map');

     $need_map_key = false;

-    if($geodir_load_map=='' || $geodir_load_map=='google' || $geodir_load_map=='auto' ){

+    if ($geodir_load_map == '' || $geodir_load_map == 'google' || $geodir_load_map == 'auto') {

         $need_map_key = true;

     }

 

     if (!geodir_get_map_api_key() && $need_map_key) {

-        echo '<div class="error"><p><strong>' . sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings') . '\'>', '</a>') . '</strong></p></div>';

+        echo '<div class="error"><p><strong>'.sprintf(__('Google Maps API KEY not set, %sclick here%s to set one OR use Open Street Maps instead.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=design_settings&active_tab=geodir_map_settings').'\'>', '</a>').'</strong></p></div>';

     }

 

     if (!geodir_is_default_location_set()) {

-        echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+        echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will make the plugin work properly.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';

 

     }

 

     if (!function_exists('curl_init')) {

-        echo '<div class="error"><p><strong>' . __('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory') . '</strong></p></div>';

+        echo '<div class="error"><p><strong>'.__('CURL is not installed on this server, this can cause problems, please ask your server admin to install it.', 'geodirectory').'</strong></p></div>';

 

     }

 

@@ -394,18 +394,18 @@ 
 function geodir_handle_option_form_submit($current_tab)

 {

     global $geodir_settings;

-    if (file_exists(dirname(__FILE__) . '/option-pages/' . $current_tab . '_array.php')) {

+    if (file_exists(dirname(__FILE__).'/option-pages/'.$current_tab.'_array.php')) {

         /**

          * Contains settings array for current tab.

          *

          * @since 1.0.0

          * @package GeoDirectory

          */

-        include_once('option-pages/' . $current_tab . '_array.php');

+        include_once('option-pages/'.$current_tab.'_array.php');

     }

     if (isset($_POST) && $_POST && isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') :

         if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'geodir-settings')) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

-        if (!wp_verify_nonce($_REQUEST['_wpnonce-' . $current_tab], 'geodir-settings-' . $current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

+        if (!wp_verify_nonce($_REQUEST['_wpnonce-'.$current_tab], 'geodir-settings-'.$current_tab)) die(__('Action failed. Please refresh the page and retry.', 'geodirectory'));

 		

 		/**

 		 * Fires before updating geodirectory admin settings.

@@ -438,13 +438,13 @@ 
          * @param string $current_tab The current settings tab name.

          * @param array $geodir_settings[$current_tab] The array of settings for the current settings tab.

          */

-        do_action('geodir_update_options_' . $current_tab, $geodir_settings[$current_tab]);

+        do_action('geodir_update_options_'.$current_tab, $geodir_settings[$current_tab]);

 

         flush_rewrite_rules(false);

 

         $current_tab = isset($_REQUEST['tab']) ? $_REQUEST['tab'] : '';

 

-        $redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $_REQUEST['active_tab'] . '&msg=success');

+        $redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$_REQUEST['active_tab'].'&msg=success');

 

         wp_redirect($redirect_url);

         exit();

@@ -454,7 +454,7 @@ 
 }

 

 

-if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined( 'GD_TESTING_MODE' ))) {

+if (!function_exists('geodir_autoinstall_admin_header') && (get_option('geodir_installed') || defined('GD_TESTING_MODE'))) {

     /**

      * GeoDirectory dummy data installation.

      *

@@ -470,18 +470,18 @@ 
         global $wpdb, $plugin_prefix;

 

         if (!geodir_is_default_location_set()) {

-            echo '<div class="updated fade"><p><strong>' . sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\'' . admin_url('admin.php?page=geodirectory&tab=default_location_settings') . '\'>', '</a>') . '</strong></p></div>';

+            echo '<div class="updated fade"><p><strong>'.sprintf(__('Please %sclick here%s to set a default location, this will help to set location of all dummy data.', 'geodirectory'), '<a href=\''.admin_url('admin.php?page=geodirectory&tab=default_location_settings').'\'>', '</a>').'</strong></p></div>';

         } else {

 

-            $geodir_url = admin_url() . 'admin.php?page=geodirectory&tab=general_settings&active_tab=';

+            $geodir_url = admin_url().'admin.php?page=geodirectory&tab=general_settings&active_tab=';

 

-            $post_counts = $wpdb->get_var("SELECT count(post_id) FROM " . $plugin_prefix . $post_type . "_detail WHERE post_dummy='1'");

+            $post_counts = $wpdb->get_var("SELECT count(post_id) FROM ".$plugin_prefix.$post_type."_detail WHERE post_dummy='1'");

 

             if ($post_counts > 0) {

                 $nonce = wp_create_nonce('geodir_dummy_posts_delete_noncename');

 

-                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . SAMPLE_DATA_SHOW_MSG . '</b><br /><a id="geodir_dummy_delete" class="button_delete" onclick="geodir_autoinstall(this,\'geodir_dummy_delete\',\'' . $nonce . '\',\'' . $post_type . '\')" href="javascript:void(0);" redirect_to="' . $geodir_url . '"  >' . DELETE_BTN_SAMPLE_MSG . '</a></p></div>';

-                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_DELETE_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /></p></div>';

+                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>'.SAMPLE_DATA_SHOW_MSG.'</b><br /><a id="geodir_dummy_delete" class="button_delete" onclick="geodir_autoinstall(this,\'geodir_dummy_delete\',\''.$nonce.'\',\''.$post_type.'\')" href="javascript:void(0);" redirect_to="'.$geodir_url.'"  >'.DELETE_BTN_SAMPLE_MSG.'</a></p></div>';

+                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>'.GEODIR_SAMPLE_DATA_DELETE_MSG.'</b><br><img src="'.geodir_plugin_url().'/geodirectory-assets/images/loadingAnimation.gif" /></p></div>';

             } else {

                 $options_list = '';

                 for ($option = 1; $option <= 30; $option++) {

@@ -489,13 +489,13 @@ 
                     if ($option == 10)

                         $selected = 'selected="selected"';

 

-                    $options_list .= '<option ' . $selected . ' value="' . $option . '">' . $option . '</option>';

+                    $options_list .= '<option '.$selected.' value="'.$option.'">'.$option.'</option>';

                 }

 

                 $nonce = wp_create_nonce('geodir_dummy_posts_insert_noncename');

 

-                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>' . AUTO_INSATALL_MSG . '</b><br /><select class="selected_sample_data">' . $options_list . '</select><a id="geodir_dummy_insert" class="button_insert" href="javascript:void(0);" onclick="geodir_autoinstall(this,\'geodir_dummy_insert\',\'' . $nonce . '\',\'' . $post_type . '\')"   redirect_to="' . $geodir_url . '" >' . INSERT_BTN_SAMPLE_MSG . '</a></p></div>';

-                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>' . GEODIR_SAMPLE_DATA_IMPORT_MSG . '</b><br><img src="' . geodir_plugin_url() . '/geodirectory-assets/images/loadingAnimation.gif" /><br><span class="dummy_post_inserted"></span></div>';

+                $dummy_msg = '<div id="" class="geodir_auto_install updated highlight fade"><p><b>'.AUTO_INSATALL_MSG.'</b><br /><select class="selected_sample_data">'.$options_list.'</select><a id="geodir_dummy_insert" class="button_insert" href="javascript:void(0);" onclick="geodir_autoinstall(this,\'geodir_dummy_insert\',\''.$nonce.'\',\''.$post_type.'\')"   redirect_to="'.$geodir_url.'" >'.INSERT_BTN_SAMPLE_MSG.'</a></p></div>';

+                $dummy_msg .= '<div id="" style="display:none;" class="geodir_show_progress updated highlight fade"><p><b>'.GEODIR_SAMPLE_DATA_IMPORT_MSG.'</b><br><img src="'.geodir_plugin_url().'/geodirectory-assets/images/loadingAnimation.gif" /><br><span class="dummy_post_inserted"></span></div>';

 

             }

             echo $dummy_msg;

@@ -509,7 +509,7 @@ 
             ?>

             <script type="text/javascript">

                 var geocoder = window.gdMaps == 'google' ? new google.maps.Geocoder() : null;

-                var CITY_ADDRESS = '<?php echo addslashes( $city . ',' . $region . ',' . $country );?>';

+                var CITY_ADDRESS = '<?php echo addslashes($city.','.$region.','.$country); ?>';

                 var bound_lat_lng;

                 var latlng = ['<?php echo $city_latitude; ?>', <?php echo $city_longitude; ?>];

                 var lat = <?php echo $city_latitude; ?>;

@@ -539,7 +539,7 @@ 
                                     return x.replace(" ", '');

                                 }); // remove spaces from lat/lon

                             } else {

-                                alert("<?php _e('Geocode was not successful for the following reason:','geodirectory');?> " + status);

+                                alert("<?php _e('Geocode was not successful for the following reason:', 'geodirectory'); ?> " + status);

                             }

                         });

                 } else if (window.gdMaps == 'osm') {

@@ -564,7 +564,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,

@@ -585,7 +585,7 @@ 
                         var post_url = '<?php echo geodir_get_ajax_url(); ?>&geodir_autofill=' + id + '&posttype=' + posttype + '&insert_dummy_post_index=' + dummy_post_index + '&city_bound_lat1=' + bound_lat_lng[0] + '&city_bound_lng1=' + bound_lat_lng[1] + '&city_bound_lat2=' + bound_lat_lng[2] + '&city_bound_lng2=' + bound_lat_lng[3] + '&_wpnonce=' + nonce;

                         

                         jQuery.post( post_url, function (data) {

-                            jQuery(obj).closest('form').find('.dummy_post_inserted').html('<?php _e('Dummy post(s) inserted:','geodirectory');?> ' + dummy_post_index + ' <?php _e('of' ,'geodirectory'); ?> ' + total_dummy_post_count + '');

+                            jQuery(obj).closest('form').find('.dummy_post_inserted').html('<?php _e('Dummy post(s) inserted:', 'geodirectory'); ?> ' + dummy_post_index + ' <?php _e('of', 'geodirectory'); ?> ' + total_dummy_post_count + '');

                             

                             dummy_post_index++;

                             

@@ -626,7 +626,7 @@ 
      * @package GeoDirectory

      */

     include_once('place_dummy_post.php');

-    delete_transient( 'cached_dummy_images' );

+    delete_transient('cached_dummy_images');

 

 }

 

@@ -643,7 +643,7 @@ 
     global $wpdb, $plugin_prefix;

 

 

-    $post_ids = $wpdb->get_results("SELECT post_id FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

+    $post_ids = $wpdb->get_results("SELECT post_id FROM ".$plugin_prefix."gd_place_detail WHERE post_dummy='1'");

 

 

     foreach ($post_ids as $post_ids_obj) {

@@ -651,7 +651,7 @@ 
     }

 

     //double check posts are deleted

-    $wpdb->get_results("DELETE FROM " . $plugin_prefix . "gd_place_detail WHERE post_dummy='1'");

+    $wpdb->get_results("DELETE FROM ".$plugin_prefix."gd_place_detail WHERE post_dummy='1'");

 }

 

 /**

@@ -689,14 +689,14 @@ 
 

 

                     if (geodir_dummy_folder_exists())

-                        $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

+                        $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";

                     else

                         $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

 

                     $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

 

                     $catname = str_replace(' ', '_', $catname);

-                    $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

+                    $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");

 

                     if (empty($uploaded['error'])) {

                         $new_path = $uploaded['file'];

@@ -706,7 +706,7 @@ 
                     $wp_filetype = wp_check_filetype(basename($new_path), null);

 

                     $attachment = array(

-                        'guid' => $uploads['baseurl'] . '/' . basename($new_path),

+                        'guid' => $uploads['baseurl'].'/'.basename($new_path),

                         'post_mime_type' => $wp_filetype['type'],

                         'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

                         'post_content' => '',

@@ -716,7 +716,7 @@ 
 

                     // you must first include the image.php file

                     // for the function wp_generate_attachment_metadata() to work

-                    require_once(ABSPATH . 'wp-admin/includes/image.php');

+                    require_once(ABSPATH.'wp-admin/includes/image.php');

                     $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

                     wp_update_attachment_metadata($attach_id, $attach_data);

 

@@ -733,14 +733,14 @@ 
                 $last_catid = wp_insert_term($catname, 'gd_placecategory');

 

                 if (geodir_dummy_folder_exists())

-                    $dummy_image_url = geodir_plugin_url() . "/geodirectory-admin/dummy/cat_icon";

+                    $dummy_image_url = geodir_plugin_url()."/geodirectory-admin/dummy/cat_icon";

                 else

                     $dummy_image_url = 'http://www.wpgeodirectory.com/dummy/cat_icon';

 

                 $dummy_image_url = apply_filters('place_dummy_cat_image_url', $dummy_image_url);

 

                 $catname = str_replace(' ', '_', $catname);

-                $uploaded = (array)fetch_remote_file("$dummy_image_url/" . $catname . ".png");

+                $uploaded = (array) fetch_remote_file("$dummy_image_url/".$catname.".png");

 

                 if (empty($uploaded['error'])) {

                     $new_path = $uploaded['file'];

@@ -750,7 +750,7 @@ 
                 $wp_filetype = wp_check_filetype(basename($new_path), null);

 

                 $attachment = array(

-                    'guid' => $uploads['baseurl'] . '/' . basename($new_path),

+                    'guid' => $uploads['baseurl'].'/'.basename($new_path),

                     'post_mime_type' => $wp_filetype['type'],

                     'post_title' => preg_replace('/\.[^.]+$/', '', basename($new_path)),

                     'post_content' => '',

@@ -762,7 +762,7 @@ 
 

                 // you must first include the image.php file

                 // for the function wp_generate_attachment_metadata() to work

-                require_once(ABSPATH . 'wp-admin/includes/image.php');

+                require_once(ABSPATH.'wp-admin/includes/image.php');

                 $attach_data = wp_generate_attachment_metadata($attach_id, $new_path);

                 wp_update_attachment_metadata($attach_id, $attach_data);

 

@@ -804,18 +804,18 @@ 
 

         elseif (isset($value['type']) && $value['type'] == 'image_width') :

 

-            if (isset($value['id']) && isset($_POST[$value['id'] . '_width'])) {

-                update_option($value['id'] . '_width', $_POST[$value['id'] . '_width']);

-                update_option($value['id'] . '_height', $_POST[$value['id'] . '_height']);

-                if (isset($_POST[$value['id'] . '_crop'])) :

-                    update_option($value['id'] . '_crop', 1);

+            if (isset($value['id']) && isset($_POST[$value['id'].'_width'])) {

+                update_option($value['id'].'_width', $_POST[$value['id'].'_width']);

+                update_option($value['id'].'_height', $_POST[$value['id'].'_height']);

+                if (isset($_POST[$value['id'].'_crop'])) :

+                    update_option($value['id'].'_crop', 1);

                 else :

-                    update_option($value['id'] . '_crop', 0);

+                    update_option($value['id'].'_crop', 0);

                 endif;

             } else {

-                update_option($value['id'] . '_width', $value['std']);

-                update_option($value['id'] . '_height', $value['std']);

-                update_option($value['id'] . '_crop', 1);

+                update_option($value['id'].'_width', $value['std']);

+                update_option($value['id'].'_height', $value['std']);

+                update_option($value['id'].'_crop', 1);

             }

 

         elseif (isset($value['type']) && $value['type'] == 'map') :

@@ -857,12 +857,12 @@ 
         elseif (isset($value['type']) && $value['type'] == 'file') :

 

 

-            if (isset($_POST[$value['id'] . '_remove']) && $_POST[$value['id'] . '_remove']) {// if remove is set then remove the file

+            if (isset($_POST[$value['id'].'_remove']) && $_POST[$value['id'].'_remove']) {// if remove is set then remove the file

 

                 if (get_option($value['id'])) {

                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

+                    $img_path = $uploads['path'].'/'.$noimg_name;

                     if (file_exists($img_path))

                         unlink($img_path);

                 }

@@ -890,7 +890,7 @@ 
                 if (get_option($value['id'])) {

                     $image_name_arr = explode('/', get_option($value['id']));

                     $noimg_name = end($image_name_arr);

-                    $img_path = $uploads['path'] . '/' . $noimg_name;

+                    $img_path = $uploads['path'].'/'.$noimg_name;

                     if (file_exists($img_path))

                         unlink($img_path);

                 }

@@ -911,7 +911,7 @@ 
             // same menu setting per theme.

             if (isset($value['id']) && $value['id'] == 'geodir_theme_location_nav' && isset($_POST[$value['id']])) {

                 $theme = wp_get_theme();

-                update_option('geodir_theme_location_nav_' . $theme->name, $_POST[$value['id']]);

+                update_option('geodir_theme_location_nav_'.$theme->name, $_POST[$value['id']]);

             }

 

             if (isset($value['id']) && isset($_POST[$value['id']])) {

@@ -981,8 +981,8 @@ 
 

             $listing_slug = $geodir_posttype_info['labels']['singular_name'];

 

-            $tabs[$geodir_post_type . '_fields_settings'] = array(

-                'label' => __(ucfirst($listing_slug) . ' Settings', 'geodirectory'),

+            $tabs[$geodir_post_type.'_fields_settings'] = array(

+                'label' => __(ucfirst($listing_slug).' Settings', 'geodirectory'),

                 'subtabs' => array(

                     array('subtab' => 'custom_fields',

                         'label' => __('Custom Fields', 'geodirectory'),

@@ -1015,7 +1015,7 @@ 
  */

 function geodir_tools_setting_tab($tabs)

 {

-    wp_enqueue_script( 'jquery-ui-progressbar' );

+    wp_enqueue_script('jquery-ui-progressbar');

     $tabs['tools_settings'] = array('label' => __('GD Tools', 'geodirectory'));

     return $tabs;

 }

@@ -1049,7 +1049,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;

 }

 

@@ -1109,8 +1109,8 @@ 
                     _e('Unknown', 'geodirectory');

                 } else {

                     /* If there is a city id, append 'city name' to the text string. */

-                    $add_location_id = $location_id > 0 ? ' (' . $location_id . ')' : '';

-                    echo(__($location->country, 'geodirectory') . '-' . $location->region . '-' . $location->city . $add_location_id);

+                    $add_location_id = $location_id > 0 ? ' ('.$location_id.')' : '';

+                    echo(__($location->country, 'geodirectory').'-'.$location->region.'-'.$location->city.$add_location_id);

                 }

                 break;

 

@@ -1128,14 +1128,14 @@ 
                         $expire_class = 'expire_over';

                     }

                     $date_diff = round(abs(strtotime($d1) - strtotime($d2)) / 86400); // get the difference in days

-                    $date_diff_text = '<br /><span class="' . $expire_class . '">(' . $date_diff . ' ' . $state . ')</span>';

+                    $date_diff_text = '<br /><span class="'.$expire_class.'">('.$date_diff.' '.$state.')</span>';

                 }

                 /* If no expire_date is found, output a default message. */

                 if (empty($expire_date))

                     echo __('Unknown', 'geodirectory');

                 /* If there is a expire_date, append 'days left' to the text string. */

                 else

-                    echo $expire_date . $date_diff_text;

+                    echo $expire_date.$date_diff_text;

                 break;

 

             /* If displaying the 'categorys' column. */

@@ -1202,7 +1202,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;

     }

 

@@ -1270,7 +1270,7 @@ 
                     $tab_id = $value['id'];

 

                 if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;">:- ' . $value['desc'] . '</span>';

+                    $desc = '<span style=" text-transform:none;">:- '.$value['desc'].'</span>';

 

                 if (isset($value['name']) && $value['name']) {

                     if ($first_title === true) {

@@ -1278,9 +1278,9 @@ 
                     } else {

                         echo '</div>';

                     }

-                    echo '<dd id="' . trim($tab_id) . '" class="geodir_option_tabs" ><a href="javascript:void(0);">' . $value['name'] . '</a></dd>';

+                    echo '<dd id="'.trim($tab_id).'" class="geodir_option_tabs" ><a href="javascript:void(0);">'.$value['name'].'</a></dd>';

 

-                    echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+                    echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';

                 }

 

                 /**

@@ -1290,21 +1290,21 @@ 
                  *

                  * @since 1.0.0

                  */

-                do_action('geodir_settings_' . sanitize_title($value['id']));

+                do_action('geodir_settings_'.sanitize_title($value['id']));

                 break;

 

             case 'no_tabs':

 

                 echo '<div class="inner_content_tab_main">';

-                echo '<div id="sub_' . trim($tab_id) . '" class="gd-content-heading" style=" margin-bottom:10px;" >';

+                echo '<div id="sub_'.trim($tab_id).'" class="gd-content-heading" style=" margin-bottom:10px;" >';

 

                 break;

 

             case 'sectionstart':

                 if (isset($value['desc']) && $value['desc'])

-                    $desc = '<span style=" text-transform:none;"> - ' . $value['desc'] . '</span>';

+                    $desc = '<span style=" text-transform:none;"> - '.$value['desc'].'</span>';

                 if (isset($value['name']) && $value['name'])

-                    echo '<h3>' . $value['name'] . $desc . '</h3>';

+                    echo '<h3>'.$value['name'].$desc.'</h3>';

                 /**

                  * Called after a GeoDirectory settings sectionstart is output in the GD settings page.

                  *

@@ -1312,8 +1312,8 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_start');

-                echo '<table class="form-table">' . "\n\n";

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_start');

+                echo '<table class="form-table">'."\n\n";

 

                 break;

             case 'sectionend':

@@ -1324,7 +1324,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_end');

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_end');

                 echo '</table>';

                 /**

                  * Called after a GeoDirectory settings sectionend is output in the GD settings page.

@@ -1333,7 +1333,7 @@ 
                  *

                  * @since 1.0.0

                  */

-                if (isset($value['id']) && $value['id']) do_action('geodir_settings_' . sanitize_title($value['id']) . '_after');

+                if (isset($value['id']) && $value['id']) do_action('geodir_settings_'.sanitize_title($value['id']).'_after');

                 break;

             case 'text':

                 ?>

@@ -1342,7 +1342,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'])));

@@ -1359,7 +1359,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'])));

@@ -1405,17 +1405,17 @@ 
                     <?php _e('Width', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_width"

                         id="<?php echo esc_attr($value['id']); ?>_width" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'].'_width')) echo stripslashes($size); else echo $value['std']; ?>"/>

 

                     <?php _e('Height', 'geodirectory'); ?> <input

                         name="<?php echo esc_attr($value['id']); ?>_height"

                         id="<?php echo esc_attr($value['id']); ?>_height" type="text" size="3"

-                        value="<?php if ($size = get_option($value['id'] . '_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

+                        value="<?php if ($size = get_option($value['id'].'_height')) echo stripslashes($size); else echo $value['std']; ?>"/>

 

                     <label><?php _e('Hard Crop', 'geodirectory'); ?> <input

                             name="<?php echo esc_attr($value['id']); ?>_crop"

                             id="<?php echo esc_attr($value['id']); ?>_crop"

-                            type="checkbox" <?php if (get_option($value['id'] . '_crop') != '') checked(get_option($value['id'] . '_crop'), 1); else checked(1); ?> /></label>

+                            type="checkbox" <?php if (get_option($value['id'].'_crop') != '') checked(get_option($value['id'].'_crop'), 1); else checked(1); ?> /></label>

 

                     <span class="description"><?php echo $value['desc'] ?></span></td>

                 </tr><?php

@@ -1465,7 +1465,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) {

@@ -1476,7 +1476,7 @@ 
                             } else {

                                 ?>

                                 <option

-                                    value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values)));?>><?php echo ucfirst($val) ?></option>

+                                    value="<?php echo esc_attr($key); ?>" <?php selected(true, (is_array($option_values) && in_array($key, $option_values))); ?>><?php echo ucfirst($val) ?></option>

                             <?php

                             }

                         }

@@ -1511,7 +1511,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

@@ -1593,7 +1593,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

@@ -1634,7 +1634,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">

@@ -1663,7 +1663,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;"

@@ -1721,12 +1721,12 @@ 
                 ?>

                 <fieldset>

                     <legend class="screen-reader-text"><span><?php echo $value['name'] ?></span></legend>

-                    <label for="<?php echo $value['id'];?>">

+                    <label for="<?php echo $value['id']; ?>">

                         <input name="<?php echo esc_attr($value['id']); ?>"

-                               id="<?php echo esc_attr($value['id'] . $value['value']); ?>" type="radio"

+                               id="<?php echo esc_attr($value['id'].$value['value']); ?>" type="radio"

                                value="<?php echo $value['value'] ?>" <?php if (get_option($value['id']) == $value['value']) {

                             echo 'checked="checked"';

-                        }elseif(get_option($value['id'])=='' && $value['std']==$value['value']){echo 'checked="checked"';} ?> />

+                        }elseif (get_option($value['id']) == '' && $value['std'] == $value['value']) {echo 'checked="checked"'; } ?> />

                         <?php echo $value['desc']; ?></label><br>

                 </fieldset>

                 <?php

@@ -1746,9 +1746,9 @@ 
                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

                     <textarea

-                        <?php if (isset($value['args'])) echo $value['args'] . ' '; ?>name="<?php echo esc_attr($value['id']); ?>"

+                        <?php if (isset($value['args'])) echo $value['args'].' '; ?>name="<?php echo esc_attr($value['id']); ?>"

                         id="<?php echo esc_attr($value['id']); ?>"

-                        <?php if(isset($value['placeholder'])){?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

+                        <?php if (isset($value['placeholder'])) {?>placeholder="<?php echo esc_attr($value['placeholder']); ?>"<?php }?>

                         style="<?php echo esc_attr($value['css']); ?>"><?php if (get_option($value['id'])) echo esc_textarea(stripslashes(get_option($value['id']))); else echo esc_textarea($value['std']); ?></textarea><span

                         class="description"><?php echo $value['desc'] ?></span>

 

@@ -1793,7 +1793,7 @@ 
 					}

 				}

 				//

-				$page_setting = (int)get_option($value['id']);

+				$page_setting = (int) get_option($value['id']);

 

                 $args = array('name' => $value['id'],

                     'id' => $value['id'],

@@ -1810,7 +1810,7 @@ 
                 <tr valign="top" class="single_select_page">

                 <th scope="row" class="titledesc"><?php echo $value['name'] ?></th>

                 <td class="forminp">

-                    <?php echo str_replace(' id=', " data-placeholder='" . __('Select a page...', 'geodirectory') . "' style='" . $value['css'] . "' class='" . $value['class'] . "' " . $disabled . " id=", wp_dropdown_pages($args)); ?>

+                    <?php echo str_replace(' id=', " data-placeholder='".__('Select a page...', 'geodirectory')."' style='".$value['css']."' class='".$value['class']."' ".$disabled." id=", wp_dropdown_pages($args)); ?>

                     <span class="description"><?php echo $value['desc'] ?></span>

                 </td>

                 </tr><?php

@@ -1819,7 +1819,7 @@ 
 				}

                 break;

             case 'single_select_country' :

-                $country_setting = (string)get_option($value['id']);

+                $country_setting = (string) get_option($value['id']);

                 if (strstr($country_setting, ':')) :

                     $country = current(explode(':', $country_setting));

                     $state = end(explode(':', $country_setting));

@@ -1842,7 +1842,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>

@@ -1852,7 +1852,7 @@ 
                             title="Country" class="chosen_select">

                         <?php

                         if ($countries) foreach ($countries as $key => $val) :

-                            echo '<option value="' . $key . '" ' . selected(in_array($key, $selections), true, false) . '>' . $val . '</option>';

+                            echo '<option value="'.$key.'" '.selected(in_array($key, $selections), true, false).'>'.$val.'</option>';

                         endforeach;

                         ?>

                     </select>

@@ -1864,8 +1864,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>

@@ -1876,20 +1876,20 @@ 
 

                             $oAuthURL = "https://accounts.google.com/o/oauth2/auth?";

                             $scope = "scope=https://www.googleapis.com/auth/analytics.readonly";

-                            $state = "&state=123";//any string

-                            $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+                            $state = "&state=123"; //any string

+                            $redirect_uri = "&redirect_uri=".admin_url('admin-ajax.php')."?action=geodir_ga_callback";

                             $response_type = "&response_type=code";

                             $client_id = "&client_id=".get_option('geodir_ga_client_id');

                             $access_type = "&access_type=offline";

                             $approval_prompt = "&approval_prompt=force";

 

-                            $auth_url = $oAuthURL . $scope . $state . $redirect_uri . $response_type . $client_id . $access_type . $approval_prompt;

+                            $auth_url = $oAuthURL.$scope.$state.$redirect_uri.$response_type.$client_id.$access_type.$approval_prompt;

 

 

                             ?>

                             <script>

                                 function gd_ga_popup() {

-                                    var win = window.open("<?php echo $auth_url;?>", "Google Analytics", "");

+                                    var win = window.open("<?php echo $auth_url; ?>", "Google Analytics", "");

                                     var pollTimer = window.setInterval(function () {

                                         if (win.closed !== false) { // !== is required for compatibility with Opera

                                             window.clearInterval(pollTimer);

@@ -1911,7 +1911,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

                             }

                             ?>

@@ -1982,9 +1982,9 @@ 
 

             <?php if (isset($_REQUEST['active_tab']) && $_REQUEST['active_tab'] != '') { ?>

             jQuery('.geodir_option_tabs').removeClass('gd-tab-active');

-            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').addClass('gd-tab-active');

+            jQuery('#<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').addClass('gd-tab-active');

             jQuery('.gd-content-heading').hide();

-            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']);?>').show();

+            jQuery('#sub_<?php echo sanitize_text_field($_REQUEST['active_tab']); ?>').show();

             <?php } ?>

         });

     </script>

@@ -2070,7 +2070,7 @@ 
     wp_nonce_field(plugin_basename(__FILE__), 'geodir_post_attachments_noncename');

 

     if (geodir_get_featured_image($post_id, 'thumbnail')) {

-        echo '<h4>' . __('Featured Image', 'geodirectory') . '</h4>';

+        echo '<h4>'.__('Featured Image', 'geodirectory').'</h4>';

         geodir_show_featured_image($post_id, 'thumbnail');

     }

 

@@ -2081,13 +2081,13 @@ 
 

     <h5 class="form_title">

         <?php if ($image_limit != 0 && $image_limit == 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('image with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('image with this package', 'geodirectory').')</small>';

         } ?>

         <?php if ($image_limit != 0 && $image_limit > 1) {

-            echo '<br /><small>(' . __('You can upload', 'geodirectory') . ' ' . $image_limit . ' ' . __('images with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload', 'geodirectory').' '.$image_limit.' '.__('images with this package', 'geodirectory').')</small>';

         } ?>

         <?php if ($image_limit == 0) {

-            echo '<br /><small>(' . __('You can upload unlimited images with this package', 'geodirectory') . ')</small>';

+            echo '<br /><small>('.__('You can upload unlimited images with this package', 'geodirectory').')</small>';

         } ?>

     </h5>

 

@@ -2126,10 +2126,10 @@ 
         <div

             class="plupload-upload-uic hide-if-no-js <?php if ($multiple): ?>plupload-upload-uic-multiple<?php endif; ?>"

             id="<?php echo $id; ?>plupload-upload-ui">

-            <h4><?php _e('Drop files to upload', 'geodirectory');?></h4>

+            <h4><?php _e('Drop files to upload', 'geodirectory'); ?></h4>

             <input id="<?php echo $id; ?>plupload-browse-button" type="button"

                    value="<?php _e('Select Files', 'geodirectory'); ?>" class="button"/>

-            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id . 'pluploadan'); ?>"></span>

+            <span class="ajaxnonceplu" id="ajaxnonceplu<?php echo wp_create_nonce($id.'pluploadan'); ?>"></span>

             <?php if ($width && $height): ?>

                 <span class="plupload-resize"></span>

                 <span class="plupload-width" id="plupload-width<?php echo $width; ?>"></span>

@@ -2141,7 +2141,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>

 

@@ -2351,9 +2351,9 @@ 
     $plugin = 'avada-nag';

     $timestamp = 'avada-nag1234';

     $message = __('Welcome to GeoDirectory, please have a look <a href="https://docs.wpgeodirectory.com/category/getting-started/" target="_blank">here</a> to get started. :)', 'geodirectory');

-    echo '<div id="' . $timestamp . '"  class="error">';

-    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\'' . $plugin . '\',\'' . $timestamp . '\');" ><i class="fa fa-times"></i></span>';

-    echo "<img class='gd-icon-noti' src='" . plugin_dir_url('') . "geodirectory/geodirectory-assets/images/favicon.ico' > ";

+    echo '<div id="'.$timestamp.'"  class="error">';

+    echo '<span class="gd-remove-noti" onclick="gdRemoveANotification(\''.$plugin.'\',\''.$timestamp.'\');" ><i class="fa fa-times"></i></span>';

+    echo "<img class='gd-icon-noti' src='".plugin_dir_url('')."geodirectory/geodirectory-assets/images/favicon.ico' > ";

     echo "<p>$message</p>";

     echo "</div>";

 

@@ -2486,7 +2486,7 @@ 
 		

 		// Don't allow same slug url for listing and location

 		if (geodir_strtolower($listing_prefix) == geodir_strtolower($location_prefix)) {

-			$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab . '&msg=fail&gderr=21');

+			$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab.'&msg=fail&gderr=21');

         	wp_redirect($redirect_url);

 			exit;

 		}

@@ -2498,7 +2498,7 @@ 
 			$default_language = $sitepress->get_default_language();

 			

 			if ($current_language != 'all' && $current_language != $default_language) {

-				$redirect_url = admin_url('admin.php?page=geodirectory&tab=' . $current_tab . '&active_tab=' . $active_tab);

+				$redirect_url = admin_url('admin.php?page=geodirectory&tab='.$current_tab.'&active_tab='.$active_tab);

 				wp_redirect($redirect_url);

 				exit;

 			}

@@ -2519,11 +2519,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.

@@ -2533,8 +2533,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;

 }

 

@@ -2548,8 +2548,8 @@ 
  * @return string Html content.

  */

 function geodir_import_export_page() {

-	$nonce = wp_create_nonce( 'geodir_import_export_nonce' );

-	$gd_cats_sample_csv = geodir_plugin_url() . '/geodirectory-assets/gd_sample_categories.csv';

+	$nonce = wp_create_nonce('geodir_import_export_nonce');

+	$gd_cats_sample_csv = geodir_plugin_url().'/geodirectory-assets/gd_sample_categories.csv';

     /**

      * Filter sample category data csv file url.

      *

@@ -2558,9 +2558,9 @@ 
      *

      * @param string $gd_cats_sample_csv Sample category data csv file url.

      */

-	$gd_cats_sample_csv = apply_filters( 'geodir_export_cats_sample_csv', $gd_cats_sample_csv );

+	$gd_cats_sample_csv = apply_filters('geodir_export_cats_sample_csv', $gd_cats_sample_csv);

 	

-	$gd_posts_sample_csv = geodir_plugin_url() . '/geodirectory-assets/place_listing.csv';

+	$gd_posts_sample_csv = geodir_plugin_url().'/geodirectory-assets/place_listing.csv';

     /**

      * Filter sample post data csv file url.

      *

@@ -2569,15 +2569,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;

@@ -2599,49 +2599,49 @@ 
      *

      * @param string $gd_chunksize_options Entries options.

      */

-    $gd_chunksize_options = apply_filters( 'geodir_export_csv_chunksize_options', $gd_chunksize_options );

+    $gd_chunksize_options = apply_filters('geodir_export_csv_chunksize_options', $gd_chunksize_options);

 	

 	$gd_chunksize_option = '';

 	foreach ($gd_chunksize_options as $value => $title) {

-		$gd_chunksize_option .= '<option value="' . $value . '" ' . selected($value, 5000, false) . '>' . $title . '</option>';

+		$gd_chunksize_option .= '<option value="'.$value.'" '.selected($value, 5000, false).'>'.$title.'</option>';

 	}

 	

 	$uploads = wp_upload_dir();

 ?>

 </form>

 <div class="inner_content_tab_main gd-import-export">

-  <h3><?php _e( 'GD Import & Export CSV', 'geodirectory' ) ;?></h3>

-  <span class="description"><?php _e( 'Import & export csv for GD listings & categories.', 'geodirectory' ) ;?></span>

+  <h3><?php _e('GD Import & Export CSV', 'geodirectory'); ?></h3>

+  <span class="description"><?php _e('Import & export csv for GD listings & categories.', 'geodirectory'); ?></span>

   <div class="gd-content-heading">

 

   <?php

     ini_set('max_execution_time', 999999);

-    $ini_max_execution_time_check = @ini_get( 'max_execution_time' );

+    $ini_max_execution_time_check = @ini_get('max_execution_time');

     ini_restore('max_execution_time');

 

-    if($ini_max_execution_time_check != 999999){ // only show these setting to the user if we can't change the ini setting

+    if ($ini_max_execution_time_check != 999999) { // only show these setting to the user if we can't change the ini setting

         ?>

 	<div id="gd_ie_reqs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div class="postbox">

-          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __( 'PHP Requirements for GD Import & Export CSV', 'geodirectory' );?></span></h3>

+          <h3 class="hndle"><span style='vertical-align:top;'><?php echo __('PHP Requirements for GD Import & Export CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

-            <span class="description"><?php echo __( 'Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory' );?></span>

+            <span class="description"><?php echo __('Note: In case GD import & export csv not working for larger data then please check and configure following php settings.', 'geodirectory'); ?></span>

 			<table class="form-table">

 				<thead>

 				  <tr>

-				  	<th><?php _e( 'PHP Settings', 'geodirectory' );?></th><th><?php _e( 'Current Value', 'geodirectory' );?></th><th><?php _e( 'Recommended Value', 'geodirectory' );?></th>

+				  	<th><?php _e('PHP Settings', 'geodirectory'); ?></th><th><?php _e('Current Value', 'geodirectory'); ?></th><th><?php _e('Recommended Value', 'geodirectory'); ?></th>

 				  </tr>

 				</thead>

 				<tbody>

 				  <tr>

-				  	<td>max_input_time</td><td><?php echo @ini_get( 'max_input_time' );?></td><td>3000</td>

+				  	<td>max_input_time</td><td><?php echo @ini_get('max_input_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>max_execution_time</td><td><?php  echo @ini_get( 'max_execution_time' );?></td><td>3000</td>

+				  	<td>max_execution_time</td><td><?php  echo @ini_get('max_execution_time'); ?></td><td>3000</td>

 				  </tr>

 				  <tr>

-				  	<td>memory_limit</td><td><?php echo @ini_get( 'memory_limit' );?></td><td>256M</td>

+				  	<td>memory_limit</td><td><?php echo @ini_get('memory_limit'); ?></td><td>256M</td>

 				  </tr>

 				</tbody>

 		    </table>

@@ -2653,21 +2653,21 @@ 
 	<div id="gd_ie_imposts" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_im_posts" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Listings: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Import CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Listings: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Import CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e( 'Update listing if post with post_id already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e( 'Ignore listing if post with post_id already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicepost" id="gd_im_pchoice_u" /><label for="gd_im_pchoice_u"><?php _e('Update listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicepost" id="gd_im_pchoice_s" /><label for="gd_im_pchoice_s"><?php _e('Ignore listing if post with post_id already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_postplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_post_file" class="gd-imex-file gd_im_post_file" id="gd_im_post" onclick="jQuery('#gd_im_postplupload-browse-button').trigger('click');" />

-							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

-						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv;?>" />

+							<input id="gd_im_postplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-pupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imposts_sample" id="gd_ie_imposts_sample">

+						<input type="hidden" id="gd_ie_imposts_csv" value="<?php echo $gd_posts_sample_csv; ?>" />

 							<?php

 							/**

 							 * Called just after the sample CSV download link.

@@ -2676,7 +2676,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>

@@ -2694,7 +2694,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>

@@ -2706,10 +2706,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>

@@ -2723,30 +2723,30 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

 	  <div class="meta-box-sortables ui-sortable">

 		<div id="gd_ie_ex_posts" class="postbox gd-hndle-pbox">

-		  <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - Listings: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Listings: Export CSV', 'geodirectory' );?></span></h3>

+		  <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - Listings: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Listings: Export CSV', 'geodirectory'); ?></span></h3>

 		  <div class="inside">

 			<table class="form-table">

 			  <tbody>

 				<tr>

 				  <td class="fld"><label for="gd_post_type">

-					<?php _e( 'Post Type:', 'geodirectory' );?>

+					<?php _e('Post Type:', 'geodirectory'); ?>

 					</label></td>

 				  <td><select name="gd_post_type" id="gd_post_type" style="min-width:140px">

-					  <?php echo $gd_posttypes_option;?>

+					  <?php echo $gd_posttypes_option; ?>

 					</select></td>

 				</tr>

 				<tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				</tr>

                 <tr class="gd-imex-dates">

-					<td class="fld"><label><?php _e( 'Published Date:', 'geodirectory' );?></label></td>

-					<td><label><span class="label-responsive"><?php _e( 'Start date:', 'geodirectory' );?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e( 'End date:', 'geodirectory' );?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>

+					<td class="fld"><label><?php _e('Published Date:', 'geodirectory'); ?></label></td>

+					<td><label><span class="label-responsive"><?php _e('Start date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_start_date" name="gd_imex[start_date]" data-type="date" /></label><label><span class="label-responsive"><?php _e('End date:', 'geodirectory'); ?></span><input type="text" id="gd_imex_end_date" name="gd_imex[end_date]" data-type="date" /></label></td>

 				</tr>

 				<tr>

 				  <td class="fld" style="vertical-align:top"><label>

-					<?php _e( 'Progress:', 'geodirectory' );?>

+					<?php _e('Progress:', 'geodirectory'); ?>

 					</label></td>

 				  <td><div id='gd_progressbar_box'>

 					  <div id="gd_progressbar" class="gd_progressbar">

@@ -2754,13 +2754,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>

@@ -2773,21 +2773,21 @@ 
 	<div id="gd_ie_imcategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_imcats" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Import CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Import CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Import CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Import CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

 					<td class="gd-imex-box">

 						<div class="gd-im-choices">

-						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e( 'Update item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

-						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e( 'Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory' );?></label></p>

+						<p><input type="radio" value="update" name="gd_im_choicecat" id="gd_im_cchoice_u" /><label for="gd_im_cchoice_u"><?php _e('Update item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

+						<p><input type="radio" checked="checked" value="skip" name="gd_im_choicecat" id="gd_im_cchoice_s" /><label for="gd_im_cchoice_s"><?php _e('Ignore item if item with cat_id/cat_slug already exists.', 'geodirectory'); ?></label></p>

 						</div>

 						<div class="plupload-upload-uic hide-if-no-js" id="gd_im_catplupload-upload-ui">

 							<input type="text" readonly="readonly" name="gd_im_cat_file" class="gd-imex-file gd_im_cat_file" id="gd_im_cat" onclick="jQuery('#gd_im_catplupload-browse-button').trigger('click');" />

-							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr( __( 'Download Sample CSV', 'geodirectory' ) );?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

-						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv;?>" />

+							<input id="gd_im_catplupload-browse-button" type="button" value="<?php echo SELECT_UPLOAD_CSV; ?>" class="gd-imex-cupload button-primary" /><input type="button" value="<?php echo esc_attr(__('Download Sample CSV', 'geodirectory')); ?>" class="button-secondary" name="gd_ie_imcats_sample" id="gd_ie_imcats_sample">

+						<input type="hidden" id="gd_ie_imcats_csv" value="<?php echo $gd_cats_sample_csv; ?>" />

 						<?php

 						/**

 						 * Called just after the sample CSV download link.

@@ -2797,7 +2797,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>

@@ -2814,7 +2814,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>

@@ -2826,10 +2826,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>

@@ -2843,26 +2843,26 @@ 
 	<div id="gd_ie_excategs" class="metabox-holder">

       <div class="meta-box-sortables ui-sortable">

         <div id="gd_ie_ex_cats" class="postbox gd-hndle-pbox">

-          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e( 'Toggle panel - GD Categories: Export CSV', 'geodirectory' );?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

-          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __( 'GD Categories: Export CSV', 'geodirectory' );?></span></h3>

+          <button class="handlediv button-link" type="button"><span class="screen-reader-text"><?php _e('Toggle panel - GD Categories: Export CSV', 'geodirectory'); ?></span><span aria-hidden="true" class="toggle-indicator"></span></button>

+          <h3 class="hndle gd-hndle-click"><span style='vertical-align:top;'><?php echo __('GD Categories: Export CSV', 'geodirectory'); ?></span></h3>

           <div class="inside">

             <table class="form-table">

 				<tbody>

 				  <tr>

-					<td class="fld"><label for="gd_post_type"><?php _e( 'Post Type:', 'geodirectory' );?></label></td>

-					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option;?></select></td>

+					<td class="fld"><label for="gd_post_type"><?php _e('Post Type:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_post_type" id="gd_post_type" style="min-width:140px"><?php echo $gd_posttypes_option; ?></select></td>

 				  </tr>

 				   <tr>

-					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e( 'Max entries per csv file:', 'geodirectory' );?></label></td>

-					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option;?></select><span class="description"><?php _e( 'Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory' );?></span></td>

+					<td class="fld" style="vertical-align:top"><label for="gd_chunk_size"><?php _e('Max entries per csv file:', 'geodirectory'); ?></label></td>

+					<td><select name="gd_chunk_size" id="gd_chunk_size" style="min-width:140px"><?php echo $gd_chunksize_option; ?></select><span class="description"><?php _e('Please select the maximum number of entries per csv file (defaults to 5000, you might want to lower this to prevent memory issues on some installs)', 'geodirectory'); ?></span></td>

 				  </tr>

 				  <tr>

-					<td class="fld" style="vertical-align:top"><label><?php _e( 'Progress:', 'geodirectory' );?></label></td>

-					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e( 'Elapsed Time:', 'geodirectory' );?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

+					<td class="fld" style="vertical-align:top"><label><?php _e('Progress:', 'geodirectory'); ?></label></td>

+					<td><div id='gd_progressbar_box'><div id="gd_progressbar" class="gd_progressbar"><div class="gd-progress-label"></div></div></div><p style="display:inline-block"><?php _e('Elapsed Time:', 'geodirectory'); ?></p>&nbsp;&nbsp;<p id="gd_timer" class="gd_timer">00:00:00</p></td>

 				  </tr>

 				  <tr class="gd-ie-actions">

 					<td style="vertical-align:top">

-						<input type="submit" value="<?php echo esc_attr( __( 'Export CSV', 'geodirectory' ) );?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

+						<input type="submit" value="<?php echo esc_attr(__('Export CSV', 'geodirectory')); ?>" class="button-primary" name="gd_ie_excats_submit" id="gd_ie_excats_submit">

 					</td>

 					<td id="gd_ie_ex_files" class="gd-ie-files"></td>

 				  </tr>

@@ -2884,7 +2884,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>

@@ -2903,7 +2903,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) {

@@ -2955,7 +2955,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;

@@ -3014,7 +3014,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) {

@@ -3203,27 +3203,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;

@@ -3233,17 +3233,17 @@ 
         if (type=='loc') {

             invalid_addr = invalid;

         }

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'), '%s', '%d')); ?></p>';

         msgParse = msgParse.replace("%s", invalid_addr);

         msgParse = msgParse.replace("%d", total);

         gdMsg += msgParse;

     }

 

     if (invalid > 0 && type!='loc') {

-        var msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory' ), '%s', '%d' ) );?></p>';

+        var msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to blank title/invalid post type/invalid characters used in data.', 'geodirectory'), '%s', '%d')); ?></p>';

         

         if (type=='hood') {

-            msgParse = '<p><?php echo addslashes( sprintf( __( '%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' ), '%s', '%d' ) );?></p>';

+            msgParse = '<p><?php echo addslashes(sprintf(__('%s / %s item(s) could not be added due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory'), '%s', '%d')); ?></p>';

         }

         msgParse = msgParse.replace("%s", invalid);

         msgParse = msgParse.replace("%d", total);

@@ -3251,7 +3251,7 @@ 
     }

 

     if (images > 0) {

-        gdMsg += '<p><?php echo addslashes( sprintf( CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'] ) );?></p>';

+        gdMsg += '<p><?php echo addslashes(sprintf(CSV_TRANSFER_IMG_FOLDER, $uploads['subdir'])); ?></p>';

     }

     gdMsg += '<p></p>';

     jQuery('#gd-import-msg', cont).find('#message').removeClass('error').addClass('updated').html(gdMsg);

@@ -3415,9 +3415,9 @@ 
             if (typeof filters !== 'undefined' && filters && doFilter) {

                 getTotal = true;

                 attach += '&_c=1';

-                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Preparing...', 'geodirectory' ) );?>');

+                gd_progressbar(el, 0, '<i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Preparing...', 'geodirectory')); ?>');

             } else {

-                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+                gd_progressbar(el, 0, '0% (0 / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

             }

             jQuery(el).find('#gd_timer').text('00:00:01');

             jQuery('#gd_ie_ex_files', el).html('');

@@ -3426,7 +3426,7 @@ 
         jQuery.ajax({

             url: ajaxurl,

             type: "POST",

-            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce;?>&_p=' + page + attach,

+            data: 'action=geodir_import_export&task=export_posts&_pt=' + post_type + '&_n=' + chunk_size + '&_nonce=<?php echo $nonce; ?>&_p=' + page + attach,

             dataType : 'json',

             cache: false,

             beforeSend: function (jqXHR, settings) {},

@@ -3451,11 +3451,11 @@ 
                         } else {

                             if (pages < page || pages == page) {

                                 window.clearInterval(timer_posts);

-                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+                                gd_progressbar(el, 100, '100% (' + total_posts + ' / ' + total_posts + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

                             } else {

                                 var percentage = Math.round(((page * chunk_size) / total_posts) * 100);

                                 percentage = percentage > 100 ? 100 : percentage;

-                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr( __( 'Exporting...', 'geodirectory' ) );?>');

+                                gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_posts + ') <i class="fa fa-refresh fa-spin"></i><?php echo esc_attr(__('Exporting...', 'geodirectory')); ?>');

                             }

                             if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

                                 var obj_files = data.files;

@@ -3486,7 +3486,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('');

         }

@@ -3494,7 +3494,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) {},

@@ -3508,11 +3508,11 @@ 
                     } else {

                         if (pages < page || pages == page) {

                             window.clearInterval(timer_cats);

-                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr( __( 'Complete!', 'geodirectory' ) );?>');

+                            gd_progressbar(el, 100, '100% (' + total_cats + ' / ' + total_cats + ') <i class="fa fa-check"></i><?php echo esc_attr(__('Complete!', 'geodirectory')); ?>');

                         } else {

                             var percentage = Math.round(((page * chunk_size) / total_cats) * 100);

                             percentage = percentage > 100 ? 100 : percentage;

-                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e( 'Exporting...', 'geodirectory' );?>');

+                            gd_progressbar(el, percentage, '' + percentage + '% (' + ( page * chunk_size ) + ' / ' + total_cats + ') <i class="fa fa-refresh fa-spin"></i><?php esc_attr_e('Exporting...', 'geodirectory'); ?>');

                         }

                         if (typeof data.files != 'undefined' && jQuery(data.files).length ) {

                             var obj_files = data.files;

@@ -3569,13 +3569,13 @@ 
 function geodir_init_filesystem()

 {

 

-    if(!function_exists('get_filesystem_method')){

+    if (!function_exists('get_filesystem_method')) {

         require_once(ABSPATH."/wp-admin/includes/file.php");

     }

     $access_type = get_filesystem_method();

     if ($access_type === 'direct') {

         /* you can safely run request_filesystem_credentials() without any issues and don't need to worry about passing in a URL */

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());

 

         /* initialize the API */

         if (!WP_Filesystem($creds)) {

@@ -3588,7 +3588,7 @@ 
         return $wp_filesystem;

         /* do our file manipulations below */

     } elseif (defined('FTP_USER')) {

-        $creds = request_filesystem_credentials(trailingslashit(site_url()) . 'wp-admin/', '', false, false, array());

+        $creds = request_filesystem_credentials(trailingslashit(site_url()).'wp-admin/', '', false, false, array());

 

         /* initialize the API */

         if (!WP_Filesystem($creds)) {

@@ -3623,7 +3623,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')) {

@@ -3660,64 +3660,64 @@ 
     // try to set higher limits for import

     $max_input_time = ini_get('max_input_time');

     $max_execution_time = ini_get('max_execution_time');

-    $memory_limit= ini_get('memory_limit');

+    $memory_limit = ini_get('memory_limit');

 

-    if(!$max_input_time || $max_input_time<3000){

+    if (!$max_input_time || $max_input_time < 3000) {

         ini_set('max_input_time', 3000);

     }

 

-    if(!$max_execution_time || $max_execution_time<3000){

+    if (!$max_execution_time || $max_execution_time < 3000) {

         ini_set('max_execution_time', 3000);

     }

 

-    if($memory_limit && str_replace('M','',$memory_limit)){

-        if(str_replace('M','',$memory_limit)<256){

+    if ($memory_limit && str_replace('M', '', $memory_limit)) {

+        if (str_replace('M', '', $memory_limit) < 256) {

             ini_set('memory_limit', '256M');

         }

     }

 

     $json = array();

 

-    if ( !current_user_can( 'manage_options' ) ) {

-        wp_send_json( $json );

+    if (!current_user_can('manage_options')) {

+        wp_send_json($json);

     }

 

-    $task = isset( $_REQUEST['task'] ) ? $_REQUEST['task'] : NULL;

-    $nonce = isset( $_REQUEST['_nonce'] ) ? $_REQUEST['_nonce'] : NULL;

-    $stat = isset( $_REQUEST['_st'] ) ? $_REQUEST['_st'] : false;

+    $task = isset($_REQUEST['task']) ? $_REQUEST['task'] : NULL;

+    $nonce = isset($_REQUEST['_nonce']) ? $_REQUEST['_nonce'] : NULL;

+    $stat = isset($_REQUEST['_st']) ? $_REQUEST['_st'] : false;

 

-    if ( !wp_verify_nonce( $nonce, 'geodir_import_export_nonce' ) ) {

-        wp_send_json( $json );

+    if (!wp_verify_nonce($nonce, 'geodir_import_export_nonce')) {

+        wp_send_json($json);

     }

 

-    $post_type = isset( $_REQUEST['_pt'] ) ? $_REQUEST['_pt'] : NULL;

-    $chunk_per_page = isset( $_REQUEST['_n'] ) ? absint($_REQUEST['_n']) : NULL;

+    $post_type = isset($_REQUEST['_pt']) ? $_REQUEST['_pt'] : NULL;

+    $chunk_per_page = isset($_REQUEST['_n']) ? absint($_REQUEST['_n']) : NULL;

     $chunk_per_page = $chunk_per_page < 50 || $chunk_per_page > 100000 ? 5000 : $chunk_per_page;

-    $chunk_page_no = isset( $_REQUEST['_p'] ) ? absint($_REQUEST['_p']) : 1;

+    $chunk_page_no = isset($_REQUEST['_p']) ? absint($_REQUEST['_p']) : 1;

 

     $wp_filesystem = geodir_init_filesystem();

     if (!$wp_filesystem) {

-        $json['error'] = __( 'Filesystem ERROR: Could not access filesystem.', 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: Could not access filesystem.', 'geodirectory');

+        wp_send_json($json);

     }

 

     if (!empty($wp_filesystem) && isset($wp_filesystem->errors) && is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {

-        $json['error'] = __( 'Filesystem ERROR: ' . $wp_filesystem->errors->get_error_message(), 'geodirectory' );

-        wp_send_json( $json );

+        $json['error'] = __('Filesystem ERROR: '.$wp_filesystem->errors->get_error_message(), 'geodirectory');

+        wp_send_json($json);

     }

 

-    $csv_file_dir = geodir_path_import_export( false );

-    if ( !$wp_filesystem->is_dir( $csv_file_dir ) ) {

-        if ( !$wp_filesystem->mkdir( $csv_file_dir, FS_CHMOD_DIR ) ) {

-            $json['error'] = __( 'ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory' );

-            wp_send_json( $json );

+    $csv_file_dir = geodir_path_import_export(false);

+    if (!$wp_filesystem->is_dir($csv_file_dir)) {

+        if (!$wp_filesystem->mkdir($csv_file_dir, FS_CHMOD_DIR)) {

+            $json['error'] = __('ERROR: Could not create cache directory. This is usually due to inconsistent file permissions.', 'geodirectory');

+            wp_send_json($json);

         }

     }

     

     $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

     $neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

 

-    switch ( $task ) {

+    switch ($task) {

         case 'export_posts': {

             // WPML

             $is_wpml = geodir_is_wpml();

@@ -3728,36 +3728,36 @@ 
                 $sitepress->switch_lang('all', true);

             }

             // WPML

-            if ( $post_type == 'gd_event' ) {

-                add_filter( 'geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2 );

+            if ($post_type == 'gd_event') {

+                add_filter('geodir_imex_export_posts_query', 'geodir_imex_get_events_query', 10, 2);

             }

-            $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+            $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;

             

-            $file_name = $post_type . '_' . date( 'dmyHi' );

-            if ( $filters && isset( $filters['start_date'] ) && isset( $filters['end_date'] ) ) {

-                $file_name = $post_type . '_' . date_i18n( 'dmy', strtotime( $filters['start_date'] ) ) . '_' . date_i18n( 'dmy', strtotime( $filters['end_date'] ) );

+            $file_name = $post_type.'_'.date('dmyHi');

+            if ($filters && isset($filters['start_date']) && isset($filters['end_date'])) {

+                $file_name = $post_type.'_'.date_i18n('dmy', strtotime($filters['start_date'])).'_'.date_i18n('dmy', strtotime($filters['end_date']));

             }

-            $posts_count = geodir_get_posts_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . '_' . $nonce . '.csv';

+            $posts_count = geodir_get_posts_count($post_type);

+            $file_url_base = geodir_path_import_export().'/';

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/'.$post_type.'_'.$nonce.'.csv';

             

             $chunk_file_paths = array();

 

-            if ( isset( $_REQUEST['_c'] ) ) {

+            if (isset($_REQUEST['_c'])) {

                 $json['total'] = $posts_count;

                 // WPML

                 if ($is_wpml) {

                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 gd_die();

-            } else if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $posts_count ) > 0 && $line_count > 0 ? ceil( $line_count / $posts_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            } else if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($posts_count) > 0 && $line_count > 0 ? ceil($line_count / $posts_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

@@ -3765,45 +3765,45 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

                 gd_die();

             } else {

-                if ( !$posts_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$posts_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_posts = $posts_count;

                     if ($chunk_per_page > $total_posts) {

                         $chunk_per_page = $total_posts;

                     }

-                    $chunk_total_pages = ceil( $total_posts / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_posts / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_posts = geodir_imex_get_posts( $post_type, $chunk_per_page, $j );

+                    $chunk_save_posts = geodir_imex_get_posts($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_posts = array_slice( $chunk_save_posts , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_posts = array_slice($chunk_save_posts, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_posts, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_posts, $clear);

                     }

                         

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $posts_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

@@ -3811,7 +3811,7 @@ 
                             $json['total'] = $posts_count;

                             $json['files'] = array();

                         } else {

-                            $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                            $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                         }

                     }

                 }

@@ -3820,7 +3820,7 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -3834,20 +3834,20 @@ 
                 $sitepress->switch_lang('all', true);

             }

             // WPML

-            $file_name = $post_type . 'category_' . date( 'dmyHi' );

+            $file_name = $post_type.'category_'.date('dmyHi');

             

-            $terms_count = geodir_get_terms_count( $post_type );

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/' . $post_type . 'category_' . $nonce . '.csv';

+            $terms_count = geodir_get_terms_count($post_type);

+            $file_url_base = geodir_path_import_export().'/';

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/'.$post_type.'category_'.$nonce.'.csv';

             

             $chunk_file_paths = array();

             

-            if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $terms_count ) > 0 && $line_count > 0 ? ceil( $line_count / $terms_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($terms_count) > 0 && $line_count > 0 ? ceil($line_count / $terms_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

                 // WPML

@@ -3855,48 +3855,48 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

-                if ( !$terms_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$terms_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

                     $total_terms = $terms_count;

                     if ($chunk_per_page > $terms_count) {

                         $chunk_per_page = $terms_count;

                     }

-                    $chunk_total_pages = ceil( $total_terms / $chunk_per_page );

+                    $chunk_total_pages = ceil($total_terms / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_terms = geodir_imex_get_terms( $post_type, $chunk_per_page, $j );

+                    $chunk_save_terms = geodir_imex_get_terms($post_type, $chunk_per_page, $j);

                     

                     $per_page = 500;

                     if ($per_page > $chunk_per_page) {

                         $per_page = $chunk_per_page;

                     }

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_terms = array_slice( $chunk_save_terms , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_terms = array_slice($chunk_save_terms, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_terms, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_terms, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $terms_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory' );

+                        $json['error'] = __('ERROR: Could not create csv file. This is usually due to inconsistent file permissions.', 'geodirectory');

                     }

                 }

                 // WPML

@@ -3904,127 +3904,127 @@ 
                     $sitepress->switch_lang($active_lang, true);

                 }

                 // WPML

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_locations': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_locations_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_locations_' . $nonce . '.csv';

+            $file_url_base = geodir_path_import_export().'/';

+            $file_name = 'gd_locations_'.date('dmyHi');

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/gd_locations_'.$nonce.'.csv';

             

-            $items_count = (int)geodir_location_imex_count_locations();

+            $items_count = (int) geodir_location_imex_count_locations();

             

-            if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_locations_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_locations_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

         case 'export_hoods': {

-            $file_url_base = geodir_path_import_export() . '/';

-            $file_name = 'gd_neighbourhoods_' . date( 'dmyHi' );

-            $file_url = $file_url_base . $file_name . '.csv';

-            $file_path = $csv_file_dir . '/' . $file_name . '.csv';

-            $file_path_temp = $csv_file_dir . '/gd_neighbourhoods_' . $nonce . '.csv';

+            $file_url_base = geodir_path_import_export().'/';

+            $file_name = 'gd_neighbourhoods_'.date('dmyHi');

+            $file_url = $file_url_base.$file_name.'.csv';

+            $file_path = $csv_file_dir.'/'.$file_name.'.csv';

+            $file_path_temp = $csv_file_dir.'/gd_neighbourhoods_'.$nonce.'.csv';

             

-            $items_count = (int)geodir_location_imex_count_neighbourhoods();

+            $items_count = (int) geodir_location_imex_count_neighbourhoods();

             

-            if ( isset( $_REQUEST['_st'] ) ) {

-                $line_count = (int)geodir_import_export_line_count( $file_path_temp );

-                $percentage = count( $items_count ) > 0 && $line_count > 0 ? ceil( $line_count / $items_count ) * 100 : 0;

-                $percentage = min( $percentage, 100 );

+            if (isset($_REQUEST['_st'])) {

+                $line_count = (int) geodir_import_export_line_count($file_path_temp);

+                $percentage = count($items_count) > 0 && $line_count > 0 ? ceil($line_count / $items_count) * 100 : 0;

+                $percentage = min($percentage, 100);

                 

                 $json['percentage'] = $percentage;

-                wp_send_json( $json );

+                wp_send_json($json);

             } else {

                 $chunk_file_paths = array();

                 

-                if ( !$items_count > 0 ) {

-                    $json['error'] = __( 'No records to export.', 'geodirectory' );

+                if (!$items_count > 0) {

+                    $json['error'] = __('No records to export.', 'geodirectory');

                 } else {

-                    $chunk_per_page = min( $chunk_per_page, $items_count );

-                    $chunk_total_pages = ceil( $items_count / $chunk_per_page );

+                    $chunk_per_page = min($chunk_per_page, $items_count);

+                    $chunk_total_pages = ceil($items_count / $chunk_per_page);

                     

                     $j = $chunk_page_no;

-                    $chunk_save_items = geodir_location_imex_neighbourhoods_data( $chunk_per_page, $j );

+                    $chunk_save_items = geodir_location_imex_neighbourhoods_data($chunk_per_page, $j);

                     

                     $per_page = 500;

-                    $per_page = min( $per_page, $chunk_per_page );

-                    $total_pages = ceil( $chunk_per_page / $per_page );

+                    $per_page = min($per_page, $chunk_per_page);

+                    $total_pages = ceil($chunk_per_page / $per_page);

                     

-                    for ( $i = 0; $i <= $total_pages; $i++ ) {

-                        $save_items = array_slice( $chunk_save_items , ( $i * $per_page ), $per_page );

+                    for ($i = 0; $i <= $total_pages; $i++) {

+                        $save_items = array_slice($chunk_save_items, ($i * $per_page), $per_page);

                         

                         $clear = $i == 0 ? true : false;

-                        geodir_save_csv_data( $file_path_temp, $save_items, $clear );

+                        geodir_save_csv_data($file_path_temp, $save_items, $clear);

                     }

                     

-                    if ( $wp_filesystem->exists( $file_path_temp ) ) {

-                        $chunk_page_no = $chunk_total_pages > 1 ? '-' . $j : '';

-                        $chunk_file_name = $file_name . $chunk_page_no . '.csv';

-                        $file_path = $csv_file_dir . '/' . $chunk_file_name;

-                        $wp_filesystem->move( $file_path_temp, $file_path, true );

+                    if ($wp_filesystem->exists($file_path_temp)) {

+                        $chunk_page_no = $chunk_total_pages > 1 ? '-'.$j : '';

+                        $chunk_file_name = $file_name.$chunk_page_no.'.csv';

+                        $file_path = $csv_file_dir.'/'.$chunk_file_name;

+                        $wp_filesystem->move($file_path_temp, $file_path, true);

                         

-                        $file_url = $file_url_base . $chunk_file_name;

-                        $chunk_file_paths[] = array('i' => $j . '.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

+                        $file_url = $file_url_base.$chunk_file_name;

+                        $chunk_file_paths[] = array('i' => $j.'.', 'u' => $file_url, 's' => size_format(filesize($file_path), 2));

                     }

                     

-                    if ( !empty($chunk_file_paths) ) {

+                    if (!empty($chunk_file_paths)) {

                         $json['total'] = $items_count;

                         $json['files'] = $chunk_file_paths;

                     } else {

-                        $json['error'] = __( 'Fail, something wrong to create csv file.', 'geodirectory' );

+                        $json['error'] = __('Fail, something wrong to create csv file.', 'geodirectory');

                     }

                 }

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -4041,25 +4041,25 @@ 
             }

             // WPML

             

-            ini_set( 'auto_detect_line_endings', true );

+            ini_set('auto_detect_line_endings', true);

             

             $uploads = wp_upload_dir();

             $uploads_dir = $uploads['path'];

             $uploads_subdir = $uploads['subdir'];

             

-            $csv_file = isset( $_POST['_file'] ) ? $_POST['_file'] : NULL;

-            $import_choice = isset( $_REQUEST['_ch'] ) ? $_REQUEST['_ch'] : 'skip';

+            $csv_file = isset($_POST['_file']) ? $_POST['_file'] : NULL;

+            $import_choice = isset($_REQUEST['_ch']) ? $_REQUEST['_ch'] : 'skip';

             

-            $csv_file_arr = explode( '/', $csv_file );

-            $csv_filename = end( $csv_file_arr );

-            $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $csv_filename;

+            $csv_file_arr = explode('/', $csv_file);

+            $csv_filename = end($csv_file_arr);

+            $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$csv_filename;

             

             $json['file'] = $csv_file;

-            $json['error'] = __( 'The uploaded file is not a valid csv file. Please try again.', 'geodirectory' );

+            $json['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

             $file = array();

 

-            if ( $csv_file && $wp_filesystem->is_file( $target_path ) && $wp_filesystem->exists( $target_path ) ) {

-                $wp_filetype = wp_check_filetype_and_ext( $target_path, $csv_filename );

+            if ($csv_file && $wp_filesystem->is_file($target_path) && $wp_filesystem->exists($target_path)) {

+                $wp_filetype = wp_check_filetype_and_ext($target_path, $csv_filename);

                 

                 if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

                     $json['error'] = NULL;

@@ -4067,9 +4067,9 @@ 
                     

                     $lc_all = setlocale(LC_ALL, 0); // Fix issue of fgetcsv ignores special characters when they are at the beginning of line

                     setlocale(LC_ALL, 'en_US.UTF-8');

-                    if ( ( $handle = fopen($target_path, "r" ) ) !== FALSE ) {

-                        while ( ( $data = fgetcsv( $handle, 100000, "," ) ) !== FALSE ) {

-                            if ( !empty( $data ) ) {

+                    if (($handle = fopen($target_path, "r")) !== FALSE) {

+                        while (($data = fgetcsv($handle, 100000, ",")) !== FALSE) {

+                            if (!empty($data)) {

                                 $file[] = $data;

                             }

                         }

@@ -4083,19 +4083,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;

             

@@ -4120,13 +4120,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;

                     }

                     

@@ -4137,7 +4137,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 = '';

@@ -4154,42 +4154,42 @@ 
                             $cat_id_original = '';

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

-                                if ( $column == 'cat_id' ) {

-                                    $cat_id = (int)$row[$c];

-                                } else if ( $column == 'cat_name' ) {

+                            foreach ($columns as $column) {

+                                if ($column == 'cat_id') {

+                                    $cat_id = (int) $row[$c];

+                                } else if ($column == 'cat_name') {

                                     $cat_name = $row[$c];

-                                } else if ( $column == 'cat_slug' ) {

+                                } else if ($column == 'cat_slug') {

                                     $cat_slug = $row[$c];

-                                } else if ( $column == 'cat_posttype' ) {

+                                } else if ($column == 'cat_posttype') {

                                     $cat_posttype = $row[$c];

-                                } else if ( $column == 'cat_parent' ) {

+                                } else if ($column == 'cat_parent') {

                                     $cat_parent = trim($row[$c]);

-                                } else if ( $column == 'cat_schema' && $row[$c] != '' ) {

+                                } else if ($column == 'cat_schema' && $row[$c] != '') {

                                     $cat_schema = $row[$c];

-                                } else if ( $column == 'cat_description' ) {

+                                } else if ($column == 'cat_description') {

                                     $cat_description = $row[$c];

-                                } else if ( $column == 'cat_top_description' ) {

+                                } else if ($column == 'cat_top_description') {

                                     $cat_top_description = $row[$c];

-                                } else if ( $column == 'cat_image' ) {

+                                } else if ($column == 'cat_image') {

                                     $cat_image = $row[$c];

-                                } else if ( $column == 'cat_icon' ) {

+                                } else if ($column == 'cat_icon') {

                                     $cat_icon = $row[$c];

                                 }

                                 // WPML

-                                if ( $is_wpml ) {

-                                    if ( $column == 'cat_language' ) {

-                                        $cat_language = geodir_strtolower( trim( $row[$c] ) );

-                                    } else if ( $column == 'cat_id_original' ) {

-                                        $cat_id_original = (int)$row[$c];

+                                if ($is_wpml) {

+                                    if ($column == 'cat_language') {

+                                        $cat_language = geodir_strtolower(trim($row[$c]));

+                                    } else if ($column == 'cat_id_original') {

+                                        $cat_id_original = (int) $row[$c];

                                     }

                                 }

                                 // WPML

                                 $c++;

                             }

                             

-                            if ( $cat_name == '' || !in_array( $cat_posttype, $post_types ) ) {

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+                            if ($cat_name == '' || !in_array($cat_posttype, $post_types)) {

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));

                                 

                                 $invalid++;

                                 continue;

@@ -4207,24 +4207,24 @@ 
                             $term_data['description'] = $cat_description;

                             $term_data['cat_schema'] = $cat_schema;

                             $term_data['top_description'] = $cat_top_description;

-                            $term_data['image'] = $cat_image != '' ? basename( $cat_image ) : '';

-                            $term_data['icon'] = $cat_icon != '' ? basename( $cat_icon ) : '';

+                            $term_data['image'] = $cat_image != '' ? basename($cat_image) : '';

+                            $term_data['icon'] = $cat_icon != '' ? basename($cat_icon) : '';

                             

                             //$term_data = array_map( 'utf8_encode', $term_data );

                             

-                            $taxonomy = $cat_posttype . 'category';

+                            $taxonomy = $cat_posttype.'category';

                             

                             $term_data['taxonomy'] = $taxonomy;

 

                             $term_parent_id = 0;

-                            if ($cat_parent != "" || (int)$cat_parent > 0) {

+                            if ($cat_parent != "" || (int) $cat_parent > 0) {

                                 $term_parent = '';

                                 

-                                if ( $term_parent = get_term_by( 'name', $cat_parent, $taxonomy ) ) {

+                                if ($term_parent = get_term_by('name', $cat_parent, $taxonomy)) {

                                     //

-                                } else if ( $term_parent = get_term_by( 'slug', $cat_parent, $taxonomy ) ) {

+                                } else if ($term_parent = get_term_by('slug', $cat_parent, $taxonomy)) {

                                     //

-                                } else if ( $term_parent = get_term_by( 'id', $cat_parent, $taxonomy ) ) {

+                                } else if ($term_parent = get_term_by('id', $cat_parent, $taxonomy)) {

                                     //

                                 } else {

                                     $term_parent_data = array();

@@ -4232,104 +4232,104 @@ 
                                     //$term_parent_data = array_map( 'utf8_encode', $term_parent_data );

                                     $term_parent_data['taxonomy'] = $taxonomy;

                                     

-                                    $term_parent_id = (int)geodir_imex_insert_term( $taxonomy, $term_parent_data );

+                                    $term_parent_id = (int) geodir_imex_insert_term($taxonomy, $term_parent_data);

                                 }

                                 

-                                if ( !empty( $term_parent ) && !is_wp_error( $term_parent ) ) {

-                                    $term_parent_id = (int)$term_parent->term_id;

+                                if (!empty($term_parent) && !is_wp_error($term_parent)) {

+                                    $term_parent_id = (int) $term_parent->term_id;

                                 }

                             }

-                            $term_data['parent'] = (int)$term_parent_id;

+                            $term_data['parent'] = (int) $term_parent_id;

 

                             $term_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            if ($import_choice == 'update') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $term_data['term_id'] = $term['term_id'];

                                     

-                                    if ( $term_id = geodir_imex_update_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_update_term($taxonomy, $term_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $cat_id > 0 && $term = (array)term_exists( $cat_id, $taxonomy ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($cat_id > 0 && $term = (array) term_exists($cat_id, $taxonomy)) {

                                     $skipped++;

-                                } else if ( $term_data['slug'] != '' && $term = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+                                } else if ($term_data['slug'] != '' && $term = (array) term_exists($term_data['slug'], $taxonomy)) {

                                     $skipped++;

                                 } else {

-                                    if ( $term_id = geodir_imex_insert_term( $taxonomy, $term_data ) ) {

+                                    if ($term_id = geodir_imex_insert_term($taxonomy, $term_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be updated due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory' ) );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to invalid data (check & remove if any invalid characters used in data)', 'geodirectory'));

                             }

                             

-                            if ( $term_id ) {

+                            if ($term_id) {

                                 // WPML

                                 if ($is_wpml && $cat_id_original > 0 && $cat_language != '') {

-                                    $wpml_element_type = 'tax_' . $taxonomy;

-                                    $source_language = geodir_get_language_for_element( $cat_id_original, $wpml_element_type );

+                                    $wpml_element_type = 'tax_'.$taxonomy;

+                                    $source_language = geodir_get_language_for_element($cat_id_original, $wpml_element_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $cat_id_original, $wpml_element_type );

+                                    $trid = $sitepress->get_element_trid($cat_id_original, $wpml_element_type);

                                     

-                                    $sitepress->set_element_language_details( $term_id, $wpml_element_type, $trid, $cat_language, $source_language );

+                                    $sitepress->set_element_language_details($term_id, $wpml_element_type, $trid, $cat_language, $source_language);

                                 }

                                 // WPML

                                 

-                                if ( isset( $term_data['top_description'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype );

+                                if (isset($term_data['top_description'])) {

+                                    update_tax_meta($term_id, 'ct_cat_top_desc', $term_data['top_description'], $cat_posttype);

                                 }

                                 

-                                if ( isset( $term_data['cat_schema'] ) ) {

-                                    update_tax_meta( $term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype );

+                                if (isset($term_data['cat_schema'])) {

+                                    update_tax_meta($term_id, 'ct_cat_schema', $term_data['cat_schema'], $cat_posttype);

                                 }

             

                                 $attachment = false;

-                                if ( isset( $term_data['image'] ) && $term_data['image'] != '' ) {

-                                    $cat_image = geodir_get_default_catimage( $term_id, $cat_posttype );

-                                    $cat_image = !empty( $cat_image ) && isset( $cat_image['src'] ) ? $cat_image['src'] : '';

+                                if (isset($term_data['image']) && $term_data['image'] != '') {

+                                    $cat_image = geodir_get_default_catimage($term_id, $cat_posttype);

+                                    $cat_image = !empty($cat_image) && isset($cat_image['src']) ? $cat_image['src'] : '';

                                     

-                                    if ( basename($cat_image) != $term_data['image'] ) {

+                                    if (basename($cat_image) != $term_data['image']) {

                                         $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_default_img', array( 'id' => 'image', 'src' => $uploads['url'] . '/' . $term_data['image'] ), $cat_posttype );

+                                        update_tax_meta($term_id, 'ct_cat_default_img', array('id' => 'image', 'src' => $uploads['url'].'/'.$term_data['image']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( isset( $term_data['icon'] ) && $term_data['icon'] != '' ) {

-                                    $cat_icon = get_tax_meta( $term_id, 'ct_cat_icon', false, $cat_posttype );

-                                    $cat_icon = !empty( $cat_icon ) && isset( $cat_icon['src'] ) ? $cat_icon['src'] : '';

+                                if (isset($term_data['icon']) && $term_data['icon'] != '') {

+                                    $cat_icon = get_tax_meta($term_id, 'ct_cat_icon', false, $cat_posttype);

+                                    $cat_icon = !empty($cat_icon) && isset($cat_icon['src']) ? $cat_icon['src'] : '';

                                         

-                                    if ( basename($cat_icon) != $term_data['icon'] ) {

+                                    if (basename($cat_icon) != $term_data['icon']) {

                                         $attachment = true;

-                                        update_tax_meta( $term_id, 'ct_cat_icon', array( 'id' => 'icon', 'src' => $uploads['url'] . '/' . $term_data['icon'] ), $cat_posttype );

+                                        update_tax_meta($term_id, 'ct_cat_icon', array('id' => 'icon', 'src' => $uploads['url'].'/'.$term_data['icon']), $cat_posttype);

                                     }

                                 }

                                 

-                                if ( $attachment ) {

+                                if ($attachment) {

                                     $images++;

                                 }

                             }

@@ -4351,34 +4351,34 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

                 exit;

-            } else if ( $task == 'import_post' ) {

+            } else if ($task == 'import_post') {

                 //run some stuff to make the import quicker

-                wp_defer_term_counting( true );

-                wp_defer_comment_counting( true );

-                $wpdb->query( 'SET autocommit = 0;' );

+                wp_defer_term_counting(true);

+                wp_defer_comment_counting(true);

+                $wpdb->query('SET autocommit = 0;');

 

                 //remove_all_actions('publish_post');

                 //remove_all_actions('transition_post_status');

                 //remove_all_actions('publish_future_post');

 

                 if (!empty($file)) {

-                    $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+                    $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;

                     $wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

                     $default_status = 'publish';

-                    $current_date = date_i18n( 'Y-m-d', time() );

+                    $current_date = date_i18n('Y-m-d', time());

                     

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = CSV_INVAILD_FILE;

-                        wp_send_json( $json );

+                        wp_send_json($json);

                         exit;

                     }

 

                     $gd_error_log = __('GD IMPORT LISTINGS [ROW %d]:', 'geodirectory');

-                    $wp_chars_error = __( '(check & remove if any invalid characters used in data)', 'geodirectory' );

+                    $wp_chars_error = __('(check & remove if any invalid characters used in data)', 'geodirectory');

                     $processed_actual = 0;

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

@@ -4387,9 +4387,9 @@ 
                         if (isset($file[$index])) {

                             $processed_actual++;

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             //$row = array_map( 'utf8_encode', $row );

-                            $row = array_map( 'addslashes_gpc', $row );

+                            $row = array_map('addslashes_gpc', $row);

                             

                             $post_id = '';

                             $post_title = '';

@@ -4426,78 +4426,78 @@ 
                             $original_post_id = '';

                             

                             $c = 0;

-                            foreach ($columns as $column ) {

+                            foreach ($columns as $column) {

                                 $gd_post[$column] = $row[$c];

                                 

-                                if ( $column == 'post_id' ) {

+                                if ($column == 'post_id') {

                                     $post_id = $row[$c];

-                                } else if ( $column == 'post_title' ) {

+                                } else if ($column == 'post_title') {

                                     $post_title = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_author' ) {

+                                } else if ($column == 'post_author') {

                                     $post_author = $row[$c];

-                                } else if ( $column == 'post_content' ) {

+                                } else if ($column == 'post_content') {

                                     $post_content = $row[$c];

-                                } else if ( $column == 'post_category' && $row[$c] != '' ) {

-                                    $post_category_arr = explode( ',', $row[$c] );

-                                } else if ( $column == 'default_category' ) {

+                                } else if ($column == 'post_category' && $row[$c] != '') {

+                                    $post_category_arr = explode(',', $row[$c]);

+                                } else if ($column == 'default_category') {

                                     $default_category = wp_kses_normalize_entities($row[$c]);

-                                } else if ( $column == 'post_tags' && $row[$c] != '' ) {

-                                    $post_tags = explode( ',', sanitize_text_field($row[$c]) );

-                                } else if ( $column == 'post_type' ) {

+                                } else if ($column == 'post_tags' && $row[$c] != '') {

+                                    $post_tags = explode(',', sanitize_text_field($row[$c]));

+                                } else if ($column == 'post_type') {

                                     $post_type = $row[$c];

-                                } else if ( $column == 'post_status' ) {

-                                    $post_status = sanitize_key( $row[$c] );

-                                } else if ( $column == 'is_featured' ) {

-                                    $is_featured = (int)$row[$c];

-                                } else if ( $column == 'geodir_video' ) {

+                                } else if ($column == 'post_status') {

+                                    $post_status = sanitize_key($row[$c]);

+                                } else if ($column == 'is_featured') {

+                                    $is_featured = (int) $row[$c];

+                                } else if ($column == 'geodir_video') {

                                     $geodir_video = $row[$c];

-                                } else if ( $column == 'post_address' ) {

+                                } else if ($column == 'post_address') {

                                     $post_address = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_city' ) {

+                                } else if ($column == 'post_city') {

                                     $post_city = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_region' ) {

+                                } else if ($column == 'post_region') {

                                     $post_region = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_country' ) {

+                                } else if ($column == 'post_country') {

                                     $post_country = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_zip' ) {

+                                } else if ($column == 'post_zip') {

                                     $post_zip = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_latitude' ) {

+                                } else if ($column == 'post_latitude') {

                                     $post_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_longitude' ) {

+                                } else if ($column == 'post_longitude') {

                                     $post_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'post_neighbourhood' ) {

+                                } else if ($column == 'post_neighbourhood') {

                                     $post_neighbourhood = sanitize_text_field($row[$c]);

                                     unset($gd_post[$column]);

-                                } else if ( $column == 'neighbourhood_latitude' ) {

+                                } else if ($column == 'neighbourhood_latitude') {

                                     $neighbourhood_latitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'neighbourhood_longitude' ) {

+                                } else if ($column == 'neighbourhood_longitude') {

                                     $neighbourhood_longitude = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_timing' ) {

+                                } else if ($column == 'geodir_timing') {

                                     $geodir_timing = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_contact' ) {

+                                } else if ($column == 'geodir_contact') {

                                     $geodir_contact = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_email' ) {

+                                } else if ($column == 'geodir_email') {

                                     $geodir_email = sanitize_email($row[$c]);

-                                } else if ( $column == 'geodir_website' ) {

+                                } else if ($column == 'geodir_website') {

                                     $geodir_website = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_twitter' ) {

+                                } else if ($column == 'geodir_twitter') {

                                     $geodir_twitter = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'geodir_facebook' ) {

+                                } else if ($column == 'geodir_facebook') {

                                     $geodir_facebook = sanitize_text_field($row[$c]);

-                                } else if ( $column == 'IMAGE' && !empty( $row[$c] ) && $row[$c] != '' ) {

+                                } else if ($column == 'IMAGE' && !empty($row[$c]) && $row[$c] != '') {

                                     $post_images[] = $row[$c];

-                                } else if ( $column == 'alive_days' && (int)$row[$c] > 0 ) {

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $current_date . '+' . (int)$row[$c] . ' days' ) );

-                                } else if ( $column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never' ) {

+                                } else if ($column == 'alive_days' && (int) $row[$c] > 0) {

+                                    $expire_date = date_i18n('Y-m-d', strtotime($current_date.'+'.(int) $row[$c].' days'));

+                                } else if ($column == 'expire_date' && $row[$c] != '' && geodir_strtolower($row[$c]) != 'never') {

                                     $row[$c] = str_replace('/', '-', $row[$c]);

-                                    $expire_date = date_i18n( 'Y-m-d', strtotime( $row[$c] ) );

+                                    $expire_date = date_i18n('Y-m-d', strtotime($row[$c]));

                                 }

                                 // WPML

                                 if ($is_wpml) {

                                     if ($column == 'language') {

                                         $language = geodir_strtolower(trim($row[$c]));

                                     } else if ($column == 'original_post_id') {

-                                        $original_post_id = (int)$row[$c];

+                                        $original_post_id = (int) $row[$c];

                                     }

                                 }

                                 // WPML

@@ -4505,7 +4505,7 @@ 
                             }

                             // listing claimed or not

                             if ($is_claim_active && isset($gd_post['claimed'])) {

-                                $gd_post['claimed'] = (int)$gd_post['claimed'] == 1 ? 1 : 0;

+                                $gd_post['claimed'] = (int) $gd_post['claimed'] == 1 ? 1 : 0;

                             }

                             

                             // WPML

@@ -4516,43 +4516,43 @@ 
 

                             $gd_post['IMAGE'] = $post_images;

                             

-                            $post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

-                            $post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

+                            $post_status = !empty($post_status) ? sanitize_key($post_status) : $default_status;

+                            $post_status = !empty($wp_post_statuses) && !isset($wp_post_statuses[$post_status]) ? $default_status : $post_status;

                                                                                                                 

                             $valid = true;

                             

-                            if ( $post_title == '' || !in_array( $post_type, $post_types ) ) {

+                            if ($post_title == '' || !in_array($post_type, $post_types)) {

                                 $invalid++;

                                 $valid = false;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank title/invalid post type', 'geodirectory' ) );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank title/invalid post type', 'geodirectory'));

                             }

                             

-                            $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

-                            if ( $location_allowed ) {

+                            $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

+                            if ($location_allowed) {

                                 $location_result = geodir_get_default_location();

-                                if ( $post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '' ) {

+                                if ($post_address == '' || $post_city == '' || $post_region == '' || $post_country == '' || $post_latitude == '' || $post_longitude == '') {

                                     $invalid_addr++;

                                     $valid = false;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

-                                } else if ( !empty( $location_result ) && $location_result->location_id == 0 ) {

-                                    if ( ( geodir_strtolower( $post_city ) != geodir_strtolower( $location_result->city ) ) || ( geodir_strtolower( $post_region ) != geodir_strtolower( $location_result->region ) ) || (geodir_strtolower( $post_country ) != geodir_strtolower( $location_result->country ) ) ) {

+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));

+                                } else if (!empty($location_result) && $location_result->location_id == 0) {

+                                    if ((geodir_strtolower($post_city) != geodir_strtolower($location_result->city)) || (geodir_strtolower($post_region) != geodir_strtolower($location_result->region)) || (geodir_strtolower($post_country) != geodir_strtolower($location_result->country))) {

                                         $invalid_addr++;

                                         $valid = false;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . __( 'Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory' ) );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.__('Could not be added due to blank/invalid address(city, region, country, latitude, longitude).', 'geodirectory'));

                                     } else {

                                         if (!$location_manager) {

-                                            $gd_post['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // Set the default location when location manager not activated.

+                                            $gd_post['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // Set the default location when location manager not activated.

                                         }

                                     }

                                 }

                             }

                             

-                            if ( !$valid ) {

+                            if (!$valid) {

                                 continue;

                             }

 

-                            $cat_taxonomy = $post_type . 'category';

-                            $tags_taxonomy = $post_type . '_tags';

+                            $cat_taxonomy = $post_type.'category';

+                            $tags_taxonomy = $post_type.'_tags';

                             

                             if ($default_category != '' && !in_array($default_category, $post_category_arr)) {

                                 $post_category_arr = array_merge(array($default_category), $post_category_arr);

@@ -4560,29 +4560,29 @@ 
 

                             $post_category = array();

                             $default_category_id = NULL;

-                            if ( !empty( $post_category_arr ) ) {

-                                foreach ( $post_category_arr as $value ) {

-                                    $category_name = wp_kses_normalize_entities( trim( $value ) );

+                            if (!empty($post_category_arr)) {

+                                foreach ($post_category_arr as $value) {

+                                    $category_name = wp_kses_normalize_entities(trim($value));

                                     

-                                    if ( $category_name != '' ) {

+                                    if ($category_name != '') {

                                         $term_category = array();

                                         

-                                        if ( $term = get_term_by( 'name', $category_name, $cat_taxonomy ) ) {

+                                        if ($term = get_term_by('name', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

-                                        } else if ( $term = get_term_by( 'slug', $category_name, $cat_taxonomy ) ) {

+                                        } else if ($term = get_term_by('slug', $category_name, $cat_taxonomy)) {

                                             $term_category = $term;

                                         } else {

                                             $term_data = array();

                                             $term_data['name'] = $category_name;

                                             $term_data['taxonomy'] = $cat_taxonomy;

                                             

-                                            $term_id = geodir_imex_insert_term( $cat_taxonomy, $term_data );

-                                            if ( $term_id ) {

-                                                $term_category = get_term( $term_id, $cat_taxonomy );

+                                            $term_id = geodir_imex_insert_term($cat_taxonomy, $term_data);

+                                            if ($term_id) {

+                                                $term_category = get_term($term_id, $cat_taxonomy);

                                             }

                                         }

                                         

-                                        if ( !empty( $term_category ) && !is_wp_error( $term_category ) ) {

+                                        if (!empty($term_category) && !is_wp_error($term_category)) {

                                             $post_category[] = intval($term_category->term_id);

                                             

                                             if ($category_name == $default_category) {

@@ -4603,15 +4603,15 @@ 
                             $save_post['post_tags'] = $post_tags;

 

                             $saved_post_id = NULL;

-                            if ( $import_choice == 'update' ) {

-                                $gd_wp_error = __( 'Unable to add listing, please check the listing data.', 'geodirectory' );

+                            if ($import_choice == 'update') {

+                                $gd_wp_error = __('Unable to add listing, please check the listing data.', 'geodirectory');

                                 

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                                if ($post_id > 0 && get_post($post_id)) {

                                     $save_post['ID'] = $post_id;

                                     

-                                    if ( $saved_post_id = wp_update_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+                                    if ($saved_post_id = wp_update_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;

                                             $saved_post_id = 0;

                                         } else {

                                             $saved_post_id = $post_id;

@@ -4619,9 +4619,9 @@ 
                                         }

                                     }

                                 } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

-                                            $gd_wp_error = $saved_post_id->get_error_message() . ' ' . $wp_chars_error;

+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

+                                            $gd_wp_error = $saved_post_id->get_error_message().' '.$wp_chars_error;

                                             $saved_post_id = 0;

                                         } else {

                                             $created++;

@@ -4629,19 +4629,19 @@ 
                                     }

                                 }

                                 

-                                if ( !$saved_post_id > 0 ) {

+                                if (!$saved_post_id > 0) {

                                     $invalid++;

-                                    geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_wp_error );

+                                    geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_wp_error);

                                 }

-                            } else if ( $import_choice == 'skip' ) {

-                                if ( $post_id > 0 && get_post( $post_id ) ) {

+                            } else if ($import_choice == 'skip') {

+                                if ($post_id > 0 && get_post($post_id)) {

                                     $skipped++;	

                                 } else {

-                                    if ( $saved_post_id = wp_insert_post( $save_post, true ) ) {

-                                        if ( is_wp_error( $saved_post_id ) ) {

+                                    if ($saved_post_id = wp_insert_post($save_post, true)) {

+                                        if (is_wp_error($saved_post_id)) {

                                             $invalid++;

                                             

-                                            geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $saved_post_id->get_error_message() . ' ' . $wp_chars_error );

+                                            geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$saved_post_id->get_error_message().' '.$wp_chars_error);

                                             $saved_post_id = 0;

                                         } else {

                                             $created++;

@@ -4649,28 +4649,28 @@ 
                                     } else {

                                         $invalid++;

                                         

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);

                                     }

                                 }

                             } else {

                                 $invalid++;

                                 

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $wp_chars_error );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$wp_chars_error);

                             }

 

-                            if ( (int)$saved_post_id > 0 ) {

+                            if ((int) $saved_post_id > 0) {

                                 // WPML

                                 if ($is_wpml && $original_post_id > 0 && $language != '') {

-                                    $wpml_post_type = 'post_' . $post_type;

-                                    $source_language = geodir_get_language_for_element( $original_post_id, $wpml_post_type );

+                                    $wpml_post_type = 'post_'.$post_type;

+                                    $source_language = geodir_get_language_for_element($original_post_id, $wpml_post_type);

                                     $source_language = $source_language != '' ? $source_language : $sitepress->get_default_language();

 

-                                    $trid = $sitepress->get_element_trid( $original_post_id, $wpml_post_type );

+                                    $trid = $sitepress->get_element_trid($original_post_id, $wpml_post_type);

                                     

-                                    $sitepress->set_element_language_details( $saved_post_id, $wpml_post_type, $trid, $language, $source_language );

+                                    $sitepress->set_element_language_details($saved_post_id, $wpml_post_type, $trid, $language, $source_language);

                                 }

                                 // WPML

-                                $gd_post_info = geodir_get_post_info( $saved_post_id );

+                                $gd_post_info = geodir_get_post_info($saved_post_id);

                                 

                                 $gd_post['post_id'] = $saved_post_id;

                                 $gd_post['ID'] = $saved_post_id;

@@ -4682,7 +4682,7 @@ 
                                                     

                                 // post location

                                 $post_location_id = 0;

-                                if ( $location_allowed && !empty( $location_result ) && $location_result->location_id > 0 ) {

+                                if ($location_allowed && !empty($location_result) && $location_result->location_id > 0) {

                                     $gd_post['post_neighbourhood'] = '';

                                     

                                     $post_location_info = array(

@@ -4692,7 +4692,7 @@ 
                                                                 'geo_lat' => $post_latitude,

                                                                 'geo_lng' => $post_longitude

                                                             );

-                                    if ( $location_id = (int)geodir_add_new_location( $post_location_info ) ) {

+                                    if ($location_id = (int) geodir_add_new_location($post_location_info)) {

                                         $post_location_id = $location_id;

                                     }

                                     

@@ -4730,14 +4730,14 @@ 
                                 $gd_post['post_location_id'] = $post_location_id;

                                 

                                 // post package info

-                                $package_id = isset( $gd_post['package_id'] ) && !empty( $gd_post['package_id'] ) ? (int)$gd_post['package_id'] : 0;

+                                $package_id = isset($gd_post['package_id']) && !empty($gd_post['package_id']) ? (int) $gd_post['package_id'] : 0;

                                 if (!$package_id && !empty($gd_post_info) && isset($gd_post_info->package_id) && $gd_post_info->package_id) {

                                     $package_id = $gd_post_info->package_id;

                                 }

                                 

                                 $package_info = array();

                                 if ($package_id && function_exists('geodir_get_package_info_by_id')) {

-                                    $package_info = (array)geodir_get_package_info_by_id($package_id);

+                                    $package_info = (array) geodir_get_package_info_by_id($package_id);

                                     

                                     if (!(!empty($package_info) && isset($package_info['post_type']) && $package_info['post_type'] == $post_type)) {

                                         $package_info = array();

@@ -4745,18 +4745,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';

                                         }

@@ -4765,7 +4765,7 @@ 
                                     $gd_post['package_id'] = $package_id;

                                 }

 

-                                $table = $plugin_prefix . $post_type . '_detail';

+                                $table = $plugin_prefix.$post_type.'_detail';

                                 

                                 if ($post_type == 'gd_event') {

                                     $gd_post = geodir_imex_process_event_data($gd_post);

@@ -4776,28 +4776,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;

@@ -4806,34 +4806,34 @@ 
                                 }

                                 

                                 // Save post info

-                                geodir_save_post_info( $saved_post_id, $gd_post );

+                                geodir_save_post_info($saved_post_id, $gd_post);

                                 // post taxonomies

-                                if ( !empty( $save_post['post_category'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_category'], $cat_taxonomy );

+                                if (!empty($save_post['post_category'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_category'], $cat_taxonomy);

                                     

-                                    $post_default_category = isset( $save_post['post_default_category'] ) ? $save_post['post_default_category'] : '';

+                                    $post_default_category = isset($save_post['post_default_category']) ? $save_post['post_default_category'] : '';

                                     if ($default_category_id) {

                                         $post_default_category = $default_category_id;

                                     }

                                     $post_cat_ids = geodir_get_post_meta($saved_post_id, $cat_taxonomy);

                                     $save_post['post_category'] = !empty($post_cat_ids) ? explode(",", trim($post_cat_ids, ",")) : $save_post['post_category'];

-                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']) . ',y:' : '';

+                                    $post_category_str = !empty($save_post['post_category']) ? implode(",y:#", $save_post['post_category']).',y:' : '';

                                     

                                     if ($post_category_str != '' && $post_default_category) {

-                                        $post_category_str = str_replace($post_default_category . ',y:', $post_default_category . ',y,d:', $post_category_str);

+                                        $post_category_str = str_replace($post_default_category.',y:', $post_default_category.',y,d:', $post_category_str);

                                     }

                                     

                                     $post_category_str = $post_category_str != '' ? array($cat_taxonomy => $post_category_str) : '';

                                     

-                                    geodir_set_postcat_structure( $saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str );

+                                    geodir_set_postcat_structure($saved_post_id, $cat_taxonomy, $post_default_category, $post_category_str);

                                 }

 

-                                if ( !empty( $save_post['post_tags'] ) ) {

-                                    wp_set_object_terms( $saved_post_id, $save_post['post_tags'], $tags_taxonomy );

+                                if (!empty($save_post['post_tags'])) {

+                                    wp_set_object_terms($saved_post_id, $save_post['post_tags'], $tags_taxonomy);

                                 }

 

                                 // Post images

-                                if ( !empty( $post_images ) ) {

+                                if (!empty($post_images)) {

                                     $post_images = array_unique($post_images);

                                     

                                     $old_post_images_arr = array();

@@ -4841,61 +4841,61 @@ 
                                     

                                     $order = 1;

                                     

-                                    $old_post_images = geodir_get_images( $saved_post_id );

+                                    $old_post_images = geodir_get_images($saved_post_id);

                                     if (!empty($old_post_images)) {

-                                        foreach( $old_post_images as $old_post_image ) {

+                                        foreach ($old_post_images as $old_post_image) {

                                             if (!empty($old_post_image) && isset($old_post_image->file) && $old_post_image->file != '') {

                                                 $old_post_images_arr[] = $old_post_image->file;

                                             }

                                         }

                                     }

 

-                                    foreach ( $post_images as $post_image ) {

-                                        $image_name = basename( $post_image );

+                                    foreach ($post_images as $post_image) {

+                                        $image_name = basename($post_image);

                                         $saved_post_images_arr[] = $image_name;

                                         

-                                        if (!empty($old_post_images_arr) && in_array( $image_name, $old_post_images_arr) ) {

+                                        if (!empty($old_post_images_arr) && in_array($image_name, $old_post_images_arr)) {

                                             continue; // Skip if image already exists.

                                         }

                                         

-                                        $image_name_parts = explode( '.', $image_name );

-                                        array_pop( $image_name_parts );

-                                        $proper_image_name = implode( '.', $image_name_parts );

+                                        $image_name_parts = explode('.', $image_name);

+                                        array_pop($image_name_parts);

+                                        $proper_image_name = implode('.', $image_name_parts);

                                         

-                                        $arr_file_type = wp_check_filetype( $image_name );

+                                        $arr_file_type = wp_check_filetype($image_name);

                                         

-                                        if ( !empty( $arr_file_type ) ) {

+                                        if (!empty($arr_file_type)) {

                                             $uploaded_file_type = $arr_file_type['type'];

                                             

                                             $attachment = array();

                                             $attachment['post_id'] = $saved_post_id;

                                             $attachment['title'] = $proper_image_name;

                                             $attachment['content'] = '';

-                                            $attachment['file'] = $uploads_subdir . '/' . $image_name;

+                                            $attachment['file'] = $uploads_subdir.'/'.$image_name;

                                             $attachment['mime_type'] = $uploaded_file_type;

                                             $attachment['menu_order'] = $order;

                                             $attachment['is_featured'] = 0;

 

                                             $attachment_set = '';

-                                            foreach ( $attachment as $key => $val ) {

-                                                if ( $val != '' ) {

-                                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                            foreach ($attachment as $key => $val) {

+                                                if ($val != '') {

+                                                    $attachment_set .= $key." = '".$val."', ";

                                                 }

                                             }

-                                            $attachment_set = trim( $attachment_set, ", " );

+                                            $attachment_set = trim($attachment_set, ", ");

                                                                                         

                                             // Add new attachment

-                                            $wpdb->query( "INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set );

+                                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

                                                                                         

                                             $order++;

                                         }

                                     }

 

-                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/" . implode("' AND file NOT LIKE '%/",  $saved_post_images_arr) . "' )" : '';

+                                    $saved_post_images_sql = !empty($saved_post_images_arr) ? " AND ( file NOT LIKE '%/".implode("' AND file NOT LIKE '%/", $saved_post_images_arr)."' )" : '';

                                     // Remove previous attachment

-                                    $wpdb->query( "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = " . (int)$saved_post_id . " " . $saved_post_images_sql );

+                                    $wpdb->query("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = ".(int) $saved_post_id." ".$saved_post_images_sql);

                                     

-                                    if ( !empty( $saved_post_images_arr ) ) {

+                                    if (!empty($saved_post_images_arr)) {

                                         geodir_set_wp_featured_image($saved_post_id);

                                         /*

                                         $menu_order = 1;

@@ -4912,13 +4912,13 @@ 
                                         }*/

                                     }

                                     

-                                    if ( $order > 1 ) {

+                                    if ($order > 1) {

                                         $images++;

                                     }

                                 }

 

                                 /** This action is documented in geodirectory-functions/post-functions.php */

-                                do_action( 'geodir_after_save_listing', $saved_post_id, $gd_post );

+                                do_action('geodir_after_save_listing', $saved_post_id, $gd_post);

                                 

                                 if (isset($is_featured)) {

                                     geodir_save_post_meta($saved_post_id, 'is_featured', $is_featured);

@@ -4938,10 +4938,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;

@@ -4952,9 +4952,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;

                 

@@ -4963,82 +4963,82 @@ 
                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

                     $gd_error_log = __('GD IMPORT LOCATIONS [ROW %d]:', 'geodirectory');

-                    $gd_error_location = __( 'Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory' );

+                    $gd_error_location = __('Could not be saved due to blank/invalid address(city, region, country, latitude, longitude)', 'geodirectory');

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

-                            foreach ($columns as $c => $column ) {

+                            foreach ($columns as $c => $column) {

                                 if (in_array($column, array('location_id', 'latitude', 'longitude', 'city', 'city_slug', 'region', 'country', 'city_meta', 'city_desc', 'region_meta', 'region_desc', 'country_meta', 'country_desc'))) {

                                     $data[$column] = $row[$c];

                                 }

                             }

 

-                            if ( empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude']) ) {

+                            if (empty($data['city']) || empty($data['region']) || empty($data['country']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                 continue;

                             }

                             

                             $data['location_id'] = isset($data['location_id']) ? absint($data['location_id']) : 0;

                             

-                            if ( $import_choice == 'update' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                            if ($import_choice == 'update') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

-                                    $data['location_id'] = (int)$location->location_id;

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

+                                    $data['location_id'] = (int) $location->location_id;

                                     

-                                    if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'region' => $data['region'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

-                                    } else if ( $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'], 'country' => $data['country'] ) ) ) {

-                                        $data['location_id'] = (int)$location->location_id;

+                                    if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'region' => $data['region']))) {

+                                        $data['location_id'] = (int) $location->location_id;

+                                    } else if ($location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug'], 'country' => $data['country']))) {

+                                        $data['location_id'] = (int) $location->location_id;

                                     }

                                     

-                                    if ( $location_id = geodir_location_update_city( $data, true, $location ) ) {

+                                    if ($location_id = geodir_location_update_city($data, true, $location)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                    if ($location_id = geodir_location_insert_city($data, true)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ( (int)$data['location_id'] > 0 && $location = geodir_get_location_by_id( '', (int)$data['location_id'] ) ) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['location_id'] > 0 && $location = geodir_get_location_by_id('', (int) $data['location_id'])) {

                                     $skipped++;

-                                } else if ( !empty( $data['city_slug'] ) && $location = geodir_get_location_by_slug( 'city', array( 'city_slug' => $data['city_slug'] ) ) ) {

+                                } else if (!empty($data['city_slug']) && $location = geodir_get_location_by_slug('city', array('city_slug' => $data['city_slug']))) {

                                     $skipped++;

                                 } else {

-                                    if ( $location_id = geodir_location_insert_city( $data, true ) ) {

+                                    if ($location_id = geodir_location_insert_city($data, true)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_location );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_location);

                             }

                         }

                     }

@@ -5052,24 +5052,24 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

-            } else if ( $task == 'import_hood' ) {               

+                wp_send_json($json);

+            } else if ($task == 'import_hood') {               

                 if (!empty($file)) {

                     $columns = isset($file[0]) ? $file[0] : NULL;

                     

                     if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

                         $json['error'] = __('File you are uploading is not valid. Columns does not matching.', 'geodirectory');

-                        wp_send_json( $json );

+                        wp_send_json($json);

                     }

                     

                     $gd_error_log = __('GD IMPORT NEIGHBOURHOODS [ROW %d]:', 'geodirectory');

-                    $gd_error_hood = __( 'Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory' );

+                    $gd_error_hood = __('Could not be saved due to invalid neighbourhood data(name, latitude, longitude) or invalid location data(either location_id or city/region/country is empty)', 'geodirectory');

                     for ($i = 1; $i <= $limit; $i++) {

                         $index = $processed + $i;

                         

                         if (isset($file[$index])) {

                             $row = $file[$index];

-                            $row = array_map( 'trim', $row );

+                            $row = array_map('trim', $row);

                             $data = array();

                             

                             foreach ($columns as $c => $column) {

@@ -5080,20 +5080,20 @@ 
 

                             if (empty($data['neighbourhood_name']) || empty($data['latitude']) || empty($data['longitude'])) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                 continue;

                             }

                             

                             $location_info = array();

-                            if (!empty($data['location_id']) && (int)$data['location_id'] > 0) {

-                                $location_info = geodir_get_location_by_id('', (int)$data['location_id']);

+                            if (!empty($data['location_id']) && (int) $data['location_id'] > 0) {

+                                $location_info = geodir_get_location_by_id('', (int) $data['location_id']);

                             } else if (!empty($data['city']) && !empty($data['region']) && !empty($data['country'])) {

                                 $location_info = geodir_get_location_by_slug('city', array('fields' => 'location_id', 'city' => $data['city'], 'country' => $data['country'], 'region' => $data['region']));

                             }

 

                             if (empty($location_info)) {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                 continue;

                             }

                             

@@ -5108,35 +5108,35 @@ 
                             $hood_data['hood_longitude'] = $data['longitude'];

                             $hood_data['hood_location_id'] = $location_id;

                                     

-                            if ( $import_choice == 'update' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

-                                    $hood_data['hood_id'] = (int)$data['neighbourhood_id'];

+                            if ($import_choice == 'update') {

+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {

+                                    $hood_data['hood_id'] = (int) $data['neighbourhood_id'];

                                     

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

-                                    $hood_data['hood_id'] = (int)$neighbourhood->hood_id;

+                                    $hood_data['hood_id'] = (int) $neighbourhood->hood_id;

                                     

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $updated++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 } else {

                                     if ($neighbourhood = geodir_location_insert_update_neighbourhood($hood_data)) {

                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 }

-                            } elseif ( $import_choice == 'skip' ) {

-                                if ((int)$data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int)$data['neighbourhood_id']))) {

+                            } elseif ($import_choice == 'skip') {

+                                if ((int) $data['neighbourhood_id'] > 0 && ($neighbourhood = geodir_location_get_neighbourhood_by_id((int) $data['neighbourhood_id']))) {

                                     $skipped++;

                                 } else if (!empty($data['neighbourhood_slug']) && ($neighbourhood = geodir_location_get_neighbourhood_by_id($data['neighbourhood_slug'], true))) {

                                     $skipped++;

@@ -5146,12 +5146,12 @@ 
                                         $created++;

                                     } else {

                                         $invalid++;

-                                        geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                        geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                                     }

                                 }

                             } else {

                                 $invalid++;

-                                geodir_error_log( wp_sprintf( $gd_error_log, ($index + 1) ) . ' ' . $gd_error_hood );

+                                geodir_error_log(wp_sprintf($gd_error_log, ($index + 1)).' '.$gd_error_hood);

                             }

                         }

                     }

@@ -5165,7 +5165,7 @@ 
                 $json['invalid'] = $invalid;

                 $json['images'] = $images;

                 

-                wp_send_json( $json );

+                wp_send_json($json);

             }

         }

         break;

@@ -5209,29 +5209,29 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_insert_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_insert_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

-	$term = isset( $term_data['name'] ) && !empty( $term_data['name'] ) ? $term_data['name'] : '';

+	$term = isset($term_data['name']) && !empty($term_data['name']) ? $term_data['name'] : '';

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( ( !empty( $args['slug'] ) && term_exists( $args['slug'], $taxonomy ) ) || empty( $args['slug'] ) ) {

-		$term_args = array_merge( $term_data, $args );

-		$defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

-		$term_args = wp_parse_args( $term_args, $defaults );

-		$term_args = sanitize_term( $term_args, $taxonomy, 'db' );

-		$args['slug'] = wp_unique_term_slug( $args['slug'], (object)$term_args );

+	if ((!empty($args['slug']) && term_exists($args['slug'], $taxonomy)) || empty($args['slug'])) {

+		$term_args = array_merge($term_data, $args);

+		$defaults = array('alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');

+		$term_args = wp_parse_args($term_args, $defaults);

+		$term_args = sanitize_term($term_args, $taxonomy, 'db');

+		$args['slug'] = wp_unique_term_slug($args['slug'], (object) $term_args);

 	}

 	

-    if( !empty( $term ) ) {

-		$result = wp_insert_term( $term, $taxonomy, $args );

-        if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+    if (!empty($term)) {

+		$result = wp_insert_term($term, $taxonomy, $args);

+        if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

     }

 	

@@ -5261,36 +5261,36 @@ 
  * }

  * @return int|bool Term id when success, false when fail.

  */

-function geodir_imex_update_term( $taxonomy, $term_data ) {

-	if ( empty( $taxonomy ) || empty( $term_data ) ) {

+function geodir_imex_update_term($taxonomy, $term_data) {

+	if (empty($taxonomy) || empty($term_data)) {

 		return false;

 	}

 	

-	$term_id = isset( $term_data['term_id'] ) && !empty( $term_data['term_id'] ) ? $term_data['term_id'] : 0;

+	$term_id = isset($term_data['term_id']) && !empty($term_data['term_id']) ? $term_data['term_id'] : 0;

 	

 	$args = array();

-	$args['description'] = isset( $term_data['description'] ) ? $term_data['description'] : '';

-	$args['slug'] = isset( $term_data['slug'] ) ? $term_data['slug'] : '';

-	$args['parent'] = isset( $term_data['parent'] ) ? (int)$term_data['parent'] : '';

+	$args['description'] = isset($term_data['description']) ? $term_data['description'] : '';

+	$args['slug'] = isset($term_data['slug']) ? $term_data['slug'] : '';

+	$args['parent'] = isset($term_data['parent']) ? (int) $term_data['parent'] : '';

 	

-	if ( $term_id > 0 && $term_info = (array)get_term( $term_id, $taxonomy ) ) {

+	if ($term_id > 0 && $term_info = (array) get_term($term_id, $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

-	} else if ( $term_data['slug'] != '' && $term_info = (array)term_exists( $term_data['slug'], $taxonomy ) ) {

+	} else if ($term_data['slug'] != '' && $term_info = (array) term_exists($term_data['slug'], $taxonomy)) {

 		$term_data['term_id'] = $term_info['term_id'];

 		

-		$result = wp_update_term( $term_data['term_id'], $taxonomy, $term_data );

+		$result = wp_update_term($term_data['term_id'], $taxonomy, $term_data);

 		

-		if( !is_wp_error( $result ) ) {

-            return isset( $result['term_id'] ) ? $result['term_id'] : 0;

+		if (!is_wp_error($result)) {

+            return isset($result['term_id']) ? $result['term_id'] : 0;

         }

 	} else {

-		return geodir_imex_insert_term( $taxonomy, $term_data );

+		return geodir_imex_insert_term($taxonomy, $term_data);

 	}

 	

 	return false;

@@ -5309,20 +5309,20 @@ 
  * @param string $post_type Post type.

  * @return int Posts count.

  */

-function geodir_get_posts_count( $post_type ) {

+function geodir_get_posts_count($post_type) {

     global $wpdb, $plugin_prefix;

 

-    if ( !post_type_exists( $post_type ) ) {

+    if (!post_type_exists($post_type)) {

         return 0;

     }

         

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

     // Skip listing with statuses trash, auto-draft etc...

     $skip_statuses = geodir_imex_export_skip_statuses();

     $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+    if (!empty($skip_statuses) && is_array($skip_statuses)) {

+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

     }

     

     /**

@@ -5333,11 +5333,11 @@ 
      *

      * @param string $where SQL where clause part.

      */

-    $where_statuses = apply_filters( 'geodir_get_posts_count', $where_statuses, $post_type );

+    $where_statuses = apply_filters('geodir_get_posts_count', $where_statuses, $post_type);

 

-    $query = $wpdb->prepare( "SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses, $post_type );

+    $query = $wpdb->prepare("SELECT COUNT({$wpdb->posts}.ID) FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses, $post_type);

 

-    $posts_count = (int)$wpdb->get_var( $query );

+    $posts_count = (int) $wpdb->get_var($query);

     

     /**

      * Modify returned post counts for the current post type.

@@ -5348,7 +5348,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;

 }

@@ -5369,19 +5369,19 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_imex_get_posts( $post_type, $per_page = 0, $page_no = 0 ) {	

+function geodir_imex_get_posts($post_type, $per_page = 0, $page_no = 0) {	

 	global $wp_filesystem;

 

-	$posts = geodir_get_export_posts( $post_type, $per_page, $page_no );

+	$posts = geodir_get_export_posts($post_type, $per_page, $page_no);

 

 	$csv_rows = array();

 	

-	if ( !empty( $posts ) ) {

-		$is_payment_plugin = is_plugin_active( 'geodir_payment_manager/geodir_payment_manager.php' );

+	if (!empty($posts)) {

+		$is_payment_plugin = is_plugin_active('geodir_payment_manager/geodir_payment_manager.php');

         $location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

-        $location_allowed = function_exists( 'geodir_cpt_no_location' ) && geodir_cpt_no_location( $post_type ) ? false : true;

+        $location_allowed = function_exists('geodir_cpt_no_location') && geodir_cpt_no_location($post_type) ? false : true;

         $neighbourhood_active = $location_manager && $location_allowed && get_option('location_neighbourhoods') ? true : false;

-        $is_claim_active = is_plugin_active( 'geodir_claim_listing/geodir_claim_listing.php' ) && get_option('geodir_claim_enable') === 'yes' ? true : false;

+        $is_claim_active = is_plugin_active('geodir_claim_listing/geodir_claim_listing.php') && get_option('geodir_claim_enable') === 'yes' ? true : false;

 		

 		$csv_row = array();

 		$csv_row[] = 'post_id';

@@ -5392,7 +5392,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';

@@ -5450,15 +5450,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';

@@ -5479,28 +5479,28 @@ 
 		$csv_rows[] = $csv_row;

 

 		$images_count = 5;

-        $xx=0;

-		foreach ( $posts as $post ) {$xx++;

+        $xx = 0;

+		foreach ($posts as $post) {$xx++;

 			$post_id = $post['ID'];

 			

-			$gd_post_info = geodir_get_post_info( $post_id );

-			$post_info = (array)$gd_post_info;

+			$gd_post_info = geodir_get_post_info($post_id);

+			$post_info = (array) $gd_post_info;

 						

-			$taxonomy_category = $post_type . 'category';

-			$taxonomy_tags = $post_type . '_tags';

+			$taxonomy_category = $post_type.'category';

+			$taxonomy_tags = $post_type.'_tags';

 			

 			$post_category = '';

 			$default_category_id = $gd_post_info->default_category;

 			$default_category = '';

 			$post_tags = '';

-			$terms = wp_get_post_terms( $post_id, array( $taxonomy_category, $taxonomy_tags ) );

+			$terms = wp_get_post_terms($post_id, array($taxonomy_category, $taxonomy_tags));

 			

-			if ( !empty( $terms ) && !is_wp_error( $terms ) ) {

+			if (!empty($terms) && !is_wp_error($terms)) {

 				$post_category = array();

 				$post_tags = array();

 			

-				foreach ( $terms as $term ) {

-					if ( $term->taxonomy == $taxonomy_category ) {

+				foreach ($terms as $term) {

+					if ($term->taxonomy == $taxonomy_category) {

 						$post_category[] = $term->name;

 						

 						if ($default_category_id == $term->term_id) {

@@ -5508,7 +5508,7 @@ 
 						}

 					}

 					

-					if ( $term->taxonomy == $taxonomy_tags ) {

+					if ($term->taxonomy == $taxonomy_tags) {

 						$post_tags[] = $term->name;

 					}

 				}

@@ -5516,47 +5516,47 @@ 
 				if (empty($default_category) && !empty($post_category)) {

 					$default_category = $post_category[0]; // Set first one as default category.

 				}

-				$post_category = !empty( $post_category ) ? implode( ',', $post_category ) : '';

-				$post_tags = !empty( $post_tags ) ? implode( ',', $post_tags ) : '';

+				$post_category = !empty($post_category) ? implode(',', $post_category) : '';

+				$post_tags = !empty($post_tags) ? implode(',', $post_tags) : '';

 			}

 

 			// Franchise data

-			if ($is_franchise_active && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 && geodir_franchise_check((int)$post_info['franchise'])) {

+			if ($is_franchise_active && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 && geodir_franchise_check((int) $post_info['franchise'])) {

 				$franchise_id = $post_info['franchise'];

 				$gd_franchise_info = geodir_get_post_info($franchise_id);

 

 				if (geodir_franchise_pkg_is_active($gd_franchise_info)) {

-					$franchise_info = (array)$gd_franchise_info;

+					$franchise_info = (array) $gd_franchise_info;

 					$locked_fields = geodir_franchise_get_locked_fields($franchise_id, true);

 					

 					if (!empty($locked_fields)) {

-						foreach( $locked_fields as $locked_field) {

+						foreach ($locked_fields as $locked_field) {

 							if (isset($post_info[$locked_field]) && isset($franchise_info[$locked_field])) {

 								$post_info[$locked_field] = $franchise_info[$locked_field];

 							}

 							

 							if (in_array($taxonomy_category, $locked_fields) || in_array('post_tags', $locked_fields)) {

-								$franchise_terms = wp_get_post_terms( $franchise_id, array( $taxonomy_category, $taxonomy_tags ) );

+								$franchise_terms = wp_get_post_terms($franchise_id, array($taxonomy_category, $taxonomy_tags));

 			

-								if ( !empty( $franchise_terms ) && !is_wp_error( $franchise_terms ) ) {

+								if (!empty($franchise_terms) && !is_wp_error($franchise_terms)) {

 									$franchise_post_category = array();

 									$franchise_post_tags = array();

 								

-									foreach ( $franchise_terms as $franchise_term ) {

-										if ( $franchise_term->taxonomy == $taxonomy_category ) {

+									foreach ($franchise_terms as $franchise_term) {

+										if ($franchise_term->taxonomy == $taxonomy_category) {

 											$franchise_post_category[] = $franchise_term->name;

 										}

 										

-										if ( $franchise_term->taxonomy == $taxonomy_tags ) {

+										if ($franchise_term->taxonomy == $taxonomy_tags) {

 											$franchise_post_tags[] = $franchise_term->name;

 										}

 									}

 									

 									if (in_array($taxonomy_category, $locked_fields)) {

-										$post_category = !empty( $franchise_post_category ) ? implode( ',', $franchise_post_category ) : '';

+										$post_category = !empty($franchise_post_category) ? implode(',', $franchise_post_category) : '';

 									}

 									if (in_array('post_tags', $locked_fields)) {

-										$post_tags = !empty( $franchise_post_tags ) ? implode( ',', $franchise_post_tags ) : '';

+										$post_tags = !empty($franchise_post_tags) ? implode(',', $franchise_post_tags) : '';

 									}

 								}

 							}

@@ -5565,18 +5565,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();

@@ -5588,7 +5588,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

@@ -5609,12 +5609,12 @@ 
 				$csv_row[] = $event_data['recurring_end_date']; // repeat_end

 			}

 			$csv_row[] = $post_info['post_status']; // post_status

-			$csv_row[] = (int)$post_info['is_featured'] == 1 ? 1 : ''; // is_featured

+			$csv_row[] = (int) $post_info['is_featured'] == 1 ? 1 : ''; // is_featured

             if ($is_claim_active) {

-                $csv_row[] = !empty($post_info['claimed']) && (int)$post_info['claimed'] == 1 ? 1 : ''; // claimed

+                $csv_row[] = !empty($post_info['claimed']) && (int) $post_info['claimed'] == 1 ? 1 : ''; // claimed

             }

 			if ($is_payment_plugin) {

-				$csv_row[] = (int)$post_info['package_id']; // package_id

+				$csv_row[] = (int) $post_info['package_id']; // package_id

 				$csv_row[] = $post_info['expire_date'] != '' && geodir_strtolower($post_info['expire_date']) != 'never' ? date_i18n('Y-m-d', strtotime($post_info['expire_date'])) : 'Never'; // expire_date

 			}

             $csv_row[] = $post_info['post_date']; // post_date

@@ -5650,14 +5650,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] : '';

 				}

 			}

 			

@@ -5668,15 +5668,15 @@ 
 				$franchise = '';

 					

 				if (geodir_franchise_pkg_is_active($gd_post_info)) {

-					$gd_is_franchise = (int)get_post_meta( $post_id, 'gd_is_franchise', true );

-					$locaked_fields = $gd_is_franchise ? get_post_meta( $post_id, 'gd_franchise_lock', true ) : '';

+					$gd_is_franchise = (int) get_post_meta($post_id, 'gd_is_franchise', true);

+					$locaked_fields = $gd_is_franchise ? get_post_meta($post_id, 'gd_franchise_lock', true) : '';

 					$locaked_fields = (is_array($locaked_fields) && !empty($locaked_fields) ? implode(",", $locaked_fields) : '');

-					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int)$post_info['franchise'] > 0 ? (int)$post_info['franchise'] : 0; // franchise id

+					$franchise = !$gd_is_franchise && isset($post_info['franchise']) && (int) $post_info['franchise'] > 0 ? (int) $post_info['franchise'] : 0; // franchise id

 				}

 				

-				$csv_row[] = (int)$gd_is_franchise; // gd_is_franchise

+				$csv_row[] = (int) $gd_is_franchise; // gd_is_franchise

 				$csv_row[] = $locaked_fields; // gd_franchise_lock fields

-				$csv_row[] = (int)$franchise; // franchise id

+				$csv_row[] = (int) $franchise; // franchise id

 			}

             

             /**

@@ -5690,15 +5690,15 @@ 
              */

             $csv_row = apply_filters('geodir_export_listing_csv_column_values', $csv_row, $post_info);

 			

-			for ( $c = 0; $c < $images_count; $c++ ) {

-				$csv_row[] = isset( $current_images[$c] ) ? $current_images[$c] : ''; // IMAGE

+			for ($c = 0; $c < $images_count; $c++) {

+				$csv_row[] = isset($current_images[$c]) ? $current_images[$c] : ''; // IMAGE

 			}

 			

 			$csv_rows[] = $csv_row;

 

 		}

 

-		for ( $c = 0; $c < $images_count; $c++ ) {

+		for ($c = 0; $c < $images_count; $c++) {

 			$csv_rows[0][] = 'IMAGE';

 		}

 	}

@@ -5720,30 +5720,30 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of posts data.

  */

-function geodir_get_export_posts( $post_type, $per_page = 0, $page_no = 0 ) {

+function geodir_get_export_posts($post_type, $per_page = 0, $page_no = 0) {

     global $wpdb, $plugin_prefix;

 

-    if ( ! post_type_exists( $post_type ) )

+    if (!post_type_exists($post_type))

         return new stdClass;

         

-    $table = $plugin_prefix . $post_type . '_detail';

+    $table = $plugin_prefix.$post_type.'_detail';

 

     $limit = '';

-    if ( $per_page > 0 && $page_no > 0 ) {

-        $offset = ( $page_no - 1 ) * $per_page;

+    if ($per_page > 0 && $page_no > 0) {

+        $offset = ($page_no - 1) * $per_page;

         

-        if ( $offset > 0 ) {

-            $limit = " LIMIT " . $offset . "," . $per_page;

+        if ($offset > 0) {

+            $limit = " LIMIT ".$offset.",".$per_page;

         } else {

-            $limit = " LIMIT " . $per_page;

+            $limit = " LIMIT ".$per_page;

         }

     }

 

     // Skip listing with statuses trash, auto-draft etc...

     $skip_statuses = geodir_imex_export_skip_statuses();

     $where_statuses = '';

-    if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-        $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+    if (!empty($skip_statuses) && is_array($skip_statuses)) {

+        $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

     }

     

     /**

@@ -5754,9 +5754,9 @@ 
      *

      * @param string $where SQL where clause part.

      */

-    $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+    $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);

 

-    $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " ORDER BY {$wpdb->posts}.ID ASC" . $limit, $post_type );

+    $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID FROM {$wpdb->posts} INNER JOIN {$table} ON {$table}.post_id = {$wpdb->posts}.ID WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." ORDER BY {$wpdb->posts}.ID ASC".$limit, $post_type);

     /**

      * Modify returned posts SQL query for the current post type.

      *

@@ -5766,8 +5766,8 @@ 
      * @param int $query The SQL query.

      * @param string $post_type Post type.

      */

-    $query = apply_filters( 'geodir_imex_export_posts_query', $query, $post_type );

-    $results = (array)$wpdb->get_results( $wpdb->prepare( $query, $post_type ), ARRAY_A );

+    $query = apply_filters('geodir_imex_export_posts_query', $query, $post_type);

+    $results = (array) $wpdb->get_results($wpdb->prepare($query, $post_type), ARRAY_A);

 

     /**

      * Modify returned post results for the current post type.

@@ -5778,7 +5778,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);

 }

 

 /**

@@ -5796,24 +5796,24 @@ 
  * @param string $post_type Post type.

  * @return string The SQL query.

  */

-function geodir_imex_get_events_query( $query, $post_type ) {

-    if ( $post_type == 'gd_event' ) {

+function geodir_imex_get_events_query($query, $post_type) {

+    if ($post_type == 'gd_event') {

         global $wpdb, $plugin_prefix;

         

-        $table = $plugin_prefix . $post_type . '_detail';

+        $table = $plugin_prefix.$post_type.'_detail';

         $schedule_table = EVENT_SCHEDULE;

         

         // Skip listing with statuses trash, auto-draft etc...

         $skip_statuses = geodir_imex_export_skip_statuses();

         $where_statuses = '';

-        if ( !empty( $skip_statuses ) && is_array( $skip_statuses ) ) {

-            $where_statuses = "AND `" . $wpdb->posts . "`.`post_status` NOT IN('" . implode( "','", $skip_statuses ) . "')";

+        if (!empty($skip_statuses) && is_array($skip_statuses)) {

+            $where_statuses = "AND `".$wpdb->posts."`.`post_status` NOT IN('".implode("','", $skip_statuses)."')";

         }

         

         /** This action is documented in geodirectory-functions/geodirectory-admin/admin_functions.php */

-        $where_statuses = apply_filters( 'geodir_get_export_posts', $where_statuses, $post_type );

+        $where_statuses = apply_filters('geodir_get_export_posts', $where_statuses, $post_type);

 

-        $query = $wpdb->prepare( "SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s " . $where_statuses . " GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type );

+        $query = $wpdb->prepare("SELECT {$wpdb->posts}.ID, {$schedule_table}.event_date, {$schedule_table}.event_enddate AS enddate, {$schedule_table}.event_starttime AS starttime, {$schedule_table}.event_endtime AS endtime FROM {$wpdb->posts} INNER JOIN {$table} ON ({$table}.post_id = {$wpdb->posts}.ID) INNER JOIN {$schedule_table} ON ({$schedule_table}.event_id = {$wpdb->posts}.ID) WHERE {$wpdb->posts}.post_type = %s ".$where_statuses." GROUP BY {$table}.post_id ORDER BY {$wpdb->posts}.ID ASC, {$schedule_table}.schedule_id ASC", $post_type);

     }

 

     return $query;

@@ -5837,35 +5837,35 @@ 
  * @param  string $post_type Post type.

  * @return int Total terms count.

  */

-function geodir_get_terms_count( $post_type ) {

-    $args = array( 'hide_empty' => 0 );

+function geodir_get_terms_count($post_type) {

+    $args = array('hide_empty' => 0);

 

-    remove_all_filters( 'get_terms' );

+    remove_all_filters('get_terms');

 

-    $taxonomy = $post_type . 'category';

+    $taxonomy = $post_type.'category';

 

     // WPML

     $is_wpml = geodir_is_wpml();

     $active_lang = 'all';

-    if ( $is_wpml ) {

+    if ($is_wpml) {

         global $sitepress;

         $active_lang = $sitepress->get_current_language();

         

-        if ( $active_lang != 'all' ) {

-            $sitepress->switch_lang( 'all', true );

+        if ($active_lang != 'all') {

+            $sitepress->switch_lang('all', true);

         }

     }

     // WPML

             

-    $count_terms = wp_count_terms( $taxonomy, $args );

+    $count_terms = wp_count_terms($taxonomy, $args);

 

     // WPML

-    if ( $is_wpml && $active_lang !== 'all' ) {

+    if ($is_wpml && $active_lang !== 'all') {

         global $sitepress;

-        $sitepress->switch_lang( $active_lang, true );

+        $sitepress->switch_lang($active_lang, true);

     }

     // WPML

-    $count_terms = !is_wp_error( $count_terms ) ? $count_terms : 0;

+    $count_terms = !is_wp_error($count_terms) ? $count_terms : 0;

      

     return $count_terms;

 }

@@ -5882,23 +5882,23 @@ 
  * @param int $page_no Page number. Default 0.

  * @return array Array of terms data.

  */

-function geodir_imex_get_terms( $post_type, $per_page = 0, $page_no = 0 ) {

-	$args = array( 'hide_empty' => 0, 'orderby' => 'id' );

+function geodir_imex_get_terms($post_type, $per_page = 0, $page_no = 0) {

+	$args = array('hide_empty' => 0, 'orderby' => 'id');

 	

-	remove_all_filters( 'get_terms' );

+	remove_all_filters('get_terms');

 	

-	$taxonomy = $post_type . 'category';

+	$taxonomy = $post_type.'category';

 	

-	if ( $per_page > 0 && $page_no > 0 ) {

-		$args['offset'] = ( $page_no - 1 ) * $per_page;

+	if ($per_page > 0 && $page_no > 0) {

+		$args['offset'] = ($page_no - 1) * $per_page;

 		$args['number'] = $per_page;

 	}

 	

-	$terms = get_terms( $taxonomy, $args );

+	$terms = get_terms($taxonomy, $args);

 

 	$csv_rows = array();

 	

-	if ( !empty( $terms ) ) {

+	if (!empty($terms)) {

 		$csv_row = array();

 		$csv_row[] = 'cat_id';

 		$csv_row[] = 'cat_name';

@@ -5920,16 +5920,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'] : '';

 			}

 			

@@ -5939,15 +5939,15 @@ 
 			$csv_row[] = $term->slug;

 			$csv_row[] = $post_type;

 			$csv_row[] = $cat_parent;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_schema', false, $post_type );

+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_schema', false, $post_type);

             // WPML

 			if ($is_wpml) {

-				$csv_row[] = geodir_get_language_for_element( $term->term_id, 'tax_' . $taxonomy );

-                $csv_row[] = geodir_imex_original_post_id( $term->term_id, 'tax_' . $taxonomy );

+				$csv_row[] = geodir_get_language_for_element($term->term_id, 'tax_'.$taxonomy);

+                $csv_row[] = geodir_imex_original_post_id($term->term_id, 'tax_'.$taxonomy);

 			}

 			// WPML

 			$csv_row[] = $term->description;

-			$csv_row[] = get_tax_meta( $term->term_id, 'ct_cat_top_desc', false, $post_type );

+			$csv_row[] = get_tax_meta($term->term_id, 'ct_cat_top_desc', false, $post_type);

 			$csv_row[] = $cat_image;

 			$csv_row[] = $cat_icon;

 			

@@ -5966,10 +5966,10 @@ 
  * @param  bool $relative True for relative path & False for absolute path.

  * @return string Path to the cache directory.

  */

-function geodir_path_import_export( $relative = true ) {

+function geodir_path_import_export($relative = true) {

 	$upload_dir = wp_upload_dir();

 	

-	return $relative ? $upload_dir['baseurl'] . '/cache' : $upload_dir['basedir'] . '/cache';

+	return $relative ? $upload_dir['baseurl'].'/cache' : $upload_dir['basedir'].'/cache';

 }

 

 /**

@@ -5985,8 +5985,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;

 	}

 	

@@ -5994,17 +5994,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);

 		}

 	}

 		

@@ -6022,14 +6022,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;

 		}

 	}

 	

@@ -6046,11 +6046,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;

 }

@@ -6129,14 +6129,14 @@ 
 	global $wpdb, $plugin_prefix;

 	

 	$post_type = get_post_type($master_post_id);

-	$post_table = $plugin_prefix . $post_type . '_detail';

+	$post_table = $plugin_prefix.$post_type.'_detail';

 	

-	$query = $wpdb->prepare("SELECT * FROM " . $post_table . " WHERE post_id = %d", array($master_post_id));

-	$data = (array)$wpdb->get_row($query);

+	$query = $wpdb->prepare("SELECT * FROM ".$post_table." WHERE post_id = %d", array($master_post_id));

+	$data = (array) $wpdb->get_row($query);

 	

-	if ( !empty( $data ) ) {

+	if (!empty($data)) {

 		$data['post_id'] = $tr_post_id;

-		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type . 'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

+		unset($data['default_category'], $data['marker_json'], $data['featured_image'], $data[$post_type.'category'], $data['overall_rating'], $data['rating_count'], $data['ratings']);

 		

 		$wpdb->update($post_table, $data, array('post_id' => $tr_post_id));		

 		return true;

@@ -6162,7 +6162,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) {

@@ -6171,9 +6171,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));

@@ -6182,14 +6182,14 @@ 
 				}

 			}

 

-			if (!is_taxonomy_hierarchical($taxonomy)){

-				$terms_array = array_unique( array_map( 'intval', $terms_array ) );

+			if (!is_taxonomy_hierarchical($taxonomy)) {

+				$terms_array = array_unique(array_map('intval', $terms_array));

 			}

 

 			wp_set_post_terms($tr_post_id, $terms_array, $taxonomy);

 			

-			if ($taxonomy == $post_type . 'category') {

-				geodir_set_postcat_structure($tr_post_id, $post_type . 'category');

+			if ($taxonomy == $post_type.'category') {

+				geodir_set_postcat_structure($tr_post_id, $post_type.'category');

 			}

 		}

 	}

@@ -6210,15 +6210,15 @@ 
 function geodir_icl_duplicate_post_images($master_post_id, $tr_post_id, $lang) {

 	global $wpdb;

 	

-	$query = $wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

+	$query = $wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d", array('%image%', $tr_post_id));

 	$wpdb->query($query);

 	

-	$query = $wpdb->prepare("SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

+	$query = $wpdb->prepare("SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC", array('%image%', $master_post_id));

 	$post_images = $wpdb->get_results($query);

 	

-	if ( !empty( $post_images ) ) {

-		foreach ( $post_images as $post_image) {

-			$image_data = (array)$post_image;

+	if (!empty($post_images)) {

+		foreach ($post_images as $post_image) {

+			$image_data = (array) $post_image;

 			unset($image_data['ID']);

 			$image_data['post_id'] = $tr_post_id;

 			

@@ -6244,10 +6244,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 = '';

@@ -6264,15 +6264,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;

@@ -6282,13 +6282,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);

@@ -6304,7 +6304,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);

@@ -6314,7 +6314,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);

@@ -6326,8 +6326,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');

@@ -6343,11 +6343,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);

 				}

 			}

 		}

@@ -6411,9 +6411,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;

@@ -6460,17 +6460,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) {

@@ -6488,7 +6488,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);

@@ -6552,7 +6552,7 @@ 
 

     $page_found = $wpdb->get_var(

         $wpdb->prepare(

-            "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+            "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",

             array($slug)

         )

     );

@@ -6607,7 +6607,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>";

 }

 

@@ -6619,7 +6619,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(

@@ -6627,7 +6627,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) {

 

@@ -6642,20 +6642,20 @@ 
 function geodir_in_plugin_update_message($content) {

     // Output Upgrade Notice

     $matches        = null;

-    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*' . preg_quote( GEODIRECTORY_VERSION ) . '\s*=|$)~Uis';

+    $regexp         = '~==\s*Upgrade Notice\s*==\s*=\s*(.*)\s*=(.*)(=\s*'.preg_quote(GEODIRECTORY_VERSION).'\s*=|$)~Uis';

     $upgrade_notice = '';

-    if ( preg_match( $regexp, $content, $matches ) ) {

-        if(empty($matches)){return;}

+    if (preg_match($regexp, $content, $matches)) {

+        if (empty($matches)) {return; }

 

-        $version = trim( $matches[1] );

-        if($version && $version>GEODIRECTORY_VERSION){

+        $version = trim($matches[1]);

+        if ($version && $version > GEODIRECTORY_VERSION) {

 

 

-        $notices = (array) preg_split('~[\r\n]+~', trim( $matches[2] ) );

-        if ( version_compare( GEODIRECTORY_VERSION, $version, '<' ) ) {

+        $notices = (array) preg_split('~[\r\n]+~', trim($matches[2]));

+        if (version_compare(GEODIRECTORY_VERSION, $version, '<')) {

             $upgrade_notice .= '<div class="geodir_plugin_upgrade_notice">';

-            foreach ( $notices as $index => $line ) {

-                $upgrade_notice .= wp_kses_post( preg_replace( '~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line ) );

+            foreach ($notices as $index => $line) {

+                $upgrade_notice .= wp_kses_post(preg_replace('~\[([^\]]*)\]\(([^\)]*)\)~', '<a href="${2}">${1}</a>', $line));

             }

             $upgrade_notice .= '</div> ';

         }

@@ -6679,7 +6679,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

 		}

 	}

@@ -6694,7 +6694,7 @@ 
  * @param array Listing statuses to be skipped.

  */

 function geodir_imex_export_skip_statuses() {

-    $statuses = array( 'trash', 'auto-draft' );

+    $statuses = array('trash', 'auto-draft');

     

     /**

      * Filter the statuses to skip during GD export listings.

@@ -6704,7 +6704,7 @@ 
      *

      * @param array $statuses Listing statuses to be skipped.

      */

-    $statuses = apply_filters( 'geodir_imex_export_skip_statuses', $statuses );

+    $statuses = apply_filters('geodir_imex_export_skip_statuses', $statuses);

      

     return $statuses;

 }

@@ -6744,16 +6744,16 @@ 
 function geodir_imex_get_filter_where($where = '', $post_type = '') {

     global $wpdb;

     

-    $filters = !empty( $_REQUEST['gd_imex'] ) && is_array( $_REQUEST['gd_imex'] ) ? $_REQUEST['gd_imex'] : NULL;

+    $filters = !empty($_REQUEST['gd_imex']) && is_array($_REQUEST['gd_imex']) ? $_REQUEST['gd_imex'] : NULL;

     

-    if ( !empty( $filters ) ) {

-        foreach ( $filters as $field => $value ) {

+    if (!empty($filters)) {

+        foreach ($filters as $field => $value) {

             switch ($field) {

                 case 'start_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` >= '" . sanitize_text_field( $value ) . " 00:00:00'";

+                    $where .= " AND `".$wpdb->posts."`.`post_date` >= '".sanitize_text_field($value)." 00:00:00'";

                 break;

                 case 'end_date':

-                    $where .= " AND `" . $wpdb->posts . "`.`post_date` <= '" . sanitize_text_field( $value ) . " 23:59:59'";

+                    $where .= " AND `".$wpdb->posts."`.`post_date` <= '".sanitize_text_field($value)." 23:59:59'";

                 break;

             }

         }

geodirectory-admin/admin_hooks_actions.php

Doc Comments +1 added lines

@@ -1639,6 +1639,7 @@
  * @since 1.0.0

  * @package GeoDirectory

  * @global object $current_user Current user object.

+ * @param string|null $input
  * @return array Returns parsed data as array.

  */

 function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")

Indentation +1479 added lines, -1479 removed lines

@@ -10,33 +10,33 @@ 
 

 add_action('admin_init', 'geodir_admin_init');

 if (!function_exists('geodir_admin_init')) {

-    /**

-     * Adds GD setting pages in admin.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global string $current_tab The current settings tab name.

-     */

-    function geodir_admin_init()

-    {

-

-        if (is_admin()):

-            global $current_tab;

-            geodir_redirect_to_admin_panel_on_installed();

-            $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

-            if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests

-                geodir_handle_option_form_submit($current_tab); // located in admin function.php

-            /**

-             * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

-             *

-             * @since 1.0.0

-             */

-            do_action('admin_panel_init');

-            add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);

-

-

-        endif;

-    }

+	/**

+	 * Adds GD setting pages in admin.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global string $current_tab The current settings tab name.

+	 */

+	function geodir_admin_init()

+	{

+

+		if (is_admin()):

+			global $current_tab;

+			geodir_redirect_to_admin_panel_on_installed();

+			$current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

+			if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests

+				geodir_handle_option_form_submit($current_tab); // located in admin function.php

+			/**

+			 * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

+			 *

+			 * @since 1.0.0

+			 */

+			do_action('admin_panel_init');

+			add_action('geodir_admin_option_form', 'geodir_get_admin_option_form', 1);

+

+

+		endif;

+	}

 }

 

 /**

@@ -47,10 +47,10 @@ 
  */

 function geodir_redirect_to_admin_panel_on_installed()

 {

-    if (get_option('geodir_installation_redirect', false)) {

-        delete_option('geodir_installation_redirect');

-        wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));

-    }

+	if (get_option('geodir_installation_redirect', false)) {

+		delete_option('geodir_installation_redirect');

+		wp_redirect(admin_url('admin.php?page=geodirectory&installed=yes'));

+	}

 }

 

 /**

@@ -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

 }

 

 

@@ -85,19 +85,19 @@ 
  */

 function geodir_conditional_admin_script_load()

 {

-    global $pagenow;

+	global $pagenow;

 	

 	// Get the current post type

 	$post_type = geodir_admin_current_post_type();

 	$geodir_post_types = geodir_get_posttypes();

     

 	if ((isset($_REQUEST['page']) && $_REQUEST['page'] == 'geodirectory') || (($pagenow == 'post.php' || $pagenow == 'post-new.php' || $pagenow == 'edit.php') && $post_type && in_array($post_type, $geodir_post_types)) || ($pagenow == 'edit-tags.php' || $pagenow == 'term.php' || $pagenow == 'edit-comments.php' || $pagenow == 'comment.php')) {

-        add_action('admin_enqueue_scripts', 'geodir_admin_scripts');

-        add_action('admin_enqueue_scripts', 'geodir_admin_styles');

-        add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);

-    }

+		add_action('admin_enqueue_scripts', 'geodir_admin_scripts');

+		add_action('admin_enqueue_scripts', 'geodir_admin_styles');

+		add_action('admin_enqueue_scripts', 'geodir_admin_dequeue_scripts', 100);

+	}

 

-    add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');

+	add_action('admin_enqueue_scripts', 'geodir_admin_styles_req');

 

 }

 

@@ -131,12 +131,12 @@ 
  */

 function create_default_admin_main_nav()

 {

-    add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);

-    add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);

-    add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);

-    add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);

-    add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);

-    //add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);

+	add_filter('geodir_settings_tabs_array', 'geodir_default_admin_main_tabs', 1);

+	add_filter('geodir_settings_tabs_array', 'places_custom_fields_tab', 2);

+	add_filter('geodir_settings_tabs_array', 'geodir_compatibility_setting_tab', 90);

+	add_filter('geodir_settings_tabs_array', 'geodir_tools_setting_tab', 95);

+	add_filter('geodir_settings_tabs_array', 'geodir_extend_geodirectory_setting_tab', 100);

+	//add_filter('geodir_settings_tabs_array', 'geodir_hide_set_location_default',3);

 

 }

 

@@ -149,16 +149,16 @@ 
  */

 function geodir_admin_list_columns()

 {

-    if ($post_types = geodir_get_posttypes()) {

+	if ($post_types = geodir_get_posttypes()) {

 

-        foreach ($post_types as $post_type):

-            add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);

-            //Filter-Payment-Manager to show Package

-            add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);

+		foreach ($post_types as $post_type):

+			add_filter("manage_edit-{$post_type}_columns", 'geodir_edit_post_columns', 100);

+			//Filter-Payment-Manager to show Package

+			add_action("manage_{$post_type}_posts_custom_column", 'geodir_manage_post_columns', 10, 2);

 

-            add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');

-        endforeach;

-    }

+			add_filter("manage_edit-{$post_type}_sortable_columns", 'geodir_post_sortable_columns');

+		endforeach;

+	}

 }

 

 /**

@@ -171,15 +171,15 @@ 
  */

 function geodir_default_admin_main_tabs($tabs)

 {

-    return $tabs = array(

-        'general_settings' => array('label' => __('General', 'geodirectory')),

-        'design_settings' => array('label' => __('Design', 'geodirectory')),

-        'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),

-        'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),

-        'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),

-        'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),

-

-    );

+	return $tabs = array(

+		'general_settings' => array('label' => __('General', 'geodirectory')),

+		'design_settings' => array('label' => __('Design', 'geodirectory')),

+		'permalink_settings' => array('label' => __('Permalinks', 'geodirectory')),

+		'title_meta_settings' => array('label' => __('Titles & Metas', 'geodirectory')),

+		'notifications_settings' => array('label' => __('Notifications', 'geodirectory')),

+		'default_location_settings' => array('label' => __('Set Default Location', 'geodirectory')),

+

+	);

 }

 

 add_action('do_meta_boxes', 'geodir_remove_image_box');

@@ -192,16 +192,16 @@ 
  */

 function geodir_remove_image_box()

 {

-    global $post;

+	global $post;

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

-    if (isset($post) && in_array($post->post_type, $geodir_posttypes)):

+	if (isset($post) && in_array($post->post_type, $geodir_posttypes)):

 

-        remove_meta_box('postimagediv', $post->post_type, 'side');

-        remove_meta_box('revisionsdiv', $post->post_type, 'normal');

+		remove_meta_box('postimagediv', $post->post_type, 'side');

+		remove_meta_box('revisionsdiv', $post->post_type, 'normal');

 

-    endif;

+	endif;

 

 }

 

@@ -216,26 +216,26 @@ 
  */

 function geodir_meta_box_add()

 {

-    global $post;

+	global $post;

 

-    $geodir_post_types = geodir_get_posttypes('array');

-    $geodir_posttypes = array_keys($geodir_post_types);

+	$geodir_post_types = geodir_get_posttypes('array');

+	$geodir_posttypes = array_keys($geodir_post_types);

 

-    if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)):

+	if (isset($post->post_type) && in_array($post->post_type, $geodir_posttypes)):

 

-        $geodir_posttype = $post->post_type;

-        $post_typename = geodir_ucwords($geodir_post_types[$geodir_posttype]['labels']['singular_name']);

+		$geodir_posttype = $post->post_type;

+		$post_typename = geodir_ucwords($geodir_post_types[$geodir_posttype]['labels']['singular_name']);

 

-        // Filter-Payment-Manager

+		// Filter-Payment-Manager

 

-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

+		add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

 

-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

+		add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

 

-        // no need of this box as all fields moved to main information box

-        //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

+		// no need of this box as all fields moved to main information box

+		//add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

 

-    endif;

+	endif;

 

 }

 

@@ -259,23 +259,23 @@ 
 function geodir_hide_post_taxonomy_meta_boxes()

 {

 

-    $geodir_post_types = get_option('geodir_post_types');

+	$geodir_post_types = get_option('geodir_post_types');

 

-    if (!empty($geodir_post_types)) {

-        foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {

+	if (!empty($geodir_post_types)) {

+		foreach ($geodir_post_types as $geodir_post_type => $geodir_posttype_info) {

 

-            $gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

+			$gd_taxonomy = geodir_get_taxonomies($geodir_post_type);

 

-            if(!empty($gd_taxonomy)) {

-                foreach ($gd_taxonomy as $tax) {

+			if(!empty($gd_taxonomy)) {

+				foreach ($gd_taxonomy as $tax) {

 

-                    remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

+					remove_meta_box($tax . 'div', $geodir_post_type, 'normal');

 

-                }

-            }

+				}

+			}

 

-        }

-    }

+		}

+	}

 }

 

 add_filter('geodir_add_listing_map_restrict', 'geodir_add_listing_map_restrict');

@@ -289,12 +289,12 @@ 
  */

 function geodir_add_listing_map_restrict($map_restirct)

 {

-    if (is_admin()) {

-        if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {

-            $map_restirct = false;

-        }

-    }

-    return $map_restirct;

+	if (is_admin()) {

+		if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'default_location_settings') {

+			$map_restirct = false;

+		}

+	}

+	return $map_restirct;

 }

 

 

@@ -313,16 +313,16 @@ 
 function geodir_enable_editor_on_notifications($notification)

 {

 

-    if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

+	if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

 

-        foreach ($notification as $key => $value) {

-            if ($value['type'] == 'textarea')

-                $notification[$key]['type'] = 'editor';

-        }

+		foreach ($notification as $key => $value) {

+			if ($value['type'] == 'textarea')

+				$notification[$key]['type'] = 'editor';

+		}

 

-    }

+	}

 

-    return $notification;

+	return $notification;

 }

 

 

@@ -339,16 +339,16 @@ 
 function geodir_enable_editor_on_design_settings($design_setting)

 {

 

-    if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

+	if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

 

-        foreach ($design_setting as $key => $value) {

-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

-                $design_setting[$key]['type'] = 'editor';

-        }

+		foreach ($design_setting as $key => $value) {

+			if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

+				$design_setting[$key]['type'] = 'editor';

+		}

 

-    }

+	}

 

-    return $design_setting;

+	return $design_setting;

 }

 

 /* ----------- START MANAGE CUSTOM FIELDS ---------------- */

@@ -356,15 +356,15 @@ 
 add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');

 

 function geodir_manage_available_fields_predefined($sub_tab){

-    if($sub_tab=='custom_fields'){

-        geodir_custom_available_fields('predefined');

-    }

+	if($sub_tab=='custom_fields'){

+		geodir_custom_available_fields('predefined');

+	}

 }

 

 function geodir_manage_available_fields_custom($sub_tab){

-    if($sub_tab=='custom_fields'){

-        geodir_custom_available_fields('custom');

-    }

+	if($sub_tab=='custom_fields'){

+		geodir_custom_available_fields('custom');

+	}

 }

 

 

@@ -383,16 +383,16 @@ 
 function geodir_manage_available_fields($sub_tab)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            geodir_custom_available_fields();

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			geodir_custom_available_fields();

+			break;

 

-        case 'sorting_options':

-            geodir_sorting_options_available_fields();

-            break;

+		case 'sorting_options':

+			geodir_sorting_options_available_fields();

+			break;

 

-    }

+	}

 }

 

 

@@ -408,16 +408,16 @@ 
 function geodir_manage_selected_fields($sub_tab)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            geodir_custom_selected_fields();

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			geodir_custom_selected_fields();

+			break;

 

-        case 'sorting_options':

-            geodir_sorting_options_selected_fields();

-            break;

+		case 'sorting_options':

+			geodir_sorting_options_selected_fields();

+			break;

 

-    }

+	}

 }

 

 /**

@@ -429,52 +429,52 @@ 
  */

 function geodir_sorting_options_available_fields()

 {

-    global $wpdb;

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	global $wpdb;

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <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 sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul>

     <?php

-        $sort_options = geodir_get_custom_sort_options($listing_type);

+		$sort_options = geodir_get_custom_sort_options($listing_type);

         

-        foreach ($sort_options as $key => $val) {

-            $val = stripslashes_deep($val); // strip slashes

-

-            $check_html_variable = $wpdb->get_var(

-                $wpdb->prepare(

-                    "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

-                    array($val['htmlvar_name'], $listing_type, $val['field_type'])

-                )

-            );

+		foreach ($sort_options as $key => $val) {

+			$val = stripslashes_deep($val); // strip slashes

+

+			$check_html_variable = $wpdb->get_var(

+				$wpdb->prepare(

+					"SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

+					array($val['htmlvar_name'], $listing_type, $val['field_type'])

+				)

+			);

             

-            $display = $check_html_variable ? ' style="display:none;"' : '';

-           ?>

+			$display = $check_html_variable ? ' style="display:none;"' : '';

+		   ?>

 

             <li   class="gd-cf-tooltip-wrap" <?php echo $display;?>>

                 <?php

-                if(isset($val['description']) && $val['description']){

-                    echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';

-                }?>

+				if(isset($val['description']) && $val['description']){

+					echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';

+				}?>

 

                 <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>"  data-field-type="<?php echo $val['field_type'];?>"

                    title="<?php echo $val['site_title'];?>"

                    class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">

                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {

-                        echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){

-                        echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

-                    }else{

-                        echo '<i class="fa fa-cog" aria-hidden="true"></i>';

-                    }?>

+						echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

+					}elseif(isset($val['field_icon']) && $val['field_icon'] ){

+						echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

+					}else{

+						echo '<i class="fa fa-cog" aria-hidden="true"></i>';

+					}?>

                     <?php echo $val['site_title'];?>

                 </a>

             </li>

 

 

             <?php

-        }

-    ?>

+		}

+	?>

     </ul>

     <?php

 }

@@ -488,28 +488,28 @@ 
  */

 function geodir_sorting_options_selected_fields()

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul class="core">

     <?php 

-        global $wpdb;

+		global $wpdb;

         

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

+		$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

 

-        if (!empty($fields)) {

-            foreach ($fields as $field) {

-                //$result_str = $field->id;

-                $result_str = $field;

-                $field_type = $field->field_type;

-                $field_ins_upd = 'display';

+		if (!empty($fields)) {

+			foreach ($fields as $field) {

+				//$result_str = $field->id;

+				$result_str = $field;

+				$field_type = $field->field_type;

+				$field_ins_upd = 'display';

 

-                $default = false;

+				$default = false;

 

-                geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default);

-            }

-        }

-    ?>

+				geodir_custom_sort_field_adminhtml($field_type, $result_str, $field_ins_upd, $default);

+			}

+		}

+	?>

     </ul>

     <?php

 }

@@ -522,12 +522,12 @@ 
  */

 function geodir_custom_fields_custom($post_type=''){

 

-    $custom_fields = array();

+	$custom_fields = array();

 

-    /**

-     * @see `geodir_custom_fields`

-     */

-    return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);

+	/**

+	 * @see `geodir_custom_fields`

+	 */

+	return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);

 }

 

 

@@ -540,139 +540,139 @@ 
  */

 function geodir_custom_fields($post_type=''){

     

-    $custom_fields = array(

-        'text' => array(

-            'field_type'  =>  'text',

-            'class' =>  'gd-text',

-            'icon'  =>  'fa fa-minus',

-            'name'  =>  __('Text', 'geodirectory'),

-            'description' =>  __('Add any sort of text field, text or numbers', 'geodirectory')

-        ),

-        'datepicker' => array(

-            'field_type'  =>  'datepicker',

-            'class' =>  'gd-datepicker',

-            'icon'  =>  'fa fa-calendar',

-            'name'  =>  __('Date', 'geodirectory'),

-            'description' =>  __('Adds a date picker.', 'geodirectory')

-        ),

-        'textarea' => array(

-            'field_type'  =>  'textarea',

-            'class' =>  'gd-textarea',

-            'icon'  =>  'fa fa-bars',

-            'name'  =>  __('Textarea', 'geodirectory'),

-            'description' =>  __('Adds a textarea', 'geodirectory')

-        ),

-        'time' => array(

-            'field_type'  =>  'time',

-            'class' =>  'gd-time',

-            'icon' =>  'fa fa-clock-o',

-            'name'  =>  __('Time', 'geodirectory'),

-            'description' =>  __('Adds a time picker', 'geodirectory')

-        ),

-        'checkbox' => array(

-            'field_type'  =>  'checkbox',

-            'class' =>  'gd-checkbox',

-            'icon' =>  'fa fa-check-square-o',

-            'name'  =>  __('Checkbox', 'geodirectory'),

-            'description' =>  __('Adds a checkbox', 'geodirectory')

-        ),

-        'phone' => array(

-            'field_type'  =>  'phone',

-            'class' =>  'gd-phone',

-            'icon' =>  'fa fa-phone',

-            'name'  =>  __('Phone', 'geodirectory'),

-            'description' =>  __('Adds a phone input', 'geodirectory')

-        ),

-        'radio' => array(

-            'field_type'  =>  'radio',

-            'class' =>  'gd-radio',

-            'icon' =>  'fa fa-dot-circle-o',

-            'name'  =>  __('Radio', 'geodirectory'),

-            'description' =>  __('Adds a radio input', 'geodirectory')

-        ),

-        'email' => array(

-            'field_type'  =>  'email',

-            'class' =>  'gd-email',

-            'icon' =>  'fa fa-envelope-o',

-            'name'  =>  __('Email', 'geodirectory'),

-            'description' =>  __('Adds a email input', 'geodirectory')

-        ),

-        'select' => array(

-            'field_type'  =>  'select',

-            'class' =>  'gd-select',

-            'icon' =>  'fa fa-caret-square-o-down',

-            'name'  =>  __('Select', 'geodirectory'),

-            'description' =>  __('Adds a select input', 'geodirectory')

-        ),

-        'multiselect' => array(

-            'field_type'  =>  'multiselect',

-            'class' =>  'gd-multiselect',

-            'icon' =>  'fa fa-caret-square-o-down',

-            'name'  =>  __('Multi Select', 'geodirectory'),

-            'description' =>  __('Adds a multiselect input', 'geodirectory')

-        ),

-        'url' => array(

-            'field_type'  =>  'url',

-            'class' =>  'gd-url',

-            'icon' =>  'fa fa-link',

-            'name'  =>  __('URL', 'geodirectory'),

-            'description' =>  __('Adds a url input', 'geodirectory')

-        ),

-        'html' => array(

-            'field_type'  =>  'html',

-            'class' =>  'gd-html',

-            'icon' =>  'fa fa-code',

-            'name'  =>  __('HTML', 'geodirectory'),

-            'description' =>  __('Adds a html input textarea', 'geodirectory')

-        ),

-        'file' => array(

-            'field_type'  =>  'file',

-            'class' =>  'gd-file',

-            'icon' =>  'fa fa-file',

-            'name'  =>  __('File Upload', 'geodirectory'),

-            'description' =>  __('Adds a file input', 'geodirectory')

-        )

-    );

-

-    /**

-     * Filter the custom fields array to be able to add or remove items.

-     * 

-     * @since 1.6.6

-     *

-     * @param array $custom_fields {

-     *     The custom fields array to be filtered.

-     *

-     *     @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file.

-     *     @type string $class The class for the field in backend.

-     *     @type string $icon Can be font-awesome class name or icon image url.

-     *     @type string $name The name of the field.

-     *     @type string $description A short description about the field.

-     *     @type array $defaults {

-     *                    Optional. Used to set the default value of the field.

-     *

-     *                    @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE

-     *                    @type string admin_title The admin title for the field.

-     *                    @type string site_title This will be the title for the field on the frontend.

-     *                    @type string admin_desc This will be shown below the field on the add listing form.

-     *                    @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.

-     *                    @type bool is_active If false the field will not be displayed anywhere.

-     *                    @type bool for_admin_use If true then only site admin can see and edit this field.

-     *                    @type string default_value The default value for the input on the add listing page.

-     *                    @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble]

-     *                    @type bool is_required If true the field will be required on the add listing page.

-     *                    @type string option_values The option values for select and multiselect only

-     *                    @type string validation_pattern HTML5 validation pattern (text input only by default).

-     *                    @type string validation_msg HTML5 validation message (text input only by default).

-     *                    @type string required_msg Required warning message.

-     *                    @type string field_icon Icon url or font awesome class.

-     *                    @type string css_class Field custom css class for field custom style.

-     *                    @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option.

-     *                    @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required)

-     *     }

-     * }

-     * @param string $post_type The post type requested.

-     */

-    return apply_filters('geodir_custom_fields',$custom_fields,$post_type);

+	$custom_fields = array(

+		'text' => array(

+			'field_type'  =>  'text',

+			'class' =>  'gd-text',

+			'icon'  =>  'fa fa-minus',

+			'name'  =>  __('Text', 'geodirectory'),

+			'description' =>  __('Add any sort of text field, text or numbers', 'geodirectory')

+		),

+		'datepicker' => array(

+			'field_type'  =>  'datepicker',

+			'class' =>  'gd-datepicker',

+			'icon'  =>  'fa fa-calendar',

+			'name'  =>  __('Date', 'geodirectory'),

+			'description' =>  __('Adds a date picker.', 'geodirectory')

+		),

+		'textarea' => array(

+			'field_type'  =>  'textarea',

+			'class' =>  'gd-textarea',

+			'icon'  =>  'fa fa-bars',

+			'name'  =>  __('Textarea', 'geodirectory'),

+			'description' =>  __('Adds a textarea', 'geodirectory')

+		),

+		'time' => array(

+			'field_type'  =>  'time',

+			'class' =>  'gd-time',

+			'icon' =>  'fa fa-clock-o',

+			'name'  =>  __('Time', 'geodirectory'),

+			'description' =>  __('Adds a time picker', 'geodirectory')

+		),

+		'checkbox' => array(

+			'field_type'  =>  'checkbox',

+			'class' =>  'gd-checkbox',

+			'icon' =>  'fa fa-check-square-o',

+			'name'  =>  __('Checkbox', 'geodirectory'),

+			'description' =>  __('Adds a checkbox', 'geodirectory')

+		),

+		'phone' => array(

+			'field_type'  =>  'phone',

+			'class' =>  'gd-phone',

+			'icon' =>  'fa fa-phone',

+			'name'  =>  __('Phone', 'geodirectory'),

+			'description' =>  __('Adds a phone input', 'geodirectory')

+		),

+		'radio' => array(

+			'field_type'  =>  'radio',

+			'class' =>  'gd-radio',

+			'icon' =>  'fa fa-dot-circle-o',

+			'name'  =>  __('Radio', 'geodirectory'),

+			'description' =>  __('Adds a radio input', 'geodirectory')

+		),

+		'email' => array(

+			'field_type'  =>  'email',

+			'class' =>  'gd-email',

+			'icon' =>  'fa fa-envelope-o',

+			'name'  =>  __('Email', 'geodirectory'),

+			'description' =>  __('Adds a email input', 'geodirectory')

+		),

+		'select' => array(

+			'field_type'  =>  'select',

+			'class' =>  'gd-select',

+			'icon' =>  'fa fa-caret-square-o-down',

+			'name'  =>  __('Select', 'geodirectory'),

+			'description' =>  __('Adds a select input', 'geodirectory')

+		),

+		'multiselect' => array(

+			'field_type'  =>  'multiselect',

+			'class' =>  'gd-multiselect',

+			'icon' =>  'fa fa-caret-square-o-down',

+			'name'  =>  __('Multi Select', 'geodirectory'),

+			'description' =>  __('Adds a multiselect input', 'geodirectory')

+		),

+		'url' => array(

+			'field_type'  =>  'url',

+			'class' =>  'gd-url',

+			'icon' =>  'fa fa-link',

+			'name'  =>  __('URL', 'geodirectory'),

+			'description' =>  __('Adds a url input', 'geodirectory')

+		),

+		'html' => array(

+			'field_type'  =>  'html',

+			'class' =>  'gd-html',

+			'icon' =>  'fa fa-code',

+			'name'  =>  __('HTML', 'geodirectory'),

+			'description' =>  __('Adds a html input textarea', 'geodirectory')

+		),

+		'file' => array(

+			'field_type'  =>  'file',

+			'class' =>  'gd-file',

+			'icon' =>  'fa fa-file',

+			'name'  =>  __('File Upload', 'geodirectory'),

+			'description' =>  __('Adds a file input', 'geodirectory')

+		)

+	);

+

+	/**

+	 * Filter the custom fields array to be able to add or remove items.

+	 * 

+	 * @since 1.6.6

+	 *

+	 * @param array $custom_fields {

+	 *     The custom fields array to be filtered.

+	 *

+	 *     @type string $field_type The type of field, eg: text, datepicker, textarea, time, checkbox, phone, radio, email, select, multiselect, url, html, file.

+	 *     @type string $class The class for the field in backend.

+	 *     @type string $icon Can be font-awesome class name or icon image url.

+	 *     @type string $name The name of the field.

+	 *     @type string $description A short description about the field.

+	 *     @type array $defaults {

+	 *                    Optional. Used to set the default value of the field.

+	 *

+	 *                    @type string data_type The SQL data type for the field. VARCHAR, TEXT, TIME, TINYINT, INT, FLOAT, DATE

+	 *                    @type string admin_title The admin title for the field.

+	 *                    @type string site_title This will be the title for the field on the frontend.

+	 *                    @type string admin_desc This will be shown below the field on the add listing form.

+	 *                    @type string htmlvar_name This is a unique identifier used in the HTML, it MUST NOT contain spaces or special characters.

+	 *                    @type bool is_active If false the field will not be displayed anywhere.

+	 *                    @type bool for_admin_use If true then only site admin can see and edit this field.

+	 *                    @type string default_value The default value for the input on the add listing page.

+	 *                    @type string show_in The locations to show in. [detail],[moreinfo],[listing],[owntab],[mapbubble]

+	 *                    @type bool is_required If true the field will be required on the add listing page.

+	 *                    @type string option_values The option values for select and multiselect only

+	 *                    @type string validation_pattern HTML5 validation pattern (text input only by default).

+	 *                    @type string validation_msg HTML5 validation message (text input only by default).

+	 *                    @type string required_msg Required warning message.

+	 *                    @type string field_icon Icon url or font awesome class.

+	 *                    @type string css_class Field custom css class for field custom style.

+	 *                    @type bool cat_sort If true the field will appear in the category sort options, if false the field will be hidden, leave blank to show option.

+	 *                    @type bool cat_sort If true the field will appear in the advanced search sort options, if false the field will be hidden, leave blank to show option. (advanced search addon required)

+	 *     }

+	 * }

+	 * @param string $post_type The post type requested.

+	 */

+	return apply_filters('geodir_custom_fields',$custom_fields,$post_type);

 }

 

 /**

@@ -685,19 +685,19 @@ 
  */

 function geodir_custom_available_fields($type='')

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <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 sanitize_text_field($_REQUEST['subtab']); ?>" />

 

         <?php

-        if($type=='predefined'){

-            $cfs = geodir_custom_fields_predefined($listing_type);

-        }elseif($type=='custom'){

-            $cfs = geodir_custom_fields_custom($listing_type);

-        }else{

-            $cfs = geodir_custom_fields($listing_type);

-            ?>

+		if($type=='predefined'){

+			$cfs = geodir_custom_fields_predefined($listing_type);

+		}elseif($type=='custom'){

+			$cfs = geodir_custom_fields_custom($listing_type);

+		}else{

+			$cfs = geodir_custom_fields($listing_type);

+			?>

             <ul class="full gd-cf-tooltip-wrap">

                 <li>

                     <div class="gdcf-tooltip">

@@ -718,18 +718,18 @@ 
             </ul>

 

             <?php

-        }

+		}

 

-    if(!empty($cfs)) {

+	if(!empty($cfs)) {

 

-        foreach ( $cfs as $id => $cf ) {

-            ?>

+		foreach ( $cfs as $id => $cf ) {

+			?>

             <ul>

             <li class="gd-cf-tooltip-wrap">

                 <?php

-                if ( isset( $cf['description'] ) && $cf['description'] ) {

-                    echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';

-                } ?>

+				if ( isset( $cf['description'] ) && $cf['description'] ) {

+					echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';

+				} ?>

 

                 <a id="gd-<?php echo $id; ?>"

                    data-field-custom-type="<?php echo $type; ?>"

@@ -739,21 +739,21 @@ 
                    href="javascript:void(0);">

 

                     <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {

-                        echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';

-                    } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {

-                        echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';

-                    } else {

-                        echo '<i class="fa fa-cog" aria-hidden="true"></i>';

-                    } ?>

+						echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';

+					} elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {

+						echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';

+					} else {

+						echo '<i class="fa fa-cog" aria-hidden="true"></i>';

+					} ?>

                     <?php echo $cf['name']; ?>

                 </a>

             </li>

             <?php

-        }

-    }else{

-        _e('There are no custom fields here yet.', 'geodirectory');

-    }

-        ?>

+		}

+	}else{

+		_e('There are no custom fields here yet.', 'geodirectory');

+	}

+		?>

 

 

     </ul>

@@ -772,26 +772,26 @@ 
  */

 function geodir_custom_selected_fields()

 {

-    $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

-    ?>

+	$listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_REQUEST['listing_type']) : 'gd_place';

+	?>

     <input type="hidden" name="manage_field_type" class="manage_field_type" value="<?php echo sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul class="core">

     <?php 

-        global $wpdb;

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

-

-        if (!empty($fields)) {

-            foreach ($fields as $field) {

-                //$result_str = $field->id;

-                $result_str = $field;

-                $field_type = $field->field_type;

-                $field_type_key = $field->field_type_key;

-                $field_ins_upd = 'display';

-

-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);

-            }

-        }

-        ?></ul>

+		global $wpdb;

+		$fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

+

+		if (!empty($fields)) {

+			foreach ($fields as $field) {

+				//$result_str = $field->id;

+				$result_str = $field;

+				$field_type = $field->field_type;

+				$field_type_key = $field->field_type_key;

+				$field_ins_upd = 'display';

+

+				geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);

+			}

+		}

+		?></ul>

 <?php

 

 }

@@ -810,16 +810,16 @@ 
 function geodir_custom_fields_panel_head($heading, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$heading = sprintf(__('Manage %s Custom Fields', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

 

-        case 'sorting_options':

-            $heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $heading;

+		case 'sorting_options':

+			$heading = sprintf(__('Manage %s Listing Sorting Options Fields', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $heading;

 }

 

 

@@ -837,16 +837,16 @@ 
 function geodir_cf_panel_available_fields_head($heading, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$heading = sprintf(__('Add new %s form field', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

 

-        case 'sorting_options':

-            $heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $heading;

+		case 'sorting_options':

+			$heading = sprintf(__('Available sorting options for %s listing and search results', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $heading;

 }

 

 

@@ -864,16 +864,16 @@ 
 function geodir_cf_panel_available_fields_note($note, $sub_tab, $listing_type)

 {

 

-    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));;

-            break;

+	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));;

+			break;

 

-        case 'sorting_options':

-            $note = sprintf(__('Click on any box below to make it appear in sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $note;

+		case 'sorting_options':

+			$note = sprintf(__('Click on any box below to make it appear in sorting option dropdown on %s listing and search results.<br />To make a field available here, go to custom fields tab and expand any field from selected fields panel and tick the checkbox saying \'Include this field in sort option\'.', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $note;

 }

 

 

@@ -891,16 +891,16 @@ 
 function geodir_cf_panel_selected_fields_head($heading, $sub_tab, $listing_type)

 {

 

-    switch ($sub_tab) {

-        case 'custom_fields':

-            $heading = sprintf(__('List of fields those will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

+	switch ($sub_tab) {

+		case 'custom_fields':

+			$heading = sprintf(__('List of fields those will appear on add new %s listing form', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

 

-        case 'sorting_options':

-            $heading = sprintf(__('List of fields those will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $heading;

+		case 'sorting_options':

+			$heading = sprintf(__('List of fields those will appear in %s listing and search results sorting option dropdown box.', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $heading;

 }

 

 

@@ -918,16 +918,16 @@ 
 function geodir_cf_panel_selected_fields_note($note, $sub_tab, $listing_type)

 {

 

-    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));;

-            break;

+	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));;

+			break;

 

-        case 'sorting_options':

-            $note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type));

-            break;

-    }

-    return $note;

+		case 'sorting_options':

+			$note = sprintf(__('Click to expand and view field related settings. You may drag and drop to arrange fields order in sorting option dropdown box on %s listing and search results page.', 'geodirectory'), get_post_type_singular_label($listing_type));

+			break;

+	}

+	return $note;

 }

 

 

@@ -943,16 +943,16 @@ 
  */

 function geodir_remove_unnecessary_fields()

 {

-    global $wpdb, $plugin_prefix;

+	global $wpdb, $plugin_prefix;

 

-    if (!get_option('geodir_remove_unnecessary_fields')) {

+	if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+		if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

+			$wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

 

-        update_option('geodir_remove_unnecessary_fields', '1');

+		update_option('geodir_remove_unnecessary_fields', '1');

 

-    }

+	}

 

 }

 

@@ -970,25 +970,25 @@ 
  */

 function geodir_admin_ajax_handler()

 {

-    if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {

-        $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];

-        switch ($geodir_admin_ajax_action) {

-            case 'diagnosis' :

-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

-                exit();

-                break;

-

-            case 'diagnosis-fix' :

-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

-                exit();

-                break;

-        }

-    }

-    exit();

+	if (isset($_REQUEST['geodir_admin_ajax_action']) && $_REQUEST['geodir_admin_ajax_action'] != '') {

+		$geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];

+		switch ($geodir_admin_ajax_action) {

+			case 'diagnosis' :

+				if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

+					$diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+				call_user_func('geodir_diagnose_' . $diagnose_this);

+				exit();

+				break;

+

+			case 'diagnosis-fix' :

+				if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

+					$diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+				call_user_func('geodir_diagnose_' . $diagnose_this);

+				exit();

+				break;

+		}

+	}

+	exit();

 }

 

 

@@ -1006,127 +1006,127 @@ 
  */

 function geodir_diagnose_multisite_table($filter_arr, $table, $tabel_name, $fix)

 {

-    global $wpdb;

-    //$filter_arr['output_str'] .='###'.$table.'###';

-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

-        $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

-

-            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

-

-                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>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

-                }

-

-            } 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

-

-                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>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

-                }

-

-            } 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

-

-                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>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

-                }

-

-            }

-

-        }

-

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

-                if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

-                }

-

-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

-                }

-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-                }

-            } else {// else rename the original table to _ms_bak

-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

-                } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

-                }

-            }

-        }

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            // if original table exists but new does not, rename

-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-            } else {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

-            }

-

-        }

-

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

-        $filter_arr['is_error_during_diagnose'] = true;

-

-        if ($fix) {

-            // if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run;

-            delete_option('geodirlocation_db_version');

-            delete_option('geodirevents_db_version');

-            delete_option('geodir_reviewrating_db_version');

-            delete_option('gdevents_db_version');

-            delete_option('geodirectory_db_version');

-            delete_option('geodirclaim_db_version');

-            delete_option('geodir_custom_posts_db_version');

-            delete_option('geodir_reviewratings_db_version');

-            delete_option('geodiradvancesearch_db_version');

-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

-        }

-

-    } else {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

-    }

-    return $filter_arr;

+	global $wpdb;

+	//$filter_arr['output_str'] .='###'.$table.'###';

+	if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

+		$filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+		$filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

+		$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

+

+			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

+

+				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>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+				}

+

+			} 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

+

+				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>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+				}

+

+			} 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

+

+				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>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+				}

+

+			}

+

+		}

+

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

+				if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

+				}

+

+			} elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

+				if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+				}

+				if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+				}

+			} else {// else rename the original table to _ms_bak

+				if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+				} else {

+					$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+				}

+			}

+		}

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			// if original table exists but new does not, rename

+			if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+				$filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+			} else {

+				$filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+			}

+

+		}

+

+	} elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

+		$filter_arr['is_error_during_diagnose'] = true;

+

+		if ($fix) {

+			// if original table does not exist try deleting db_vers of all addons so the initial db_install scripts run;

+			delete_option('geodirlocation_db_version');

+			delete_option('geodirevents_db_version');

+			delete_option('geodir_reviewrating_db_version');

+			delete_option('gdevents_db_version');

+			delete_option('geodirectory_db_version');

+			delete_option('geodirclaim_db_version');

+			delete_option('geodir_custom_posts_db_version');

+			delete_option('geodir_reviewratings_db_version');

+			delete_option('geodiradvancesearch_db_version');

+			$filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

+		}

+

+	} else {

+		$filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

+	}

+	return $filter_arr;

 }

 

 

@@ -1140,53 +1140,53 @@ 
  */

 function geodir_diagnose_tags_sync()

 {

-    global $wpdb, $plugin_prefix;

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-

-    $all_postypes = geodir_get_posttypes();

-

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CPT

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

-

-            if (!empty($posts)) {

-

-                foreach ($posts as $p) {

-                    $p->post_type = $key;

-                    $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

-                    if (empty($raw_tags)) {

-                        $post_tags = '';

-                    } else {

-                        $post_tags = implode(",", $raw_tags);

-                    }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

-

-                }

-                $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

-            }

-

-        }

-

-    }

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb, $plugin_prefix;

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+

+	$all_postypes = geodir_get_posttypes();

+

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CPT

+			$posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

+

+			if (!empty($posts)) {

+

+				foreach ($posts as $p) {

+					$p->post_type = $key;

+					$raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+					if (empty($raw_tags)) {

+						$post_tags = '';

+					} else {

+						$post_tags = implode(",", $raw_tags);

+					}

+					$tablename = $plugin_prefix . $p->post_type . '_detail';

+					$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+

+				}

+				$output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+			}

+

+		}

+

+	}

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1202,75 +1202,75 @@ 
  */

 function geodir_diagnose_cats_sync()

 {

-    global $wpdb, $plugin_prefix;

-    $fix = isset($_POST['fix']) ? true : false;

+	global $wpdb, $plugin_prefix;

+	$fix = isset($_POST['fix']) ? true : false;

 

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

 

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

-    if (!empty($all_postypes)) {

-        foreach ($all_postypes as $key) {

-            // update each GD CTP

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

+	if (!empty($all_postypes)) {

+		foreach ($all_postypes as $key) {

+			// update each GD CTP

+			$posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

 

-            if (!empty($posts)) {

+			if (!empty($posts)) {

 

-                foreach ($posts as $p) {

-                    $p->post_type = $key;

-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

+				foreach ($posts as $p) {

+					$p->post_type = $key;

+					$raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

 

-                    if (empty($raw_cats)) {

-                        $post_categories = get_post_meta($p->post_id, 'post_categories', true);

+					if (empty($raw_cats)) {

+						$post_categories = get_post_meta($p->post_id, 'post_categories', true);

 

-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

-                            $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;

-                                }

-                            }

+						if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

+							$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;

+								}

+							}

 

-                        }

+						}

 

-                        if (!empty($raw_cats)) {

-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

+						if (!empty($raw_cats)) {

+							$term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

 

-                        }

+						}

 

-                    }

+					}

 

 

-                    if (empty($raw_cats)) {

-                        $post_cats = '';

-                    } else {

-                        $post_cats = ',' . implode(",", $raw_cats) . ',';

-                    }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

-                }

+					if (empty($raw_cats)) {

+						$post_cats = '';

+					} else {

+						$post_cats = ',' . implode(",", $raw_cats) . ',';

+					}

+					$tablename = $plugin_prefix . $p->post_type . '_detail';

+					$wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

+				}

 

-            }

-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+			}

+			$output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

 

-        }

+		}

 

-    }

+	}

 

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1284,61 +1284,61 @@ 
  */

 function geodir_diagnose_version_clear()

 {

-    global $wpdb, $plugin_prefix;

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-

-    $gd_arr = array('GeoDirectory' => 'geodirectory_db_version',

-        'Payment Manager' => 'geodir_payments_db_version',

-        'GeoDirectory Framework' => 'gdf_db_version',

-        'Advanced Search' => 'geodiradvancesearch_db_version',

-        'Review Rating Manager' => 'geodir_reviewratings_db_version',

-        'Claim Manager' => 'geodirclaim_db_version',

-        'CPT Manager' => 'geodir_custom_posts_db_version',

-        'Location Manager' => 'geodirlocation_db_version',

-        'Payment Manager' => 'geodir_payments_db_version',

-        'Events Manager' => 'geodirevents_db_version',

-    );

-

-    /**

-     * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers.

-     *

-     * @since 1.0.0

-     * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...

-     */

-    $ver_arr = apply_filters('geodir_db_version_name', $gd_arr);

-

-    if (!empty($ver_arr)) {

-        foreach ($ver_arr as $key => $val) {

-            if (delete_option($val)) {

-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

-            } else {

-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

-            }

-

-        }

-

-        if ($output_str) {

-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

-        }

-

-    }

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb, $plugin_prefix;

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+

+	$gd_arr = array('GeoDirectory' => 'geodirectory_db_version',

+		'Payment Manager' => 'geodir_payments_db_version',

+		'GeoDirectory Framework' => 'gdf_db_version',

+		'Advanced Search' => 'geodiradvancesearch_db_version',

+		'Review Rating Manager' => 'geodir_reviewratings_db_version',

+		'Claim Manager' => 'geodirclaim_db_version',

+		'CPT Manager' => 'geodir_custom_posts_db_version',

+		'Location Manager' => 'geodirlocation_db_version',

+		'Payment Manager' => 'geodir_payments_db_version',

+		'Events Manager' => 'geodirevents_db_version',

+	);

+

+	/**

+	 * Filter the array of plugins to clear the version numbers for in the GD >Tools : clear all version numbers.

+	 *

+	 * @since 1.0.0

+	 * @param array $gd_arr The array or addons to clear, array('GeoDirectory' => 'geodirectory_db_version',...

+	 */

+	$ver_arr = apply_filters('geodir_db_version_name', $gd_arr);

+

+	if (!empty($ver_arr)) {

+		foreach ($ver_arr as $key => $val) {

+			if (delete_option($val)) {

+				$output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

+			} else {

+				$output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

+			}

+

+		}

+

+		if ($output_str) {

+			$output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

+		}

+

+	}

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1352,59 +1352,59 @@ 
  */

 function geodir_diagnose_ratings()

 {

-    global $wpdb;

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-    // check review locations

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

-        $is_error_during_diagnose = true;

-

-        if ($fix) {

-            if (geodir_fix_review_location()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-

-    } else {

-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

-    }

-

-    // check review content

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

-        $is_error_during_diagnose = true;

-

-        if ($fix) {

-            if (geodir_fix_review_content()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-

-    } else {

-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

-    }

-

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb;

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+	// check review locations

+	if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

+		$output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

+		$is_error_during_diagnose = true;

+

+		if ($fix) {

+			if (geodir_fix_review_location()) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+

+	} else {

+		$output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

+	}

+

+	// check review content

+	if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

+		$output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

+		$is_error_during_diagnose = true;

+

+		if ($fix) {

+			if (geodir_fix_review_content()) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+

+	} else {

+		$output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

+	}

+

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1418,57 +1418,57 @@ 
  */

 function geodir_diagnose_multisite_conversion()

 {

-    global $wpdb;

-    $fix = isset($_POST['fix']) ? true : false;

-    //if($fix){echo 'true';}else{echo 'false';}

-    $is_error_during_diagnose = false;

-    $output_str = '';

-

-    $filter_arr = array();

-    $filter_arr['output_str'] = $output_str;

-    $filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose;

-    $table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),

-        'geodir_custom_fields' => __('Custom fields', 'geodirectory'),

-        'geodir_post_icon' => __('Post icon', 'geodirectory'),

-        'geodir_attachments' => __('Attachments', 'geodirectory'),

-        'geodir_post_review' => __('Reviews', 'geodirectory'),

-        'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),

-        'geodir_gd_place_detail' => __('Place detail', 'geodirectory')

-    );

-

-    // allow other addons to hook in and add their checks

-

-    /**

-     * Filter the array of tables.

-     *

-     * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks.

-     *

-     * @since 1.0.0

-     * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...

-     */

-    $table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);

-

-    foreach ($table_arr as $table => $table_name) {

-        // Diagnose table

-        $filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix);

-    }

-

-

-    $output_str = $filter_arr['output_str'];

-    $is_error_during_diagnose = $filter_arr['is_error_during_diagnose'];

-

-

-    if ($is_error_during_diagnose) {

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb;

+	$fix = isset($_POST['fix']) ? true : false;

+	//if($fix){echo 'true';}else{echo 'false';}

+	$is_error_during_diagnose = false;

+	$output_str = '';

+

+	$filter_arr = array();

+	$filter_arr['output_str'] = $output_str;

+	$filter_arr['is_error_during_diagnose'] = $is_error_during_diagnose;

+	$table_arr = array('geodir_countries' => __('Countries', 'geodirectory'),

+		'geodir_custom_fields' => __('Custom fields', 'geodirectory'),

+		'geodir_post_icon' => __('Post icon', 'geodirectory'),

+		'geodir_attachments' => __('Attachments', 'geodirectory'),

+		'geodir_post_review' => __('Reviews', 'geodirectory'),

+		'geodir_custom_sort_fields' => __('Custom sort fields', 'geodirectory'),

+		'geodir_gd_place_detail' => __('Place detail', 'geodirectory')

+	);

+

+	// allow other addons to hook in and add their checks

+

+	/**

+	 * Filter the array of tables.

+	 *

+	 * Filter the array of tables to check during the GD>Tools multisite DB conversion tool check, this allows addons to add their DB tables to the checks.

+	 *

+	 * @since 1.0.0

+	 * @param array $table_arr The array of tables to check, array('geodir_countries' => __('Countries', 'geodirectory'),...

+	 */

+	$table_arr = apply_filters('geodir_diagnose_multisite_conversion', $table_arr);

+

+	foreach ($table_arr as $table => $table_name) {

+		// Diagnose table

+		$filter_arr = geodir_diagnose_multisite_table($filter_arr, $table, $table_name, $fix);

+	}

+

+

+	$output_str = $filter_arr['output_str'];

+	$is_error_during_diagnose = $filter_arr['is_error_during_diagnose'];

+

+

+	if ($is_error_during_diagnose) {

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 }

 

 /**

@@ -1486,39 +1486,39 @@ 
  */

 function geodir_fix_virtual_page($slug, $page_title, $old_id, $option)

 {

-    global $wpdb, $current_user;

-

-    if (!empty($old_id)) {

-        wp_delete_post($old_id, true);

-    }//delete post if already there

-    else {

-        $page_found = $wpdb->get_var(

-            $wpdb->prepare(

-                "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

-                array($slug)

-            )

-        );

-        wp_delete_post($page_found, true);

-

-    }

-

-    $page_data = array(

-        'post_status' => 'publish',

-        'post_type' => 'page',

-        'post_author' => $current_user->ID,

-        'post_name' => $slug,

-        'post_title' => $page_title,

-        'post_content' => '',

-        'post_parent' => 0,

-        'comment_status' => 'closed'

-    );

-    $page_id = wp_insert_post($page_data);

-    update_option($option, $page_id);

-    if ($page_id) {

-        return true;

-    } else {

-        return false;

-    }

+	global $wpdb, $current_user;

+

+	if (!empty($old_id)) {

+		wp_delete_post($old_id, true);

+	}//delete post if already there

+	else {

+		$page_found = $wpdb->get_var(

+			$wpdb->prepare(

+				"SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+				array($slug)

+			)

+		);

+		wp_delete_post($page_found, true);

+

+	}

+

+	$page_data = array(

+		'post_status' => 'publish',

+		'post_type' => 'page',

+		'post_author' => $current_user->ID,

+		'post_name' => $slug,

+		'post_title' => $page_title,

+		'post_content' => '',

+		'post_parent' => 0,

+		'comment_status' => 'closed'

+	);

+	$page_id = wp_insert_post($page_data);

+	update_option($option, $page_id);

+	if ($page_id) {

+		return true;

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -1530,212 +1530,212 @@ 
  */

 function geodir_diagnose_default_pages()

 {

-    global $wpdb;

-    $is_error_during_diagnose = false;

-    $output_str = '';

-    $fix = isset($_POST['fix']) ? true : false;

-

-    //////////////////////////////////

-    /* Diagnose GD Home Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_home_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose GD Home Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Add Listing Page Starts */

-    //////////////////////////////////

-    $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($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Add Listing Page Ends */

-    ////////////////////////////////

-

-

-    //////////////////////////////////

-    /* Diagnose Listing Preview Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_preview_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Listing Preview Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Listing Success Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_success_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Listing Sucess Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Info Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_info_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Info Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Login Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_login_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Info Page Ends */

-    ////////////////////////////////

-

-    //////////////////////////////////

-    /* Diagnose Location Page Starts */

-    //////////////////////////////////

-    $option_value = get_option('geodir_location_page');

-    $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

-

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

-        $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

-        if ($fix) {

-            if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

-            } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

-            }

-        }

-    }

-

-    ////////////////////////////////

-    /* Diagnose Location Page Ends */

-    ////////////////////////////////

-

-    $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);

-

-    $output_str = $page_chk_arr['output_str'];

-    $is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

-

-    if ($is_error_during_diagnose) {

-        if ($fix) {

-            flush_rewrite_rules();

-        }

-        $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

-    } else {

-        $info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

-    echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	global $wpdb;

+	$is_error_during_diagnose = false;

+	$output_str = '';

+	$fix = isset($_POST['fix']) ? true : false;

+

+	//////////////////////////////////

+	/* Diagnose GD Home Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_home_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose GD Home Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Add Listing Page Starts */

+	//////////////////////////////////

+	$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($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Add Listing Page Ends */

+	////////////////////////////////

+

+

+	//////////////////////////////////

+	/* Diagnose Listing Preview Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_preview_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Listing Preview Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Listing Success Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_success_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Listing Sucess Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Info Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_info_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Info Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Login Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_login_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Info Page Ends */

+	////////////////////////////////

+

+	//////////////////////////////////

+	/* Diagnose Location Page Starts */

+	//////////////////////////////////

+	$option_value = get_option('geodir_location_page');

+	$page = get_post($option_value);

+	if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+

+	if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

+		$output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

+	else {

+		$is_error_during_diagnose = true;

+		$output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

+		if ($fix) {

+			if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

+				$output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

+			} else {

+				$output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

+			}

+		}

+	}

+

+	////////////////////////////////

+	/* Diagnose Location Page Ends */

+	////////////////////////////////

+

+	$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);

+

+	$output_str = $page_chk_arr['output_str'];

+	$is_error_during_diagnose = $page_chk_arr['is_error_during_diagnose'];

+

+	if ($is_error_during_diagnose) {

+		if ($fix) {

+			flush_rewrite_rules();

+		}

+		$info_div_class = "geodir_problem_info";

+		$fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

+	} else {

+		$info_div_class = "geodir_noproblem_info";

+		$fix_button_txt = '';

+	}

+	echo "<ul class='$info_div_class'>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1747,26 +1747,26 @@ 
  * @global object $wpdb WordPress Database object.

  */

 function geodir_diagnose_load_db_language() {

-    global $wpdb;

+	global $wpdb;

 	

 	$is_error_during_diagnose = geodirectory_load_db_language();

 

-    $output_str = '';

-    $fix_button_txt = '';

+	$output_str = '';

+	$fix_button_txt = '';

 

-    if ($is_error_during_diagnose) {

-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

+	if ($is_error_during_diagnose) {

+		$output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

 		$info_div_class = "geodir_problem_info";

-    } else {

-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

+	} else {

+		$output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

 		$info_div_class = "geodir_noproblem_info";

-        $fix_button_txt = '';

-    }

+		$fix_button_txt = '';

+	}

     

 	echo "<ul class='$info_div_class'>";

-    echo $output_str;

-    echo $fix_button_txt;

-    echo "</ul>";

+	echo $output_str;

+	echo $fix_button_txt;

+	echo "</ul>";

 

 }

 

@@ -1797,23 +1797,23 @@ 
  */

 function geodir_posts_clauses_request($clauses)

 {

-    global $wpdb, $wp_query, $plugin_prefix;

+	global $wpdb, $wp_query, $plugin_prefix;

 

-    if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

+	if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

+		$table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

 

-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

-        $clauses['join'] = $join;

+		$join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

+		$clauses['join'] = $join;

 

-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

-        $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

-        $clauses['fields'] = $fields;

+		$fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

+		$fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

+		$clauses['fields'] = $fields;

 

-        $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

-        $orderby = 'gd_expire ' . $order;

-        $clauses['orderby'] = $orderby;

-    }

-    return $clauses;

+		$order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

+		$orderby = 'gd_expire ' . $order;

+		$clauses['orderby'] = $orderby;

+	}

+	return $clauses;

 }

 

 

@@ -1834,7 +1834,7 @@ 
  */

 function gd_theme_switch_compat_check()

 {

-    gd_set_theme_compat();

+	gd_set_theme_compat();

 }

 

 /**

@@ -1847,27 +1847,27 @@ 
  */

 function geodir_str_getcsv($input, $delimiter = ",", $enclosure = '"', $escape = "\\")

 {

-    if (function_exists('str_getcsv')) {

-        $fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape);

-    } else {

-        global $current_user;

-        $upload_dir = wp_upload_dir();

-

-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

-        $handle = fopen($file, 'w');

-

-        fwrite($handle, $input);

-        fclose($handle);

-

-        $handle = fopen($file, 'rt');

-        if (PHP_VERSION >= '5.3.0') {

-            $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape);

-        } else {

-            $fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure);

-        }

-        fclose($handle);

-    }

-    return $fgetcsv;

+	if (function_exists('str_getcsv')) {

+		$fgetcsv = str_getcsv($input, $delimiter, $enclosure, $escape);

+	} else {

+		global $current_user;

+		$upload_dir = wp_upload_dir();

+

+		$file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

+		$handle = fopen($file, 'w');

+

+		fwrite($handle, $input);

+		fclose($handle);

+

+		$handle = fopen($file, 'rt');

+		if (PHP_VERSION >= '5.3.0') {

+			$fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure, $escape);

+		} else {

+			$fgetcsv = fgetcsv($handle, 0, $delimiter, $enclosure);

+		}

+		fclose($handle);

+	}

+	return $fgetcsv;

 }

 

 add_action('wp_ajax_gdImportCsv', 'geodir_ajax_import_csv');

@@ -1882,375 +1882,375 @@ 
  */

 function geodir_ajax_import_csv()

 {

-    error_reporting(0); // hide error to get clean json response

+	error_reporting(0); // hide error to get clean json response

 

-    global $wpdb, $plugin_prefix, $current_user;

-    $uploads = wp_upload_dir();

-    ini_set('auto_detect_line_endings', true);

+	global $wpdb, $plugin_prefix, $current_user;

+	$uploads = wp_upload_dir();

+	ini_set('auto_detect_line_endings', true);

 	

 	$wp_post_statuses = get_post_statuses(); // All of the WordPress supported post statuses.

 

-    $task = isset($_POST['task']) ? $_POST['task'] : '';

-    $uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;

-    $filename = $uploadedFile;

-

-    $uploads = wp_upload_dir();

-    $uploads_dir = $uploads['path'];

-    $image_name_arr = explode('/', $filename);

-    $filename = end($image_name_arr);

-    $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-    $return = array();

-    $return['file'] = $uploadedFile;

-    $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

-

-    if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {

-        $wp_filetype = wp_check_filetype_and_ext($target_path, $filename);

-

-        if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

-            $return['error'] = NULL;

-

-            $return['rows'] = 0;

-

-

-

-                if (($handle = fopen($target_path, "r")) !== FALSE) {

-                    while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

-                        if(is_array($data) && !empty($data)) {

-                            $file[] = '"' . implode('","', $data) . '"';

-                        }

-                    }

-                    fclose($handle);

-                    $file = $file;

-                }

-

-

-

-                $return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

-

-

-            if (!$return['rows'] > 0) {

-                $return['error'] = __('No data found in csv file.', 'geodirectory');

-            }

-        }

-    }

-    if ($task == 'prepare' || !empty($return['error'])) {

-        echo json_encode($return);

-        exit;

-    }

-

-    $totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL;

-    $importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1;

-    $count = $importlimit;

-    $requested_limit = $importlimit;

-    $tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0;

-

-    if ($count < $totRecords) {

-        $count = $tmpCnt + $count;

-        if ($count > $totRecords) {

-            $count = $totRecords;

-        }

-    } else {

-        $count = $totRecords;

-    }

-

-    $total_records = 0;

-    $rowcount = 0;

-    $address_invalid = 0;

-    $blank_address = 0;

-    $upload_files = 0;

-    $invalid_post_type = 0;

-    $invalid_title = 0;

-    $customKeyarray = array();

-    $gd_post_info = array();

-    $post_location = array();

-    $countpost = 0;

-

-    if (!empty($file)) {

-        $columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL;

-        $customKeyarray = $columns;

-

-        if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

-            $return['error'] = CSV_INVAILD_FILE;

-            echo json_encode($return);

-            exit;

-        }

-

-        for ($i = 1; $i <= $importlimit; $i++) {

-            $current_index = $tmpCnt + $i;

-            if (isset($file[$current_index])) {

-                $total_records++;

-

-                $buffer = geodir_str_getcsv($file[$current_index]);

-                $post_title = addslashes($buffer[0]);

-                $current_post_author = $buffer[1];

-                $post_desc = addslashes($buffer[2]);

-                $post_cat = array();

-                $catids_arr = array();

-                $post_cat = trim($buffer[3]); // comma seperated category name

-

-                if ($post_cat) {

-                    $post_cat_arr = explode(',', $post_cat);

-

-                    for ($c = 0; $c < count($post_cat_arr); $c++) {

-                        $catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));

-

-                        if (!empty($buffer[5])) {

-                            if (in_array($buffer[5], geodir_get_posttypes())) {

-

-                                $p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));

-

-                                if (get_term_by('name', $catid, $p_taxonomy[0])) {

-                                    $cat = get_term_by('name', $catid, $p_taxonomy[0]);

-                                    $catids_arr[] = $cat->slug;

-                                } else if (get_term_by('slug', $catid, $p_taxonomy[0])) {

-                                    $cat = get_term_by('slug', $catid, $p_taxonomy[0]);

-                                    $catids_arr[] = $cat->slug;

-                                } else {

-                                    $ret = wp_insert_term($catid, $p_taxonomy[0]);

-                                    if ($ret && !is_wp_error($ret)) {

-                                        if (get_term_by('name', $catid, $p_taxonomy[0])) {

-                                            $cat = get_term_by('name', $catid, $p_taxonomy[0]);

-                                            $catids_arr[] = $cat->slug;

-                                        } elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {

-                                            $cat = get_term_by('slug', $catid, $p_taxonomy[0]);

-                                            $catids_arr[] = $cat->slug;

-                                        }

-                                    }

-                                }

-                            }

-                        }

-                    }

-                }

-

-                if (!$catids_arr) {

-                    $catids_arr[] = 1;

-                }

-

-                $post_tags = trim($buffer[4]); // comma seperated tags

-

-                $tag_arr = '';

-                if ($post_tags) {

-                    $tag_arr = explode(',', $post_tags);

-                }

-

-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

-

-                $error = '';

-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

-                    $invalid_post_type++;

-                    continue;

-                }

-

-                if ($post_title != '') {

-                    $menu_order = 0;

-                    $image_folder_name = 'uplaod/';

-

-                    $image_names = array();

-

-                    for ($c = 5; $c < count($customKeyarray); $c++) {

-                        $gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);

-

-                        if ($customKeyarray[$c] == 'IMAGE') {

-                            $buffer[$c] = trim($buffer[$c]);

-

-                            if (!empty($buffer[$c])) {

-                                $image_names[] = $buffer[$c];

-                            }

-                        }

-

-                        if ($customKeyarray[$c] == 'alive_days') {

-                            if ($buffer[$c] != '0' && $buffer[$c] != '') {

-                                $submitdata = date('Y-m-d');

-

-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

-                            } else {

-                                $gd_post_info['expire_date'] = 'Never';

-                            }

-                        }

-

-                        if ($customKeyarray[$c] == 'post_city') {

-                            $post_city = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_region') {

-                            $post_region = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_country') {

-                            $post_country = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_latitude') {

-                            $post_latitude = addslashes($buffer[$c]);

-                        }

-

-                        if ($customKeyarray[$c] == 'post_longitude') {

-                            $post_longitude = addslashes($buffer[$c]);

-                        }

+	$task = isset($_POST['task']) ? $_POST['task'] : '';

+	$uploadedFile = isset($_POST['gddata']['uploadedFile']) ? $_POST['gddata']['uploadedFile'] : NULL;

+	$filename = $uploadedFile;

+

+	$uploads = wp_upload_dir();

+	$uploads_dir = $uploads['path'];

+	$image_name_arr = explode('/', $filename);

+	$filename = end($image_name_arr);

+	$target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+	$return = array();

+	$return['file'] = $uploadedFile;

+	$return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

+

+	if (is_file($target_path) && file_exists($target_path) && $uploadedFile) {

+		$wp_filetype = wp_check_filetype_and_ext($target_path, $filename);

+

+		if (!empty($wp_filetype) && isset($wp_filetype['ext']) && geodir_strtolower($wp_filetype['ext']) == 'csv') {

+			$return['error'] = NULL;

+

+			$return['rows'] = 0;

+

+

+

+				if (($handle = fopen($target_path, "r")) !== FALSE) {

+					while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

+						if(is_array($data) && !empty($data)) {

+							$file[] = '"' . implode('","', $data) . '"';

+						}

+					}

+					fclose($handle);

+					$file = $file;

+				}

+

+

+

+				$return['rows'] = (!empty($file) && count($file) > 1) ? count($file) - 1 : 0;

+

+

+			if (!$return['rows'] > 0) {

+				$return['error'] = __('No data found in csv file.', 'geodirectory');

+			}

+		}

+	}

+	if ($task == 'prepare' || !empty($return['error'])) {

+		echo json_encode($return);

+		exit;

+	}

+

+	$totRecords = isset($_POST['gddata']['totRecords']) ? $_POST['gddata']['totRecords'] : NULL;

+	$importlimit = isset($_POST['gddata']['importlimit']) ? $_POST['gddata']['importlimit'] : 1;

+	$count = $importlimit;

+	$requested_limit = $importlimit;

+	$tmpCnt = isset($_POST['gddata']['tmpcount']) ? $_POST['gddata']['tmpcount'] : 0;

+

+	if ($count < $totRecords) {

+		$count = $tmpCnt + $count;

+		if ($count > $totRecords) {

+			$count = $totRecords;

+		}

+	} else {

+		$count = $totRecords;

+	}

+

+	$total_records = 0;

+	$rowcount = 0;

+	$address_invalid = 0;

+	$blank_address = 0;

+	$upload_files = 0;

+	$invalid_post_type = 0;

+	$invalid_title = 0;

+	$customKeyarray = array();

+	$gd_post_info = array();

+	$post_location = array();

+	$countpost = 0;

+

+	if (!empty($file)) {

+		$columns = isset($file[0]) ? geodir_str_getcsv($file[0]) : NULL;

+		$customKeyarray = $columns;

+

+		if (empty($columns) || (!empty($columns) && $columns[0] == '')) {

+			$return['error'] = CSV_INVAILD_FILE;

+			echo json_encode($return);

+			exit;

+		}

+

+		for ($i = 1; $i <= $importlimit; $i++) {

+			$current_index = $tmpCnt + $i;

+			if (isset($file[$current_index])) {

+				$total_records++;

+

+				$buffer = geodir_str_getcsv($file[$current_index]);

+				$post_title = addslashes($buffer[0]);

+				$current_post_author = $buffer[1];

+				$post_desc = addslashes($buffer[2]);

+				$post_cat = array();

+				$catids_arr = array();

+				$post_cat = trim($buffer[3]); // comma seperated category name

+

+				if ($post_cat) {

+					$post_cat_arr = explode(',', $post_cat);

+

+					for ($c = 0; $c < count($post_cat_arr); $c++) {

+						$catid = wp_kses_normalize_entities(trim($post_cat_arr[$c]));

+

+						if (!empty($buffer[5])) {

+							if (in_array($buffer[5], geodir_get_posttypes())) {

+

+								$p_taxonomy = geodir_get_taxonomies(addslashes($buffer[5]));

+

+								if (get_term_by('name', $catid, $p_taxonomy[0])) {

+									$cat = get_term_by('name', $catid, $p_taxonomy[0]);

+									$catids_arr[] = $cat->slug;

+								} else if (get_term_by('slug', $catid, $p_taxonomy[0])) {

+									$cat = get_term_by('slug', $catid, $p_taxonomy[0]);

+									$catids_arr[] = $cat->slug;

+								} else {

+									$ret = wp_insert_term($catid, $p_taxonomy[0]);

+									if ($ret && !is_wp_error($ret)) {

+										if (get_term_by('name', $catid, $p_taxonomy[0])) {

+											$cat = get_term_by('name', $catid, $p_taxonomy[0]);

+											$catids_arr[] = $cat->slug;

+										} elseif (get_term_by('slug', $catid, $p_taxonomy[0])) {

+											$cat = get_term_by('slug', $catid, $p_taxonomy[0]);

+											$catids_arr[] = $cat->slug;

+										}

+									}

+								}

+							}

+						}

+					}

+				}

+

+				if (!$catids_arr) {

+					$catids_arr[] = 1;

+				}

+

+				$post_tags = trim($buffer[4]); // comma seperated tags

+

+				$tag_arr = '';

+				if ($post_tags) {

+					$tag_arr = explode(',', $post_tags);

+				}

+

+				$table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

+

+				$error = '';

+				if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

+					$invalid_post_type++;

+					continue;

+				}

+

+				if ($post_title != '') {

+					$menu_order = 0;

+					$image_folder_name = 'uplaod/';

+

+					$image_names = array();

+

+					for ($c = 5; $c < count($customKeyarray); $c++) {

+						$gd_post_info[$customKeyarray[$c]] = addslashes($buffer[$c]);

+

+						if ($customKeyarray[$c] == 'IMAGE') {

+							$buffer[$c] = trim($buffer[$c]);

+

+							if (!empty($buffer[$c])) {

+								$image_names[] = $buffer[$c];

+							}

+						}

+

+						if ($customKeyarray[$c] == 'alive_days') {

+							if ($buffer[$c] != '0' && $buffer[$c] != '') {

+								$submitdata = date('Y-m-d');

+

+								$gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

+							} else {

+								$gd_post_info['expire_date'] = 'Never';

+							}

+						}

+

+						if ($customKeyarray[$c] == 'post_city') {

+							$post_city = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_region') {

+							$post_region = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_country') {

+							$post_country = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_latitude') {

+							$post_latitude = addslashes($buffer[$c]);

+						}

+

+						if ($customKeyarray[$c] == 'post_longitude') {

+							$post_longitude = addslashes($buffer[$c]);

+						}

 						

 						// Post status

 						if ($customKeyarray[$c] == 'post_status') {

-                            $post_status = sanitize_key( $buffer[$c] );

-                        }

-                    }

-

-                    /* ================ before array create ============== */

-                    $location_result = geodir_get_default_location();

-                    if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {

-                        $blank_address++;

-                        continue;

-                    } else if ($location_result->location_id == 0) {

-                        if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {

-                            $address_invalid++;

-                            continue;

-                        }

-                    }

+							$post_status = sanitize_key( $buffer[$c] );

+						}

+					}

+

+					/* ================ before array create ============== */

+					$location_result = geodir_get_default_location();

+					if ((!isset($gd_post_info['post_city']) || $gd_post_info['post_city'] == '') || (!isset($gd_post_info['post_region']) || $gd_post_info['post_region'] == '') || (!isset($gd_post_info['post_country']) || $gd_post_info['post_country'] == '') || (!isset($gd_post_info['post_address']) || $gd_post_info['post_address'] == '') || (!isset($gd_post_info['post_latitude']) || $gd_post_info['post_latitude'] == '') || (!isset($gd_post_info['post_longitude']) || $gd_post_info['post_longitude'] == '')) {

+						$blank_address++;

+						continue;

+					} else if ($location_result->location_id == 0) {

+						if ((geodir_strtolower($gd_post_info['post_city']) != geodir_strtolower($location_result->city)) || (geodir_strtolower($gd_post_info['post_region']) != geodir_strtolower($location_result->region)) || (geodir_strtolower($gd_post_info['post_country']) != geodir_strtolower($location_result->country))) {

+							$address_invalid++;

+							continue;

+						}

+					}

 					

 					// Default post status

 					$default_status = 'publish';

 					$post_status = !empty( $post_status ) ? sanitize_key( $post_status ) : $default_status;

 					$post_status = !empty( $wp_post_statuses ) && !isset( $wp_post_statuses[$post_status] ) ? $default_status : $post_status;

 

-                    $my_post['post_title'] = $post_title;

-                    $my_post['post_content'] = $post_desc;

-                    $my_post['post_type'] = addslashes($buffer[5]);

-                    $my_post['post_author'] = $current_post_author;

-                    $my_post['post_status'] = $post_status;

-                    $my_post['post_category'] = $catids_arr;

-                    $my_post['post_tags'] = $tag_arr;

-

-                    $gd_post_info['post_tags'] = $tag_arr;

-                    $gd_post_info['post_title'] = $post_title;

-                    $gd_post_info['post_status'] = $post_status;

-                    $gd_post_info['submit_time'] = time();

-                    $gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];

-

-                    $last_postid = wp_insert_post($my_post);

-                    $countpost++;

-

-                    // Check if we need to save post location as new location

-                    if ($location_result->location_id > 0) {

-                        if (isset($post_city) && isset($post_region)) {

-                            $request_info['post_location'] = array(

-                                'city' => $post_city,

-                                'region' => $post_region,

-                                'country' => $post_country,

-                                'geo_lat' => $post_latitude,

-                                'geo_lng' => $post_longitude

-                            );

-

-                            $post_location_info = $request_info['post_location'];

-                            if ($location_id = geodir_add_new_location($post_location_info))

-                                $post_location_id = $location_id;

-                        } else {

-                            $post_location_id = 0;

-                        }

-                    } else {

-                        $post_location_id = 0;

-                    }

-

-                    /* ------- get default package info ----- */

-                    $payment_info = array();

-                    $package_info = array();

-

-                    $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'];

-                    }

-

-                    if (!empty($package_info)) {

-                        $payment_info['package_id'] = $package_info['pid'];

-

-                        if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {

-                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));

-                        } else {

-                            $payment_info['expire_date'] = 'Never';

-                        }

-

-                        $gd_post_info = array_merge($gd_post_info, $payment_info);

-                    }

-

-                    $gd_post_info['post_location_id'] = $post_location_id;

-

-                    $post_type = get_post_type($last_postid);

-

-                    $table = $plugin_prefix . $post_type . '_detail';

-

-                    geodir_save_post_info($last_postid, $gd_post_info);

-

-                    if (!empty($image_names)) {

-                        $upload_files++;

-                        $menu_order = 1;

-

-                        foreach ($image_names as $image_name) {

-                            $img_name_arr = explode('.', $image_name);

-

-                            $uploads = wp_upload_dir();

-                            $sub_dir = $uploads['subdir'];

-

-                            $arr_file_type = wp_check_filetype($image_name);

-                            $uploaded_file_type = $arr_file_type['type'];

-

-                            $attachment = array();

-                            $attachment['post_id'] = $last_postid;

-                            $attachment['title'] = $img_name_arr[0];

-                            $attachment['content'] = '';

-                            $attachment['file'] = $sub_dir . '/' . $image_name;

-                            $attachment['mime_type'] = $uploaded_file_type;

-                            $attachment['menu_order'] = $menu_order;

-                            $attachment['is_featured'] = 0;

-

-                            $attachment_set = '';

-

-                            foreach ($attachment as $key => $val) {

-                                if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

-                            }

-                            $attachment_set = trim($attachment_set, ", ");

-

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

-

-                            if ($menu_order == 1) {

-                                $post_type = get_post_type($last_postid);

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

-                            }

-                            $menu_order++;

-                        }

-                    }

-

-                    $gd_post_info['package_id'] = $package_id;

-

-                    /** This action is documented in geodirectory-functions/post-functions.php */

-                    do_action('geodir_after_save_listing', $last_postid, $gd_post_info);

-

-                    if (!empty($buffer[5])) {

-                        if (in_array($buffer[5], geodir_get_posttypes())) {

-                            $taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));

-                            wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);

-                            wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);

-

-                            $post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';

-                            $post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';

-                            geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);

-                        }

-                    }

-                } else {

-                    $invalid_title++;

-                }

-            }

-        }

-    }

-    $return['rowcount'] = $countpost;

-    $return['invalidcount'] = $address_invalid;

-    $return['blank_address'] = $blank_address;

-    $return['upload_files'] = $upload_files;

-    $return['invalid_post_type'] = $invalid_post_type;

-    $return['invalid_title'] = $invalid_title;

-    $return['total_records'] = $total_records;

-

-    echo json_encode($return);

-    exit;

+					$my_post['post_title'] = $post_title;

+					$my_post['post_content'] = $post_desc;

+					$my_post['post_type'] = addslashes($buffer[5]);

+					$my_post['post_author'] = $current_post_author;

+					$my_post['post_status'] = $post_status;

+					$my_post['post_category'] = $catids_arr;

+					$my_post['post_tags'] = $tag_arr;

+

+					$gd_post_info['post_tags'] = $tag_arr;

+					$gd_post_info['post_title'] = $post_title;

+					$gd_post_info['post_status'] = $post_status;

+					$gd_post_info['submit_time'] = time();

+					$gd_post_info['submit_ip'] = $_SERVER['REMOTE_ADDR'];

+

+					$last_postid = wp_insert_post($my_post);

+					$countpost++;

+

+					// Check if we need to save post location as new location

+					if ($location_result->location_id > 0) {

+						if (isset($post_city) && isset($post_region)) {

+							$request_info['post_location'] = array(

+								'city' => $post_city,

+								'region' => $post_region,

+								'country' => $post_country,

+								'geo_lat' => $post_latitude,

+								'geo_lng' => $post_longitude

+							);

+

+							$post_location_info = $request_info['post_location'];

+							if ($location_id = geodir_add_new_location($post_location_info))

+								$post_location_id = $location_id;

+						} else {

+							$post_location_id = 0;

+						}

+					} else {

+						$post_location_id = 0;

+					}

+

+					/* ------- get default package info ----- */

+					$payment_info = array();

+					$package_info = array();

+

+					$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'];

+					}

+

+					if (!empty($package_info)) {

+						$payment_info['package_id'] = $package_info['pid'];

+

+						if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {

+							$payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));

+						} else {

+							$payment_info['expire_date'] = 'Never';

+						}

+

+						$gd_post_info = array_merge($gd_post_info, $payment_info);

+					}

+

+					$gd_post_info['post_location_id'] = $post_location_id;

+

+					$post_type = get_post_type($last_postid);

+

+					$table = $plugin_prefix . $post_type . '_detail';

+

+					geodir_save_post_info($last_postid, $gd_post_info);

+

+					if (!empty($image_names)) {

+						$upload_files++;

+						$menu_order = 1;

+

+						foreach ($image_names as $image_name) {

+							$img_name_arr = explode('.', $image_name);

+

+							$uploads = wp_upload_dir();

+							$sub_dir = $uploads['subdir'];

+

+							$arr_file_type = wp_check_filetype($image_name);

+							$uploaded_file_type = $arr_file_type['type'];

+

+							$attachment = array();

+							$attachment['post_id'] = $last_postid;

+							$attachment['title'] = $img_name_arr[0];

+							$attachment['content'] = '';

+							$attachment['file'] = $sub_dir . '/' . $image_name;

+							$attachment['mime_type'] = $uploaded_file_type;

+							$attachment['menu_order'] = $menu_order;

+							$attachment['is_featured'] = 0;

+

+							$attachment_set = '';

+

+							foreach ($attachment as $key => $val) {

+								if ($val != '')

+									$attachment_set .= $key . " = '" . $val . "', ";

+							}

+							$attachment_set = trim($attachment_set, ", ");

+

+							$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+

+							if ($menu_order == 1) {

+								$post_type = get_post_type($last_postid);

+								$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

+							}

+							$menu_order++;

+						}

+					}

+

+					$gd_post_info['package_id'] = $package_id;

+

+					/** This action is documented in geodirectory-functions/post-functions.php */

+					do_action('geodir_after_save_listing', $last_postid, $gd_post_info);

+

+					if (!empty($buffer[5])) {

+						if (in_array($buffer[5], geodir_get_posttypes())) {

+							$taxonomies = geodir_get_posttype_info(addslashes($buffer[5]));

+							wp_set_object_terms($last_postid, $my_post['post_tags'], $taxonomy = $taxonomies['taxonomies'][1]);

+							wp_set_object_terms($last_postid, $my_post['post_category'], $taxonomy = $taxonomies['taxonomies'][0]);

+

+							$post_default_category = isset($my_post['post_default_category']) ? $my_post['post_default_category'] : '';

+							$post_category_str = isset($my_post['post_category_str']) ? $my_post['post_category_str'] : '';

+							geodir_set_postcat_structure($last_postid, $taxonomy, $post_default_category, $post_category_str);

+						}

+					}

+				} else {

+					$invalid_title++;

+				}

+			}

+		}

+	}

+	$return['rowcount'] = $countpost;

+	$return['invalidcount'] = $address_invalid;

+	$return['blank_address'] = $blank_address;

+	$return['upload_files'] = $upload_files;

+	$return['invalid_post_type'] = $invalid_post_type;

+	$return['invalid_title'] = $invalid_title;

+	$return['total_records'] = $total_records;

+

+	echo json_encode($return);

+	exit;

 }

 

 // Add the tab in left sidebar menu fro import & export page.

@@ -2270,9 +2270,9 @@ 
  * @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);

-    }

+	if($post->post_type=='page' && $post->post_name && $post_id==get_option('geodir_location_page')){

+		update_option('geodir_location_prefix',$post->post_name);

+	}

 

 }

 

@@ -2283,50 +2283,50 @@ 
 function geodir_ga_callback(){

 

 if(isset($_REQUEST['code']) && $_REQUEST['code']) {

-    $oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

-    $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');

+	$oAuthURL = "https://www.googleapis.com/oauth2/v3/token?";

+	$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');

 

-    $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));

+	$response = wp_remote_post($auth_url, array('timeout' => 15));

 

-    //print_r($response);

+	//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{

+		$parts = json_decode($response['body']);

+		//print_r($parts);

+		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);

-            ?><script>window.close();</script><?php

-        }

+			update_option('gd_ga_access_token', $parts->access_token);

+			update_option('gd_ga_refresh_token', $parts->refresh_token);

+			?><script>window.close();</script><?php

+		}

 

 

-    }

-    elseif(!empty($response['response']['code'])) {

-        $parts = json_decode($response['body']);

+	}

+	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;

+	exit;

 }

 

 add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

Spacing +219 added lines, -219 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');

 

@@ -228,9 +228,9 @@ 
 

         // Filter-Payment-Manager

 

-        add_meta_box('geodir_post_images', $post_typename . ' ' . __('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

+        add_meta_box('geodir_post_images', $post_typename.' '.__('Attachments', 'geodirectory'), 'geodir_post_attachments', $geodir_posttype, 'side');

 

-        add_meta_box('geodir_post_info', $post_typename . ' ' . __('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

+        add_meta_box('geodir_post_info', $post_typename.' '.__('Information', 'geodirectory'), 'geodir_post_info_setting', $geodir_posttype, 'normal', 'high');

 

         // no need of this box as all fields moved to main information box

         //add_meta_box( 'geodir_post_addinfo', $post_typename. ' ' .__('Additional Information' , 'geodirectory'), 'geodir_post_addinfo_setting', $geodir_posttype,'normal', 'high' );

@@ -239,7 +239,7 @@ 
 

 }

 

-add_action('save_post', 'geodir_post_information_save',10,2);

+add_action('save_post', 'geodir_post_information_save', 10, 2);

 

 

 

@@ -266,10 +266,10 @@ 
 

             $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');

+                    remove_meta_box($tax.'div', $geodir_post_type, 'normal');

 

                 }

             }

@@ -355,14 +355,14 @@ 
 add_action('geodir_manage_available_fields_predefined', 'geodir_manage_available_fields_predefined');

 add_action('geodir_manage_available_fields_custom', 'geodir_manage_available_fields_custom');

 

-function geodir_manage_available_fields_predefined($sub_tab){

-    if($sub_tab=='custom_fields'){

+function geodir_manage_available_fields_predefined($sub_tab) {

+    if ($sub_tab == 'custom_fields') {

         geodir_custom_available_fields('predefined');

     }

 }

 

-function geodir_manage_available_fields_custom($sub_tab){

-    if($sub_tab=='custom_fields'){

+function geodir_manage_available_fields_custom($sub_tab) {

+    if ($sub_tab == 'custom_fields') {

         geodir_custom_available_fields('custom');

     }

 }

@@ -432,7 +432,7 @@ 
     global $wpdb;

     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_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 sanitize_text_field($_REQUEST['subtab']); ?>"/>

     <ul>

     <?php

@@ -443,7 +443,7 @@ 
 

             $check_html_variable = $wpdb->get_var(

                 $wpdb->prepare(

-                    "SELECT htmlvar_name FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

+                    "SELECT htmlvar_name FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE htmlvar_name = %s AND post_type = %s AND field_type=%s",

                     array($val['htmlvar_name'], $listing_type, $val['field_type'])

                 )

             );

@@ -451,23 +451,23 @@ 
             $display = $check_html_variable ? ' style="display:none;"' : '';

            ?>

 

-            <li   class="gd-cf-tooltip-wrap" <?php echo $display;?>>

+            <li   class="gd-cf-tooltip-wrap" <?php echo $display; ?>>

                 <?php

-                if(isset($val['description']) && $val['description']){

+                if (isset($val['description']) && $val['description']) {

                     echo '<div class="gdcf-tooltip">'.$val['description'].'</div>';

                 }?>

 

-                <a id="gd-<?php echo $val['field_type'];?>-_-<?php echo $val['htmlvar_name'];?>" data-field-type-key="<?php echo $val['htmlvar_name'];?>"  data-field-type="<?php echo $val['field_type'];?>"

-                   title="<?php echo $val['site_title'];?>"

-                   class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">

+                <a id="gd-<?php echo $val['field_type']; ?>-_-<?php echo $val['htmlvar_name']; ?>" data-field-type-key="<?php echo $val['htmlvar_name']; ?>"  data-field-type="<?php echo $val['field_type']; ?>"

+                   title="<?php echo $val['site_title']; ?>"

+                   class="gd-draggable-form-items  gd-<?php echo $val['field_type']; ?> geodir-sort-<?php echo $val['htmlvar_name']; ?>" href="javascript:void(0);">

                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {

                         echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){

+                    }elseif (isset($val['field_icon']) && $val['field_icon']) {

                         echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

-                    }else{

+                    } else {

                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';

                     }?>

-                    <?php echo $val['site_title'];?>

+                    <?php echo $val['site_title']; ?>

                 </a>

             </li>

 

@@ -495,7 +495,7 @@ 
     <?php 

         global $wpdb;

         

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type = %s AND field_type != 'address' ORDER BY sort_order ASC", array($listing_type)));

 

         if (!empty($fields)) {

             foreach ($fields as $field) {

@@ -520,14 +520,14 @@ 
  * @since 1.6.9

  * @package GeoDirectory

  */

-function geodir_custom_fields_custom($post_type=''){

+function geodir_custom_fields_custom($post_type = '') {

 

     $custom_fields = array();

 

     /**

      * @see `geodir_custom_fields`

      */

-    return apply_filters('geodir_custom_fields_custom',$custom_fields,$post_type);

+    return apply_filters('geodir_custom_fields_custom', $custom_fields, $post_type);

 }

 

 

@@ -538,7 +538,7 @@ 
  * @since 1.6.6

  * @package GeoDirectory

  */

-function geodir_custom_fields($post_type=''){

+function geodir_custom_fields($post_type = '') {

     

     $custom_fields = array(

         'text' => array(

@@ -672,7 +672,7 @@ 
      * }

      * @param string $post_type The post type requested.

      */

-    return apply_filters('geodir_custom_fields',$custom_fields,$post_type);

+    return apply_filters('geodir_custom_fields', $custom_fields, $post_type);

 }

 

 /**

@@ -683,25 +683,25 @@ 
  * @param string $type The custom field type, predefined, custom or blank for default

  * @package GeoDirectory

  */

-function geodir_custom_available_fields($type='')

+function geodir_custom_available_fields($type = '')

 {

     $listing_type = ($_REQUEST['listing_type'] != '') ? sanitize_text_field($_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 sanitize_text_field($_REQUEST['subtab']); ?>" />

 

         <?php

-        if($type=='predefined'){

+        if ($type == 'predefined') {

             $cfs = geodir_custom_fields_predefined($listing_type);

-        }elseif($type=='custom'){

+        }elseif ($type == 'custom') {

             $cfs = geodir_custom_fields_custom($listing_type);

-        }else{

+        } else {

             $cfs = geodir_custom_fields($listing_type);

             ?>

             <ul class="full gd-cf-tooltip-wrap">

                 <li>

                     <div class="gdcf-tooltip">

-                        <?php _e('This adds a section separator with a title.', 'geodirectory');?>

+                        <?php _e('This adds a section separator with a title.', 'geodirectory'); ?>

                     </div>

                     <a id="gt-fieldset"

                        class="gd-draggable-form-items gt-fieldset"

@@ -712,7 +712,7 @@ 
 

                         <i class="fa fa-long-arrow-left " aria-hidden="true"></i>

                         <i class="fa fa-long-arrow-right " aria-hidden="true"></i>

-                        <?php _e('Fieldset (section separator)', 'geodirectory');?>

+                        <?php _e('Fieldset (section separator)', 'geodirectory'); ?>

                     </a>

                 </li>

             </ul>

@@ -720,15 +720,15 @@ 
             <?php

         }

 

-    if(!empty($cfs)) {

+    if (!empty($cfs)) {

 

-        foreach ( $cfs as $id => $cf ) {

+        foreach ($cfs as $id => $cf) {

             ?>

             <ul>

             <li class="gd-cf-tooltip-wrap">

                 <?php

-                if ( isset( $cf['description'] ) && $cf['description'] ) {

-                    echo '<div class="gdcf-tooltip">' . $cf['description'] . '</div>';

+                if (isset($cf['description']) && $cf['description']) {

+                    echo '<div class="gdcf-tooltip">'.$cf['description'].'</div>';

                 } ?>

 

                 <a id="gd-<?php echo $id; ?>"

@@ -738,10 +738,10 @@ 
                    class="gd-draggable-form-items <?php echo $cf['class']; ?>"

                    href="javascript:void(0);">

 

-                    <?php if ( isset( $cf['icon'] ) && strpos( $cf['icon'], 'fa fa-' ) !== false ) {

-                        echo '<i class="' . $cf['icon'] . '" aria-hidden="true"></i>';

-                    } elseif ( isset( $cf['icon'] ) && $cf['icon'] ) {

-                        echo '<b style="background-image: url("' . $cf['icon'] . '")"></b>';

+                    <?php if (isset($cf['icon']) && strpos($cf['icon'], 'fa fa-') !== false) {

+                        echo '<i class="'.$cf['icon'].'" aria-hidden="true"></i>';

+                    } elseif (isset($cf['icon']) && $cf['icon']) {

+                        echo '<b style="background-image: url("'.$cf['icon'].'")"></b>';

                     } else {

                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';

                     } ?>

@@ -750,7 +750,7 @@ 
             </li>

             <?php

         }

-    }else{

+    } else {

         _e('There are no custom fields here yet.', 'geodirectory');

     }

         ?>

@@ -778,7 +778,7 @@ 
     <ul class="core">

     <?php 

         global $wpdb;

-        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

+        $fields = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type = %s ORDER BY sort_order ASC", array($listing_type)));

 

         if (!empty($fields)) {

             foreach ($fields as $field) {

@@ -788,7 +788,7 @@ 
                 $field_type_key = $field->field_type_key;

                 $field_ins_upd = 'display';

 

-                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd,$field_type_key);

+                geodir_custom_field_adminhtml($field_type, $result_str, $field_ins_upd, $field_type_key);

             }

         }

         ?></ul>

@@ -866,7 +866,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':

@@ -920,7 +920,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':

@@ -947,8 +947,8 @@ 
 

     if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+        if ($wpdb->get_var("SHOW COLUMNS FROM ".$plugin_prefix."gd_place_detail WHERE field = 'categories'"))

+            $wpdb->query("ALTER TABLE `".$plugin_prefix."gd_place_detail` DROP `categories`");

 

         update_option('geodir_remove_unnecessary_fields', '1');

 

@@ -976,14 +976,14 @@ 
             case 'diagnosis' :

                 if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

+                call_user_func('geodir_diagnose_'.$diagnose_this);

                 exit();

                 break;

 

             case 'diagnosis-fix' :

                 if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

                     $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

-                call_user_func('geodir_diagnose_' . $diagnose_this);

+                call_user_func('geodir_diagnose_'.$diagnose_this);

                 exit();

                 break;

         }

@@ -1008,50 +1008,50 @@ 
 {

     global $wpdb;

     //$filter_arr['output_str'] .='###'.$table.'###';

-    if ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . __('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory') . "</li>";

+    if ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak2'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0) {

+        $filter_arr['output_str'] .= "<li>".__('ERROR: You did not follow instructions! Now you will need to contact support to manually fix things.', 'geodirectory')."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '" . $table . "_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '".$table."_ms_bak'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s_ms_bak table found', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

-        $filter_arr['output_str'] .= "<li>" . __('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory') . "</li>";

+        $filter_arr['output_str'] .= "<li>".__('IMPORTANT: This can be caused by out of date core or addons, please update core + addons before trying the fix OR YOU WILL HAVE A BAD TIME!', 'geodirectory')."</li>";

         $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>";

+                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>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             } 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>";

+                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>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             } 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>";

+                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>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . __('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory') . "</li>";

+                    $filter_arr['output_str'] .= "<li>".__('-->PROBLEM: Failed to rename tables, please contact support.', 'geodirectory')."</li>";

                 }

 

             }

@@ -1059,54 +1059,54 @@ 
         }

 

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") > 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") > 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: Two %s tables found', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

             if ($wpdb->get_var("SELECT COUNT(*) FROM $table") == 0) {// if first table is empty just delete it

                 if ($wpdb->query("DROP TABLE IF EXISTS $table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $table)."</li>";

                 }

 

-            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM " . $wpdb->prefix . "$table") == 0) {// if main table is empty but original is not, delete main and rename original

-                if ($wpdb->query("DROP TABLE IF EXISTS " . $wpdb->prefix . "$table")) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+            } elseif ($wpdb->get_var("SELECT COUNT(*) FROM ".$wpdb->prefix."$table") == 0) {// if main table is empty but original is not, delete main and rename original

+                if ($wpdb->query("DROP TABLE IF EXISTS ".$wpdb->prefix."$table")) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Deleted table %s', 'geodirectory'), $wpdb->prefix.$table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix . $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Delete table %s failed, please try manual delete from DB', 'geodirectory'), $wpdb->prefix.$table)."</li>";

                 }

-                if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

                 }

             } else {// else rename the original table to _ms_bak

-                if ($wpdb->query("RENAME TABLE $table TO " . $table . "_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+                if ($wpdb->query("RENAME TABLE $table TO ".$table."_ms_bak") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table contained info so we renamed %s to %s incase it is needed in future', 'geodirectory'), $table, $table."_ms_bak")."</li>";

                 } else {

-                    $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table . "_ms_bak") . "</li>";

+                    $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Table %s could not be renamed to %s, this table has info so may need to be reviewed manually in the DB', 'geodirectory'), $table, $table."_ms_bak")."</li>";

                 }

             }

         }

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table not converted', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

             // if original table exists but new does not, rename

-            if ($wpdb->query("RENAME TABLE $table TO " . $wpdb->prefix . "$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+            if ($wpdb->query("RENAME TABLE $table TO ".$wpdb->prefix."$table") || $wpdb->query("SHOW TABLES LIKE '$table'") == 0) {

+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->FIXED: Table %s renamed to %s', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

             } else {

-                $filter_arr['output_str'] .= "<li>" . sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix . $table) . "</li>";

+                $filter_arr['output_str'] .= "<li>".sprintf(__('-->PROBLEM: Failed to rename table %s to %s, please try manually from DB', 'geodirectory'), $table, $wpdb->prefix.$table)."</li>";

             }

 

         }

 

-    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "$table'") == 0) {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name) . "</li>";

+    } elseif ($wpdb->query("SHOW TABLES LIKE '$table'") == 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."$table'") == 0) {

+        $filter_arr['output_str'] .= "<li>".sprintf(__('ERROR: %s table does not exist', 'geodirectory'), $tabel_name)."</li>";

         $filter_arr['is_error_during_diagnose'] = true;

 

         if ($fix) {

@@ -1120,11 +1120,11 @@ 
             delete_option('geodir_custom_posts_db_version');

             delete_option('geodir_reviewratings_db_version');

             delete_option('geodiradvancesearch_db_version');

-            $filter_arr['output_str'] .= "<li>" . __('-->TRY: Please refresh page to run table install functions', 'geodirectory') . "</li>";

+            $filter_arr['output_str'] .= "<li>".__('-->TRY: Please refresh page to run table install functions', 'geodirectory')."</li>";

         }

 

     } else {

-        $filter_arr['output_str'] .= "<li>" . sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name) . "</li>";

+        $filter_arr['output_str'] .= "<li>".sprintf(__('%s table converted correctly', 'geodirectory'), $tabel_name)."</li>";

     }

     return $filter_arr;

 }

@@ -1153,23 +1153,23 @@ 
     if (!empty($all_postypes)) {

         foreach ($all_postypes as $key) {

             // update each GD CPT

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d");

+            $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d");

 

             if (!empty($posts)) {

 

                 foreach ($posts as $p) {

                     $p->post_type = $key;

-                    $raw_tags = wp_get_object_terms($p->post_id, $p->post_type . '_tags', array('fields' => 'names'));

+                    $raw_tags = wp_get_object_terms($p->post_id, $p->post_type.'_tags', array('fields' => 'names'));

                     if (empty($raw_tags)) {

                         $post_tags = '';

                     } else {

                         $post_tags = implode(",", $raw_tags);

                     }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

+                    $tablename = $plugin_prefix.$p->post_type.'_detail';

+                    $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET post_tags=%s WHERE post_id =%d", $post_tags, $p->post_id));

 

                 }

-                $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+                $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";

             }

 

         }

@@ -1178,7 +1178,7 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1215,29 +1215,29 @@ 
     if (!empty($all_postypes)) {

         foreach ($all_postypes as $key) {

             // update each GD CTP

-            $posts = $wpdb->get_results("SELECT * FROM " . $wpdb->prefix . "geodir_" . $key . "_detail d WHERE d." . $key . "category='' ");

+            $posts = $wpdb->get_results("SELECT * FROM ".$wpdb->prefix."geodir_".$key."_detail d WHERE d.".$key."category='' ");

 

             if (!empty($posts)) {

 

                 foreach ($posts as $p) {

                     $p->post_type = $key;

-                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type . 'category', array('fields' => 'ids'));

+                    $raw_cats = wp_get_object_terms($p->post_id, $p->post_type.'category', array('fields' => 'ids'));

 

                     if (empty($raw_cats)) {

                         $post_categories = get_post_meta($p->post_id, 'post_categories', true);

 

-                        if (!empty($post_categories) && !empty($post_categories[$p->post_type . 'category'])) {

-                            $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 (!empty($post_categories) && !empty($post_categories[$p->post_type.'category'])) {

+                            $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;

                                 }

                             }

 

                         }

 

                         if (!empty($raw_cats)) {

-                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type . 'category');

+                            $term_taxonomy_ids = wp_set_object_terms($p->post_id, $raw_cats, $p->post_type.'category');

 

                         }

 

@@ -1247,14 +1247,14 @@ 
                     if (empty($raw_cats)) {

                         $post_cats = '';

                     } else {

-                        $post_cats = ',' . implode(",", $raw_cats) . ',';

+                        $post_cats = ','.implode(",", $raw_cats).',';

                     }

-                    $tablename = $plugin_prefix . $p->post_type . '_detail';

-                    $wpdb->query($wpdb->prepare("UPDATE " . $tablename . " SET " . $p->post_type . "category=%s WHERE post_id =%d", $post_cats, $p->post_id));

+                    $tablename = $plugin_prefix.$p->post_type.'_detail';

+                    $wpdb->query($wpdb->prepare("UPDATE ".$tablename." SET ".$p->post_type."category=%s WHERE post_id =%d", $post_cats, $p->post_id));

                 }

 

             }

-            $output_str .= "<li>" . $key . __(': Done', 'geodirectory') . "</li>";

+            $output_str .= "<li>".$key.__(': Done', 'geodirectory')."</li>";

 

         }

 

@@ -1262,7 +1262,7 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1315,15 +1315,15 @@ 
     if (!empty($ver_arr)) {

         foreach ($ver_arr as $key => $val) {

             if (delete_option($val)) {

-                $output_str .= "<li>" . $key . __(' Version: Deleted', 'geodirectory') . "</li>";

+                $output_str .= "<li>".$key.__(' Version: Deleted', 'geodirectory')."</li>";

             } else {

-                $output_str .= "<li>" . $key . __(' Version: Not Found', 'geodirectory') . "</li>";

+                $output_str .= "<li>".$key.__(' Version: Not Found', 'geodirectory')."</li>";

             }

 

         }

 

         if ($output_str) {

-            $output_str .= "<li><strong>" . __(' Upgrade/install scripts will run on next page reload.', 'geodirectory') . "</strong></li>";

+            $output_str .= "<li><strong>".__(' Upgrade/install scripts will run on next page reload.', 'geodirectory')."</strong></li>";

         }

 

     }

@@ -1360,43 +1360,43 @@ 
     $output_str = '';

 

     // check review locations

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

-        $output_str .= "<li>" . __('Review locations missing or broken', 'geodirectory') . "</li>";

+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE post_city='' OR post_city IS NULL OR post_latitude='' OR post_latitude IS NULL")) {

+        $output_str .= "<li>".__('Review locations missing or broken', 'geodirectory')."</li>";

         $is_error_during_diagnose = true;

 

         if ($fix) {

             if (geodir_fix_review_location()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review locations fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Review locations fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review locations fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Review locations fix failed', 'geodirectory')."</strong></li>";

             }

         }

 

     } else {

-        $output_str .= "<li>" . __('Review locations ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Review locations ok', 'geodirectory')."</li>";

     }

 

     // check review content

-    if ($wpdb->get_results("SELECT * FROM " . GEODIR_REVIEW_TABLE . " WHERE comment_content IS NULL")) {

-        $output_str .= "<li>" . __('Review content missing or broken', 'geodirectory') . "</li>";

+    if ($wpdb->get_results("SELECT * FROM ".GEODIR_REVIEW_TABLE." WHERE comment_content IS NULL")) {

+        $output_str .= "<li>".__('Review content missing or broken', 'geodirectory')."</li>";

         $is_error_during_diagnose = true;

 

         if ($fix) {

             if (geodir_fix_review_content()) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Review content fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Review content fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Review content fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Review content fix failed', 'geodirectory')."</strong></li>";

             }

         }

 

     } else {

-        $output_str .= "<li>" . __('Review content ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Review content ok', 'geodirectory')."</li>";

     }

 

 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='ratings' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1460,7 +1460,7 @@ 
 

     if ($is_error_during_diagnose) {

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='multisite_conversion' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1494,7 +1494,7 @@ 
     else {

         $page_found = $wpdb->get_var(

             $wpdb->prepare(

-                "SELECT ID FROM " . $wpdb->posts . " WHERE post_name = %s LIMIT 1;",

+                "SELECT ID FROM ".$wpdb->posts." WHERE post_name = %s LIMIT 1;",

                 array($slug)

             )

         );

@@ -1540,18 +1540,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_home_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('GD Home page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('GD Home page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-home', __('GD Home page', 'geodirectory'), $page_found, 'geodir_home_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: GD Home page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: GD Home page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: GD Home page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: GD Home page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1565,18 +1565,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_add_listing_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Add Listing page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Add Listing page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('add-listing', __('Add Listing', 'geodirectory'), $page_found, 'geodir_add_listing_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Add Listing page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Add Listing page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Add Listing page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Add Listing page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1591,18 +1591,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_preview_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Listing Preview page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Listing Preview page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('listing-preview', __('Listing Preview', 'geodirectory'), $page_found, 'geodir_preview_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Preview page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Listing Preview page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Preview page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Listing Preview page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1616,18 +1616,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_success_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Listing Success page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Listing Success page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('listing-success', __('Listing Success', 'geodirectory'), $page_found, 'geodir_success_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Listing Success page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Listing Success page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Listing Success page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Listing Success page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1641,18 +1641,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_info_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Info page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Info page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-info', __('Info', 'geodirectory'), $page_found, 'geodir_info_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Info page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Info page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Info page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Info page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1666,18 +1666,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_login_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Login page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Login page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('gd-login', __('Login', 'geodirectory'), $page_found, 'geodir_login_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Login page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Login page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Login page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Login page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1691,18 +1691,18 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_location_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if (!empty($page)) {$page_found = $page->ID; } else {$page_found = ''; }

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

+    if (!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status == 'publish')

+        $output_str .= "<li>".__('Location page exists with proper setting.', 'geodirectory')."</li>";

     else {

         $is_error_during_diagnose = true;

-        $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

+        $output_str .= "<li><strong>".__('Location page is missing.', 'geodirectory')."</strong></li>";

         if ($fix) {

             if (geodir_fix_virtual_page('location', __('Location', 'geodirectory'), $page_found, 'geodir_location_page')) {

-                $output_str .= "<li><strong>" . __('-->FIXED: Location page fixed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FIXED: Location page fixed', 'geodirectory')."</strong></li>";

             } else {

-                $output_str .= "<li><strong>" . __('-->FAILED: Location page fix failed', 'geodirectory') . "</strong></li>";

+                $output_str .= "<li><strong>".__('-->FAILED: Location page fix failed', 'geodirectory')."</strong></li>";

             }

         }

     }

@@ -1711,13 +1711,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'];

@@ -1727,7 +1727,7 @@ 
             flush_rewrite_rules();

         }

         $info_div_class = "geodir_problem_info";

-        $fix_button_txt = "<input type='button' value='" . __('Fix', 'geodirectory') . "' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

+        $fix_button_txt = "<input type='button' value='".__('Fix', 'geodirectory')."' class='button-primary geodir_fix_diagnostic_issue' data-diagnostic-issue='default_pages' />";

     } else {

         $info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

@@ -1755,10 +1755,10 @@ 
     $fix_button_txt = '';

 

     if ($is_error_during_diagnose) {

-        $output_str .= "<li>" . __('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory') . ' ' . geodir_plugin_path() . '/db-language.php' . "</li>";

+        $output_str .= "<li>".__('Fail to load custom fields in to file for translation, please check file permission:', 'geodirectory').' '.geodir_plugin_path().'/db-language.php'."</li>";

 		$info_div_class = "geodir_problem_info";

     } else {

-        $output_str .= "<li>" . __('Load custom fields in to file for translation: ok', 'geodirectory') . "</li>";

+        $output_str .= "<li>".__('Load custom fields in to file for translation: ok', 'geodirectory')."</li>";

 		$info_div_class = "geodir_noproblem_info";

         $fix_button_txt = '';

     }

@@ -1800,17 +1800,17 @@ 
     global $wpdb, $wp_query, $plugin_prefix;

 

     if (is_admin() && !empty($wp_query->query_vars) && !empty($wp_query->query_vars['is_geodir_loop']) && !empty($wp_query->query_vars['orderby']) && $wp_query->query_vars['orderby'] == 'expire' && !empty($wp_query->query_vars['post_type']) && in_array($wp_query->query_vars['post_type'], geodir_get_posttypes()) && !empty($wp_query->query_vars['orderby']) && isset($clauses['join']) && isset($clauses['orderby']) && isset($clauses['fields'])) {

-        $table = $plugin_prefix . $wp_query->query_vars['post_type'] . '_detail';

+        $table = $plugin_prefix.$wp_query->query_vars['post_type'].'_detail';

 

-        $join = $clauses['join'] . ' INNER JOIN ' . $table . ' AS gd_posts ON (gd_posts.post_id = ' . $wpdb->posts . '.ID)';

+        $join = $clauses['join'].' INNER JOIN '.$table.' AS gd_posts ON (gd_posts.post_id = '.$wpdb->posts.'.ID)';

         $clauses['join'] = $join;

 

-        $fields = $clauses['fields'] != '' ? $clauses['fields'] . ', ' : '';

+        $fields = $clauses['fields'] != '' ? $clauses['fields'].', ' : '';

         $fields .= 'IF(UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), UNIX_TIMESTAMP(DATE_FORMAT(gd_posts.expire_date, "%Y-%m-%d")), 253402300799) AS gd_expire';

         $clauses['fields'] = $fields;

 

         $order = !empty($wp_query->query_vars['order']) ? $wp_query->query_vars['order'] : 'ASC';

-        $orderby = 'gd_expire ' . $order;

+        $orderby = 'gd_expire '.$order;

         $clauses['orderby'] = $orderby;

     }

     return $clauses;

@@ -1853,7 +1853,7 @@ 
         global $current_user;

         $upload_dir = wp_upload_dir();

 

-        $file = $upload_dir['path'] . '/temp_' . $current_user->data->ID . '/geodir_tmp.csv';

+        $file = $upload_dir['path'].'/temp_'.$current_user->data->ID.'/geodir_tmp.csv';

         $handle = fopen($file, 'w');

 

         fwrite($handle, $input);

@@ -1898,7 +1898,7 @@ 
     $uploads_dir = $uploads['path'];

     $image_name_arr = explode('/', $filename);

     $filename = end($image_name_arr);

-    $target_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+    $target_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;

     $return = array();

     $return['file'] = $uploadedFile;

     $return['error'] = __('The uploaded file is not a valid csv file. Please try again.', 'geodirectory');

@@ -1915,8 +1915,8 @@ 
 

                 if (($handle = fopen($target_path, "r")) !== FALSE) {

                     while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {

-                        if(is_array($data) && !empty($data)) {

-                            $file[] = '"' . implode('","', $data) . '"';

+                        if (is_array($data) && !empty($data)) {

+                            $file[] = '"'.implode('","', $data).'"';

                         }

                     }

                     fclose($handle);

@@ -2033,10 +2033,10 @@ 
                     $tag_arr = explode(',', $post_tags);

                 }

 

-                $table = $plugin_prefix . $buffer[5] . '_detail'; // check table in database

+                $table = $plugin_prefix.$buffer[5].'_detail'; // check table in database

 

                 $error = '';

-                if ($wpdb->get_var("SHOW TABLES LIKE '" . $table . "'") != $table) {

+                if ($wpdb->get_var("SHOW TABLES LIKE '".$table."'") != $table) {

                     $invalid_post_type++;

                     continue;

                 }

@@ -2062,7 +2062,7 @@ 
                             if ($buffer[$c] != '0' && $buffer[$c] != '') {

                                 $submitdata = date('Y-m-d');

 

-                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata . "+" . addslashes($buffer[$c]) . " days"));

+                                $gd_post_info['expire_date'] = date('Y-m-d', strtotime($submitdata."+".addslashes($buffer[$c])." days"));

                             } else {

                                 $gd_post_info['expire_date'] = 'Never';

                             }

@@ -2090,7 +2090,7 @@ 
 						

 						// Post status

 						if ($customKeyarray[$c] == 'post_status') {

-                            $post_status = sanitize_key( $buffer[$c] );

+                            $post_status = sanitize_key($buffer[$c]);

                         }

                     }

 

@@ -2108,8 +2108,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;

@@ -2153,7 +2153,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'];

@@ -2163,7 +2163,7 @@ 
                         $payment_info['package_id'] = $package_info['pid'];

 

                         if (isset($package_info['alive_days']) && $package_info['alive_days'] != 0) {

-                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['alive_days'] . " days"));

+                            $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['alive_days']." days"));

                         } else {

                             $payment_info['expire_date'] = 'Never';

                         }

@@ -2175,7 +2175,7 @@ 
 

                     $post_type = get_post_type($last_postid);

 

-                    $table = $plugin_prefix . $post_type . '_detail';

+                    $table = $plugin_prefix.$post_type.'_detail';

 

                     geodir_save_post_info($last_postid, $gd_post_info);

 

@@ -2196,7 +2196,7 @@ 
                             $attachment['post_id'] = $last_postid;

                             $attachment['title'] = $img_name_arr[0];

                             $attachment['content'] = '';

-                            $attachment['file'] = $sub_dir . '/' . $image_name;

+                            $attachment['file'] = $sub_dir.'/'.$image_name;

                             $attachment['mime_type'] = $uploaded_file_type;

                             $attachment['menu_order'] = $menu_order;

                             $attachment['is_featured'] = 0;

@@ -2205,15 +2205,15 @@ 
 

                             foreach ($attachment as $key => $val) {

                                 if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                    $attachment_set .= $key." = '".$val."', ";

                             }

                             $attachment_set = trim($attachment_set, ", ");

 

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

+                            $wpdb->query("INSERT INTO ".GEODIR_ATTACHMENT_TABLE." SET ".$attachment_set);

 

                             if ($menu_order == 1) {

                                 $post_type = get_post_type($last_postid);

-                                $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($sub_dir . '/' . $image_name, $last_postid)));

+                                $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($sub_dir.'/'.$image_name, $last_postid)));

                             }

                             $menu_order++;

                         }

@@ -2254,11 +2254,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 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' );

+add_action('wp_ajax_geodir_import_export', 'geodir_ajax_import_export');

+add_action('wp_ajax_nopriv_geodir_import_exportn', 'geodir_ajax_import_export');

 

 

 /**

@@ -2269,40 +2269,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'];

     $grant_type = "&grant_type=authorization_code";

-    $redirect_uri = "&redirect_uri=" . admin_url('admin-ajax.php') . "?action=geodir_ga_callback";

+    $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');

 

-    $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);

@@ -2311,25 +2311,25 @@ 
 

 

     }

-    elseif(!empty($response['response']['code'])) {

+    elseif (!empty($response['response']['code'])) {

         $parts = json_decode($response['body']);

 

-        if(isset($parts->error)){

-            echo $parts->error.": ".$parts->error_description;exit;

-        }else{

-            echo $error_msg." - #2";exit;

+        if (isset($parts->error)) {

+            echo $parts->error.": ".$parts->error_description; exit;

+        } else {

+            echo $error_msg." - #2"; exit;

         }

 

-    }else{

+    } else {

 

-        echo $error_msg." - #3";exit;

+        echo $error_msg." - #3"; exit;

 

     }

 }

     exit;

 }

 

-add_filter( 'icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4 );

+add_filter('icl_make_duplicate', 'geodir_icl_make_duplicate', 11, 4);

 

 if (isset($_REQUEST['tab']) && $_REQUEST['tab'] == 'permalink_settings') {

 	add_action('geodir_before_admin_panel', 'geodir_wpml_permalink_setting_notice');

Braces +63 added lines, -55 removed lines

@@ -24,8 +24,11 @@ 
             global $current_tab;

             geodir_redirect_to_admin_panel_on_installed();

             $current_tab = (isset($_GET['tab']) && $_GET['tab'] != '') ? $_GET['tab'] : 'general_settings';

-            if (!(isset($_REQUEST['action']))) // this will avoid Ajax requests

-                geodir_handle_option_form_submit($current_tab); // located in admin function.php

+            if (!(isset($_REQUEST['action']))) {
+            	// this will avoid Ajax requests

+                geodir_handle_option_form_submit($current_tab);
+            }
+            // located in admin function.php

             /**

              * Called on the WordPress 'admin_init' hook this hookis used to call everything for the GD settings pages in the admin area.

              *

@@ -316,8 +319,9 @@ 
     if (!empty($notification) && get_option('geodir_tiny_editor') == '1') {

 

         foreach ($notification as $key => $value) {

-            if ($value['type'] == 'textarea')

-                $notification[$key]['type'] = 'editor';

+            if ($value['type'] == 'textarea') {
+                            $notification[$key]['type'] = 'editor';
+            }
         }

 

     }

@@ -342,8 +346,9 @@ 
     if (!empty($design_setting) && get_option('geodir_tiny_editor') == '1') {

 

         foreach ($design_setting as $key => $value) {

-            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content')

-                $design_setting[$key]['type'] = 'editor';

+            if ($value['type'] == 'textarea' && $value['id'] == 'geodir_term_condition_content') {
+                            $design_setting[$key]['type'] = 'editor';
+            }
         }

 

     }

@@ -462,9 +467,9 @@ 
                    class="gd-draggable-form-items  gd-<?php echo $val['field_type'];?> geodir-sort-<?php echo $val['htmlvar_name'];?>" href="javascript:void(0);">

                     <?php if (isset($val['field_icon']) && strpos($val['field_icon'], 'fa fa-') !== false) {

                         echo '<i class="'.$val['field_icon'].'" aria-hidden="true"></i>';

-                    }elseif(isset($val['field_icon']) && $val['field_icon'] ){

+                    } elseif(isset($val['field_icon']) && $val['field_icon'] ){

                         echo '<b style="background-image: url("'.$val['field_icon'].'")"></b>';

-                    }else{

+                    } else{

                         echo '<i class="fa fa-cog" aria-hidden="true"></i>';

                     }?>

                     <?php echo $val['site_title'];?>

@@ -693,9 +698,9 @@ 
         <?php

         if($type=='predefined'){

             $cfs = geodir_custom_fields_predefined($listing_type);

-        }elseif($type=='custom'){

+        } elseif($type=='custom'){

             $cfs = geodir_custom_fields_custom($listing_type);

-        }else{

+        } else{

             $cfs = geodir_custom_fields($listing_type);

             ?>

             <ul class="full gd-cf-tooltip-wrap">

@@ -750,7 +755,7 @@ 
             </li>

             <?php

         }

-    }else{

+    } else{

         _e('There are no custom fields here yet.', 'geodirectory');

     }

         ?>

@@ -947,8 +952,9 @@ 
 

     if (!get_option('geodir_remove_unnecessary_fields')) {

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'"))

-            $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");

+        if ($wpdb->get_var("SHOW COLUMNS FROM " . $plugin_prefix . "gd_place_detail WHERE field = 'categories'")) {
+                    $wpdb->query("ALTER TABLE `" . $plugin_prefix . "gd_place_detail` DROP `categories`");
+        }
 

         update_option('geodir_remove_unnecessary_fields', '1');

 

@@ -974,15 +980,17 @@ 
         $geodir_admin_ajax_action = $_REQUEST['geodir_admin_ajax_action'];

         switch ($geodir_admin_ajax_action) {

             case 'diagnosis' :

-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
+                                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
+                }
                 call_user_func('geodir_diagnose_' . $diagnose_this);

                 exit();

                 break;

 

             case 'diagnosis-fix' :

-                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '')

-                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);

+                if (isset($_REQUEST['diagnose_this']) && $_REQUEST['diagnose_this'] != '') {
+                                    $diagnose_this = sanitize_text_field($_REQUEST['diagnose_this']);
+                }
                 call_user_func('geodir_diagnose_' . $diagnose_this);

                 exit();

                 break;

@@ -1540,11 +1548,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_home_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('GD Home page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('GD Home page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1565,11 +1573,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_add_listing_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Add Listing page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Add Listing page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1591,11 +1599,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_preview_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Listing Preview page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Listing Preview page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1616,11 +1624,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_success_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Listing Success page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Listing Success page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1641,11 +1649,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_info_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Info page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Info page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1666,11 +1674,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_login_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Login page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Login page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -1691,11 +1699,11 @@ 
     //////////////////////////////////

     $option_value = get_option('geodir_location_page');

     $page = get_post($option_value);

-    if(!empty($page)){$page_found = $page->ID;}else{$page_found = '';}

+    if(!empty($page)){$page_found = $page->ID;} else{$page_found = '';}

 

-    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish')

-        $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";

-    else {

+    if(!empty($option_value) && !empty($page_found) && $option_value == $page_found && $page->post_status=='publish') {
+            $output_str .= "<li>" . __('Location page exists with proper setting.', 'geodirectory') . "</li>";
+    } else {

         $is_error_during_diagnose = true;

         $output_str .= "<li><strong>" . __('Location page is missing.', 'geodirectory') . "</strong></li>";

         if ($fix) {

@@ -2140,8 +2148,9 @@ 
                             );

 

                             $post_location_info = $request_info['post_location'];

-                            if ($location_id = geodir_add_new_location($post_location_info))

-                                $post_location_id = $location_id;

+                            if ($location_id = geodir_add_new_location($post_location_info)) {
+                                                            $post_location_id = $location_id;
+                            }
                         } else {

                             $post_location_id = 0;

                         }

@@ -2204,8 +2213,9 @@ 
                             $attachment_set = '';

 

                             foreach ($attachment as $key => $val) {

-                                if ($val != '')

-                                    $attachment_set .= $key . " = '" . $val . "', ";

+                                if ($val != '') {
+                                                                    $attachment_set .= $key . " = '" . $val . "', ";
+                                }
                             }

                             $attachment_set = trim($attachment_set, ", ");

 

@@ -2301,8 +2311,7 @@ 
 

         $parts = json_decode($response['body']);

         //print_r($parts);

-        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;}

-        else{

+        if(!isset($parts->access_token)){echo $error_msg." - #1";exit;} else{

 

             update_option('gd_ga_access_token', $parts->access_token);

             update_option('gd_ga_refresh_token', $parts->refresh_token);

@@ -2310,17 +2319,16 @@ 
         }

 

 

-    }

-    elseif(!empty($response['response']['code'])) {

+    } elseif(!empty($response['response']['code'])) {

         $parts = json_decode($response['body']);

 

         if(isset($parts->error)){

             echo $parts->error.": ".$parts->error_description;exit;

-        }else{

+        } else{

             echo $error_msg." - #2";exit;

         }

 

-    }else{

+    } else{

 

         echo $error_msg." - #3";exit;

 

geodirectory-functions/cat-meta-functions/Tax-meta-class.php

Doc Comments +15 added lines

@@ -2054,6 +2054,11 @@ 
         }
 
         //update meta
+
+        /**
+         * @param string $term_id
+         * @param string $key
+         */
         public function update_tax_meta($term_id, $key, $value, $post_type = '')
         {
 
@@ -2095,6 +2100,12 @@ 
 
 //get term meta field
 if (!function_exists('get_tax_meta')) {
+
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
     {
 
@@ -2139,6 +2150,10 @@ 
 
 //update meta
 if (!function_exists('update_tax_meta')) {
+
+    /**
+     * @param string $key
+     */
     function update_tax_meta($term_id, $key, $value, $post_type = '')
     {
 

Braces +106 added lines, -69 removed lines

@@ -102,8 +102,9 @@ 
         {
 
             // If we are not in admin area exit.
-            if (!is_admin())
-                return;
+            if (!is_admin()) {
+                            return;
+            }
 
             // Assign meta box values to local variables and add it's missed values.
             $this->_meta_box = $meta_box;
@@ -111,15 +112,15 @@ 
             $this->_fields = &$this->_meta_box['fields'];
             $this->_Local_images = (isset($meta_box['local_images'])) ? true : false;
             $this->add_missed_values();
-            if (isset($meta_box['use_with_theme']))
-                if ($meta_box['use_with_theme'] === true) {
+            if (isset($meta_box['use_with_theme'])) {
+                            if ($meta_box['use_with_theme'] === true) {
                     $this->SelfPath = get_stylesheet_directory_uri() . '/library/cat-meta';
+            }
                 } elseif ($meta_box['use_with_theme'] === false) {
                     $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
                 } else {
                     $this->SelfPath = $meta_box['use_with_theme'];
-                }
-            else {
+                } else {
                 $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
             }
 
@@ -190,8 +191,9 @@ 
         {
 
             // Check if the field is an image or file. If not, return.
-            if (!$this->has_field('image') && !$this->has_field('file'))
-                return;
+            if (!$this->has_field('image') && !$this->has_field('file')) {
+                            return;
+            }
 
 
             add_action('wp_enqueue_scripts', array(&$this, 'enqueue_tax_meta_scripts'), 100);
@@ -235,8 +237,9 @@ 
         {
 
             // If post variables are empty, return.
-            if (!isset($_POST['at-insert']) || empty($_POST['attachments']))
-                return;
+            if (!isset($_POST['at-insert']) || empty($_POST['attachments'])) {
+                            return;
+            }
 
             // Security Check
             check_admin_referer('media-form');
@@ -256,8 +259,9 @@ 
                 $attachment = stripslashes_deep($attachment);
 
                 // If not selected or url is empty, continue in loop.
-                if (empty($attachment['selected']) || empty($attachment['url']))
-                    continue;
+                if (empty($attachment['selected']) || empty($attachment['url'])) {
+                                    continue;
+                }
 
                 $li = "<li id='item_{$attachment_id}'>";
                 $li .= "<img src='{$attachment['url']}' alt='image_{$attachment_id}' />";
@@ -308,13 +312,15 @@ 
 
 
             // If data is not set, die.
-            if (!isset($_POST['data']))
-                die();
+            if (!isset($_POST['data'])) {
+                            die();
+            }
 
             list($nonce, $term_id, $key, $attach_id) = explode('|', $_POST['data']);
 
-            if (!wp_verify_nonce($nonce, 'at_ajax_delete'))
-                die('1');
+            if (!wp_verify_nonce($nonce, 'at_ajax_delete')) {
+                            die('1');
+            }
 
             $this->delete_tax_meta($term_id, $key, $attach_id);
 
@@ -336,8 +342,9 @@ 
             $ok = false;
             if (strpos($field_id, '[') === false) {
                 check_admin_referer("at-delete-mupload_" . urldecode($field_id));
-                if ($term_id > 0)
-                    $this->delete_tax_meta($term_id, $field_id);
+                if ($term_id > 0) {
+                                    $this->delete_tax_meta($term_id, $field_id);
+                }
                 //$ok = wp_delete_attachment( $attachment_id );
                 $ok = 1;
             } else {
@@ -349,8 +356,9 @@ 
                 $saved = $this->get_tax_meta($term_id, $f[0], true);
                 if (isset($saved[$f[1]][$f[2]])) {
                     unset($saved[$f[1]][$f[2]]);
-                    if ($term_id > 0)
-                        update_post_meta($term_id, $f[0], $saved);
+                    if ($term_id > 0) {
+                                            update_post_meta($term_id, $f[0], $saved);
+                    }
                     //$ok = wp_delete_attachment( $attachment_id );
                     $ok = 1;
                 }
@@ -375,13 +383,15 @@ 
         public function reorder_images()
         {
 
-            if (!isset($_POST['data']))
-                die();
+            if (!isset($_POST['data'])) {
+                            die();
+            }
 
             list($order, $term_id, $key, $nonce) = explode('|', $_POST['data']);
 
-            if (!wp_verify_nonce($nonce, 'at_ajax_reorder'))
-                die('1');
+            if (!wp_verify_nonce($nonce, 'at_ajax_reorder')) {
+                            die('1');
+            }
 
             parse_str($order, $items);
             $items = $items['item'];
@@ -513,8 +523,9 @@ 
             foreach ($this->_fields as $field) {
                 $meta = $this->get_tax_meta($term_id, $field['id'], !$field['multiple']);
                 $meta = ($meta !== '') ? $meta : $field['std'];
-                if ('image' != $field['type'] && $field['type'] != 'repeater')
-                    $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
+                if ('image' != $field['type'] && $field['type'] != 'repeater') {
+                                    $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
+                }
 
                 if ($field['validate_func']) {
                     echo '<tr class="form-field form-required ' . $field['style'] . '">';
@@ -560,8 +571,9 @@ 
                         $id = $field['id'] . '[' . $c . '][' . $f['id'] . ']';
                         $m = $me[$f['id']];
                         $m = ($m !== '') ? $m : $f['std'];
-                        if ('image' != $f['type'] && $f['type'] != 'repeater')
-                            $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
+                        if ('image' != $f['type'] && $f['type'] != 'repeater') {
+                                                    $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
+                        }
                         //set new id for field in array format
                         $f['id'] = $id;
                         if (!$field['inline']) {
@@ -802,8 +814,9 @@ 
         public function show_field_select($field, $meta)
         {
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
             echo "<select class='at-select' name='{$field['id']}" . ($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'") . ">";
@@ -826,8 +839,9 @@ 
         public function show_field_radio($field, $meta)
         {
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
             foreach ($field['options'] as $key => $value) {
@@ -889,8 +903,9 @@ 
 
             global $post;
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
             echo "{$field['desc']}<br />";
@@ -934,8 +949,9 @@ 
             $this->show_field_begin($field, $meta);
             $html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_" . $field['id'], false, false);
             if (is_array($meta)) {
-                if (isset($meta[0]) && is_array($meta[0]))
-                    $meta = $meta[0];
+                if (isset($meta[0]) && is_array($meta[0])) {
+                                    $meta = $meta[0];
+                }
             }
 
             $uploads = wp_upload_dir();
@@ -947,8 +963,9 @@ 
                 //print_r($uploads);
                 //print_r($file_info);
 
-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
-                    $sub_dir = $file_info['dirname'];
+                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..') {
+                                    $sub_dir = $file_info['dirname'];
+                }
 
                 $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs	
                 $uploads_baseurl = $uploads['baseurl'];
@@ -988,8 +1005,9 @@ 
         public function show_field_color($field, $meta)
         {
 
-            if (empty($meta))
-                $meta = '#';
+            if (empty($meta)) {
+                            $meta = '#';
+            }
 
             $this->show_field_begin($field, $meta);
 
@@ -1012,8 +1030,9 @@ 
         public function show_field_checkbox_list($field, $meta)
         {
 
-            if (!is_array($meta))
-                $meta = (array)$meta;
+            if (!is_array($meta)) {
+                            $meta = (array)$meta;
+            }
 
             $this->show_field_begin($field, $meta);
 
@@ -1073,7 +1092,9 @@ 
         {
             global $post;
 
-            if (!is_array($meta)) $meta = (array)$meta;
+            if (!is_array($meta)) {
+            	$meta = (array)$meta;
+            }
             $this->show_field_begin($field, $meta);
             $options = $field['options'];
             $posts = get_posts($options['args']);
@@ -1111,7 +1132,9 @@ 
         {
             global $post;
 
-            if (!is_array($meta)) $meta = (array)$meta;
+            if (!is_array($meta)) {
+            	$meta = (array)$meta;
+            }
             $this->show_field_begin($field, $meta);
             $options = $field['options'];
             $terms = get_terms($options['taxonomy'], $options['args']);
@@ -1145,17 +1168,20 @@ 
         {
 
             $taxnow = '';
-            if (isset($_POST['taxonomy']))
-                $taxnow = $_POST['taxonomy'];
+            if (isset($_POST['taxonomy'])) {
+                            $taxnow = $_POST['taxonomy'];
+            }
 
             if (!isset($term_id)                                                        // Check Revision
                 || (!in_array($taxnow, $this->_meta_box['pages']))                            // Check if current taxonomy type is supported.
                 || (!check_admin_referer(basename(__FILE__), 'tax_meta_class_nonce'))        // Check nonce - Security
                 || (!current_user_can('manage_categories'))
-            )                                // Check permission
+            ) {
+            	// Check permission
             {
                 return $term_id;
             }
+            }
 
 
             foreach ($this->_fields as $field) {
@@ -1249,8 +1275,9 @@ 
         {
             $name = $field['id'];
             $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array())
-                return;
+            if ($new === '' || $new === array()) {
+                            return;
+            }
 
             $this->update_tax_meta($term_id, $name, $new);
         }
@@ -1270,8 +1297,9 @@ 
             $name = $field['id'];
 
             $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '')
-                return;
+            if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '') {
+                            return;
+            }
 
             $this->update_tax_meta($term_id, $name, $new);
         }
@@ -1318,8 +1346,9 @@ 
                                 break;
                         }
                     }
-                    if (!$this->is_array_empty($n))
-                        $temp[] = $n;
+                    if (!$this->is_array_empty($n)) {
+                                            $temp[] = $n;
+                    }
                 }
                 if (isset($temp) && count($temp) > 0 && !$this->is_array_empty($temp)) {
                     $this->update_tax_meta($term_id, $field['id'], $temp);
@@ -1347,14 +1376,16 @@ 
         {
 
             $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
+            if (empty($_FILES[$name])) {
+                            return;
+            }
             $this->fix_file_array($_FILES[$name]);
             foreach ($_FILES[$name] as $position => $fileitem) {
 
                 $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
+                if (empty($file['file'])) {
+                                    continue;
+                }
                 $filename = $file['file'];
 
                 $attachment = array(
@@ -1392,14 +1423,16 @@ 
         {
 
             $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
+            if (empty($_FILES[$name])) {
+                            return;
+            }
             $this->fix_file_array($_FILES[$name]);
             foreach ($_FILES[$name] as $position => $fileitem) {
 
                 $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
+                if (empty($file['file'])) {
+                                    continue;
+                }
                 $filename = $file['file'];
 
                 $attachment = array(
@@ -1454,8 +1487,9 @@ 
         {
             if(is_array($this->_fields)) {
                 foreach ($this->_fields as $field) {
-                    if ($type == $field['type'])
-                        return true;
+                    if ($type == $field['type']) {
+                                            return true;
+                    }
                 }
             }
             return false;
@@ -1993,18 +2027,21 @@ 
          */
         public function is_array_empty($array)
         {
-            if (!is_array($array))
-                return true;
+            if (!is_array($array)) {
+                            return true;
+            }
 
             foreach ($array as $a) {
                 if (is_array($a)) {
                     foreach ($a as $sub_a) {
-                        if (!empty($sub_a) && $sub_a != '')
-                            return false;
+                        if (!empty($sub_a) && $sub_a != '') {
+                                                    return false;
+                        }
                     }
                 } else {
-                    if (!empty($a) && $a != '')
-                        return false;
+                    if (!empty($a) && $a != '') {
+                                            return false;
+                    }
                 }
             }
             return true;

Indentation +2028 added lines, -2028 removed lines

@@ -28,260 +28,260 @@ 
 
 if (!class_exists('Tax_Meta_Class')) :
 
-    /**
-     * All Types Meta Box class.
-     *
-     * @package All Types Meta Box
-     * @since 1.0
-     *
-     * @todo Nothing.
-     */
-
-
-    class Tax_Meta_Class
-    {
-
-        /**
-         * Holds meta box object
-         *
-         * @var object
-         * @access protected
-         */
-        protected $_meta_box;
-
-        /**
-         * Holds meta box fields.
-         *
-         * @var array
-         * @access protected
-         */
-        protected $_prefix;
-
-        /**
-         * Holds Prefix for meta box fields.
-         *
-         * @var array
-         * @access protected
-         */
-        protected $_fields;
-
-        /**
-         * Use local images.
-         *
-         * @var bool
-         * @access protected
-         */
-        protected $_Local_images;
-
-        /**
-         * What form is this? edit or new term.
-         *
-         * @var string
-         * @access protected
-         * $since 1.0
-         */
-        protected $_form_type;
-        /**
-         * SelfPath to allow themes as well as plugins.
-         *
-         * @var string
-         * @access protected
-         * $since 1.0
-         */
-        protected $SelfPath;
-
-        /**
-         * Constructor
-         *
-         * @since 1.0
-         * @access public
-         *
-         * @param array $meta_box
-         */
-        public function __construct($meta_box)
-        {
-
-            // If we are not in admin area exit.
-            if (!is_admin())
-                return;
-
-            // Assign meta box values to local variables and add it's missed values.
-            $this->_meta_box = $meta_box;
-            $this->_prefix = (isset($meta_box['prefix'])) ? $meta_box['prefix'] : '';
-            $this->_fields = &$this->_meta_box['fields'];
-            $this->_Local_images = (isset($meta_box['local_images'])) ? true : false;
-            $this->add_missed_values();
-            if (isset($meta_box['use_with_theme']))
-                if ($meta_box['use_with_theme'] === true) {
-                    $this->SelfPath = get_stylesheet_directory_uri() . '/library/cat-meta';
-                } elseif ($meta_box['use_with_theme'] === false) {
-                    $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
-                } else {
-                    $this->SelfPath = $meta_box['use_with_theme'];
-                }
-            else {
-                $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
-            }
-
-
-            // Add Actions
-            add_action('admin_init', array(&$this, 'add'));
-
-            // Check for special fields and add needed actions for them.
-            $this->check_field_upload();
-            $this->check_field_color();
-            $this->check_field_date();
-            $this->check_field_time();
-
-            // Load common js, css files
-            // Must enqueue for all pages as we need js for the media upload, too.
-            add_action('admin_print_styles', array(&$this, 'load_scripts_styles'));
-
-        }
-
-        /**
-         * Load all Javascript and CSS
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function load_scripts_styles()
-        {
-
-            // Get Plugin Path
-            $plugin_path = $this->SelfPath;
-            //only load styles and js when needed
-            /* 
+	/**
+	 * All Types Meta Box class.
+	 *
+	 * @package All Types Meta Box
+	 * @since 1.0
+	 *
+	 * @todo Nothing.
+	 */
+
+
+	class Tax_Meta_Class
+	{
+
+		/**
+		 * Holds meta box object
+		 *
+		 * @var object
+		 * @access protected
+		 */
+		protected $_meta_box;
+
+		/**
+		 * Holds meta box fields.
+		 *
+		 * @var array
+		 * @access protected
+		 */
+		protected $_prefix;
+
+		/**
+		 * Holds Prefix for meta box fields.
+		 *
+		 * @var array
+		 * @access protected
+		 */
+		protected $_fields;
+
+		/**
+		 * Use local images.
+		 *
+		 * @var bool
+		 * @access protected
+		 */
+		protected $_Local_images;
+
+		/**
+		 * What form is this? edit or new term.
+		 *
+		 * @var string
+		 * @access protected
+		 * $since 1.0
+		 */
+		protected $_form_type;
+		/**
+		 * SelfPath to allow themes as well as plugins.
+		 *
+		 * @var string
+		 * @access protected
+		 * $since 1.0
+		 */
+		protected $SelfPath;
+
+		/**
+		 * Constructor
+		 *
+		 * @since 1.0
+		 * @access public
+		 *
+		 * @param array $meta_box
+		 */
+		public function __construct($meta_box)
+		{
+
+			// If we are not in admin area exit.
+			if (!is_admin())
+				return;
+
+			// Assign meta box values to local variables and add it's missed values.
+			$this->_meta_box = $meta_box;
+			$this->_prefix = (isset($meta_box['prefix'])) ? $meta_box['prefix'] : '';
+			$this->_fields = &$this->_meta_box['fields'];
+			$this->_Local_images = (isset($meta_box['local_images'])) ? true : false;
+			$this->add_missed_values();
+			if (isset($meta_box['use_with_theme']))
+				if ($meta_box['use_with_theme'] === true) {
+					$this->SelfPath = get_stylesheet_directory_uri() . '/library/cat-meta';
+				} elseif ($meta_box['use_with_theme'] === false) {
+					$this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
+				} else {
+					$this->SelfPath = $meta_box['use_with_theme'];
+				}
+			else {
+				$this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
+			}
+
+
+			// Add Actions
+			add_action('admin_init', array(&$this, 'add'));
+
+			// Check for special fields and add needed actions for them.
+			$this->check_field_upload();
+			$this->check_field_color();
+			$this->check_field_date();
+			$this->check_field_time();
+
+			// Load common js, css files
+			// Must enqueue for all pages as we need js for the media upload, too.
+			add_action('admin_print_styles', array(&$this, 'load_scripts_styles'));
+
+		}
+
+		/**
+		 * Load all Javascript and CSS
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function load_scripts_styles()
+		{
+
+			// Get Plugin Path
+			$plugin_path = $this->SelfPath;
+			//only load styles and js when needed
+			/* 
 		 * since 1.0
 		 */
-            $taxnow = isset($_REQUEST['taxonomy']) ? $_REQUEST['taxonomy'] : '';
-
-            if (!empty($this->_meta_box['pages'])) {
-                if (in_array($taxnow, $this->_meta_box['pages'])) {
-                    // Enqueue Meta Box Style
-                    //wp_enqueue_style( 'tax-meta-clss', $plugin_path . '/css/Tax-meta-class.css' );
-                    // Enqueue Meta Box Scripts
-                    //wp_enqueue_script( 'tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array( 'jquery' ), null, true );
-
-                }
-            }
-
-        }
-
-        /**
-         * Check the Field Upload, Add needed Actions
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function enqueue_tax_meta_scripts()
-        {
-            // Make upload feature work event when custom post type doesn't support 'editor'
-            wp_enqueue_script('media-upload');
-            wp_enqueue_script('thickbox');
-            add_thickbox();
-            wp_enqueue_script('jquery-ui-core');
-            wp_enqueue_script('jquery-ui-sortable');
-
-
-        }
-
-        public function check_field_upload()
-        {
-
-            // Check if the field is an image or file. If not, return.
-            if (!$this->has_field('image') && !$this->has_field('file'))
-                return;
-
-
-            add_action('wp_enqueue_scripts', array(&$this, 'enqueue_tax_meta_scripts'), 100);
-
-            // Add data encoding type for file uploading.	
-            add_action('post_edit_form_tag', array(&$this, 'add_enctype'));
-
-
-            // Add filters for media upload.
-            add_filter('media_upload_gallery', array(&$this, 'insert_images'));
-            add_filter('media_upload_library', array(&$this, 'insert_images'));
-            add_filter('media_upload_image', array(&$this, 'insert_images'));
-
-            // Delete all attachments when delete custom post type.
-            add_action('wp_ajax_at_delete_file', array(&$this, 'delete_file'));
-            add_action('wp_ajax_at_reorder_images', array(&$this, 'reorder_images'));
-            // Delete file via Ajax
-            add_action('wp_ajax_at_delete_mupload', array($this, 'wp_ajax_delete_image'));
-        }
-
-        /**
-         * Add data encoding type for file uploading
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function add_enctype()
-        {
-            echo ' enctype="multipart/form-data"';
-        }
-
-        /**
-         * Process images added to meta field.
-         *
-         * Modified from Faster Image Insert plugin.
-         *
-         * @return void
-         * @author Cory Crowley
-         */
-        public function insert_images()
-        {
-
-            // If post variables are empty, return.
-            if (!isset($_POST['at-insert']) || empty($_POST['attachments']))
-                return;
-
-            // Security Check
-            check_admin_referer('media-form');
-
-            // Create Security Nonce
-            $nonce = wp_create_nonce('at_ajax_delete');
-
-            // Get Post Id and Field Id
-            $term_id = $_POST['post_id'];
-            $id = $_POST['field_id'];
-
-            // Modify the insertion string
-            $html = '';
-            foreach ($_POST['attachments'] as $attachment_id => $attachment) {
-
-                // Strip Slashes
-                $attachment = stripslashes_deep($attachment);
-
-                // If not selected or url is empty, continue in loop.
-                if (empty($attachment['selected']) || empty($attachment['url']))
-                    continue;
-
-                $li = "<li id='item_{$attachment_id}'>";
-                $li .= "<img src='{$attachment['url']}' alt='image_{$attachment_id}' />";
-                //$li 	.= "<a title='" . __( 'Delete this image' ) . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'>" . __( 'Delete' ) . "</a>";
-                $li .= "<a title='" . __('Remove this image', 'geodirectory') . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'><img src='" . $this->SelfPath . "/images/delete-16.png' alt='" . __('Remove', 'geodirectory') . "' /></a>";
-                $li .= "<input type='hidden' name='{$id}[]' value='{$attachment_id}' />";
-                $li .= "</li>";
-                $html .= $li;
-
-            } // End For Each
-
-            return media_send_to_editor($html);
-
-        }
-
-        /**
-         * Delete attachments associated with the post.
-         *
-         * @since 1.0
-         * @access public
-         *
-         * @param int|string $term_id The term ID.
-         */
-        /*public function delete_attachments( $term_id ) {
+			$taxnow = isset($_REQUEST['taxonomy']) ? $_REQUEST['taxonomy'] : '';
+
+			if (!empty($this->_meta_box['pages'])) {
+				if (in_array($taxnow, $this->_meta_box['pages'])) {
+					// Enqueue Meta Box Style
+					//wp_enqueue_style( 'tax-meta-clss', $plugin_path . '/css/Tax-meta-class.css' );
+					// Enqueue Meta Box Scripts
+					//wp_enqueue_script( 'tax-meta-clss', $plugin_path . '/js/tax-meta-clss.js', array( 'jquery' ), null, true );
+
+				}
+			}
+
+		}
+
+		/**
+		 * Check the Field Upload, Add needed Actions
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function enqueue_tax_meta_scripts()
+		{
+			// Make upload feature work event when custom post type doesn't support 'editor'
+			wp_enqueue_script('media-upload');
+			wp_enqueue_script('thickbox');
+			add_thickbox();
+			wp_enqueue_script('jquery-ui-core');
+			wp_enqueue_script('jquery-ui-sortable');
+
+
+		}
+
+		public function check_field_upload()
+		{
+
+			// Check if the field is an image or file. If not, return.
+			if (!$this->has_field('image') && !$this->has_field('file'))
+				return;
+
+
+			add_action('wp_enqueue_scripts', array(&$this, 'enqueue_tax_meta_scripts'), 100);
+
+			// Add data encoding type for file uploading.	
+			add_action('post_edit_form_tag', array(&$this, 'add_enctype'));
+
+
+			// Add filters for media upload.
+			add_filter('media_upload_gallery', array(&$this, 'insert_images'));
+			add_filter('media_upload_library', array(&$this, 'insert_images'));
+			add_filter('media_upload_image', array(&$this, 'insert_images'));
+
+			// Delete all attachments when delete custom post type.
+			add_action('wp_ajax_at_delete_file', array(&$this, 'delete_file'));
+			add_action('wp_ajax_at_reorder_images', array(&$this, 'reorder_images'));
+			// Delete file via Ajax
+			add_action('wp_ajax_at_delete_mupload', array($this, 'wp_ajax_delete_image'));
+		}
+
+		/**
+		 * Add data encoding type for file uploading
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function add_enctype()
+		{
+			echo ' enctype="multipart/form-data"';
+		}
+
+		/**
+		 * Process images added to meta field.
+		 *
+		 * Modified from Faster Image Insert plugin.
+		 *
+		 * @return void
+		 * @author Cory Crowley
+		 */
+		public function insert_images()
+		{
+
+			// If post variables are empty, return.
+			if (!isset($_POST['at-insert']) || empty($_POST['attachments']))
+				return;
+
+			// Security Check
+			check_admin_referer('media-form');
+
+			// Create Security Nonce
+			$nonce = wp_create_nonce('at_ajax_delete');
+
+			// Get Post Id and Field Id
+			$term_id = $_POST['post_id'];
+			$id = $_POST['field_id'];
+
+			// Modify the insertion string
+			$html = '';
+			foreach ($_POST['attachments'] as $attachment_id => $attachment) {
+
+				// Strip Slashes
+				$attachment = stripslashes_deep($attachment);
+
+				// If not selected or url is empty, continue in loop.
+				if (empty($attachment['selected']) || empty($attachment['url']))
+					continue;
+
+				$li = "<li id='item_{$attachment_id}'>";
+				$li .= "<img src='{$attachment['url']}' alt='image_{$attachment_id}' />";
+				//$li 	.= "<a title='" . __( 'Delete this image' ) . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'>" . __( 'Delete' ) . "</a>";
+				$li .= "<a title='" . __('Remove this image', 'geodirectory') . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'><img src='" . $this->SelfPath . "/images/delete-16.png' alt='" . __('Remove', 'geodirectory') . "' /></a>";
+				$li .= "<input type='hidden' name='{$id}[]' value='{$attachment_id}' />";
+				$li .= "</li>";
+				$html .= $li;
+
+			} // End For Each
+
+			return media_send_to_editor($html);
+
+		}
+
+		/**
+		 * Delete attachments associated with the post.
+		 *
+		 * @since 1.0
+		 * @access public
+		 *
+		 * @param int|string $term_id The term ID.
+		 */
+		/*public function delete_attachments( $term_id ) {
 		
 		// Get Attachments
 		$attachments = get_posts( array( 'numberposts' => -1, 'post_type' => 'attachment', 'post_parent' => $term_id ) );
@@ -295,349 +295,349 @@ 
 		
 	}*/
 
-        /**
-         * Ajax callback for deleting files.
-         *
-         * Modified from a function used by "Verve Meta Boxes" plugin ( http://goo.gl/aw64H )
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function delete_file()
-        {
-
-
-            // If data is not set, die.
-            if (!isset($_POST['data']))
-                die();
-
-            list($nonce, $term_id, $key, $attach_id) = explode('|', $_POST['data']);
-
-            if (!wp_verify_nonce($nonce, 'at_ajax_delete'))
-                die('1');
-
-            $this->delete_tax_meta($term_id, $key, $attach_id);
-
-            die('0');
-
-        }
-
-        /**
-         * Ajax callback for deleting files.
-         * Modified from a function used by "Verve Meta Boxes" plugin (http://goo.gl/LzYSq)
-         * @since 1.0
-         * @access public
-         */
-        public function wp_ajax_delete_image()
-        {
-            $term_id = isset($_GET['post_id']) ? intval($_GET['post_id']) : 0;
-            $field_id = isset($_GET['field_id']) ? $_GET['field_id'] : 0;
-            $attachment_id = isset($_GET['attachment_id']) ? intval($_GET['attachment_id']) : 0;
-            $ok = false;
-            if (strpos($field_id, '[') === false) {
-                check_admin_referer("at-delete-mupload_" . urldecode($field_id));
-                if ($term_id > 0)
-                    $this->delete_tax_meta($term_id, $field_id);
-                //$ok = wp_delete_attachment( $attachment_id );
-                $ok = 1;
-            } else {
-                $f = explode('[', urldecode($field_id));
-                $f_fiexed = array();
-                foreach ($f as $k => $v) {
-                    $f[$k] = str_replace(']', '', $v);
-                }
-                $saved = $this->get_tax_meta($term_id, $f[0], true);
-                if (isset($saved[$f[1]][$f[2]])) {
-                    unset($saved[$f[1]][$f[2]]);
-                    if ($term_id > 0)
-                        update_post_meta($term_id, $f[0], $saved);
-                    //$ok = wp_delete_attachment( $attachment_id );
-                    $ok = 1;
-                }
-            }
-
-
-            if ($ok) {
-                echo json_encode(array('status' => 'success'));
-                die();
-            } else {
-                echo json_encode(array('message' => __('Cannot delete file. Something\'s wrong.', 'geodirectory')));
-                die();
-            }
-        }
-
-        /**
-         * Ajax callback for reordering Images.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function reorder_images()
-        {
-
-            if (!isset($_POST['data']))
-                die();
-
-            list($order, $term_id, $key, $nonce) = explode('|', $_POST['data']);
-
-            if (!wp_verify_nonce($nonce, 'at_ajax_reorder'))
-                die('1');
-
-            parse_str($order, $items);
-            $items = $items['item'];
-            $order = 1;
-            foreach ($items as $item) {
-                wp_update_post(array('ID' => $item, 'post_parent' => $term_id, 'menu_order' => $order));
-                $order++;
-            }
-
-            die('0');
-
-        }
-
-        /**
-         * Check Field Color
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function check_field_color()
-        {
-
-            if ($this->has_field('color') && $this->is_edit_page()) {
-                // Enqueu built-in script and style for color picker.
-                wp_enqueue_style('farbtastic');
-                wp_enqueue_script('farbtastic');
-            }
-
-        }
-
-        /**
-         * Check Field Date
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function check_field_date()
-        {
-
-            if ($this->has_field('date') && $this->is_edit_page()) {
-                // Enqueu JQuery UI, use proper version.
-                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css');
-                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'));
-            }
-
-        }
-
-        /**
-         * Check Field Time
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function check_field_time()
-        {
-
-            if ($this->has_field('time') && $this->is_edit_page()) {
-
-                // Enqueu JQuery UI, use proper version.
-                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css', array(), false, true);
-                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'), false, true);
-                wp_enqueue_script('at-timepicker', 'https://github.com/trentrichardson/jQuery-Timepicker-Addon/raw/master/jquery-ui-timepicker-addon.js', array('tmc-jquery-ui'), false, true);
-
-            }
-
-        }
-
-        /**
-         * Add Meta Box for multiple post types.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function add()
-        {
-
-            // Loop through array
-            if (!empty($this->_meta_box['pages'])) {
-                foreach ($this->_meta_box['pages'] as $page) {
-                    //add fields to edit form
-                    add_action($page . '_edit_form_fields', array(&$this, 'show_edit_form'));
-                    //add fields to add new form
-                    add_action($page . '_add_form_fields', array(&$this, 'show_new_form'));
-                    // this saves the edit fields
-                    add_action('edited_' . $page, array(&$this, 'save'), 10, 2);
-                    // this saves the add fields
-                    add_action('created_' . $page, array(&$this, 'save'), 10, 2);
-                }
-            }
-
-        }
-
-        /**
-         * Callback function to show fields on add new taxonomy term form.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function show_new_form($term_id)
-        {
-            $this->_form_type = 'new';
-            $this->show($term_id);
-        }
-
-        /**
-         * Callback function to show fields on term edit form.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function show_edit_form($term_id)
-        {
-            $this->_form_type = 'edit';
-            $this->show($term_id);
-        }
-
-
-        /**
-         * Callback function to show fields in meta box.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function show($term_id)
-        {
-
-            wp_nonce_field(basename(__FILE__), 'tax_meta_class_nonce');
-
-            foreach ($this->_fields as $field) {
-                $meta = $this->get_tax_meta($term_id, $field['id'], !$field['multiple']);
-                $meta = ($meta !== '') ? $meta : $field['std'];
-                if ('image' != $field['type'] && $field['type'] != 'repeater')
-                    $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
-
-                if ($field['validate_func']) {
-                    echo '<tr class="form-field form-required ' . $field['style'] . '">';
-                } else {
-                    echo '<tr class="form-field ' . $field['style'] . '">';
-                }
-
-                // Call Separated methods for displaying each type of field.
-                call_user_func(array(&$this, 'show_field_' . $field['type']), $field, $meta);
-                echo '</tr>';
-            }
-            echo '</table>';
-        }
-
-        /**
-         * Show Repeater Fields.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_repeater($field, $meta)
-        {
-            // Get Plugin Path
-            $plugin_path = $this->SelfPath;
-            $this->show_field_begin($field, $meta);
-            echo "<div class='at-repeat' id='{$field['id']}'>";
-
-            $c = 0;
-
-            if (count($meta) > 0 && is_array($meta)) {
-                foreach ($meta as $me) {
-                    //for labling toggles
-                    $mmm = $me[$field['fields'][0]['id']];
-                    echo '<div class="at-repater-block">' . $mmm . '<br/><table class="repeater-table" style="display: none;">';
-                    if ($field['inline']) {
-                        echo '<tr class="at-inline" VALIGN="top">';
-                    }
-                    foreach ($field['fields'] as $f) {
-                        //reset var $id for repeater
-                        $id = '';
-                        $id = $field['id'] . '[' . $c . '][' . $f['id'] . ']';
-                        $m = $me[$f['id']];
-                        $m = ($m !== '') ? $m : $f['std'];
-                        if ('image' != $f['type'] && $f['type'] != 'repeater')
-                            $m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
-                        //set new id for field in array format
-                        $f['id'] = $id;
-                        if (!$field['inline']) {
-                            echo '<tr>';
-                        }
-                        call_user_func(array(&$this, 'show_field_' . $f['type']), $f, $m);
-                        if (!$field['inline']) {
-                            echo '</tr>';
-                        }
-                    }
-                    if ($field['inline']) {
-                        echo '</tr>';
-                    }
-                    echo '</table>
+		/**
+		 * Ajax callback for deleting files.
+		 *
+		 * Modified from a function used by "Verve Meta Boxes" plugin ( http://goo.gl/aw64H )
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function delete_file()
+		{
+
+
+			// If data is not set, die.
+			if (!isset($_POST['data']))
+				die();
+
+			list($nonce, $term_id, $key, $attach_id) = explode('|', $_POST['data']);
+
+			if (!wp_verify_nonce($nonce, 'at_ajax_delete'))
+				die('1');
+
+			$this->delete_tax_meta($term_id, $key, $attach_id);
+
+			die('0');
+
+		}
+
+		/**
+		 * Ajax callback for deleting files.
+		 * Modified from a function used by "Verve Meta Boxes" plugin (http://goo.gl/LzYSq)
+		 * @since 1.0
+		 * @access public
+		 */
+		public function wp_ajax_delete_image()
+		{
+			$term_id = isset($_GET['post_id']) ? intval($_GET['post_id']) : 0;
+			$field_id = isset($_GET['field_id']) ? $_GET['field_id'] : 0;
+			$attachment_id = isset($_GET['attachment_id']) ? intval($_GET['attachment_id']) : 0;
+			$ok = false;
+			if (strpos($field_id, '[') === false) {
+				check_admin_referer("at-delete-mupload_" . urldecode($field_id));
+				if ($term_id > 0)
+					$this->delete_tax_meta($term_id, $field_id);
+				//$ok = wp_delete_attachment( $attachment_id );
+				$ok = 1;
+			} else {
+				$f = explode('[', urldecode($field_id));
+				$f_fiexed = array();
+				foreach ($f as $k => $v) {
+					$f[$k] = str_replace(']', '', $v);
+				}
+				$saved = $this->get_tax_meta($term_id, $f[0], true);
+				if (isset($saved[$f[1]][$f[2]])) {
+					unset($saved[$f[1]][$f[2]]);
+					if ($term_id > 0)
+						update_post_meta($term_id, $f[0], $saved);
+					//$ok = wp_delete_attachment( $attachment_id );
+					$ok = 1;
+				}
+			}
+
+
+			if ($ok) {
+				echo json_encode(array('status' => 'success'));
+				die();
+			} else {
+				echo json_encode(array('message' => __('Cannot delete file. Something\'s wrong.', 'geodirectory')));
+				die();
+			}
+		}
+
+		/**
+		 * Ajax callback for reordering Images.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function reorder_images()
+		{
+
+			if (!isset($_POST['data']))
+				die();
+
+			list($order, $term_id, $key, $nonce) = explode('|', $_POST['data']);
+
+			if (!wp_verify_nonce($nonce, 'at_ajax_reorder'))
+				die('1');
+
+			parse_str($order, $items);
+			$items = $items['item'];
+			$order = 1;
+			foreach ($items as $item) {
+				wp_update_post(array('ID' => $item, 'post_parent' => $term_id, 'menu_order' => $order));
+				$order++;
+			}
+
+			die('0');
+
+		}
+
+		/**
+		 * Check Field Color
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function check_field_color()
+		{
+
+			if ($this->has_field('color') && $this->is_edit_page()) {
+				// Enqueu built-in script and style for color picker.
+				wp_enqueue_style('farbtastic');
+				wp_enqueue_script('farbtastic');
+			}
+
+		}
+
+		/**
+		 * Check Field Date
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function check_field_date()
+		{
+
+			if ($this->has_field('date') && $this->is_edit_page()) {
+				// Enqueu JQuery UI, use proper version.
+				wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css');
+				wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'));
+			}
+
+		}
+
+		/**
+		 * Check Field Time
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function check_field_time()
+		{
+
+			if ($this->has_field('time') && $this->is_edit_page()) {
+
+				// Enqueu JQuery UI, use proper version.
+				wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css', array(), false, true);
+				wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'), false, true);
+				wp_enqueue_script('at-timepicker', 'https://github.com/trentrichardson/jQuery-Timepicker-Addon/raw/master/jquery-ui-timepicker-addon.js', array('tmc-jquery-ui'), false, true);
+
+			}
+
+		}
+
+		/**
+		 * Add Meta Box for multiple post types.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function add()
+		{
+
+			// Loop through array
+			if (!empty($this->_meta_box['pages'])) {
+				foreach ($this->_meta_box['pages'] as $page) {
+					//add fields to edit form
+					add_action($page . '_edit_form_fields', array(&$this, 'show_edit_form'));
+					//add fields to add new form
+					add_action($page . '_add_form_fields', array(&$this, 'show_new_form'));
+					// this saves the edit fields
+					add_action('edited_' . $page, array(&$this, 'save'), 10, 2);
+					// this saves the add fields
+					add_action('created_' . $page, array(&$this, 'save'), 10, 2);
+				}
+			}
+
+		}
+
+		/**
+		 * Callback function to show fields on add new taxonomy term form.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_new_form($term_id)
+		{
+			$this->_form_type = 'new';
+			$this->show($term_id);
+		}
+
+		/**
+		 * Callback function to show fields on term edit form.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_edit_form($term_id)
+		{
+			$this->_form_type = 'edit';
+			$this->show($term_id);
+		}
+
+
+		/**
+		 * Callback function to show fields in meta box.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show($term_id)
+		{
+
+			wp_nonce_field(basename(__FILE__), 'tax_meta_class_nonce');
+
+			foreach ($this->_fields as $field) {
+				$meta = $this->get_tax_meta($term_id, $field['id'], !$field['multiple']);
+				$meta = ($meta !== '') ? $meta : $field['std'];
+				if ('image' != $field['type'] && $field['type'] != 'repeater')
+					$meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
+
+				if ($field['validate_func']) {
+					echo '<tr class="form-field form-required ' . $field['style'] . '">';
+				} else {
+					echo '<tr class="form-field ' . $field['style'] . '">';
+				}
+
+				// Call Separated methods for displaying each type of field.
+				call_user_func(array(&$this, 'show_field_' . $field['type']), $field, $meta);
+				echo '</tr>';
+			}
+			echo '</table>';
+		}
+
+		/**
+		 * Show Repeater Fields.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_repeater($field, $meta)
+		{
+			// Get Plugin Path
+			$plugin_path = $this->SelfPath;
+			$this->show_field_begin($field, $meta);
+			echo "<div class='at-repeat' id='{$field['id']}'>";
+
+			$c = 0;
+
+			if (count($meta) > 0 && is_array($meta)) {
+				foreach ($meta as $me) {
+					//for labling toggles
+					$mmm = $me[$field['fields'][0]['id']];
+					echo '<div class="at-repater-block">' . $mmm . '<br/><table class="repeater-table" style="display: none;">';
+					if ($field['inline']) {
+						echo '<tr class="at-inline" VALIGN="top">';
+					}
+					foreach ($field['fields'] as $f) {
+						//reset var $id for repeater
+						$id = '';
+						$id = $field['id'] . '[' . $c . '][' . $f['id'] . ']';
+						$m = $me[$f['id']];
+						$m = ($m !== '') ? $m : $f['std'];
+						if ('image' != $f['type'] && $f['type'] != 'repeater')
+							$m = is_array($m) ? array_map('esc_attr', $m) : esc_attr($m);
+						//set new id for field in array format
+						$f['id'] = $id;
+						if (!$field['inline']) {
+							echo '<tr>';
+						}
+						call_user_func(array(&$this, 'show_field_' . $f['type']), $f, $m);
+						if (!$field['inline']) {
+							echo '</tr>';
+						}
+					}
+					if ($field['inline']) {
+						echo '</tr>';
+					}
+					echo '</table>
 				<span class="at-re-toggle"><img src="';
-                    if ($this->_Local_images) {
-                        echo $plugin_path . '/images/edit.png';
-                    } else {
-                        echo 'http://i.imgur.com/ka0E2.png';
-                    }
-                    echo '" alt="Edit" title="Edit"/></span> 
+					if ($this->_Local_images) {
+						echo $plugin_path . '/images/edit.png';
+					} else {
+						echo 'http://i.imgur.com/ka0E2.png';
+					}
+					echo '" alt="Edit" title="Edit"/></span> 
 				<img src="';
-                    if ($this->_Local_images) {
-                        echo $plugin_path . '/images/remove.png';
-                    } else {
-                        echo 'http://i.imgur.com/g8Duj.png';
-                    }
-                    echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
-                    $c = $c + 1;
-
-                }
-                $this->show_field_end($field, $meta);
-            }
-
-            echo '<img src="';
-            if ($this->_Local_images) {
-                echo $plugin_path . '/images/add.png';
-            } else {
-                echo 'http://i.imgur.com/w5Tuc.png';
-            }
-            echo '" alt="' . __('Add', 'geodirectory') . '" title="' . __('Add', 'geodirectory') . '" id="add-' . $field['id'] . '"><br/></div>';
-
-            //create all fields once more for js function and catch with object buffer
-            ob_start();
-            echo '<div class="at-repater-block"><table class="repeater-table">';
-            if ($field['inline']) {
-                echo '<tr class="at-inline" VALIGN="top">';
-            }
-            foreach ($field['fields'] as $f) {
-                //reset var $id for repeater
-                $id = '';
-                $id = $field['id'] . '[CurrentCounter][' . $f['id'] . ']';
-                $f['id'] = $id;
-                if (!$field['inline']) {
-                    echo '<tr>';
-                }
-                call_user_func(array(&$this, 'show_field_' . $f['type']), $f, '');
-                if (!$field['inline']) {
-                    echo '</tr>';
-                }
-            }
-            if ($field['inline']) {
-                echo '</tr>';
-            }
-            echo '</table><img src="';
-            if ($this->_Local_images) {
-                echo $plugin_path . '/images/remove.png';
-            } else {
-                echo 'http://i.imgur.com/g8Duj.png';
-            }
-            echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
-            $counter = 'countadd_' . $field['id'];
-            $js_code = ob_get_clean();
-            $js_code = str_replace("'", "\"", $js_code);
-            $js_code = str_replace("CurrentCounter", "' + " . $counter . " + '", $js_code);
-            echo '<script>
+					if ($this->_Local_images) {
+						echo $plugin_path . '/images/remove.png';
+					} else {
+						echo 'http://i.imgur.com/g8Duj.png';
+					}
+					echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
+					$c = $c + 1;
+
+				}
+				$this->show_field_end($field, $meta);
+			}
+
+			echo '<img src="';
+			if ($this->_Local_images) {
+				echo $plugin_path . '/images/add.png';
+			} else {
+				echo 'http://i.imgur.com/w5Tuc.png';
+			}
+			echo '" alt="' . __('Add', 'geodirectory') . '" title="' . __('Add', 'geodirectory') . '" id="add-' . $field['id'] . '"><br/></div>';
+
+			//create all fields once more for js function and catch with object buffer
+			ob_start();
+			echo '<div class="at-repater-block"><table class="repeater-table">';
+			if ($field['inline']) {
+				echo '<tr class="at-inline" VALIGN="top">';
+			}
+			foreach ($field['fields'] as $f) {
+				//reset var $id for repeater
+				$id = '';
+				$id = $field['id'] . '[CurrentCounter][' . $f['id'] . ']';
+				$f['id'] = $id;
+				if (!$field['inline']) {
+					echo '<tr>';
+				}
+				call_user_func(array(&$this, 'show_field_' . $f['type']), $f, '');
+				if (!$field['inline']) {
+					echo '</tr>';
+				}
+			}
+			if ($field['inline']) {
+				echo '</tr>';
+			}
+			echo '</table><img src="';
+			if ($this->_Local_images) {
+				echo $plugin_path . '/images/remove.png';
+			} else {
+				echo 'http://i.imgur.com/g8Duj.png';
+			}
+			echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
+			$counter = 'countadd_' . $field['id'];
+			$js_code = ob_get_clean();
+			$js_code = str_replace("'", "\"", $js_code);
+			$js_code = str_replace("CurrentCounter", "' + " . $counter . " + '", $js_code);
+			echo '<script>
 				jQuery(document).ready(function() {
 					var ' . $counter . ' = ' . $c . ';
 					jQuery("#add-' . $field['id'] . '").live(\'click\', function() {
@@ -650,7 +650,7 @@ 
         			});
     			});
     		</script>';
-            echo '<br/><style>
+			echo '<br/><style>
 .at-inline{line-height: 1 !important;}
 .at-inline .at-field{border: 0px !important;}
 .at-inline .at-label{margin: 0 0 1px !important;}
@@ -658,532 +658,532 @@ 
 .at-inline .at-textarea{width: 100px; height: 75px;}
 .at-repater-block{background-color: #FFFFFF;border: 1px solid;margin: 2px;}
 </style>';
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Begin Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_begin($field, $meta)
-        {
-            if (isset($field['group'])) {
-                if ($field['group'] == "start") {
-                    echo "<td class='at-field'>";
-                }
-            } else {
-                if ($this->_form_type == 'edit') {
-                    echo '<th valign="top" scope="row">';
-                } else {
-                    if ($field['validate_func']) {
-                        echo '<td><div class="form-field form-required">';
-                    } else {
-                        echo '<td><div class="form-field">';
-                    }
-                }
-            }
-            if ($field['name'] != '' || $field['name'] != FALSE) {
-                //echo "<div class='at-label'>";
-                echo "<label for='{$field['id']}'>{$field['name']}</label>";
-                //echo "</div>";
-            }
-            if ($this->_form_type == 'edit') {
-                echo '</th><td>';
-            }
-        }
-
-        /**
-         * End Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_end($field, $meta = NULL, $group = false)
-        {
-            if (isset($field['group'])) {
-                if ($group == 'end') {
-                    if ($field['desc'] != '') {
-                        echo "<p class='desc-field'>{$field['desc']}</p></td>";
-                    } else {
-                        echo "</td>";
-                    }
-                } else {
-                    if ($field['desc'] != '') {
-                        echo "<p class='desc-field'>{$field['desc']}</p><br/>";
-                    } else {
-                        echo '<br/>';
-                    }
-                }
-            } else {
-                if ($field['desc'] != '') {
-                    echo "<p class='desc-field'>{$field['desc']}</p>";
-                }
-                if ($this->_form_type == 'edit') {
-                    echo '</td>';
-                } else {
-                    echo '</td></div>';
-                }
-            }
-        }
-
-        /**
-         * Show Field Text.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_text($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            echo "<input type='text' class='at-text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='30' />";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Field hidden.
-         *
-         * @param string $field
-         * @param string|mixed $meta
-         * @since 0.1.3
-         * @access public
-         */
-        public function show_field_hidden($field, $meta)
-        {
-            //$this->show_field_begin( $field, $meta );
-            echo "<input type='hidden' class='at-text' name='{$field['id']}' id='{$field['id']}' value='{$meta}'/>";
-            //$this->show_field_end( $field, $meta );
-        }
-
-        /**
-         * Show Field Paragraph.
-         *
-         * @param string $field
-         * @since 0.1.3
-         * @access public
-         */
-        public function show_field_paragraph($field)
-        {
-            //$this->show_field_begin( $field, $meta );
-            echo '<p>' . $field['value'] . '</p>';
-            //$this->show_field_end( $field, $meta );
-        }
-
-        /**
-         * Show Field Textarea.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_textarea($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            echo "<textarea class='at-textarea large-text' name='{$field['id']}' id='{$field['id']}' cols='60' rows='10'>{$meta}</textarea>";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Field Select.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_select($field, $meta)
-        {
-
-            if (!is_array($meta))
-                $meta = (array)$meta;
-
-            $this->show_field_begin($field, $meta);
-            echo "<select class='at-select' name='{$field['id']}" . ($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'") . ">";
-            foreach ($field['options'] as $key => $value) {
-                echo "<option value='{$key}'" . selected(in_array($key, $meta), true, false) . ">{$value}</option>";
-            }
-            echo "</select>";
-            $this->show_field_end($field, $meta);
-
-        }
-
-        /**
-         * Show Radio Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_radio($field, $meta)
-        {
-
-            if (!is_array($meta))
-                $meta = (array)$meta;
-
-            $this->show_field_begin($field, $meta);
-            foreach ($field['options'] as $key => $value) {
-                echo "<input type='radio' class='at-radio' name='{$field['id']}' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> <span class='at-radio-label'>{$value}</span>";
-            }
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Checkbox Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_checkbox($field, $meta)
-        {
-
-            $this->show_field_begin($field, $meta);
-            echo "<input type='checkbox' class='rw-checkbox' name='{$field['id']}' id='{$field['id']}'" . checked(!empty($meta), true, false) . " /> {$field['desc']}";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Wysiwig Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_wysiwyg($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            // Add TinyMCE script for WP version < 3.3
-            global $wp_version;
-
-            if (version_compare($wp_version, '3.2.1') < 1) {
-                echo "<textarea class='at-wysiwyg theEditor large-text' name='{$field['id']}' id='{$field['id']}' cols='60' rows='10'>{$meta}</textarea>";
-            } else {
-                // Use new wp_editor() since WP 3.3
-                wp_editor(stripslashes(html_entity_decode($meta)), $field['id'], array('editor_class' => 'at-wysiwyg'));
-            }
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show File Field.
-         *
-         * @global object $post The current post object.
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_file($field, $meta)
-        {
-
-            global $post;
-
-            if (!is_array($meta))
-                $meta = (array)$meta;
-
-            $this->show_field_begin($field, $meta);
-            echo "{$field['desc']}<br />";
-
-            if (!empty($meta)) {
-                $nonce = wp_create_nonce('at_ajax_delete');
-                echo '<div style="margin-bottom: 10px"><strong>' . __('Uploaded files', 'geodirectory') . '</strong></div>';
-                echo '<ol class="at-upload">';
-                foreach ($meta as $att) {
-                    // if (wp_attachment_is_image($att)) continue; // what's image uploader for?
-                    echo "<li>" . wp_get_attachment_link($att, '', false, false, ' ') . " (<a class='at-delete-file' href='#' rel='{$nonce}|{$post->ID}|{$field['id']}|{$att}'>" . __('Remove', 'geodirectory') . "</a>)</li>";
-                }
-                echo '</ol>';
-            }
-
-            // show form upload
-
-            echo "<div class='at-file-upload-label'>";
-            echo "<strong>" . __('Upload new files', 'geodirectory') . "</strong>";
-            echo "</div>";
-            echo "<div class='new-files'>";
-            echo "<div class='file-input'>";
-            echo "<input type='file' name='{$field['id']}[]' />";
-            echo "</div><!-- End .file-input -->";
-            echo "<a class='at-add-file button' href='#'>" . __('Add more files', 'geodirectory') . "</a>";
-            echo "</div><!-- End .new-files -->";
-            echo "</td>";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Image Field.
-         *
-         * @param array $field
-         * @param array $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_image($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            $html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_" . $field['id'], false, false);
-            if (is_array($meta)) {
-                if (isset($meta[0]) && is_array($meta[0]))
-                    $meta = $meta[0];
-            }
-
-            $uploads = wp_upload_dir();
-            if (is_array($meta) && isset($meta['src']) && $meta['src'] != '') {
-
-                $file_info = pathinfo($meta['src']);
-
-                //print_r($meta);
-                //print_r($uploads);
-                //print_r($file_info);
-
-                if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
-                    $sub_dir = $file_info['dirname'];
-
-                $uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs	
-                $uploads_baseurl = $uploads['baseurl'];
-                $uploads_path = $uploads['path'];
-
-                $file_name = $file_info['basename'];
-
-                $sub_dir = str_replace($uploads_baseurl, '', $sub_dir);
-
-                $uploads_url = $uploads_baseurl . $sub_dir;
-
-                $meta['src'] = $uploads_url . '/' . $file_name;
-
-
-                $html .= "<span class='mupload_img_holder'><img src='" . $meta['src'] . "' style='max-height: 150px;max-width: 150px;' /></span>";
-                $html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='" . $meta['id'] . "' />";
-                $html .= "<input type='hidden' class='" . $field['id'] . "[src]' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='" . $meta['src'] . "' />";
-                $html .= "<input class='at-delete_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Remove Image', 'geodirectory') . "' />";
-            } else {
-                $html .= "<span class='mupload_img_holder'></span>";
-                $html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='' />";
-                $html .= "<input class='" . $field['id'] . "[src]' style='position:absolute;left:-500px;width:50px;' type='text' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='' />";
-                $html .= "<input class='at-upload_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Upload Image', 'geodirectory') . "' />";
-            }
-            echo $html;
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Color Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_color($field, $meta)
-        {
-
-            if (empty($meta))
-                $meta = '#';
-
-            $this->show_field_begin($field, $meta);
-
-            echo "<input class='at-color' type='text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='8' />";
-            //	echo "<a href='#' class='at-color-select button' rel='{$field['id']}'>" . __( 'Select a color' ) . "</a>";
-            echo "<input type='button' class='at-color-select button' rel='{$field['id']}' value='" . __('Select a color', 'geodirectory') . "'/>";
-            echo "<div style='display:none' class='at-color-picker' rel='{$field['id']}'></div>";
-            $this->show_field_end($field, $meta);
-
-        }
-
-        /**
-         * Show Checkbox List Field
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_checkbox_list($field, $meta)
-        {
-
-            if (!is_array($meta))
-                $meta = (array)$meta;
-
-            $this->show_field_begin($field, $meta);
-
-            $html = array();
-
-            foreach ($field['options'] as $key => $value) {
-                $html[] = "<input type='checkbox' class='at-checkbox_list' name='{$field['id']}[]' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> {$value}";
-            }
-
-            echo implode('<br />', $html);
-
-            $this->show_field_end($field, $meta);
-
-        }
-
-        /**
-         * Show Date Field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_date($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            echo "<input type='text' class='at-date' name='{$field['id']}' id='{$field['id']}' rel='{$field['format']}' value='{$meta}' size='30' />";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show time field.
-         *
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_time($field, $meta)
-        {
-            $this->show_field_begin($field, $meta);
-            echo "<input type='text' class='at-time' name='{$field['id']}' id='{$field['id']}' rel='{$field['format']}' value='{$meta}' size='30' />";
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Posts field.
-         * used creating a posts/pages/custom types checkboxlist or a select dropdown
-         *
-         * @global object $post The current post object.
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         */
-        public function show_field_posts($field, $meta)
-        {
-            global $post;
-
-            if (!is_array($meta)) $meta = (array)$meta;
-            $this->show_field_begin($field, $meta);
-            $options = $field['options'];
-            $posts = get_posts($options['args']);
-
-            // checkbox_list
-            if ('checkbox_list' == $options['type']) {
-                foreach ($posts as $p) {
-                    echo "<input type='checkbox' name='{$field['id']}[]' value='$p->ID'" . checked(in_array($p->ID, $meta), true, false) . " /> $p->post_title<br/>";
-                }
-            } // select
-            else {
-                echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
-                foreach ($posts as $p) {
-                    echo "<option value='$p->ID'" . selected(in_array($p->ID, $meta), true, false) . ">$p->post_title</option>";
-                }
-                echo "</select>";
-            }
-
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Show Taxonomy field.
-         * used creating a category/tags/custom taxonomy checkboxlist or a select dropdown
-         *
-         * @global object $post The current post object.
-         * @param string $field
-         * @param string $meta
-         * @since 1.0
-         * @access public
-         *
-         * @uses get_terms()
-         */
-        public function show_field_taxonomy($field, $meta)
-        {
-            global $post;
-
-            if (!is_array($meta)) $meta = (array)$meta;
-            $this->show_field_begin($field, $meta);
-            $options = $field['options'];
-            $terms = get_terms($options['taxonomy'], $options['args']);
-
-            // checkbox_list
-            if ('checkbox_list' == $options['type']) {
-                foreach ($terms as $term) {
-                    echo "<input type='checkbox' name='{$field['id']}[]' value='$term->slug'" . checked(in_array($term->slug, $meta), true, false) . " /> $term->name<br/>";
-                }
-            } // select
-            else {
-                echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
-                foreach ($terms as $term) {
-                    echo "<option value='$term->slug'" . selected(in_array($term->slug, $meta), true, false) . ">$term->name</option>";
-                }
-                echo "</select>";
-            }
-
-            $this->show_field_end($field, $meta);
-        }
-
-        /**
-         * Save Data from Metabox
-         *
-         * @param string $term_id The term ID.
-         * @since 1.0
-         * @access public
-         * @return string
-         */
-        public function save($term_id)
-        {
-
-            $taxnow = '';
-            if (isset($_POST['taxonomy']))
-                $taxnow = $_POST['taxonomy'];
-
-            if (!isset($term_id)                                                        // Check Revision
-                || (!in_array($taxnow, $this->_meta_box['pages']))                            // Check if current taxonomy type is supported.
-                || (!check_admin_referer(basename(__FILE__), 'tax_meta_class_nonce'))        // Check nonce - Security
-                || (!current_user_can('manage_categories'))
-            )                                // Check permission
-            {
-                return $term_id;
-            }
-
-
-            foreach ($this->_fields as $field) {
-
-                $name = $field['id'];
-                $type = $field['type'];
-                $old = $this->get_tax_meta($term_id, $name, !$field['multiple']);
-                $new = (isset($_POST[$name])) ? $_POST[$name] : (($field['multiple']) ? array() : '');
-
-                // Validate meta value
-                if (class_exists('Tax_Meta_Validate') && method_exists('Tax_Meta_Validate', $field['validate_func'])) {
-                    $new = call_user_func(array('Tax_Meta_Validate', $field['validate_func']), $new);
-                }
-
-
-                if ($name == 'ct_cat_icon') {
-
-                    $upload_dir = wp_upload_dir();
-
-                    $image_name_arr = explode('/', $new['src']);
-                    //$old_filename = end($image_name_arr);
-                    //$img_name_arr = explode('.',$old_filename);
-
-                    //$old_filename = $upload_dir['path'].'/'.$old_filename;
-
-                    $new_filename = $upload_dir['path'] . '/' . 'cat_icon_' . $term_id . '.png';
-
-                    /*rename($old_filename, $new_filename);
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Begin Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_begin($field, $meta)
+		{
+			if (isset($field['group'])) {
+				if ($field['group'] == "start") {
+					echo "<td class='at-field'>";
+				}
+			} else {
+				if ($this->_form_type == 'edit') {
+					echo '<th valign="top" scope="row">';
+				} else {
+					if ($field['validate_func']) {
+						echo '<td><div class="form-field form-required">';
+					} else {
+						echo '<td><div class="form-field">';
+					}
+				}
+			}
+			if ($field['name'] != '' || $field['name'] != FALSE) {
+				//echo "<div class='at-label'>";
+				echo "<label for='{$field['id']}'>{$field['name']}</label>";
+				//echo "</div>";
+			}
+			if ($this->_form_type == 'edit') {
+				echo '</th><td>';
+			}
+		}
+
+		/**
+		 * End Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_end($field, $meta = NULL, $group = false)
+		{
+			if (isset($field['group'])) {
+				if ($group == 'end') {
+					if ($field['desc'] != '') {
+						echo "<p class='desc-field'>{$field['desc']}</p></td>";
+					} else {
+						echo "</td>";
+					}
+				} else {
+					if ($field['desc'] != '') {
+						echo "<p class='desc-field'>{$field['desc']}</p><br/>";
+					} else {
+						echo '<br/>';
+					}
+				}
+			} else {
+				if ($field['desc'] != '') {
+					echo "<p class='desc-field'>{$field['desc']}</p>";
+				}
+				if ($this->_form_type == 'edit') {
+					echo '</td>';
+				} else {
+					echo '</td></div>';
+				}
+			}
+		}
+
+		/**
+		 * Show Field Text.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_text($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			echo "<input type='text' class='at-text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='30' />";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Field hidden.
+		 *
+		 * @param string $field
+		 * @param string|mixed $meta
+		 * @since 0.1.3
+		 * @access public
+		 */
+		public function show_field_hidden($field, $meta)
+		{
+			//$this->show_field_begin( $field, $meta );
+			echo "<input type='hidden' class='at-text' name='{$field['id']}' id='{$field['id']}' value='{$meta}'/>";
+			//$this->show_field_end( $field, $meta );
+		}
+
+		/**
+		 * Show Field Paragraph.
+		 *
+		 * @param string $field
+		 * @since 0.1.3
+		 * @access public
+		 */
+		public function show_field_paragraph($field)
+		{
+			//$this->show_field_begin( $field, $meta );
+			echo '<p>' . $field['value'] . '</p>';
+			//$this->show_field_end( $field, $meta );
+		}
+
+		/**
+		 * Show Field Textarea.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_textarea($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			echo "<textarea class='at-textarea large-text' name='{$field['id']}' id='{$field['id']}' cols='60' rows='10'>{$meta}</textarea>";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Field Select.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_select($field, $meta)
+		{
+
+			if (!is_array($meta))
+				$meta = (array)$meta;
+
+			$this->show_field_begin($field, $meta);
+			echo "<select class='at-select' name='{$field['id']}" . ($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'") . ">";
+			foreach ($field['options'] as $key => $value) {
+				echo "<option value='{$key}'" . selected(in_array($key, $meta), true, false) . ">{$value}</option>";
+			}
+			echo "</select>";
+			$this->show_field_end($field, $meta);
+
+		}
+
+		/**
+		 * Show Radio Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_radio($field, $meta)
+		{
+
+			if (!is_array($meta))
+				$meta = (array)$meta;
+
+			$this->show_field_begin($field, $meta);
+			foreach ($field['options'] as $key => $value) {
+				echo "<input type='radio' class='at-radio' name='{$field['id']}' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> <span class='at-radio-label'>{$value}</span>";
+			}
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Checkbox Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_checkbox($field, $meta)
+		{
+
+			$this->show_field_begin($field, $meta);
+			echo "<input type='checkbox' class='rw-checkbox' name='{$field['id']}' id='{$field['id']}'" . checked(!empty($meta), true, false) . " /> {$field['desc']}";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Wysiwig Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_wysiwyg($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			// Add TinyMCE script for WP version < 3.3
+			global $wp_version;
+
+			if (version_compare($wp_version, '3.2.1') < 1) {
+				echo "<textarea class='at-wysiwyg theEditor large-text' name='{$field['id']}' id='{$field['id']}' cols='60' rows='10'>{$meta}</textarea>";
+			} else {
+				// Use new wp_editor() since WP 3.3
+				wp_editor(stripslashes(html_entity_decode($meta)), $field['id'], array('editor_class' => 'at-wysiwyg'));
+			}
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show File Field.
+		 *
+		 * @global object $post The current post object.
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_file($field, $meta)
+		{
+
+			global $post;
+
+			if (!is_array($meta))
+				$meta = (array)$meta;
+
+			$this->show_field_begin($field, $meta);
+			echo "{$field['desc']}<br />";
+
+			if (!empty($meta)) {
+				$nonce = wp_create_nonce('at_ajax_delete');
+				echo '<div style="margin-bottom: 10px"><strong>' . __('Uploaded files', 'geodirectory') . '</strong></div>';
+				echo '<ol class="at-upload">';
+				foreach ($meta as $att) {
+					// if (wp_attachment_is_image($att)) continue; // what's image uploader for?
+					echo "<li>" . wp_get_attachment_link($att, '', false, false, ' ') . " (<a class='at-delete-file' href='#' rel='{$nonce}|{$post->ID}|{$field['id']}|{$att}'>" . __('Remove', 'geodirectory') . "</a>)</li>";
+				}
+				echo '</ol>';
+			}
+
+			// show form upload
+
+			echo "<div class='at-file-upload-label'>";
+			echo "<strong>" . __('Upload new files', 'geodirectory') . "</strong>";
+			echo "</div>";
+			echo "<div class='new-files'>";
+			echo "<div class='file-input'>";
+			echo "<input type='file' name='{$field['id']}[]' />";
+			echo "</div><!-- End .file-input -->";
+			echo "<a class='at-add-file button' href='#'>" . __('Add more files', 'geodirectory') . "</a>";
+			echo "</div><!-- End .new-files -->";
+			echo "</td>";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Image Field.
+		 *
+		 * @param array $field
+		 * @param array $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_image($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			$html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_" . $field['id'], false, false);
+			if (is_array($meta)) {
+				if (isset($meta[0]) && is_array($meta[0]))
+					$meta = $meta[0];
+			}
+
+			$uploads = wp_upload_dir();
+			if (is_array($meta) && isset($meta['src']) && $meta['src'] != '') {
+
+				$file_info = pathinfo($meta['src']);
+
+				//print_r($meta);
+				//print_r($uploads);
+				//print_r($file_info);
+
+				if ($file_info['dirname'] != '.' && $file_info['dirname'] != '..')
+					$sub_dir = $file_info['dirname'];
+
+				$uploads = wp_upload_dir(trim($sub_dir, '/')); // Array of key => value pairs	
+				$uploads_baseurl = $uploads['baseurl'];
+				$uploads_path = $uploads['path'];
+
+				$file_name = $file_info['basename'];
+
+				$sub_dir = str_replace($uploads_baseurl, '', $sub_dir);
+
+				$uploads_url = $uploads_baseurl . $sub_dir;
+
+				$meta['src'] = $uploads_url . '/' . $file_name;
+
+
+				$html .= "<span class='mupload_img_holder'><img src='" . $meta['src'] . "' style='max-height: 150px;max-width: 150px;' /></span>";
+				$html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='" . $meta['id'] . "' />";
+				$html .= "<input type='hidden' class='" . $field['id'] . "[src]' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='" . $meta['src'] . "' />";
+				$html .= "<input class='at-delete_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Remove Image', 'geodirectory') . "' />";
+			} else {
+				$html .= "<span class='mupload_img_holder'></span>";
+				$html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='' />";
+				$html .= "<input class='" . $field['id'] . "[src]' style='position:absolute;left:-500px;width:50px;' type='text' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='' />";
+				$html .= "<input class='at-upload_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Upload Image', 'geodirectory') . "' />";
+			}
+			echo $html;
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Color Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_color($field, $meta)
+		{
+
+			if (empty($meta))
+				$meta = '#';
+
+			$this->show_field_begin($field, $meta);
+
+			echo "<input class='at-color' type='text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='8' />";
+			//	echo "<a href='#' class='at-color-select button' rel='{$field['id']}'>" . __( 'Select a color' ) . "</a>";
+			echo "<input type='button' class='at-color-select button' rel='{$field['id']}' value='" . __('Select a color', 'geodirectory') . "'/>";
+			echo "<div style='display:none' class='at-color-picker' rel='{$field['id']}'></div>";
+			$this->show_field_end($field, $meta);
+
+		}
+
+		/**
+		 * Show Checkbox List Field
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_checkbox_list($field, $meta)
+		{
+
+			if (!is_array($meta))
+				$meta = (array)$meta;
+
+			$this->show_field_begin($field, $meta);
+
+			$html = array();
+
+			foreach ($field['options'] as $key => $value) {
+				$html[] = "<input type='checkbox' class='at-checkbox_list' name='{$field['id']}[]' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> {$value}";
+			}
+
+			echo implode('<br />', $html);
+
+			$this->show_field_end($field, $meta);
+
+		}
+
+		/**
+		 * Show Date Field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_date($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			echo "<input type='text' class='at-date' name='{$field['id']}' id='{$field['id']}' rel='{$field['format']}' value='{$meta}' size='30' />";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show time field.
+		 *
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_time($field, $meta)
+		{
+			$this->show_field_begin($field, $meta);
+			echo "<input type='text' class='at-time' name='{$field['id']}' id='{$field['id']}' rel='{$field['format']}' value='{$meta}' size='30' />";
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Posts field.
+		 * used creating a posts/pages/custom types checkboxlist or a select dropdown
+		 *
+		 * @global object $post The current post object.
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 */
+		public function show_field_posts($field, $meta)
+		{
+			global $post;
+
+			if (!is_array($meta)) $meta = (array)$meta;
+			$this->show_field_begin($field, $meta);
+			$options = $field['options'];
+			$posts = get_posts($options['args']);
+
+			// checkbox_list
+			if ('checkbox_list' == $options['type']) {
+				foreach ($posts as $p) {
+					echo "<input type='checkbox' name='{$field['id']}[]' value='$p->ID'" . checked(in_array($p->ID, $meta), true, false) . " /> $p->post_title<br/>";
+				}
+			} // select
+			else {
+				echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
+				foreach ($posts as $p) {
+					echo "<option value='$p->ID'" . selected(in_array($p->ID, $meta), true, false) . ">$p->post_title</option>";
+				}
+				echo "</select>";
+			}
+
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Show Taxonomy field.
+		 * used creating a category/tags/custom taxonomy checkboxlist or a select dropdown
+		 *
+		 * @global object $post The current post object.
+		 * @param string $field
+		 * @param string $meta
+		 * @since 1.0
+		 * @access public
+		 *
+		 * @uses get_terms()
+		 */
+		public function show_field_taxonomy($field, $meta)
+		{
+			global $post;
+
+			if (!is_array($meta)) $meta = (array)$meta;
+			$this->show_field_begin($field, $meta);
+			$options = $field['options'];
+			$terms = get_terms($options['taxonomy'], $options['args']);
+
+			// checkbox_list
+			if ('checkbox_list' == $options['type']) {
+				foreach ($terms as $term) {
+					echo "<input type='checkbox' name='{$field['id']}[]' value='$term->slug'" . checked(in_array($term->slug, $meta), true, false) . " /> $term->name<br/>";
+				}
+			} // select
+			else {
+				echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
+				foreach ($terms as $term) {
+					echo "<option value='$term->slug'" . selected(in_array($term->slug, $meta), true, false) . ">$term->name</option>";
+				}
+				echo "</select>";
+			}
+
+			$this->show_field_end($field, $meta);
+		}
+
+		/**
+		 * Save Data from Metabox
+		 *
+		 * @param string $term_id The term ID.
+		 * @since 1.0
+		 * @access public
+		 * @return string
+		 */
+		public function save($term_id)
+		{
+
+			$taxnow = '';
+			if (isset($_POST['taxonomy']))
+				$taxnow = $_POST['taxonomy'];
+
+			if (!isset($term_id)                                                        // Check Revision
+				|| (!in_array($taxnow, $this->_meta_box['pages']))                            // Check if current taxonomy type is supported.
+				|| (!check_admin_referer(basename(__FILE__), 'tax_meta_class_nonce'))        // Check nonce - Security
+				|| (!current_user_can('manage_categories'))
+			)                                // Check permission
+			{
+				return $term_id;
+			}
+
+
+			foreach ($this->_fields as $field) {
+
+				$name = $field['id'];
+				$type = $field['type'];
+				$old = $this->get_tax_meta($term_id, $name, !$field['multiple']);
+				$new = (isset($_POST[$name])) ? $_POST[$name] : (($field['multiple']) ? array() : '');
+
+				// Validate meta value
+				if (class_exists('Tax_Meta_Validate') && method_exists('Tax_Meta_Validate', $field['validate_func'])) {
+					$new = call_user_func(array('Tax_Meta_Validate', $field['validate_func']), $new);
+				}
+
+
+				if ($name == 'ct_cat_icon') {
+
+					$upload_dir = wp_upload_dir();
+
+					$image_name_arr = explode('/', $new['src']);
+					//$old_filename = end($image_name_arr);
+					//$img_name_arr = explode('.',$old_filename);
+
+					//$old_filename = $upload_dir['path'].'/'.$old_filename;
+
+					$new_filename = $upload_dir['path'] . '/' . 'cat_icon_' . $term_id . '.png';
+
+					/*rename($old_filename, $new_filename);
 				
 				//subdir
 				$new['src'] = $upload_dir['url'].'/'.'cat_icon_'.$term_id.'.png';
@@ -1191,7 +1191,7 @@ 
 				update_attached_file( $new['id'], $new['src'] );*/
 
 
-                    /*	
+					/*	
 		
 		$new['src'] = $upload_dir['url'].'/'.'cat_icon_'.$term_id.'.png';
 		
@@ -1216,67 +1216,67 @@ 
 		$attach_id = wp_insert_attachment( $attachment, $filename);*/
 
 
-                }
-
-
-                //skip on Paragraph field
-                if ($type != "paragraph") {
-
-                    // Call defined method to save meta value, if there's no methods, call common one.
-                    $save_func = 'save_field_' . $type;
-                    if (method_exists($this, $save_func)) {
-                        call_user_func(array(&$this, 'save_field_' . $type), $term_id, $field, $old, $new);
-                    } else {
-                        $this->save_field($term_id, $field, $old, $new);
-                    }
-                }
-
-            } // End foreach
-
-        }
-
-        /**
-         * Common function for saving fields.
-         *
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string $old
-         * @param string|mixed $new
-         * @since 1.0
-         * @access public
-         */
-        public function save_field($term_id, $field, $old, $new)
-        {
-            $name = $field['id'];
-            $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array())
-                return;
-
-            $this->update_tax_meta($term_id, $name, $new);
-        }
-
-        /**
-         * function for saving image field.
-         *
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string $old
-         * @param string|mixed $new
-         * @since 1.0
-         * @access public
-         */
-        public function save_field_image($term_id, $field, $old, $new)
-        {
-            $name = $field['id'];
-
-            $this->delete_tax_meta($term_id, $name);
-            if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '')
-                return;
-
-            $this->update_tax_meta($term_id, $name, $new);
-        }
-
-        /*
+				}
+
+
+				//skip on Paragraph field
+				if ($type != "paragraph") {
+
+					// Call defined method to save meta value, if there's no methods, call common one.
+					$save_func = 'save_field_' . $type;
+					if (method_exists($this, $save_func)) {
+						call_user_func(array(&$this, 'save_field_' . $type), $term_id, $field, $old, $new);
+					} else {
+						$this->save_field($term_id, $field, $old, $new);
+					}
+				}
+
+			} // End foreach
+
+		}
+
+		/**
+		 * Common function for saving fields.
+		 *
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string $old
+		 * @param string|mixed $new
+		 * @since 1.0
+		 * @access public
+		 */
+		public function save_field($term_id, $field, $old, $new)
+		{
+			$name = $field['id'];
+			$this->delete_tax_meta($term_id, $name);
+			if ($new === '' || $new === array())
+				return;
+
+			$this->update_tax_meta($term_id, $name, $new);
+		}
+
+		/**
+		 * function for saving image field.
+		 *
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string $old
+		 * @param string|mixed $new
+		 * @since 1.0
+		 * @access public
+		 */
+		public function save_field_image($term_id, $field, $old, $new)
+		{
+			$name = $field['id'];
+
+			$this->delete_tax_meta($term_id, $name);
+			if ($new === '' || $new === array() || $new['id'] == '' || $new['src'] == '')
+				return;
+
+			$this->update_tax_meta($term_id, $name, $new);
+		}
+
+		/*
 	 * Save Wysiwyg Field.
 	 *
 	 * @param string $term_id The term ID. 
@@ -1286,806 +1286,806 @@ 
 	 * @since 1.0
 	 * @access public 
 	 */
-        public function save_field_wysiwyg($term_id, $field, $old, $new)
-        {
-            $this->save_field($term_id, $field, $old, $new);
-        }
-
-        /**
-         * Save repeater Fields.
-         *
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string|mixed $old
-         * @param string|mixed $new
-         * @since 1.0
-         * @access public
-         */
-        public function save_field_repeater($term_id, $field, $old, $new)
-        {
-            if (is_array($new) && count($new) > 0) {
-                foreach ($new as $n) {
-                    foreach ($field['fields'] as $f) {
-                        $type = $f['type'];
-                        switch ($type) {
-                            case 'wysiwyg':
-                                $n[$f['id']] = wpautop($n[$f['id']]);
-                                break;
-                            case 'file':
-                                $n[$f['id']] = $this->save_field_file_repeater($term_id, $f, '', $n[$f['id']]);
-                                break;
-                            default:
-                                break;
-                        }
-                    }
-                    if (!$this->is_array_empty($n))
-                        $temp[] = $n;
-                }
-                if (isset($temp) && count($temp) > 0 && !$this->is_array_empty($temp)) {
-                    $this->update_tax_meta($term_id, $field['id'], $temp);
-                } else {
-                    //	remove old meta if exists
-                    delete_post_meta($term_id, $field['id']);
-                }
-            } else {
-                //	remove old meta if exists
-                delete_post_meta($term_id, $field['id']);
-            }
-        }
-
-        /**
-         * Save File Field.
-         *
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string $old
-         * @param string $new
-         * @since 1.0
-         * @access public
-         */
-        public function save_field_file($term_id, $field, $old, $new)
-        {
-
-            $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
-            $this->fix_file_array($_FILES[$name]);
-            foreach ($_FILES[$name] as $position => $fileitem) {
-
-                $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
-                $filename = $file['file'];
-
-                $attachment = array(
-                    'post_mime_type' => $file['type'],
-                    'guid' => $file['url'],
-                    'post_parent' => $term_id,
-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
-                    'post_content' => ''
-                );
-
-                $id = wp_insert_attachment($attachment, $filename, $term_id);
-
-                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
-
-                } // End if
-
-            } // End foreach
-
-        }
-
-        /**
-         * Save repeater File Field.
-         * @param string $term_id The term ID.
-         * @param string $field
-         * @param string $old
-         * @param string $new
-         * @since 1.0
-         * @access public
-         * @return int|void
-         */
-        public function save_field_file_repeater($term_id, $field, $old, $new)
-        {
-
-            $name = $field['id'];
-            if (empty($_FILES[$name]))
-                return;
-            $this->fix_file_array($_FILES[$name]);
-            foreach ($_FILES[$name] as $position => $fileitem) {
-
-                $file = wp_handle_upload($fileitem, array('test_form' => false));
-                if (empty($file['file']))
-                    continue;
-                $filename = $file['file'];
-
-                $attachment = array(
-                    'post_mime_type' => $file['type'],
-                    'guid' => $file['url'],
-                    'post_parent' => $term_id,
-                    'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
-                    'post_content' => ''
-                );
-
-                $id = wp_insert_attachment($attachment, $filename);
-
-                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
-                } // End if
-            } // End foreach
-        }
-
-        /**
-         * Add missed values for meta box.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function add_missed_values()
-        {
-
-            // Default values for meta box
-            $this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array)$this->_meta_box);
-
-            if(is_array($this->_fields)) {
-                // Default values for fields
-                foreach ($this->_fields as &$field) {
-                    $multiple = in_array($field['type'], array('checkbox_list', 'file', 'image'));
-                    $std = $multiple ? array() : '';
-                    $format = 'date' == $field['type'] ? 'yy-mm-dd' : ('time' == $field['type'] ? 'hh:mm' : '');
-                    $field = array_merge(array('multiple' => $multiple, 'std' => $std, 'desc' => '', 'format' => $format, 'validate_func' => ''), $field);
-                } // End foreach
-            }
-        }
-
-        /**
-         * Check if field with $type exists.
-         *
-         * @param string $type
-         * @since 1.0
-         * @access public
-         */
-        public function has_field($type)
-        {
-            if(is_array($this->_fields)) {
-                foreach ($this->_fields as $field) {
-                    if ($type == $field['type'])
-                        return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * Check if current page is edit page.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function is_edit_page()
-        {
-            global $pagenow;
-            return ($pagenow == 'edit-tags.php' || $pagenow == 'term.php');
-        }
-
-        /**
-         * Fixes the odd indexing of multiple file uploads.
-         *
-         * Goes from the format:
-         * $_FILES['field']['key']['index']
-         * to
-         * The More standard and appropriate:
-         * $_FILES['field']['index']['key']
-         *
-         * @param string $files
-         * @since 1.0
-         * @access public
-         */
-        public function fix_file_array(&$files)
-        {
-
-            $output = array();
-
-            foreach ($files as $key => $list) {
-                foreach ($list as $index => $value) {
-                    $output[$index][$key] = $value;
-                }
-            }
-
-            return $files = $output;
-
-        }
-
-        /**
-         * Get proper JQuery UI version.
-         *
-         * Used in order to not conflict with WP Admin Scripts.
-         *
-         * @since 1.0
-         * @access public
-         */
-        public function get_jqueryui_ver()
-        {
-
-            global $wp_version;
-
-            if (version_compare($wp_version, '3.1', '>=')) {
-                return '1.8.10';
-            }
-
-            return '1.7.3';
-
-        }
-
-        /**
-         *  Add Field to meta box (generic function)
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         */
-        public function addField($id, $args)
-        {
-            $new_field = array('id' => $id, 'std' => '', 'desc' => '', 'style' => '');
-            $new_field = array_merge($new_field, $args);
-            $this->_fields[] = $new_field;
-        }
-
-
-        /**
-         *  Add Text Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addText($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'text', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Text Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Hidden Field to meta box
-         * @author Ohad Raz
-         * @since 0.1.3
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addHidden($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'hidden', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Text Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Paragraph to meta box
-         * @author Ohad Raz
-         * @since 0.1.3
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $value  paragraph html
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addParagraph($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'paragraph', 'id' => $id, 'value' => '', 'style' => '');
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Checkbox Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addCheckbox($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'checkbox', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Checkbox Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add CheckboxList Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $options (array)  array of key => value pairs for select options
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         *
-         * @return : remember to call: $checkbox_list = $this->get_tax_meta(get_the_ID(), 'meta_name', false);
-         *   which means the last param as false to get the values in an array
-         */
-        public function addCheckboxList($id, $options, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'checkbox_list', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Checkbox List Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Textarea Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addTextarea($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'textarea', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Textarea Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Select Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string field id, i.e. the meta key
-         * @param $options (array)  array of key => value pairs for select options
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, (array) optional
-         *    'multiple' => // select multiple values, optional. Default is false.
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addSelect($id, $options, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'select', 'id' => $id, 'std' => array(), 'desc' => '', 'style' => '', 'name' => __('Select Field', 'geodirectory'), 'multiple' => false, 'options' => $options);
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-
-        /**
-         *  Add Radio Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string field id, i.e. the meta key
-         * @param $options (array)  array of key => value pairs for radio options
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addRadio($id, $options, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'radio', 'id' => $id, 'std' => array(), 'desc' => '', 'style' => '', 'name' => __('Radio Field', 'geodirectory'), 'options' => $options);
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Date Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         *    'format' => // date format, default yy-mm-dd. Optional. Default "'d MM, yy'"  See more formats here: http://goo.gl/Wcwxn
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addDate($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'date', 'id' => $id, 'std' => '', 'desc' => '', 'format' => 'yy-mm-dd', 'name' => __('Date Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Time Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string- field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         *    'format' => // time format, default hh:mm. Optional. See more formats here: http://goo.gl/83woX
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addTime($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'time', 'id' => $id, 'std' => '', 'desc' => '', 'format' => 'hh:mm', 'name' => __('Time Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Color Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addColor($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'color', 'id' => $id, 'std' => '', 'desc' => '', 'name' => __('ColorPicker Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Image Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addImage($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'image', 'id' => $id, 'desc' => '', 'style' => '', 'name' => __('Image Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add File Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addFile($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'file', 'id' => $id, 'desc' => '', 'style' => '', 'name' => __('File Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add WYSIWYG Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional Default 'width: 300px; height: 400px'
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addWysiwyg($id, $args, $repeater = false)
-        {
-            $new_field = array('type' => 'wysiwyg', 'id' => $id, 'std' => '', 'desc' => '', 'style' => 'width: 300px; height: 400px', 'name' => __('WYSIWYG Editor Field', 'geodirectory'));
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add Taxonomy Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $options mixed|array options of taxonomy field
-         *    'taxonomy' =>    // taxonomy name can be category,post_tag or any custom taxonomy default is category
-         * 'type' =>  // how to show taxonomy? 'select' (default) or 'checkbox_list'
-         * 'args' =>  // arguments to query taxonomy, see http://goo.gl/uAANN default ('hide_empty' => false)
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addTaxonomy($id, $options, $args, $repeater = false)
-        {
-            $q = array('hide_empty' => 0);
-            $tax = 'category';
-            $type = 'select';
-            $temp = array($tax, $type, $q);
-            $options = array_merge($temp, $options);
-            $new_field = array('type' => 'taxonomy', 'id' => $id, 'desc' => '', 'name' => __('Taxonomy Field', 'geodirectory'), 'options' => $options);
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add posts Field to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $options mixed|array options of taxonomy field
-         *    'post_type' =>    // post type name, 'post' (default) 'page' or any custom post type
-         * 'type' =>  // how to show posts? 'select' (default) or 'checkbox_list'
-         * 'args' =>  // arguments to query posts, see http://goo.gl/is0yK default ('posts_per_page' => -1)
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'validate_func' => // validate function, string optional
-         * @param $repeater bool  is this a field inside a repeatr? true|false(default)
-         */
-        public function addPosts($id, $options, $args, $repeater = false)
-        {
-            $q = array('posts_per_page' => -1);
-            $temp = array('post_type' => 'post', 'type' => 'select', 'args' => $q);
-            $options = array_merge($temp, $options);
-            $new_field = array('type' => 'posts', 'id' => $id, 'desc' => '', 'name' => __('Posts Field', 'geodirectory'), 'options' => $options);
-            $new_field = array_merge($new_field, $args);
-            if (false === $repeater) {
-                $this->_fields[] = $new_field;
-            } else {
-                return $new_field;
-            }
-        }
-
-        /**
-         *  Add repeater Field Block to meta box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $id string  field id, i.e. the meta key
-         * @param $args mixed|array
-         *    'name' => // field name/label string optional
-         *    'desc' => // field description, string optional
-         *    'std' => // default value, string optional
-         *    'style' =>    // custom style for field, string optional
-         *    'validate_func' => // validate function, string optional
-         *    'fields' => //fields to repeater
-         */
-        public function addRepeaterBlock($id, $args)
-        {
-            $new_field = array('type' => 'repeater', 'id' => $id, 'name' => __('Reapeater Field', 'geodirectory'), 'fields' => array(), 'inline' => false);
-            $new_field = array_merge($new_field, $args);
-            $this->_fields[] = $new_field;
-        }
-
-
-        /**
-         * Finish Declaration of Meta Box
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         */
-        public function Finish()
-        {
-            $this->add_missed_values();
-            $this->check_field_upload();
-            $this->check_field_color();
-            $this->check_field_date();
-            $this->check_field_time();
-        }
-
-        /**
-         * Helper function to check for empty arrays
-         * @author Ohad Raz
-         * @since 1.0
-         * @access public
-         * @param $args mixed|array
-         */
-        public function is_array_empty($array)
-        {
-            if (!is_array($array))
-                return true;
-
-            foreach ($array as $a) {
-                if (is_array($a)) {
-                    foreach ($a as $sub_a) {
-                        if (!empty($sub_a) && $sub_a != '')
-                            return false;
-                    }
-                } else {
-                    if (!empty($a) && $a != '')
-                        return false;
-                }
-            }
-            return true;
-        }
-
-
-        //get term meta field
-        public function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
-        {
-
-            if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-                $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-                $post_type = $taxObject->object_type[0];
-            }
-
-            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);
-            if (isset($m[$key])) {
-                return $m[$key];
-            } else {
-                return '';
-            }
-        }
-
-        //delete meta
-        public function delete_tax_meta($term_id, $key, $post_type = '')
-        {
-
-            if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-                $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-                $post_type = $taxObject->object_type[0];
-            }
-
-            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 meta
-        public function update_tax_meta($term_id, $key, $value, $post_type = '')
-        {
-
-            if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-                $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-                $post_type = $taxObject->object_type[0];
-            }
-
-            if($post_type=='post'){$post_type='';}
-            if($post_type){$post_type = $post_type.'_';}
-
-            $m = get_option('tax_meta_' . $post_type  . $term_id);
-
-            $m[$key] = $value;
-            update_option('tax_meta_' . $post_type  . $term_id, $m);
-
-            /**
-             * Called after the tax meta is updated.
-             *
-             * Used to update things after a GD category is saved.
-             *
-             * @since 1.0.0
-             * @param bool $false False.
-             * @param bool $true True.
-             * @param int $term_id The term id being updated.
-             * @param string $post_type The post type of the cat being updated.
-             */
-            do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);
-        }
-
-
-    } // End Class
+		public function save_field_wysiwyg($term_id, $field, $old, $new)
+		{
+			$this->save_field($term_id, $field, $old, $new);
+		}
+
+		/**
+		 * Save repeater Fields.
+		 *
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string|mixed $old
+		 * @param string|mixed $new
+		 * @since 1.0
+		 * @access public
+		 */
+		public function save_field_repeater($term_id, $field, $old, $new)
+		{
+			if (is_array($new) && count($new) > 0) {
+				foreach ($new as $n) {
+					foreach ($field['fields'] as $f) {
+						$type = $f['type'];
+						switch ($type) {
+							case 'wysiwyg':
+								$n[$f['id']] = wpautop($n[$f['id']]);
+								break;
+							case 'file':
+								$n[$f['id']] = $this->save_field_file_repeater($term_id, $f, '', $n[$f['id']]);
+								break;
+							default:
+								break;
+						}
+					}
+					if (!$this->is_array_empty($n))
+						$temp[] = $n;
+				}
+				if (isset($temp) && count($temp) > 0 && !$this->is_array_empty($temp)) {
+					$this->update_tax_meta($term_id, $field['id'], $temp);
+				} else {
+					//	remove old meta if exists
+					delete_post_meta($term_id, $field['id']);
+				}
+			} else {
+				//	remove old meta if exists
+				delete_post_meta($term_id, $field['id']);
+			}
+		}
+
+		/**
+		 * Save File Field.
+		 *
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string $old
+		 * @param string $new
+		 * @since 1.0
+		 * @access public
+		 */
+		public function save_field_file($term_id, $field, $old, $new)
+		{
+
+			$name = $field['id'];
+			if (empty($_FILES[$name]))
+				return;
+			$this->fix_file_array($_FILES[$name]);
+			foreach ($_FILES[$name] as $position => $fileitem) {
+
+				$file = wp_handle_upload($fileitem, array('test_form' => false));
+				if (empty($file['file']))
+					continue;
+				$filename = $file['file'];
+
+				$attachment = array(
+					'post_mime_type' => $file['type'],
+					'guid' => $file['url'],
+					'post_parent' => $term_id,
+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
+					'post_content' => ''
+				);
+
+				$id = wp_insert_attachment($attachment, $filename, $term_id);
+
+				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
+
+				} // End if
+
+			} // End foreach
+
+		}
+
+		/**
+		 * Save repeater File Field.
+		 * @param string $term_id The term ID.
+		 * @param string $field
+		 * @param string $old
+		 * @param string $new
+		 * @since 1.0
+		 * @access public
+		 * @return int|void
+		 */
+		public function save_field_file_repeater($term_id, $field, $old, $new)
+		{
+
+			$name = $field['id'];
+			if (empty($_FILES[$name]))
+				return;
+			$this->fix_file_array($_FILES[$name]);
+			foreach ($_FILES[$name] as $position => $fileitem) {
+
+				$file = wp_handle_upload($fileitem, array('test_form' => false));
+				if (empty($file['file']))
+					continue;
+				$filename = $file['file'];
+
+				$attachment = array(
+					'post_mime_type' => $file['type'],
+					'guid' => $file['url'],
+					'post_parent' => $term_id,
+					'post_title' => preg_replace('/\.[^.]+$/', '', basename($filename)),
+					'post_content' => ''
+				);
+
+				$id = wp_insert_attachment($attachment, $filename);
+
+				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
+				} // End if
+			} // End foreach
+		}
+
+		/**
+		 * Add missed values for meta box.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function add_missed_values()
+		{
+
+			// Default values for meta box
+			$this->_meta_box = array_merge(array('context' => 'normal', 'priority' => 'high', 'pages' => array('post')), (array)$this->_meta_box);
+
+			if(is_array($this->_fields)) {
+				// Default values for fields
+				foreach ($this->_fields as &$field) {
+					$multiple = in_array($field['type'], array('checkbox_list', 'file', 'image'));
+					$std = $multiple ? array() : '';
+					$format = 'date' == $field['type'] ? 'yy-mm-dd' : ('time' == $field['type'] ? 'hh:mm' : '');
+					$field = array_merge(array('multiple' => $multiple, 'std' => $std, 'desc' => '', 'format' => $format, 'validate_func' => ''), $field);
+				} // End foreach
+			}
+		}
+
+		/**
+		 * Check if field with $type exists.
+		 *
+		 * @param string $type
+		 * @since 1.0
+		 * @access public
+		 */
+		public function has_field($type)
+		{
+			if(is_array($this->_fields)) {
+				foreach ($this->_fields as $field) {
+					if ($type == $field['type'])
+						return true;
+				}
+			}
+			return false;
+		}
+
+		/**
+		 * Check if current page is edit page.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function is_edit_page()
+		{
+			global $pagenow;
+			return ($pagenow == 'edit-tags.php' || $pagenow == 'term.php');
+		}
+
+		/**
+		 * Fixes the odd indexing of multiple file uploads.
+		 *
+		 * Goes from the format:
+		 * $_FILES['field']['key']['index']
+		 * to
+		 * The More standard and appropriate:
+		 * $_FILES['field']['index']['key']
+		 *
+		 * @param string $files
+		 * @since 1.0
+		 * @access public
+		 */
+		public function fix_file_array(&$files)
+		{
+
+			$output = array();
+
+			foreach ($files as $key => $list) {
+				foreach ($list as $index => $value) {
+					$output[$index][$key] = $value;
+				}
+			}
+
+			return $files = $output;
+
+		}
+
+		/**
+		 * Get proper JQuery UI version.
+		 *
+		 * Used in order to not conflict with WP Admin Scripts.
+		 *
+		 * @since 1.0
+		 * @access public
+		 */
+		public function get_jqueryui_ver()
+		{
+
+			global $wp_version;
+
+			if (version_compare($wp_version, '3.1', '>=')) {
+				return '1.8.10';
+			}
+
+			return '1.7.3';
+
+		}
+
+		/**
+		 *  Add Field to meta box (generic function)
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 */
+		public function addField($id, $args)
+		{
+			$new_field = array('id' => $id, 'std' => '', 'desc' => '', 'style' => '');
+			$new_field = array_merge($new_field, $args);
+			$this->_fields[] = $new_field;
+		}
+
+
+		/**
+		 *  Add Text Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addText($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'text', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Text Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Hidden Field to meta box
+		 * @author Ohad Raz
+		 * @since 0.1.3
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addHidden($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'hidden', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Text Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Paragraph to meta box
+		 * @author Ohad Raz
+		 * @since 0.1.3
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $value  paragraph html
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addParagraph($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'paragraph', 'id' => $id, 'value' => '', 'style' => '');
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Checkbox Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addCheckbox($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'checkbox', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Checkbox Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add CheckboxList Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $options (array)  array of key => value pairs for select options
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 *
+		 * @return : remember to call: $checkbox_list = $this->get_tax_meta(get_the_ID(), 'meta_name', false);
+		 *   which means the last param as false to get the values in an array
+		 */
+		public function addCheckboxList($id, $options, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'checkbox_list', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Checkbox List Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Textarea Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addTextarea($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'textarea', 'id' => $id, 'std' => '', 'desc' => '', 'style' => '', 'name' => __('Textarea Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Select Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string field id, i.e. the meta key
+		 * @param $options (array)  array of key => value pairs for select options
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, (array) optional
+		 *    'multiple' => // select multiple values, optional. Default is false.
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addSelect($id, $options, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'select', 'id' => $id, 'std' => array(), 'desc' => '', 'style' => '', 'name' => __('Select Field', 'geodirectory'), 'multiple' => false, 'options' => $options);
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+
+		/**
+		 *  Add Radio Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string field id, i.e. the meta key
+		 * @param $options (array)  array of key => value pairs for radio options
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addRadio($id, $options, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'radio', 'id' => $id, 'std' => array(), 'desc' => '', 'style' => '', 'name' => __('Radio Field', 'geodirectory'), 'options' => $options);
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Date Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 *    'format' => // date format, default yy-mm-dd. Optional. Default "'d MM, yy'"  See more formats here: http://goo.gl/Wcwxn
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addDate($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'date', 'id' => $id, 'std' => '', 'desc' => '', 'format' => 'yy-mm-dd', 'name' => __('Date Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Time Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string- field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 *    'format' => // time format, default hh:mm. Optional. See more formats here: http://goo.gl/83woX
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addTime($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'time', 'id' => $id, 'std' => '', 'desc' => '', 'format' => 'hh:mm', 'name' => __('Time Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Color Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addColor($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'color', 'id' => $id, 'std' => '', 'desc' => '', 'name' => __('ColorPicker Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Image Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addImage($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'image', 'id' => $id, 'desc' => '', 'style' => '', 'name' => __('Image Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add File Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addFile($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'file', 'id' => $id, 'desc' => '', 'style' => '', 'name' => __('File Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add WYSIWYG Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional Default 'width: 300px; height: 400px'
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addWysiwyg($id, $args, $repeater = false)
+		{
+			$new_field = array('type' => 'wysiwyg', 'id' => $id, 'std' => '', 'desc' => '', 'style' => 'width: 300px; height: 400px', 'name' => __('WYSIWYG Editor Field', 'geodirectory'));
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add Taxonomy Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $options mixed|array options of taxonomy field
+		 *    'taxonomy' =>    // taxonomy name can be category,post_tag or any custom taxonomy default is category
+		 * 'type' =>  // how to show taxonomy? 'select' (default) or 'checkbox_list'
+		 * 'args' =>  // arguments to query taxonomy, see http://goo.gl/uAANN default ('hide_empty' => false)
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addTaxonomy($id, $options, $args, $repeater = false)
+		{
+			$q = array('hide_empty' => 0);
+			$tax = 'category';
+			$type = 'select';
+			$temp = array($tax, $type, $q);
+			$options = array_merge($temp, $options);
+			$new_field = array('type' => 'taxonomy', 'id' => $id, 'desc' => '', 'name' => __('Taxonomy Field', 'geodirectory'), 'options' => $options);
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add posts Field to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $options mixed|array options of taxonomy field
+		 *    'post_type' =>    // post type name, 'post' (default) 'page' or any custom post type
+		 * 'type' =>  // how to show posts? 'select' (default) or 'checkbox_list'
+		 * 'args' =>  // arguments to query posts, see http://goo.gl/is0yK default ('posts_per_page' => -1)
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'validate_func' => // validate function, string optional
+		 * @param $repeater bool  is this a field inside a repeatr? true|false(default)
+		 */
+		public function addPosts($id, $options, $args, $repeater = false)
+		{
+			$q = array('posts_per_page' => -1);
+			$temp = array('post_type' => 'post', 'type' => 'select', 'args' => $q);
+			$options = array_merge($temp, $options);
+			$new_field = array('type' => 'posts', 'id' => $id, 'desc' => '', 'name' => __('Posts Field', 'geodirectory'), 'options' => $options);
+			$new_field = array_merge($new_field, $args);
+			if (false === $repeater) {
+				$this->_fields[] = $new_field;
+			} else {
+				return $new_field;
+			}
+		}
+
+		/**
+		 *  Add repeater Field Block to meta box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $id string  field id, i.e. the meta key
+		 * @param $args mixed|array
+		 *    'name' => // field name/label string optional
+		 *    'desc' => // field description, string optional
+		 *    'std' => // default value, string optional
+		 *    'style' =>    // custom style for field, string optional
+		 *    'validate_func' => // validate function, string optional
+		 *    'fields' => //fields to repeater
+		 */
+		public function addRepeaterBlock($id, $args)
+		{
+			$new_field = array('type' => 'repeater', 'id' => $id, 'name' => __('Reapeater Field', 'geodirectory'), 'fields' => array(), 'inline' => false);
+			$new_field = array_merge($new_field, $args);
+			$this->_fields[] = $new_field;
+		}
+
+
+		/**
+		 * Finish Declaration of Meta Box
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 */
+		public function Finish()
+		{
+			$this->add_missed_values();
+			$this->check_field_upload();
+			$this->check_field_color();
+			$this->check_field_date();
+			$this->check_field_time();
+		}
+
+		/**
+		 * Helper function to check for empty arrays
+		 * @author Ohad Raz
+		 * @since 1.0
+		 * @access public
+		 * @param $args mixed|array
+		 */
+		public function is_array_empty($array)
+		{
+			if (!is_array($array))
+				return true;
+
+			foreach ($array as $a) {
+				if (is_array($a)) {
+					foreach ($a as $sub_a) {
+						if (!empty($sub_a) && $sub_a != '')
+							return false;
+					}
+				} else {
+					if (!empty($a) && $a != '')
+						return false;
+				}
+			}
+			return true;
+		}
+
+
+		//get term meta field
+		public function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
+		{
+
+			if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+				$taxObject = get_taxonomy($_REQUEST['taxonomy']);
+				$post_type = $taxObject->object_type[0];
+			}
+
+			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);
+			if (isset($m[$key])) {
+				return $m[$key];
+			} else {
+				return '';
+			}
+		}
+
+		//delete meta
+		public function delete_tax_meta($term_id, $key, $post_type = '')
+		{
+
+			if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+				$taxObject = get_taxonomy($_REQUEST['taxonomy']);
+				$post_type = $taxObject->object_type[0];
+			}
+
+			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 meta
+		public function update_tax_meta($term_id, $key, $value, $post_type = '')
+		{
+
+			if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+				$taxObject = get_taxonomy($_REQUEST['taxonomy']);
+				$post_type = $taxObject->object_type[0];
+			}
+
+			if($post_type=='post'){$post_type='';}
+			if($post_type){$post_type = $post_type.'_';}
+
+			$m = get_option('tax_meta_' . $post_type  . $term_id);
+
+			$m[$key] = $value;
+			update_option('tax_meta_' . $post_type  . $term_id, $m);
+
+			/**
+			 * Called after the tax meta is updated.
+			 *
+			 * Used to update things after a GD category is saved.
+			 *
+			 * @since 1.0.0
+			 * @param bool $false False.
+			 * @param bool $true True.
+			 * @param int $term_id The term id being updated.
+			 * @param string $post_type The post type of the cat being updated.
+			 */
+			do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);
+		}
+
+
+	} // End Class
 
 endif; // End Check Class Exists
 
@@ -2095,67 +2095,67 @@ 
 
 //get term meta field
 if (!function_exists('get_tax_meta')) {
-    function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
-    {
-
-        if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-            $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-            $post_type = $taxObject->object_type[0];
-        }
-
-        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);
-        if (isset($m[$key])) {
-            return $m[$key];
-        } else {
-            return '';
-        }
-    }
+	function get_tax_meta($term_id, $key, $multi = false, $post_type = '')
+	{
+
+		if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+			$taxObject = get_taxonomy($_REQUEST['taxonomy']);
+			$post_type = $taxObject->object_type[0];
+		}
+
+		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);
+		if (isset($m[$key])) {
+			return $m[$key];
+		} else {
+			return '';
+		}
+	}
 }
 
 //delete meta
 if (!function_exists('delete_tax_meta')) {
-    function delete_tax_meta($term_id, $key)
-    {
+	function delete_tax_meta($term_id, $key)
+	{
 
-        $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-        $post_type = $taxObject->object_type[0];
+		$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);
+		$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);
-    }
+		if (isset($m[$key])) {
+			unset($m[$key]);
+		}
+		update_option('tax_meta_' . $post_type  . $term_id, $m);
+	}
 }
 
 //update meta
 if (!function_exists('update_tax_meta')) {
-    function update_tax_meta($term_id, $key, $value, $post_type = '')
-    {
+	function update_tax_meta($term_id, $key, $value, $post_type = '')
+	{
 
-        if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
-            $taxObject = get_taxonomy($_REQUEST['taxonomy']);
-            $post_type = $taxObject->object_type[0];
-        }
+		if (empty($post_type) && isset($_REQUEST['taxonomy'])) {
+			$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);
+		$m = get_option('tax_meta_' . $post_type  . $term_id);
 
-        $m[$key] = $value;
-        update_option('tax_meta_' . $post_type . $term_id, $m);
+		$m[$key] = $value;
+		update_option('tax_meta_' . $post_type . $term_id, $m);
 
-        /** This action is documented in geodirectory-functions/cat-meta-functions/Tax-meta-class.php */
-        do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);
-    }
+		/** This action is documented in geodirectory-functions/cat-meta-functions/Tax-meta-class.php */
+		do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);
+	}
 }
\ No newline at end of file

Spacing +96 added lines, -96 removed lines

@@ -113,7 +113,7 @@ 
             $this->add_missed_values();
             if (isset($meta_box['use_with_theme']))
                 if ($meta_box['use_with_theme'] === true) {
-                    $this->SelfPath = get_stylesheet_directory_uri() . '/library/cat-meta';
+                    $this->SelfPath = get_stylesheet_directory_uri().'/library/cat-meta';
                 } elseif ($meta_box['use_with_theme'] === false) {
                     $this->SelfPath = plugins_url('cat-meta-functions', plugin_basename(dirname(__FILE__)));
                 } else {
@@ -262,7 +262,7 @@ 
                 $li = "<li id='item_{$attachment_id}'>";
                 $li .= "<img src='{$attachment['url']}' alt='image_{$attachment_id}' />";
                 //$li 	.= "<a title='" . __( 'Delete this image' ) . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'>" . __( 'Delete' ) . "</a>";
-                $li .= "<a title='" . __('Remove this image', 'geodirectory') . "' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'><img src='" . $this->SelfPath . "/images/delete-16.png' alt='" . __('Remove', 'geodirectory') . "' /></a>";
+                $li .= "<a title='".__('Remove this image', 'geodirectory')."' class='at-delete-file' href='#' rel='{$nonce}|{$term_id}|{$id}|{$attachment_id}'><img src='".$this->SelfPath."/images/delete-16.png' alt='".__('Remove', 'geodirectory')."' /></a>";
                 $li .= "<input type='hidden' name='{$id}[]' value='{$attachment_id}' />";
                 $li .= "</li>";
                 $html .= $li;
@@ -335,7 +335,7 @@ 
             $attachment_id = isset($_GET['attachment_id']) ? intval($_GET['attachment_id']) : 0;
             $ok = false;
             if (strpos($field_id, '[') === false) {
-                check_admin_referer("at-delete-mupload_" . urldecode($field_id));
+                check_admin_referer("at-delete-mupload_".urldecode($field_id));
                 if ($term_id > 0)
                     $this->delete_tax_meta($term_id, $field_id);
                 //$ok = wp_delete_attachment( $attachment_id );
@@ -423,8 +423,8 @@ 
 
             if ($this->has_field('date') && $this->is_edit_page()) {
                 // Enqueu JQuery UI, use proper version.
-                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css');
-                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'));
+                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/'.$this->get_jqueryui_ver().'/themes/base/jquery-ui.css');
+                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/'.$this->get_jqueryui_ver().'/jquery-ui.min.js', array('jquery'));
             }
 
         }
@@ -441,8 +441,8 @@ 
             if ($this->has_field('time') && $this->is_edit_page()) {
 
                 // Enqueu JQuery UI, use proper version.
-                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/themes/base/jquery-ui.css', array(), false, true);
-                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/' . $this->get_jqueryui_ver() . '/jquery-ui.min.js', array('jquery'), false, true);
+                wp_enqueue_style('tmc-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/'.$this->get_jqueryui_ver().'/themes/base/jquery-ui.css', array(), false, true);
+                wp_enqueue_script('tmc-jquery-ui', 'https://ajax.googleapis.com/ajax/libs/jqueryui/'.$this->get_jqueryui_ver().'/jquery-ui.min.js', array('jquery'), false, true);
                 wp_enqueue_script('at-timepicker', 'https://github.com/trentrichardson/jQuery-Timepicker-Addon/raw/master/jquery-ui-timepicker-addon.js', array('tmc-jquery-ui'), false, true);
 
             }
@@ -462,13 +462,13 @@ 
             if (!empty($this->_meta_box['pages'])) {
                 foreach ($this->_meta_box['pages'] as $page) {
                     //add fields to edit form
-                    add_action($page . '_edit_form_fields', array(&$this, 'show_edit_form'));
+                    add_action($page.'_edit_form_fields', array(&$this, 'show_edit_form'));
                     //add fields to add new form
-                    add_action($page . '_add_form_fields', array(&$this, 'show_new_form'));
+                    add_action($page.'_add_form_fields', array(&$this, 'show_new_form'));
                     // this saves the edit fields
-                    add_action('edited_' . $page, array(&$this, 'save'), 10, 2);
+                    add_action('edited_'.$page, array(&$this, 'save'), 10, 2);
                     // this saves the add fields
-                    add_action('created_' . $page, array(&$this, 'save'), 10, 2);
+                    add_action('created_'.$page, array(&$this, 'save'), 10, 2);
                 }
             }
 
@@ -517,13 +517,13 @@ 
                     $meta = is_array($meta) ? array_map('esc_attr', $meta) : esc_attr($meta);
 
                 if ($field['validate_func']) {
-                    echo '<tr class="form-field form-required ' . $field['style'] . '">';
+                    echo '<tr class="form-field form-required '.$field['style'].'">';
                 } else {
-                    echo '<tr class="form-field ' . $field['style'] . '">';
+                    echo '<tr class="form-field '.$field['style'].'">';
                 }
 
                 // Call Separated methods for displaying each type of field.
-                call_user_func(array(&$this, 'show_field_' . $field['type']), $field, $meta);
+                call_user_func(array(&$this, 'show_field_'.$field['type']), $field, $meta);
                 echo '</tr>';
             }
             echo '</table>';
@@ -550,14 +550,14 @@ 
                 foreach ($meta as $me) {
                     //for labling toggles
                     $mmm = $me[$field['fields'][0]['id']];
-                    echo '<div class="at-repater-block">' . $mmm . '<br/><table class="repeater-table" style="display: none;">';
+                    echo '<div class="at-repater-block">'.$mmm.'<br/><table class="repeater-table" style="display: none;">';
                     if ($field['inline']) {
                         echo '<tr class="at-inline" VALIGN="top">';
                     }
                     foreach ($field['fields'] as $f) {
                         //reset var $id for repeater
                         $id = '';
-                        $id = $field['id'] . '[' . $c . '][' . $f['id'] . ']';
+                        $id = $field['id'].'['.$c.']['.$f['id'].']';
                         $m = $me[$f['id']];
                         $m = ($m !== '') ? $m : $f['std'];
                         if ('image' != $f['type'] && $f['type'] != 'repeater')
@@ -567,7 +567,7 @@ 
                         if (!$field['inline']) {
                             echo '<tr>';
                         }
-                        call_user_func(array(&$this, 'show_field_' . $f['type']), $f, $m);
+                        call_user_func(array(&$this, 'show_field_'.$f['type']), $f, $m);
                         if (!$field['inline']) {
                             echo '</tr>';
                         }
@@ -578,18 +578,18 @@ 
                     echo '</table>
 				<span class="at-re-toggle"><img src="';
                     if ($this->_Local_images) {
-                        echo $plugin_path . '/images/edit.png';
+                        echo $plugin_path.'/images/edit.png';
                     } else {
                         echo 'http://i.imgur.com/ka0E2.png';
                     }
                     echo '" alt="Edit" title="Edit"/></span> 
 				<img src="';
                     if ($this->_Local_images) {
-                        echo $plugin_path . '/images/remove.png';
+                        echo $plugin_path.'/images/remove.png';
                     } else {
                         echo 'http://i.imgur.com/g8Duj.png';
                     }
-                    echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
+                    echo '" alt="'.__('Remove', 'geodirectory').'" title="'.__('Remove', 'geodirectory').'" id="remove-'.$field['id'].'"></div>';
                     $c = $c + 1;
 
                 }
@@ -598,11 +598,11 @@ 
 
             echo '<img src="';
             if ($this->_Local_images) {
-                echo $plugin_path . '/images/add.png';
+                echo $plugin_path.'/images/add.png';
             } else {
                 echo 'http://i.imgur.com/w5Tuc.png';
             }
-            echo '" alt="' . __('Add', 'geodirectory') . '" title="' . __('Add', 'geodirectory') . '" id="add-' . $field['id'] . '"><br/></div>';
+            echo '" alt="'.__('Add', 'geodirectory').'" title="'.__('Add', 'geodirectory').'" id="add-'.$field['id'].'"><br/></div>';
 
             //create all fields once more for js function and catch with object buffer
             ob_start();
@@ -613,12 +613,12 @@ 
             foreach ($field['fields'] as $f) {
                 //reset var $id for repeater
                 $id = '';
-                $id = $field['id'] . '[CurrentCounter][' . $f['id'] . ']';
+                $id = $field['id'].'[CurrentCounter]['.$f['id'].']';
                 $f['id'] = $id;
                 if (!$field['inline']) {
                     echo '<tr>';
                 }
-                call_user_func(array(&$this, 'show_field_' . $f['type']), $f, '');
+                call_user_func(array(&$this, 'show_field_'.$f['type']), $f, '');
                 if (!$field['inline']) {
                     echo '</tr>';
                 }
@@ -628,24 +628,24 @@ 
             }
             echo '</table><img src="';
             if ($this->_Local_images) {
-                echo $plugin_path . '/images/remove.png';
+                echo $plugin_path.'/images/remove.png';
             } else {
                 echo 'http://i.imgur.com/g8Duj.png';
             }
-            echo '" alt="' . __('Remove', 'geodirectory') . '" title="' . __('Remove', 'geodirectory') . '" id="remove-' . $field['id'] . '"></div>';
-            $counter = 'countadd_' . $field['id'];
+            echo '" alt="'.__('Remove', 'geodirectory').'" title="'.__('Remove', 'geodirectory').'" id="remove-'.$field['id'].'"></div>';
+            $counter = 'countadd_'.$field['id'];
             $js_code = ob_get_clean();
             $js_code = str_replace("'", "\"", $js_code);
-            $js_code = str_replace("CurrentCounter", "' + " . $counter . " + '", $js_code);
+            $js_code = str_replace("CurrentCounter", "' + ".$counter." + '", $js_code);
             echo '<script>
 				jQuery(document).ready(function() {
-					var ' . $counter . ' = ' . $c . ';
-					jQuery("#add-' . $field['id'] . '").live(\'click\', function() {
-						' . $counter . ' = ' . $counter . ' + 1;
-						jQuery(this).before(\'' . $js_code . '\');						
+					var ' . $counter.' = '.$c.';
+					jQuery("#add-' . $field['id'].'").live(\'click\', function() {
+						' . $counter.' = '.$counter.' + 1;
+						jQuery(this).before(\'' . $js_code.'\');						
 						update_repeater_fields();
 					});
-        			jQuery("#remove-' . $field['id'] . '").live(\'click\', function() {
+        			jQuery("#remove-' . $field['id'].'").live(\'click\', function() {
             			jQuery(this).parent().remove();
         			});
     			});
@@ -772,7 +772,7 @@ 
         public function show_field_paragraph($field)
         {
             //$this->show_field_begin( $field, $meta );
-            echo '<p>' . $field['value'] . '</p>';
+            echo '<p>'.$field['value'].'</p>';
             //$this->show_field_end( $field, $meta );
         }
 
@@ -803,12 +803,12 @@ 
         {
 
             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'" : "'") . ">";
+            echo "<select class='at-select' name='{$field['id']}".($field['multiple'] ? "[]' id='{$field['id']}' multiple='multiple'" : "'").">";
             foreach ($field['options'] as $key => $value) {
-                echo "<option value='{$key}'" . selected(in_array($key, $meta), true, false) . ">{$value}</option>";
+                echo "<option value='{$key}'".selected(in_array($key, $meta), true, false).">{$value}</option>";
             }
             echo "</select>";
             $this->show_field_end($field, $meta);
@@ -827,11 +827,11 @@ 
         {
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
             foreach ($field['options'] as $key => $value) {
-                echo "<input type='radio' class='at-radio' name='{$field['id']}' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> <span class='at-radio-label'>{$value}</span>";
+                echo "<input type='radio' class='at-radio' name='{$field['id']}' value='{$key}'".checked(in_array($key, $meta), true, false)." /> <span class='at-radio-label'>{$value}</span>";
             }
             $this->show_field_end($field, $meta);
         }
@@ -848,7 +848,7 @@ 
         {
 
             $this->show_field_begin($field, $meta);
-            echo "<input type='checkbox' class='rw-checkbox' name='{$field['id']}' id='{$field['id']}'" . checked(!empty($meta), true, false) . " /> {$field['desc']}";
+            echo "<input type='checkbox' class='rw-checkbox' name='{$field['id']}' id='{$field['id']}'".checked(!empty($meta), true, false)." /> {$field['desc']}";
             $this->show_field_end($field, $meta);
         }
 
@@ -890,18 +890,18 @@ 
             global $post;
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
             echo "{$field['desc']}<br />";
 
             if (!empty($meta)) {
                 $nonce = wp_create_nonce('at_ajax_delete');
-                echo '<div style="margin-bottom: 10px"><strong>' . __('Uploaded files', 'geodirectory') . '</strong></div>';
+                echo '<div style="margin-bottom: 10px"><strong>'.__('Uploaded files', 'geodirectory').'</strong></div>';
                 echo '<ol class="at-upload">';
                 foreach ($meta as $att) {
                     // if (wp_attachment_is_image($att)) continue; // what's image uploader for?
-                    echo "<li>" . wp_get_attachment_link($att, '', false, false, ' ') . " (<a class='at-delete-file' href='#' rel='{$nonce}|{$post->ID}|{$field['id']}|{$att}'>" . __('Remove', 'geodirectory') . "</a>)</li>";
+                    echo "<li>".wp_get_attachment_link($att, '', false, false, ' ')." (<a class='at-delete-file' href='#' rel='{$nonce}|{$post->ID}|{$field['id']}|{$att}'>".__('Remove', 'geodirectory')."</a>)</li>";
                 }
                 echo '</ol>';
             }
@@ -909,13 +909,13 @@ 
             // show form upload
 
             echo "<div class='at-file-upload-label'>";
-            echo "<strong>" . __('Upload new files', 'geodirectory') . "</strong>";
+            echo "<strong>".__('Upload new files', 'geodirectory')."</strong>";
             echo "</div>";
             echo "<div class='new-files'>";
             echo "<div class='file-input'>";
             echo "<input type='file' name='{$field['id']}[]' />";
             echo "</div><!-- End .file-input -->";
-            echo "<a class='at-add-file button' href='#'>" . __('Add more files', 'geodirectory') . "</a>";
+            echo "<a class='at-add-file button' href='#'>".__('Add more files', 'geodirectory')."</a>";
             echo "</div><!-- End .new-files -->";
             echo "</td>";
             $this->show_field_end($field, $meta);
@@ -932,7 +932,7 @@ 
         public function show_field_image($field, $meta)
         {
             $this->show_field_begin($field, $meta);
-            $html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_" . $field['id'], false, false);
+            $html = wp_nonce_field("at-delete-mupload_{$field['id']}", "nonce-delete-mupload_".$field['id'], false, false);
             if (is_array($meta)) {
                 if (isset($meta[0]) && is_array($meta[0]))
                     $meta = $meta[0];
@@ -958,20 +958,20 @@ 
 
                 $sub_dir = str_replace($uploads_baseurl, '', $sub_dir);
 
-                $uploads_url = $uploads_baseurl . $sub_dir;
+                $uploads_url = $uploads_baseurl.$sub_dir;
 
-                $meta['src'] = $uploads_url . '/' . $file_name;
+                $meta['src'] = $uploads_url.'/'.$file_name;
 
 
-                $html .= "<span class='mupload_img_holder'><img src='" . $meta['src'] . "' style='max-height: 150px;max-width: 150px;' /></span>";
-                $html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='" . $meta['id'] . "' />";
-                $html .= "<input type='hidden' class='" . $field['id'] . "[src]' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='" . $meta['src'] . "' />";
-                $html .= "<input class='at-delete_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Remove Image', 'geodirectory') . "' />";
+                $html .= "<span class='mupload_img_holder'><img src='".$meta['src']."' style='max-height: 150px;max-width: 150px;' /></span>";
+                $html .= "<input type='hidden' name='".$field['id']."[id]' id='".$field['id']."[id]' value='".$meta['id']."' />";
+                $html .= "<input type='hidden' class='".$field['id']."[src]' name='".$field['id']."[src]' id='".$field['id']."[src]' value='".$meta['src']."' />";
+                $html .= "<input class='at-delete_image_button' type='button' rel='".$field['id']."' value='".__('Remove Image', 'geodirectory')."' />";
             } else {
                 $html .= "<span class='mupload_img_holder'></span>";
-                $html .= "<input type='hidden' name='" . $field['id'] . "[id]' id='" . $field['id'] . "[id]' value='' />";
-                $html .= "<input class='" . $field['id'] . "[src]' style='position:absolute;left:-500px;width:50px;' type='text' name='" . $field['id'] . "[src]' id='" . $field['id'] . "[src]' value='' />";
-                $html .= "<input class='at-upload_image_button' type='button' rel='" . $field['id'] . "' value='" . __('Upload Image', 'geodirectory') . "' />";
+                $html .= "<input type='hidden' name='".$field['id']."[id]' id='".$field['id']."[id]' value='' />";
+                $html .= "<input class='".$field['id']."[src]' style='position:absolute;left:-500px;width:50px;' type='text' name='".$field['id']."[src]' id='".$field['id']."[src]' value='' />";
+                $html .= "<input class='at-upload_image_button' type='button' rel='".$field['id']."' value='".__('Upload Image', 'geodirectory')."' />";
             }
             echo $html;
             $this->show_field_end($field, $meta);
@@ -995,7 +995,7 @@ 
 
             echo "<input class='at-color' type='text' name='{$field['id']}' id='{$field['id']}' value='{$meta}' size='8' />";
             //	echo "<a href='#' class='at-color-select button' rel='{$field['id']}'>" . __( 'Select a color' ) . "</a>";
-            echo "<input type='button' class='at-color-select button' rel='{$field['id']}' value='" . __('Select a color', 'geodirectory') . "'/>";
+            echo "<input type='button' class='at-color-select button' rel='{$field['id']}' value='".__('Select a color', 'geodirectory')."'/>";
             echo "<div style='display:none' class='at-color-picker' rel='{$field['id']}'></div>";
             $this->show_field_end($field, $meta);
 
@@ -1013,14 +1013,14 @@ 
         {
 
             if (!is_array($meta))
-                $meta = (array)$meta;
+                $meta = (array) $meta;
 
             $this->show_field_begin($field, $meta);
 
             $html = array();
 
             foreach ($field['options'] as $key => $value) {
-                $html[] = "<input type='checkbox' class='at-checkbox_list' name='{$field['id']}[]' value='{$key}'" . checked(in_array($key, $meta), true, false) . " /> {$value}";
+                $html[] = "<input type='checkbox' class='at-checkbox_list' name='{$field['id']}[]' value='{$key}'".checked(in_array($key, $meta), true, false)." /> {$value}";
             }
 
             echo implode('<br />', $html);
@@ -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']);
@@ -1081,13 +1081,13 @@ 
             // checkbox_list
             if ('checkbox_list' == $options['type']) {
                 foreach ($posts as $p) {
-                    echo "<input type='checkbox' name='{$field['id']}[]' value='$p->ID'" . checked(in_array($p->ID, $meta), true, false) . " /> $p->post_title<br/>";
+                    echo "<input type='checkbox' name='{$field['id']}[]' value='$p->ID'".checked(in_array($p->ID, $meta), true, false)." /> $p->post_title<br/>";
                 }
             } // select
             else {
-                echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
+                echo "<select name='{$field['id']}".($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'").">";
                 foreach ($posts as $p) {
-                    echo "<option value='$p->ID'" . selected(in_array($p->ID, $meta), true, false) . ">$p->post_title</option>";
+                    echo "<option value='$p->ID'".selected(in_array($p->ID, $meta), true, false).">$p->post_title</option>";
                 }
                 echo "</select>";
             }
@@ -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']);
@@ -1119,13 +1119,13 @@ 
             // checkbox_list
             if ('checkbox_list' == $options['type']) {
                 foreach ($terms as $term) {
-                    echo "<input type='checkbox' name='{$field['id']}[]' value='$term->slug'" . checked(in_array($term->slug, $meta), true, false) . " /> $term->name<br/>";
+                    echo "<input type='checkbox' name='{$field['id']}[]' value='$term->slug'".checked(in_array($term->slug, $meta), true, false)." /> $term->name<br/>";
                 }
             } // select
             else {
-                echo "<select name='{$field['id']}" . ($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'") . ">";
+                echo "<select name='{$field['id']}".($field['multiple'] ? "[]' multiple='multiple' style='height:auto'" : "'").">";
                 foreach ($terms as $term) {
-                    echo "<option value='$term->slug'" . selected(in_array($term->slug, $meta), true, false) . ">$term->name</option>";
+                    echo "<option value='$term->slug'".selected(in_array($term->slug, $meta), true, false).">$term->name</option>";
                 }
                 echo "</select>";
             }
@@ -1181,7 +1181,7 @@ 
 
                     //$old_filename = $upload_dir['path'].'/'.$old_filename;
 
-                    $new_filename = $upload_dir['path'] . '/' . 'cat_icon_' . $term_id . '.png';
+                    $new_filename = $upload_dir['path'].'/'.'cat_icon_'.$term_id.'.png';
 
                     /*rename($old_filename, $new_filename);
 				
@@ -1223,9 +1223,9 @@ 
                 if ($type != "paragraph") {
 
                     // Call defined method to save meta value, if there's no methods, call common one.
-                    $save_func = 'save_field_' . $type;
+                    $save_func = 'save_field_'.$type;
                     if (method_exists($this, $save_func)) {
-                        call_user_func(array(&$this, 'save_field_' . $type), $term_id, $field, $old, $new);
+                        call_user_func(array(&$this, 'save_field_'.$type), $term_id, $field, $old, $new);
                     } else {
                         $this->save_field($term_id, $field, $old, $new);
                     }
@@ -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);
+        $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,13 +2147,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);
 
         /** This action is documented in geodirectory-functions/cat-meta-functions/Tax-meta-class.php */
         do_action('gd_tax_meta_updated', false, true, $term_id, $post_type);

geodirectory-functions/compatibility/X.php

Doc Comments +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
  * @since 1.0.0
  * @package GeoDirectory
  * @param array $classes Class array.
- * @return array Modified class array.
+ * @return string[] Modified class array.
  */
 function geodir_x_body_class($classes)
 {

Indentation +211 added lines, -211 removed lines

@@ -19,60 +19,60 @@ 
 function geodir_x_action_calls()
 {
 
-    /* ACTIONS
+	/* ACTIONS
     ****************************************************************************************/
 
-    // Add body class for styling purposes
-    add_filter('body_class', 'geodir_x_body_class');
+	// Add body class for styling purposes
+	add_filter('body_class', 'geodir_x_body_class');
 
-    // HOME TOP SIDEBAR
-    //remove_action( 'geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10 );
-    //remove_action( 'geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10 );
-    //add_action( 'geodir_wrapper_open', 'geodir_x_home_sidebar', 5 );
-    add_action('geodir_before_search_form', 'geodir_x_search_container_open');
-    add_action('geodir_after_search_form', 'geodir_x_search_container_close');
+	// HOME TOP SIDEBAR
+	//remove_action( 'geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10 );
+	//remove_action( 'geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10 );
+	//add_action( 'geodir_wrapper_open', 'geodir_x_home_sidebar', 5 );
+	add_action('geodir_before_search_form', 'geodir_x_search_container_open');
+	add_action('geodir_after_search_form', 'geodir_x_search_container_close');
 
-    // WRAPPER OPEN ACTIONS
-    remove_action('geodir_wrapper_open', 'geodir_action_wrapper_open', 10);
-    add_action('geodir_wrapper_open', 'geodir_x_action_wrapper_open', 9);
+	// WRAPPER OPEN ACTIONS
+	remove_action('geodir_wrapper_open', 'geodir_action_wrapper_open', 10);
+	add_action('geodir_wrapper_open', 'geodir_x_action_wrapper_open', 9);
 
-    // WRAPPER CLOSE ACTIONS
-    remove_action('geodir_wrapper_close', 'geodir_action_wrapper_close', 10);
-    add_action('geodir_wrapper_close', 'geodir_x_action_wrapper_close', 11);
+	// WRAPPER CLOSE ACTIONS
+	remove_action('geodir_wrapper_close', 'geodir_action_wrapper_close', 10);
+	add_action('geodir_wrapper_close', 'geodir_x_action_wrapper_close', 11);
 
-    // WRAPPER CONTENT OPEN ACTIONS
-    remove_action('geodir_wrapper_content_open', 'geodir_action_wrapper_content_open', 10);
-    add_action('geodir_wrapper_content_open', 'geodir_x_action_wrapper_content_open', 9, 3);
+	// WRAPPER CONTENT OPEN ACTIONS
+	remove_action('geodir_wrapper_content_open', 'geodir_action_wrapper_content_open', 10);
+	add_action('geodir_wrapper_content_open', 'geodir_x_action_wrapper_content_open', 9, 3);
 
-    // WRAPPER CONTENT CLOSE ACTIONS
-    remove_action('geodir_wrapper_content_close', 'geodir_action_wrapper_content_close', 10);
-    add_action('geodir_wrapper_content_close', 'geodir_x_action_wrapper_content_close', 11);
+	// WRAPPER CONTENT CLOSE ACTIONS
+	remove_action('geodir_wrapper_content_close', 'geodir_action_wrapper_content_close', 10);
+	add_action('geodir_wrapper_content_close', 'geodir_x_action_wrapper_content_close', 11);
 
-    // SIDEBAR RIGHT OPEN ACTIONS
-    remove_action('geodir_sidebar_right_open', 'geodir_action_sidebar_right_open', 10);
-    add_action('geodir_sidebar_right_open', 'geodir_x_action_sidebar_right_open', 10, 4);
+	// SIDEBAR RIGHT OPEN ACTIONS
+	remove_action('geodir_sidebar_right_open', 'geodir_action_sidebar_right_open', 10);
+	add_action('geodir_sidebar_right_open', 'geodir_x_action_sidebar_right_open', 10, 4);
 
-    // SIDEBAR RIGHT CLOSE ACTIONS
-    remove_action('geodir_sidebar_right_close', 'geodir_action_sidebar_right_close', 10);
-    add_action('geodir_sidebar_right_close', 'geodir_x_action_sidebar_right_close', 10, 1);
+	// SIDEBAR RIGHT CLOSE ACTIONS
+	remove_action('geodir_sidebar_right_close', 'geodir_action_sidebar_right_close', 10);
+	add_action('geodir_sidebar_right_close', 'geodir_x_action_sidebar_right_close', 10, 1);
 
-    // REMOVE BREADCRUMBS
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
+	// REMOVE BREADCRUMBS
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_home_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_location_before_main_content', 'geodir_breadcrumb', 20);
 
-    // make top section wide
-    remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
-    remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
-    remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
-    remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
-    remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
+	// make top section wide
+	remove_action('geodir_home_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_location_before_main_content', 'geodir_action_geodir_sidebar_home_top', 10);
+	remove_action('geodir_author_before_main_content', 'geodir_action_geodir_sidebar_author_top', 10);
+	remove_action('geodir_search_before_main_content', 'geodir_action_geodir_sidebar_search_top', 10);
+	remove_action('geodir_detail_before_main_content', 'geodir_action_geodir_sidebar_detail_top', 10);
+	remove_action('geodir_listings_before_main_content', 'geodir_action_geodir_sidebar_listings_top', 10);
 
-    add_action('geodir_wrapper_open', 'gd_X_compat_add_top_section_back', 5);
+	add_action('geodir_wrapper_open', 'gd_X_compat_add_top_section_back', 5);
 
 
 } // Close geodir_x_action_calls
@@ -89,17 +89,17 @@ 
 function gd_X_compat_add_top_section_back()
 {
 
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        geodir_action_geodir_sidebar_home_top();
-    } elseif (geodir_is_page('listing')) {
-        geodir_action_geodir_sidebar_listings_top();
-    } elseif (geodir_is_page('detail')) {
-        geodir_action_geodir_sidebar_detail_top();
-    } elseif (geodir_is_page('search')) {
-        geodir_action_geodir_sidebar_search_top();
-    } elseif (geodir_is_page('author')) {
-        geodir_action_geodir_sidebar_author_top();
-    }
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		geodir_action_geodir_sidebar_home_top();
+	} elseif (geodir_is_page('listing')) {
+		geodir_action_geodir_sidebar_listings_top();
+	} elseif (geodir_is_page('detail')) {
+		geodir_action_geodir_sidebar_detail_top();
+	} elseif (geodir_is_page('search')) {
+		geodir_action_geodir_sidebar_search_top();
+	} elseif (geodir_is_page('author')) {
+		geodir_action_geodir_sidebar_author_top();
+	}
 
 
 }
@@ -117,8 +117,8 @@ 
  */
 function geodir_x_body_class($classes)
 {
-    $classes[] = 'geodir-x';
-    return $classes;
+	$classes[] = 'geodir-x';
+	return $classes;
 }
 
 /**
@@ -130,14 +130,14 @@ 
  */
 function geodir_x_home_sidebar()
 {
-    //if ( geodir_is_geodir_page() ) {
-    global $wp;
-    if ($wp->query_vars['page_id'] == geodir_location_page_id() || is_home() && !geodir_is_page('login')) {
-        echo '<div class="x-main full">';
-        dynamic_sidebar('geodir_home_top');
-        echo '</div>';
-    }
-    //}
+	//if ( geodir_is_geodir_page() ) {
+	global $wp;
+	if ($wp->query_vars['page_id'] == geodir_location_page_id() || is_home() && !geodir_is_page('login')) {
+		echo '<div class="x-main full">';
+		dynamic_sidebar('geodir_home_top');
+		echo '</div>';
+	}
+	//}
 }
 
 /**
@@ -148,7 +148,7 @@ 
  */
 function geodir_x_search_container_open()
 {
-    echo '<div class="x-container-fluid x-container max">';
+	echo '<div class="x-container-fluid x-container max">';
 }
 
 /**
@@ -159,7 +159,7 @@ 
  */
 function geodir_x_search_container_close()
 {
-    echo '</div>';
+	echo '</div>';
 }
 
 /**
@@ -170,16 +170,16 @@ 
  */
 function geodir_x_action_wrapper_open()
 {
-    global $stack;
-    if ($stack == 'integrity') {
-        echo '<div class="x-container-fluid x-container max width offset">';
-    } elseif ($stack == 'renew') {
-        echo '<div class="x-container-fluid x-container max width offset cf">';
-    } elseif ($stack == 'icon') {
-        echo '<div class="x-main full" role="main">';
-    } elseif ($stack == 'ethos') {
-        echo '<div class="x-container-fluid x-container max width main"><div class="offset cf">';
-    }
+	global $stack;
+	if ($stack == 'integrity') {
+		echo '<div class="x-container-fluid x-container max width offset">';
+	} elseif ($stack == 'renew') {
+		echo '<div class="x-container-fluid x-container max width offset cf">';
+	} elseif ($stack == 'icon') {
+		echo '<div class="x-main full" role="main">';
+	} elseif ($stack == 'ethos') {
+		echo '<div class="x-container-fluid x-container max width main"><div class="offset cf">';
+	}
 }
 
 /**
@@ -190,12 +190,12 @@ 
  */
 function geodir_x_action_wrapper_close()
 {
-    global $stack;
-    if ($stack == 'ethos') {
-        echo '</div></div>';
-    } else {
-        echo '</div>';
-    }
+	global $stack;
+	if ($stack == 'ethos') {
+		echo '</div></div>';
+	} else {
+		echo '</div>';
+	}
 }
 
 /**
@@ -209,7 +209,7 @@ 
  */
 function geodir_x_action_wrapper_content_open($type = '', $id = '', $class = '')
 {
-    echo '<div class="x-main left ' . $class . '" role="main">';
+	echo '<div class="x-main left ' . $class . '" role="main">';
 }
 
 /**
@@ -220,7 +220,7 @@ 
  */
 function geodir_x_action_wrapper_content_close()
 {
-    echo '</div>';
+	echo '</div>';
 }
 
 /**
@@ -235,7 +235,7 @@ 
  */
 function geodir_x_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')
 {
-    echo '<aside class="x-sidebar right" role="complementary" itemscope itemtype="' . $itemtype . '">';
+	echo '<aside class="x-sidebar right" role="complementary" itemscope itemtype="' . $itemtype . '">';
 }
 
 /**
@@ -247,7 +247,7 @@ 
  */
 function geodir_x_action_sidebar_right_close($type = '')
 {
-    echo '</aside>';
+	echo '</aside>';
 }
 
 add_filter('geodir_breadcrumb', 'geodir_x_breadcrumb');
@@ -261,12 +261,12 @@ 
  */
 function geodir_x_breadcrumb($breadcrumb)
 {
-    $breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '', $breadcrumb);
-    $breadcrumb = str_replace('<li>', '', $breadcrumb);
-    $breadcrumb = str_replace('</li>', '', $breadcrumb);
-    $breadcrumb = str_replace('Home', '<span class="home"><i class="x-icon-home"></i></span>', $breadcrumb);
-    $breadcrumb = str_replace('</ul></div>', '', $breadcrumb);
-    return $breadcrumb;
+	$breadcrumb = str_replace('<div class="geodir-breadcrumb clearfix"><ul id="breadcrumbs">', '', $breadcrumb);
+	$breadcrumb = str_replace('<li>', '', $breadcrumb);
+	$breadcrumb = str_replace('</li>', '', $breadcrumb);
+	$breadcrumb = str_replace('Home', '<span class="home"><i class="x-icon-home"></i></span>', $breadcrumb);
+	$breadcrumb = str_replace('</ul></div>', '', $breadcrumb);
+	return $breadcrumb;
 }
 
 add_filter('geodir_breadcrumb_separator', 'geodir_x_breadcrumb_separator');
@@ -280,125 +280,125 @@ 
  */
 function geodir_x_breadcrumb_separator($separator)
 {
-    $separator = str_replace(' > ', ' <span class="delimiter"><i class="x-icon-angle-right"></i></span> ', $separator);
-    return $separator;
+	$separator = str_replace(' > ', ' <span class="delimiter"><i class="x-icon-angle-right"></i></span> ', $separator);
+	return $separator;
 }
 
 if (!function_exists('x_breadcrumbs')) :
-    /**
-     * breadcrumbs.
-     *
-     * @since 1.0.0
-     * @package GeoDirectory
-     */
-    function x_breadcrumbs()
-    {
-
-        if (x_get_option('x_breadcrumb_display', '1')) {
-
-            //
-            // 1. Delimiter between crumbs.
-            // 2. Output text for the "Home" link.
-            // 3. Link to the home page.
-            // 4. Tag before the current crumb.
-            // 5. Tag after the current crumb.
-            // 6. Get page title.
-            // 7. Get blog title.
-            // 8. Get shop title.
-            //
-
-            GLOBAL $post,$wp;
-
-            if (geodir_is_page('detail') || geodir_is_page('listing') || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id())) {
-                geodir_breadcrumb();
-            } else {
-
-                $stack = x_get_stack();
-                $delimiter = ' <span class="delimiter"><i class="x-icon-angle-right"></i></span> '; // 1
-                $home_text = '<span class="home"><i class="x-icon-home"></i></span>';               // 2
-                $home_link = home_url();                                                            // 3
-                $current_before = '<span class="current">';                                              // 4
-                $current_after = '</span>';                                                             // 5
-                $page_title = get_the_title();                                                       // 6
-                $blog_title = get_the_title(get_option('page_for_posts', true));                 // 7
-                $shop_title = get_theme_mod('x_' . $stack . '_shop_title');                        // 8
-
-                if (function_exists('woocommerce_get_page_id')) {
-                    $shop_url = x_get_shop_link();
-                    $shop_link = '<a href="' . $shop_url . '">' . $shop_title . '</a>';
-                }
-
-                if (is_front_page()) {
-                    echo '<div class="x-breadcrumbs">' . $current_before . $home_text . $current_after . '</div>';
-                } elseif (is_home()) {
-                    echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter . $current_before . $blog_title . $current_after . '</div>';
-                } else {
-                    echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter;
-                    if (is_category()) {
-                        $the_cat = get_category(get_query_var('cat'), false);
-                        if ($the_cat->parent != 0) echo get_category_parents($the_cat->parent, TRUE, $delimiter);
-                        echo $current_before . single_cat_title('', false) . $current_after;
-                    } elseif (x_is_product_category()) {
-                        echo $shop_link . $delimiter . $current_before . single_cat_title('', false) . $current_after;
-                    } elseif (x_is_product_tag()) {
-                        echo $shop_link . $delimiter . $current_before . single_tag_title('', false) . $current_after;
-                    } elseif (is_search()) {
-                        echo $current_before . __('Search Results for ', '__x__') . '&#8220;' . get_search_query() . '&#8221;' . $current_after;
-                    } elseif (is_singular('post')) {
-                        if (get_option('page_for_posts') == is_front_page()) {
-                            echo $current_before . $page_title . $current_after;
-                        } else {
-                            echo '<a href="' . get_permalink(get_option('page_for_posts')) . '" title="' . esc_attr(__('See All Posts', '__x__')) . '">' . $blog_title . '</a>' . $delimiter . $current_before . $page_title . $current_after;
-                        }
-                    } elseif (x_is_portfolio()) {
-                        echo $current_before . get_the_title() . $current_after;
-                    } elseif (x_is_portfolio_item()) {
-                        $link = x_get_parent_portfolio_link();
-                        $title = x_get_parent_portfolio_title();
-                        echo '<a href="' . $link . '" title="' . esc_attr(__('See All Posts', '__x__')) . '">' . $title . '</a>' . $delimiter . $current_before . $page_title . $current_after;
-                    } elseif (x_is_product()) {
-                        echo $shop_link . $delimiter . $current_before . $page_title . $current_after;
-                    } elseif (is_page() && !$post->post_parent) {
-                        echo $current_before . $page_title . $current_after;
-                    } elseif (is_page() && $post->post_parent) {
-                        $parent_id = $post->post_parent;
-                        $breadcrumbs = array();
-                        while ($parent_id) {
-                            $page = get_page($parent_id);
-                            $breadcrumbs[] = '<a href="' . get_permalink($page->ID) . '">' . get_the_title($page->ID) . '</a>';
-                            $parent_id = $page->post_parent;
-                        }
-                        $breadcrumbs = array_reverse($breadcrumbs);
-                        for ($i = 0; $i < count($breadcrumbs); $i++) {
-                            echo $breadcrumbs[$i];
-                            if ($i != count($breadcrumbs) - 1) echo $delimiter;
-                        }
-                        echo $delimiter . $current_before . $page_title . $current_after;
-                    } elseif (is_tag()) {
-                        echo $current_before . single_tag_title('', false) . $current_after;
-                    } elseif (is_author()) {
-                        GLOBAL $author;
-                        $userdata = get_userdata($author);
-                        echo $current_before . __('Posts by ', '__x__') . '&#8220;' . $userdata->display_name . $current_after . '&#8221;';
-                    } elseif (is_404()) {
-                        echo $current_before . __('404 (Page Not Found)', '__x__') . $current_after;
-                    } elseif (is_archive()) {
-                        if (x_is_shop()) {
-                            echo $current_before . $shop_title . $current_after;
-                        } else {
-                            echo $current_before . __('Archives ', '__x__') . $current_after;
-                        }
-                    }
-                    if (get_query_var('paged')) {
-                        echo ' <span class="current" style="white-space: nowrap;">(' . __('Page', '__x__') . ' ' . get_query_var('paged') . ')</span>';
-                    }
-                    echo '</div>';
-                }
-
-            }
-
-        }
-    } // ends my geodir check
+	/**
+	 * breadcrumbs.
+	 *
+	 * @since 1.0.0
+	 * @package GeoDirectory
+	 */
+	function x_breadcrumbs()
+	{
+
+		if (x_get_option('x_breadcrumb_display', '1')) {
+
+			//
+			// 1. Delimiter between crumbs.
+			// 2. Output text for the "Home" link.
+			// 3. Link to the home page.
+			// 4. Tag before the current crumb.
+			// 5. Tag after the current crumb.
+			// 6. Get page title.
+			// 7. Get blog title.
+			// 8. Get shop title.
+			//
+
+			GLOBAL $post,$wp;
+
+			if (geodir_is_page('detail') || geodir_is_page('listing') || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id())) {
+				geodir_breadcrumb();
+			} else {
+
+				$stack = x_get_stack();
+				$delimiter = ' <span class="delimiter"><i class="x-icon-angle-right"></i></span> '; // 1
+				$home_text = '<span class="home"><i class="x-icon-home"></i></span>';               // 2
+				$home_link = home_url();                                                            // 3
+				$current_before = '<span class="current">';                                              // 4
+				$current_after = '</span>';                                                             // 5
+				$page_title = get_the_title();                                                       // 6
+				$blog_title = get_the_title(get_option('page_for_posts', true));                 // 7
+				$shop_title = get_theme_mod('x_' . $stack . '_shop_title');                        // 8
+
+				if (function_exists('woocommerce_get_page_id')) {
+					$shop_url = x_get_shop_link();
+					$shop_link = '<a href="' . $shop_url . '">' . $shop_title . '</a>';
+				}
+
+				if (is_front_page()) {
+					echo '<div class="x-breadcrumbs">' . $current_before . $home_text . $current_after . '</div>';
+				} elseif (is_home()) {
+					echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter . $current_before . $blog_title . $current_after . '</div>';
+				} else {
+					echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter;
+					if (is_category()) {
+						$the_cat = get_category(get_query_var('cat'), false);
+						if ($the_cat->parent != 0) echo get_category_parents($the_cat->parent, TRUE, $delimiter);
+						echo $current_before . single_cat_title('', false) . $current_after;
+					} elseif (x_is_product_category()) {
+						echo $shop_link . $delimiter . $current_before . single_cat_title('', false) . $current_after;
+					} elseif (x_is_product_tag()) {
+						echo $shop_link . $delimiter . $current_before . single_tag_title('', false) . $current_after;
+					} elseif (is_search()) {
+						echo $current_before . __('Search Results for ', '__x__') . '&#8220;' . get_search_query() . '&#8221;' . $current_after;
+					} elseif (is_singular('post')) {
+						if (get_option('page_for_posts') == is_front_page()) {
+							echo $current_before . $page_title . $current_after;
+						} else {
+							echo '<a href="' . get_permalink(get_option('page_for_posts')) . '" title="' . esc_attr(__('See All Posts', '__x__')) . '">' . $blog_title . '</a>' . $delimiter . $current_before . $page_title . $current_after;
+						}
+					} elseif (x_is_portfolio()) {
+						echo $current_before . get_the_title() . $current_after;
+					} elseif (x_is_portfolio_item()) {
+						$link = x_get_parent_portfolio_link();
+						$title = x_get_parent_portfolio_title();
+						echo '<a href="' . $link . '" title="' . esc_attr(__('See All Posts', '__x__')) . '">' . $title . '</a>' . $delimiter . $current_before . $page_title . $current_after;
+					} elseif (x_is_product()) {
+						echo $shop_link . $delimiter . $current_before . $page_title . $current_after;
+					} elseif (is_page() && !$post->post_parent) {
+						echo $current_before . $page_title . $current_after;
+					} elseif (is_page() && $post->post_parent) {
+						$parent_id = $post->post_parent;
+						$breadcrumbs = array();
+						while ($parent_id) {
+							$page = get_page($parent_id);
+							$breadcrumbs[] = '<a href="' . get_permalink($page->ID) . '">' . get_the_title($page->ID) . '</a>';
+							$parent_id = $page->post_parent;
+						}
+						$breadcrumbs = array_reverse($breadcrumbs);
+						for ($i = 0; $i < count($breadcrumbs); $i++) {
+							echo $breadcrumbs[$i];
+							if ($i != count($breadcrumbs) - 1) echo $delimiter;
+						}
+						echo $delimiter . $current_before . $page_title . $current_after;
+					} elseif (is_tag()) {
+						echo $current_before . single_tag_title('', false) . $current_after;
+					} elseif (is_author()) {
+						GLOBAL $author;
+						$userdata = get_userdata($author);
+						echo $current_before . __('Posts by ', '__x__') . '&#8220;' . $userdata->display_name . $current_after . '&#8221;';
+					} elseif (is_404()) {
+						echo $current_before . __('404 (Page Not Found)', '__x__') . $current_after;
+					} elseif (is_archive()) {
+						if (x_is_shop()) {
+							echo $current_before . $shop_title . $current_after;
+						} else {
+							echo $current_before . __('Archives ', '__x__') . $current_after;
+						}
+					}
+					if (get_query_var('paged')) {
+						echo ' <span class="current" style="white-space: nowrap;">(' . __('Page', '__x__') . ' ' . get_query_var('paged') . ')</span>';
+					}
+					echo '</div>';
+				}
+
+			}
+
+		}
+	} // ends my geodir check
 endif;
 
 
@@ -413,8 +413,8 @@ 
  */
 function geodir_x_location_switcher_menu_li_class($class)
 {
-    $class .= " menu-item-has-children ";
-    return $class;
+	$class .= " menu-item-has-children ";
+	return $class;
 }
 
 add_filter('geodir_sub_menu_li_class', 'geodir_x_sub_menu_li_class', 10, 1);
@@ -428,6 +428,6 @@ 
  */
 function geodir_x_sub_menu_li_class($class)
 {
-    $class .= " menu-item-has-children ";
-    return $class;
+	$class .= " menu-item-has-children ";
+	return $class;
 }
\ No newline at end of file

Braces +6 added lines, -2 removed lines

@@ -336,7 +336,9 @@ 
                     echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter;
                     if (is_category()) {
                         $the_cat = get_category(get_query_var('cat'), false);
-                        if ($the_cat->parent != 0) echo get_category_parents($the_cat->parent, TRUE, $delimiter);
+                        if ($the_cat->parent != 0) {
+                        	echo get_category_parents($the_cat->parent, TRUE, $delimiter);
+                        }
                         echo $current_before . single_cat_title('', false) . $current_after;
                     } elseif (x_is_product_category()) {
                         echo $shop_link . $delimiter . $current_before . single_cat_title('', false) . $current_after;
@@ -371,7 +373,9 @@ 
                         $breadcrumbs = array_reverse($breadcrumbs);
                         for ($i = 0; $i < count($breadcrumbs); $i++) {
                             echo $breadcrumbs[$i];
-                            if ($i != count($breadcrumbs) - 1) echo $delimiter;
+                            if ($i != count($breadcrumbs) - 1) {
+                            	echo $delimiter;
+                            }
                         }
                         echo $delimiter . $current_before . $page_title . $current_after;
                     } elseif (is_tag()) {

Spacing +32 added lines, -32 removed lines

@@ -209,7 +209,7 @@ 
  */
 function geodir_x_action_wrapper_content_open($type = '', $id = '', $class = '')
 {
-    echo '<div class="x-main left ' . $class . '" role="main">';
+    echo '<div class="x-main left '.$class.'" role="main">';
 }
 
 /**
@@ -235,7 +235,7 @@ 
  */
 function geodir_x_action_sidebar_right_open($type = '', $id = '', $class = '', $itemtype = '')
 {
-    echo '<aside class="x-sidebar right" role="complementary" itemscope itemtype="' . $itemtype . '">';
+    echo '<aside class="x-sidebar right" role="complementary" itemscope itemtype="'.$itemtype.'">';
 }
 
 /**
@@ -307,7 +307,7 @@ 
             // 8. Get shop title.
             //
 
-            GLOBAL $post,$wp;
+            GLOBAL $post, $wp;
 
             if (geodir_is_page('detail') || geodir_is_page('listing') || (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id())) {
                 geodir_breadcrumb();
@@ -315,57 +315,57 @@ 
 
                 $stack = x_get_stack();
                 $delimiter = ' <span class="delimiter"><i class="x-icon-angle-right"></i></span> '; // 1
-                $home_text = '<span class="home"><i class="x-icon-home"></i></span>';               // 2
-                $home_link = home_url();                                                            // 3
-                $current_before = '<span class="current">';                                              // 4
-                $current_after = '</span>';                                                             // 5
-                $page_title = get_the_title();                                                       // 6
-                $blog_title = get_the_title(get_option('page_for_posts', true));                 // 7
-                $shop_title = get_theme_mod('x_' . $stack . '_shop_title');                        // 8
+                $home_text = '<span class="home"><i class="x-icon-home"></i></span>'; // 2
+                $home_link = home_url(); // 3
+                $current_before = '<span class="current">'; // 4
+                $current_after = '</span>'; // 5
+                $page_title = get_the_title(); // 6
+                $blog_title = get_the_title(get_option('page_for_posts', true)); // 7
+                $shop_title = get_theme_mod('x_'.$stack.'_shop_title'); // 8
 
                 if (function_exists('woocommerce_get_page_id')) {
                     $shop_url = x_get_shop_link();
-                    $shop_link = '<a href="' . $shop_url . '">' . $shop_title . '</a>';
+                    $shop_link = '<a href="'.$shop_url.'">'.$shop_title.'</a>';
                 }
 
                 if (is_front_page()) {
-                    echo '<div class="x-breadcrumbs">' . $current_before . $home_text . $current_after . '</div>';
+                    echo '<div class="x-breadcrumbs">'.$current_before.$home_text.$current_after.'</div>';
                 } elseif (is_home()) {
-                    echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter . $current_before . $blog_title . $current_after . '</div>';
+                    echo '<div class="x-breadcrumbs"><a href="'.$home_link.'">'.$home_text.'</a>'.$delimiter.$current_before.$blog_title.$current_after.'</div>';
                 } else {
-                    echo '<div class="x-breadcrumbs"><a href="' . $home_link . '">' . $home_text . '</a>' . $delimiter;
+                    echo '<div class="x-breadcrumbs"><a href="'.$home_link.'">'.$home_text.'</a>'.$delimiter;
                     if (is_category()) {
                         $the_cat = get_category(get_query_var('cat'), false);
                         if ($the_cat->parent != 0) echo get_category_parents($the_cat->parent, TRUE, $delimiter);
-                        echo $current_before . single_cat_title('', false) . $current_after;
+                        echo $current_before.single_cat_title('', false).$current_after;
                     } elseif (x_is_product_category()) {
-                        echo $shop_link . $delimiter . $current_before . single_cat_title('', false) . $current_after;
+                        echo $shop_link.$delimiter.$current_before.single_cat_title('', false).$current_after;
                     } elseif (x_is_product_tag()) {
-                        echo $shop_link . $delimiter . $current_before . single_tag_title('', false) . $current_after;
+                        echo $shop_link.$delimiter.$current_before.single_tag_title('', false).$current_after;
                     } elseif (is_search()) {
-                        echo $current_before . __('Search Results for ', '__x__') . '&#8220;' . get_search_query() . '&#8221;' . $current_after;
+                        echo $current_before.__('Search Results for ', '__x__').'&#8220;'.get_search_query().'&#8221;'.$current_after;
                     } elseif (is_singular('post')) {
                         if (get_option('page_for_posts') == is_front_page()) {
-                            echo $current_before . $page_title . $current_after;
+                            echo $current_before.$page_title.$current_after;
                         } else {
-                            echo '<a href="' . get_permalink(get_option('page_for_posts')) . '" title="' . esc_attr(__('See All Posts', '__x__')) . '">' . $blog_title . '</a>' . $delimiter . $current_before . $page_title . $current_after;
+                            echo '<a href="'.get_permalink(get_option('page_for_posts')).'" title="'.esc_attr(__('See All Posts', '__x__')).'">'.$blog_title.'</a>'.$delimiter.$current_before.$page_title.$current_after;
                         }
                     } elseif (x_is_portfolio()) {
-                        echo $current_before . get_the_title() . $current_after;
+                        echo $current_before.get_the_title().$current_after;
                     } elseif (x_is_portfolio_item()) {
                         $link = x_get_parent_portfolio_link();
                         $title = x_get_parent_portfolio_title();
-                        echo '<a href="' . $link . '" title="' . esc_attr(__('See All Posts', '__x__')) . '">' . $title . '</a>' . $delimiter . $current_before . $page_title . $current_after;
+                        echo '<a href="'.$link.'" title="'.esc_attr(__('See All Posts', '__x__')).'">'.$title.'</a>'.$delimiter.$current_before.$page_title.$current_after;
                     } elseif (x_is_product()) {
-                        echo $shop_link . $delimiter . $current_before . $page_title . $current_after;
+                        echo $shop_link.$delimiter.$current_before.$page_title.$current_after;
                     } elseif (is_page() && !$post->post_parent) {
-                        echo $current_before . $page_title . $current_after;
+                        echo $current_before.$page_title.$current_after;
                     } elseif (is_page() && $post->post_parent) {
                         $parent_id = $post->post_parent;
                         $breadcrumbs = array();
                         while ($parent_id) {
                             $page = get_page($parent_id);
-                            $breadcrumbs[] = '<a href="' . get_permalink($page->ID) . '">' . get_the_title($page->ID) . '</a>';
+                            $breadcrumbs[] = '<a href="'.get_permalink($page->ID).'">'.get_the_title($page->ID).'</a>';
                             $parent_id = $page->post_parent;
                         }
                         $breadcrumbs = array_reverse($breadcrumbs);
@@ -373,24 +373,24 @@ 
                             echo $breadcrumbs[$i];
                             if ($i != count($breadcrumbs) - 1) echo $delimiter;
                         }
-                        echo $delimiter . $current_before . $page_title . $current_after;
+                        echo $delimiter.$current_before.$page_title.$current_after;
                     } elseif (is_tag()) {
-                        echo $current_before . single_tag_title('', false) . $current_after;
+                        echo $current_before.single_tag_title('', false).$current_after;
                     } elseif (is_author()) {
                         GLOBAL $author;
                         $userdata = get_userdata($author);
-                        echo $current_before . __('Posts by ', '__x__') . '&#8220;' . $userdata->display_name . $current_after . '&#8221;';
+                        echo $current_before.__('Posts by ', '__x__').'&#8220;'.$userdata->display_name.$current_after.'&#8221;';
                     } elseif (is_404()) {
-                        echo $current_before . __('404 (Page Not Found)', '__x__') . $current_after;
+                        echo $current_before.__('404 (Page Not Found)', '__x__').$current_after;
                     } elseif (is_archive()) {
                         if (x_is_shop()) {
-                            echo $current_before . $shop_title . $current_after;
+                            echo $current_before.$shop_title.$current_after;
                         } else {
-                            echo $current_before . __('Archives ', '__x__') . $current_after;
+                            echo $current_before.__('Archives ', '__x__').$current_after;
                         }
                     }
                     if (get_query_var('paged')) {
-                        echo ' <span class="current" style="white-space: nowrap;">(' . __('Page', '__x__') . ' ' . get_query_var('paged') . ')</span>';
+                        echo ' <span class="current" style="white-space: nowrap;">('.__('Page', '__x__').' '.get_query_var('paged').')</span>';
                     }
                     echo '</div>';
                 }

geodirectory-functions/custom_functions.php

Doc Comments +1 added lines, -1 removed lines

@@ -153,7 +153,7 @@
  * @param array $package_info Package info array.

  * @param object|string $post The post object.

  * @param string $post_type The post type.

- * @return object Returns filtered package info as an object.

+ * @return string Returns filtered package info as an object.

  */

 function geodir_post_package_info($package_info, $post = '', $post_type = '')

 {

Indentation +4 added lines, -4 removed lines

@@ -2348,10 +2348,10 @@
 	?>

 	<input class="search_text" name="s"

 	       value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {

-		       echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) );

-	       } else {

-		       echo $default_search_for_text;

-	       } ?>" type="text"

+			   echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) );

+		   } else {

+			   echo $default_search_for_text;

+		   } ?>" type="text"

 	       onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"

 	       onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"

 	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);">

Spacing +608 added lines, -608 removed lines

@@ -52,31 +52,31 @@ 
 				jQuery(listSel).children('li').switchClass('gridview_onehalf gridview_onethird gridview_onefourth', 'gridview_onefifth', 600);

 			}

 

-			jQuery.post("<?php echo geodir_get_ajax_url();?>&gd_listing_view=" + val, function (data) {

+			jQuery.post("<?php echo geodir_get_ajax_url(); ?>&gd_listing_view=" + val, function (data) {

 				//alert(data );

 			});

 		}

 	</script>

 	<div class="geodir-list-view-select">

 		<select name="gd_list_view" id="gd_list_view" onchange="geodir_list_view_select(this);">

-			<?php $listing_view = (int) $gd_session->get( 'gd_listing_view' ); ?>

-			<option value=""><?php _e( 'View:', 'geodirectory' ); ?></option>

+			<?php $listing_view = (int) $gd_session->get('gd_listing_view'); ?>

+			<option value=""><?php _e('View:', 'geodirectory'); ?></option>

 			<option

-				value="1" <?php selected( 1, $listing_view ); ?>><?php _e( 'View: List', 'geodirectory' ); ?></option>

+				value="1" <?php selected(1, $listing_view); ?>><?php _e('View: List', 'geodirectory'); ?></option>

 			<option

-				value="2" <?php selected( 2, $listing_view ); ?>><?php _e( 'View: Grid 2', 'geodirectory' ); ?></option>

+				value="2" <?php selected(2, $listing_view); ?>><?php _e('View: Grid 2', 'geodirectory'); ?></option>

 			<option

-				value="3" <?php selected( 3, $listing_view ); ?>><?php _e( 'View: Grid 3', 'geodirectory' ); ?></option>

+				value="3" <?php selected(3, $listing_view); ?>><?php _e('View: Grid 3', 'geodirectory'); ?></option>

 			<option

-				value="4" <?php selected( 4, $listing_view ); ?>><?php _e( 'View: Grid 4', 'geodirectory' ); ?></option>

+				value="4" <?php selected(4, $listing_view); ?>><?php _e('View: Grid 4', 'geodirectory'); ?></option>

 			<option

-				value="5" <?php selected( 5, $listing_view ); ?>><?php _e( 'View: Grid 5', 'geodirectory' ); ?></option>

+				value="5" <?php selected(5, $listing_view); ?>><?php _e('View: Grid 5', 'geodirectory'); ?></option>

 		</select>

 	</div>

 	<?php

 }

 

-add_action( 'geodir_before_listing', 'geodir_list_view_select', 100 );

+add_action('geodir_before_listing', 'geodir_list_view_select', 100);

 

 /**

  * Limit the listing excerpt.

@@ -91,9 +91,9 @@ 
  * @global object $post          The current post object.

  * @return string The modified excerpt.

  */

-function geodir_max_excerpt( $charlength ) {

+function geodir_max_excerpt($charlength) {

 	global $post;

-	if ( $charlength == '0' ) {

+	if ($charlength == '0') {

 		return;

 	}

 	$out = '';

@@ -101,46 +101,46 @@ 
 	$temp_post = $post;

 	$excerpt   = get_the_excerpt();

 

-	$charlength ++;

-	$excerpt_more = function_exists( 'geodirf_excerpt_more' ) ? geodirf_excerpt_more( '' ) : geodir_excerpt_more( '' );

-	if ( mb_strlen( $excerpt ) > $charlength ) {

-		if ( mb_strlen( $excerpt_more ) > 0 && mb_strpos( $excerpt, $excerpt_more ) !== false ) {

-			$excut = - ( mb_strlen( $excerpt_more ) );

-			$subex = mb_substr( $excerpt, 0, $excut );

-			if ( $charlength > 0 && mb_strlen( $subex ) > $charlength ) {

-				$subex = mb_substr( $subex, 0, $charlength );

+	$charlength++;

+	$excerpt_more = function_exists('geodirf_excerpt_more') ? geodirf_excerpt_more('') : geodir_excerpt_more('');

+	if (mb_strlen($excerpt) > $charlength) {

+		if (mb_strlen($excerpt_more) > 0 && mb_strpos($excerpt, $excerpt_more) !== false) {

+			$excut = - (mb_strlen($excerpt_more));

+			$subex = mb_substr($excerpt, 0, $excut);

+			if ($charlength > 0 && mb_strlen($subex) > $charlength) {

+				$subex = mb_substr($subex, 0, $charlength);

 			}

 			$out .= $subex;

 		} else {

-			$subex   = mb_substr( $excerpt, 0, $charlength - 5 );

-			$exwords = explode( ' ', $subex );

-			$excut   = - ( mb_strlen( $exwords[ count( $exwords ) - 1 ] ) );

-			if ( $excut < 0 ) {

-				$out .= mb_substr( $subex, 0, $excut );

+			$subex   = mb_substr($excerpt, 0, $charlength - 5);

+			$exwords = explode(' ', $subex);

+			$excut   = - (mb_strlen($exwords[count($exwords) - 1]));

+			if ($excut < 0) {

+				$out .= mb_substr($subex, 0, $excut);

 			} else {

 				$out .= $subex;

 			}

 		}

-		$out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">';

+		$out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">';

 		/**

 		 * Filter excerpt read more text.

 		 *

 		 * @since 1.0.0

 		 */

-		$out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );

+		$out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));

 		$out .= '</a>';

 

 	} else {

-		if ( mb_strlen( $excerpt_more ) > 0 && mb_strpos( $excerpt, $excerpt_more ) !== false ) {

-			$excut = - ( mb_strlen( $excerpt_more ) );

-			$out .= mb_substr( $excerpt, 0, $excut );

-			$out .= ' <a class="excerpt-read-more" href="' . get_permalink() . '" title="' . get_the_title() . '">';

+		if (mb_strlen($excerpt_more) > 0 && mb_strpos($excerpt, $excerpt_more) !== false) {

+			$excut = - (mb_strlen($excerpt_more));

+			$out .= mb_substr($excerpt, 0, $excut);

+			$out .= ' <a class="excerpt-read-more" href="'.get_permalink().'" title="'.get_the_title().'">';

 			/**

 			 * Filter excerpt read more text.

 			 *

 			 * @since 1.0.0

 			 */

-			$out .= apply_filters( 'geodir_max_excerpt_end', __( 'Read more [...]', 'geodirectory' ) );

+			$out .= apply_filters('geodir_max_excerpt_end', __('Read more [...]', 'geodirectory'));

 			$out .= '</a>';

 		} else {

 			$out .= $excerpt;

@@ -163,7 +163,7 @@ 
  *

  * @return object Returns filtered package info as an object.

  */

-function geodir_post_package_info( $package_info, $post = '', $post_type = '' ) {

+function geodir_post_package_info($package_info, $post = '', $post_type = '') {

 	$package_info['pid']              = 0;

 	$package_info['days']             = 0;

 	$package_info['amount']           = 0;

@@ -192,7 +192,7 @@ 
 	 * @param object|string $post  The post object.

 	 * @param string $post_type    The post type.

 	 */

-	return (object) apply_filters( 'geodir_post_package_info', $package_info, $post, $post_type );

+	return (object) apply_filters('geodir_post_package_info', $package_info, $post, $post_type);

 

 }

 

@@ -220,11 +220,11 @@ 
  *

  * }

  */

-function geodir_send_inquiry( $request ) {

+function geodir_send_inquiry($request) {

 	global $wpdb;

 

 	// strip slashes from text

-	$request = ! empty( $request ) ? stripslashes_deep( $request ) : $request;

+	$request = !empty($request) ? stripslashes_deep($request) : $request;

 

 	$yourname      = $request['inq_name'];

 	$youremail     = $request['inq_email'];

@@ -235,26 +235,26 @@ 
 	$author_id  = '';

 	$post_title = '';

 

-	if ( $request['pid'] ) {

+	if ($request['pid']) {

 

 		$productinfosql = $wpdb->prepare(

 			"select ID,post_author,post_title from $wpdb->posts where ID =%d",

-			array( $request['pid'] )

+			array($request['pid'])

 		);

-		$productinfo    = $wpdb->get_row( $productinfosql );

+		$productinfo = $wpdb->get_row($productinfosql);

 

 		$author_id  = $productinfo->post_author;

 		$post_title = $productinfo->post_title;

 	}

 

-	$post_title = '<a href="' . get_permalink( $pid ) . '">' . $post_title . '</a>';

+	$post_title = '<a href="'.get_permalink($pid).'">'.$post_title.'</a>';

 

-	$user_info = get_userdata( $author_id );

-	$to_email  = geodir_get_post_meta( $pid, 'geodir_email', true );

-	$to_name   = geodir_get_client_name( $author_id );

+	$user_info = get_userdata($author_id);

+	$to_email  = geodir_get_post_meta($pid, 'geodir_email', true);

+	$to_name   = geodir_get_client_name($author_id);

 

-	if ( $to_email == '' ) {

-		$to_email = get_option( 'admin_email' );

+	if ($to_email == '') {

+		$to_email = get_option('admin_email');

 	}

 

 	/**

@@ -275,10 +275,10 @@ 
 	 * }

 	 * @param string $type     The form type, default: `Enquiry`.

 	 */

-	do_action( 'geodir_after_send_enquiry', $request, 'Enquiry' );

+	do_action('geodir_after_send_enquiry', $request, 'Enquiry');

 

 	$client_message = $frnd_comments;

-	$client_message .= '<br>' . __( 'From :', 'geodirectory' ) . ' ' . $yourname . '<br>' . __( 'Phone :', 'geodirectory' ) . ' ' . $inq_phone . '<br>' . __( 'Email :', 'geodirectory' ) . ' ' . $youremail . '<br><br>' . __( 'Sent from', 'geodirectory' ) . ' - <b><a href="' . trailingslashit( home_url() ) . '">' . get_option( 'blogname' ) . '</a></b>.';

+	$client_message .= '<br>'.__('From :', 'geodirectory').' '.$yourname.'<br>'.__('Phone :', 'geodirectory').' '.$inq_phone.'<br>'.__('Email :', 'geodirectory').' '.$youremail.'<br><br>'.__('Sent from', 'geodirectory').' - <b><a href="'.trailingslashit(home_url()).'">'.get_option('blogname').'</a></b>.';

 	/**

 	 * Filter client message text.

 	 *

@@ -286,7 +286,7 @@ 
 	 *

 	 * @param string $client_message Client message text.

 	 */

-	$client_message = apply_filters( 'geodir_inquiry_email_msg', $client_message );

+	$client_message = apply_filters('geodir_inquiry_email_msg', $client_message);

 

 	/**

 	 * Called before the send enquiry email is sent.

@@ -305,12 +305,12 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_before_send_enquiry_email', $request );

-	if ( $to_email ) {

+	do_action('geodir_before_send_enquiry_email', $request);

+	if ($to_email) {

 		// strip slashes message

-		$client_message = stripslashes_deep( $client_message );

+		$client_message = stripslashes_deep($client_message);

 

-		geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid'] );//To client email

+		geodir_sendEmail($youremail, $yourname, $to_email, $to_name, '', $client_message, $extra = '', 'send_enquiry', $request['pid']); //To client email

 	}

 

 	/**

@@ -330,12 +330,12 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_after_send_enquiry_email', $request );

-	$url = get_permalink( $pid );

-	if ( strstr( $url, '?' ) ) {

-		$url = $url . "&send_inquiry=success";

+	do_action('geodir_after_send_enquiry_email', $request);

+	$url = get_permalink($pid);

+	if (strstr($url, '?')) {

+		$url = $url."&send_inquiry=success";

 	} else {

-		$url = $url . "?send_inquiry=success";

+		$url = $url."?send_inquiry=success";

 	}

 	/**

 	 * Filter redirect url after the send enquiry email is sent.

@@ -344,8 +344,8 @@ 
 	 *

 	 * @param string $url Redirect url.

 	 */

-	$url = apply_filters( 'geodir_send_enquiry_after_submit_redirect', $url );

-	wp_redirect( $url );

+	$url = apply_filters('geodir_send_enquiry_after_submit_redirect', $url);

+	wp_redirect($url);

 	gd_die();

 

 }

@@ -374,11 +374,11 @@ 
  * }

  * @global object $wpdb        WordPress Database object.

  */

-function geodir_send_friend( $request ) {

+function geodir_send_friend($request) {

 	global $wpdb;

 

 	// strip slashes from text

-	$request = ! empty( $request ) ? stripslashes_deep( $request ) : $request;

+	$request = !empty($request) ? stripslashes_deep($request) : $request;

 

 	$yourname      = $request['yourname'];

 	$youremail     = $request['youremail'];

@@ -387,13 +387,13 @@ 
 	$pid           = $request['pid'];

 	$to_email      = $request['to_email'];

 	$to_name       = $request['to_name'];

-	if ( $request['pid'] ) {

+	if ($request['pid']) {

 		$productinfosql = $wpdb->prepare(

 			"select ID,post_title from $wpdb->posts where ID =%d",

-			array( $request['pid'] )

+			array($request['pid'])

 		);

-		$productinfo    = $wpdb->get_results( $productinfosql );

-		foreach ( $productinfo as $productinfoObj ) {

+		$productinfo = $wpdb->get_results($productinfosql);

+		foreach ($productinfo as $productinfoObj) {

 			$post_title = $productinfoObj->post_title;

 		}

 	}

@@ -417,8 +417,8 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_before_send_to_friend_email', $request );

-	geodir_sendEmail( $youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid'] );//To client email

+	do_action('geodir_before_send_to_friend_email', $request);

+	geodir_sendEmail($youremail, $yourname, $to_email, $to_name, $frnd_subject, $frnd_comments, $extra = '', 'send_friend', $request['pid']); //To client email

 

 	/**

 	 * Called after the send to friend email is sent.

@@ -439,13 +439,13 @@ 
 	 *

 	 * }

 	 */

-	do_action( 'geodir_after_send_to_friend_email', $request );

+	do_action('geodir_after_send_to_friend_email', $request);

 

-	$url = get_permalink( $pid );

-	if ( strstr( $url, '?' ) ) {

-		$url = $url . "&sendtofrnd=success";

+	$url = get_permalink($pid);

+	if (strstr($url, '?')) {

+		$url = $url."&sendtofrnd=success";

 	} else {

-		$url = $url . "?sendtofrnd=success";

+		$url = $url."?sendtofrnd=success";

 	}

 	/**

 	 * Filter redirect url after the send to friend email is sent.

@@ -454,8 +454,8 @@ 
 	 *

 	 * @param string $url Redirect url.

 	 */

-	$url = apply_filters( 'geodir_send_to_friend_after_submit_redirect', $url );

-	wp_redirect( $url );

+	$url = apply_filters('geodir_send_to_friend_after_submit_redirect', $url);

+	wp_redirect($url);

 	gd_die();

 }

 

@@ -469,8 +469,8 @@ 
  *

  * @param string $hash_key

  */

-function geodir_before_tab_content( $hash_key ) {

-	switch ( $hash_key ) {

+function geodir_before_tab_content($hash_key) {

+	switch ($hash_key) {

 		case 'post_info' :

 			echo '<div class="geodir-company_info field-group">';

 			break;

@@ -480,7 +480,7 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			echo ' <div id="' . apply_filters( 'geodir_post_gallery_id', 'geodir-post-gallery' ) . '" class="clearfix" >';

+			echo ' <div id="'.apply_filters('geodir_post_gallery_id', 'geodir-post-gallery').'" class="clearfix" >';

 			break;

 		case 'reviews' :

 			echo '<div id="reviews-wrap" class="clearfix"> ';

@@ -504,8 +504,8 @@ 
  *

  * @param string $hash_key

  */

-function geodir_after_tab_content( $hash_key ) {

-	switch ( $hash_key ) {

+function geodir_after_tab_content($hash_key) {

+	switch ($hash_key) {

 		case 'post_info' :

 			echo '</div>';

 			break;

@@ -536,25 +536,25 @@ 
  * @global object $wpdb     WordPress Database object.

  * @return bool|null|string Returns default sort results, when the post type is valid. Otherwise returns false.

  */

-function geodir_get_posts_default_sort( $post_type ) {

+function geodir_get_posts_default_sort($post_type) {

 

 	global $wpdb;

 

-	if ( $post_type != '' ) {

+	if ($post_type != '') {

 

 		$all_postypes = geodir_get_posttypes();

 

-		if ( ! in_array( $post_type, $all_postypes ) ) {

+		if (!in_array($post_type, $all_postypes)) {

 			return false;

 		}

 

-		$sort_field_info = $wpdb->get_var( $wpdb->prepare( "select default_order from " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " where	post_type= %s and is_active=%d and is_default=%d", array(

+		$sort_field_info = $wpdb->get_var($wpdb->prepare("select default_order from ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." where	post_type= %s and is_active=%d and is_default=%d", array(

 			$post_type,

 			1,

 			1

-		) ) );

+		)));

 

-		if ( ! empty( $sort_field_info ) ) {

+		if (!empty($sort_field_info)) {

 			return $sort_field_info;

 		}

 

@@ -574,20 +574,20 @@ 
  * @global object $wpdb     WordPress Database object.

  * @return bool|mixed|void Returns sort results, when the post type is valid. Otherwise returns false.

  */

-function geodir_get_sort_options( $post_type ) {

+function geodir_get_sort_options($post_type) {

 	global $wpdb;

 

-	if ( $post_type != '' ) {

+	if ($post_type != '') {

 		$all_postypes = geodir_get_posttypes();

 

-		if ( ! in_array( $post_type, $all_postypes ) ) {

+		if (!in_array($post_type, $all_postypes)) {

 			return false;

 		}

 

-		$sort_field_info = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array(

+		$sort_field_info = $wpdb->get_results($wpdb->prepare("SELECT * FROM ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." WHERE post_type=%s AND is_active=%d AND (sort_asc=1 || sort_desc=1 || field_type='random') AND field_type != 'address' ORDER BY sort_order ASC", array(

 			$post_type,

 			1

-		) ) );

+		)));

 

 		/**

 		 * Filter post sort options.

@@ -597,7 +597,7 @@ 
 		 * @param array $sort_field_info Unfiltered sort field array.

 		 * @param string $post_type      Post type.

 		 */

-		return apply_filters( 'geodir_get_sort_options', $sort_field_info, $post_type );

+		return apply_filters('geodir_get_sort_options', $sort_field_info, $post_type);

 	}

 

 }

@@ -618,63 +618,63 @@ 
 	 *

 	 * @since 1.4.4

 	 */

-	if ( is_search() ) {

+	if (is_search()) {

 		return;

 	}

 

 	$sort_by = '';

 

-	if ( isset( $_REQUEST['sort_by'] ) ) {

+	if (isset($_REQUEST['sort_by'])) {

 		$sort_by = $_REQUEST['sort_by'];

 	}

 

 	$gd_post_type = geodir_get_current_posttype();

 

-	$sort_options = geodir_get_sort_options( $gd_post_type );

+	$sort_options = geodir_get_sort_options($gd_post_type);

 

 

 	$sort_field_options = '';

 

-	if ( ! empty( $sort_options ) ) {

-		foreach ( $sort_options as $sort ) {

-			$sort = stripslashes_deep( $sort ); // strip slashes

+	if (!empty($sort_options)) {

+		foreach ($sort_options as $sort) {

+			$sort = stripslashes_deep($sort); // strip slashes

 

-			$label = __( $sort->site_title, 'geodirectory' );

+			$label = __($sort->site_title, 'geodirectory');

 

-			if ( $sort->field_type == 'random' ) {

+			if ($sort->field_type == 'random') {

 				$key = $sort->field_type;

-				( $sort_by == $key || ( $sort->is_default == '1' && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';

-				$sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';

+				($sort_by == $key || ($sort->is_default == '1' && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';

+				$sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';

 			}

 

-			if ( $sort->htmlvar_name == 'comment_count' ) {

+			if ($sort->htmlvar_name == 'comment_count') {

 				$sort->htmlvar_name = 'rating_count';

 			}

 

-			if ( $sort->sort_asc ) {

-				$key   = $sort->htmlvar_name . '_asc';

+			if ($sort->sort_asc) {

+				$key   = $sort->htmlvar_name.'_asc';

 				$label = $sort->site_title;

-				if ( $sort->asc_title ) {

+				if ($sort->asc_title) {

 					$label = $sort->asc_title;

 				}

-				( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';

-				$sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';

+				($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';

+				$sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';

 			}

 

-			if ( $sort->sort_desc ) {

-				$key   = $sort->htmlvar_name . '_desc';

+			if ($sort->sort_desc) {

+				$key   = $sort->htmlvar_name.'_desc';

 				$label = $sort->site_title;

-				if ( $sort->desc_title ) {

+				if ($sort->desc_title) {

 					$label = $sort->desc_title;

 				}

-				( $sort_by == $key || ( $sort->is_default == '1' && $sort->default_order == $key && ! isset( $_REQUEST['sort_by'] ) ) ) ? $selected = 'selected="selected"' : $selected = '';

-				$sort_field_options .= '<option ' . $selected . ' value="' . esc_url( add_query_arg( 'sort_by', $key ) ) . '">' . __( $label, 'geodirectory' ) . '</option>';

+				($sort_by == $key || ($sort->is_default == '1' && $sort->default_order == $key && !isset($_REQUEST['sort_by']))) ? $selected = 'selected="selected"' : $selected = '';

+				$sort_field_options .= '<option '.$selected.' value="'.esc_url(add_query_arg('sort_by', $key)).'">'.__($label, 'geodirectory').'</option>';

 			}

 

 		}

 	}

 

-	if ( $sort_field_options != '' ) {

+	if ($sort_field_options != '') {

 

 		?>

 

@@ -683,9 +683,9 @@ 
 			<select name="sort_by" id="sort_by" onchange="javascript:window.location=this.value;">

 

 				<option

-					value="<?php echo esc_url( add_query_arg( 'sort_by', '' ) ); ?>" <?php if ( $sort_by == '' ) {

+					value="<?php echo esc_url(add_query_arg('sort_by', '')); ?>" <?php if ($sort_by == '') {

 					echo 'selected="selected"';

-				} ?>><?php _e( 'Sort By', 'geodirectory' ); ?></option><?php

+				} ?>><?php _e('Sort By', 'geodirectory'); ?></option><?php

 

 				echo $sort_field_options; ?>

 

@@ -713,9 +713,9 @@ 
  *

  * @return string Returns the section title.

  */

-function geodir_advance_customfields_heading( $title, $field_type ) {

+function geodir_advance_customfields_heading($title, $field_type) {

 

-	if ( in_array( $field_type, array( 'multiselect', 'textarea', 'taxonomy' ) ) ) {

+	if (in_array($field_type, array('multiselect', 'textarea', 'taxonomy'))) {

 		$title = '';

 	}

 

@@ -737,19 +737,19 @@ 
  * @global object $gd_session       GeoDirectory Session object.

  * @return string Returns related posts html.

  */

-function geodir_related_posts_display( $request ) {

-	if ( ! empty( $request ) ) {

-		$before_title = ( isset( $request['before_title'] ) && ! empty( $request['before_title'] ) ) ? $request['before_title'] : '';

-		$after_title  = ( isset( $request['after_title'] ) && ! empty( $request['after_title'] ) ) ? $request['after_title'] : '';

-

-		$title               = ( isset( $request['title'] ) && ! empty( $request['title'] ) ) ? $request['title'] : __( 'Related Listings', 'geodirectory' );

-		$post_number         = ( isset( $request['post_number'] ) && ! empty( $request['post_number'] ) ) ? $request['post_number'] : '5';

-		$relate_to           = ( isset( $request['relate_to'] ) && ! empty( $request['relate_to'] ) ) ? $request['relate_to'] : 'category';

-		$layout              = ( isset( $request['layout'] ) && ! empty( $request['layout'] ) ) ? $request['layout'] : 'gridview_onehalf';

-		$add_location_filter = ( isset( $request['add_location_filter'] ) && ! empty( $request['add_location_filter'] ) ) ? $request['add_location_filter'] : '0';

-		$listing_width       = ( isset( $request['listing_width'] ) && ! empty( $request['listing_width'] ) ) ? $request['listing_width'] : '';

-		$list_sort           = ( isset( $request['list_sort'] ) && ! empty( $request['list_sort'] ) ) ? $request['list_sort'] : 'latest';

-		$character_count     = ( isset( $request['character_count'] ) && ! empty( $request['character_count'] ) ) ? $request['character_count'] : '';

+function geodir_related_posts_display($request) {

+	if (!empty($request)) {

+		$before_title = (isset($request['before_title']) && !empty($request['before_title'])) ? $request['before_title'] : '';

+		$after_title  = (isset($request['after_title']) && !empty($request['after_title'])) ? $request['after_title'] : '';

+

+		$title               = (isset($request['title']) && !empty($request['title'])) ? $request['title'] : __('Related Listings', 'geodirectory');

+		$post_number         = (isset($request['post_number']) && !empty($request['post_number'])) ? $request['post_number'] : '5';

+		$relate_to           = (isset($request['relate_to']) && !empty($request['relate_to'])) ? $request['relate_to'] : 'category';

+		$layout              = (isset($request['layout']) && !empty($request['layout'])) ? $request['layout'] : 'gridview_onehalf';

+		$add_location_filter = (isset($request['add_location_filter']) && !empty($request['add_location_filter'])) ? $request['add_location_filter'] : '0';

+		$listing_width       = (isset($request['listing_width']) && !empty($request['listing_width'])) ? $request['listing_width'] : '';

+		$list_sort           = (isset($request['list_sort']) && !empty($request['list_sort'])) ? $request['list_sort'] : 'latest';

+		$character_count     = (isset($request['character_count']) && !empty($request['character_count'])) ? $request['character_count'] : '';

 

 		global $wpdb, $post, $gd_session, $related_nearest, $related_parent_lat, $related_parent_lon;

 		$related_parent_lat   = $post->post_latitude;

@@ -757,10 +757,10 @@ 
 		$arr_detail_page_tabs = geodir_detail_page_tabs_list();

 

 		$related_listing_array = array();

-		if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {

-			$related_listing_array = get_option( 'geodir_add_related_listing_posttypes' );

+		if (get_option('geodir_add_related_listing_posttypes')) {

+			$related_listing_array = get_option('geodir_add_related_listing_posttypes');

 		}

-		if ( in_array( $post->post_type, $related_listing_array ) ) {

+		if (in_array($post->post_type, $related_listing_array)) {

 			$arr_detail_page_tabs['related_listing']['is_display'] = true;

 		}

 

@@ -772,90 +772,90 @@ 
 		$tax_field         = 'id';

 		$category          = array();

 

-		if ( isset( $_REQUEST['backandedit'] ) ) {

-			$post      = (object) $gd_session->get( 'listing' );

+		if (isset($_REQUEST['backandedit'])) {

+			$post      = (object) $gd_session->get('listing');

 			$post_type = $post->listing_type;

-			if ( isset( $_REQUEST['pid'] ) && $_REQUEST['pid'] != '' ) {

+			if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

 				$post_id = $_REQUEST['pid'];

 			}

-		} elseif ( isset( $_REQUEST['pid'] ) && $_REQUEST['pid'] != '' ) {

-			$post      = geodir_get_post_info( $_REQUEST['pid'] );

+		} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {

+			$post      = geodir_get_post_info($_REQUEST['pid']);

 			$post_type = $post->post_type;

 			$post_id   = $_REQUEST['pid'];

-		} elseif ( isset( $post->post_type ) && $post->post_type != '' ) {

+		} elseif (isset($post->post_type) && $post->post_type != '') {

 			$post_type = $post->post_type;

 			$post_id   = $post->ID;

 		}

 

-		if ( $relate_to == 'category' ) {

+		if ($relate_to == 'category') {

 

-			$category_taxonomy = $post_type . $relate_to;

-			if ( isset( $post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '' ) {

-				$category = explode( ',', trim( $post->{$category_taxonomy}, ',' ) );

+			$category_taxonomy = $post_type.$relate_to;

+			if (isset($post->{$category_taxonomy} ) && $post->{$category_taxonomy} != '') {

+				$category = explode(',', trim($post->{$category_taxonomy}, ','));

 			}

 

-		} elseif ( $relate_to == 'tags' ) {

+		} elseif ($relate_to == 'tags') {

 

-			$category_taxonomy = $post_type . '_' . $relate_to;

-			if ( $post->post_tags != '' ) {

-				$category = explode( ',', trim( $post->post_tags, ',' ) );

+			$category_taxonomy = $post_type.'_'.$relate_to;

+			if ($post->post_tags != '') {

+				$category = explode(',', trim($post->post_tags, ','));

 			}

 			$tax_field = 'name';

 		}

 

 		/* --- return false in invalid request --- */

-		if ( empty( $category ) ) {

+		if (empty($category)) {

 			return false;

 		}

 

 		$all_postypes = geodir_get_posttypes();

 

-		if ( ! in_array( $post_type, $all_postypes ) ) {

+		if (!in_array($post_type, $all_postypes)) {

 			return false;

 		}

 

 		/* --- return false in invalid request --- */

 

 		$location_url = '';

-		if ( $add_location_filter != '0' ) {

+		if ($add_location_filter != '0') {

 			$location_url             = array();

-			$geodir_show_location_url = get_option( 'geodir_show_location_url' );

+			$geodir_show_location_url = get_option('geodir_show_location_url');

 

-			$gd_city = get_query_var( 'gd_city' );

+			$gd_city = get_query_var('gd_city');

 

-			if ( $gd_city ) {

-				$gd_country = get_query_var( 'gd_country' );

-				$gd_region  = get_query_var( 'gd_region' );

+			if ($gd_city) {

+				$gd_country = get_query_var('gd_country');

+				$gd_region  = get_query_var('gd_region');

 			} else {

 				$location = geodir_get_default_location();

 

-				$gd_country = isset( $location->country_slug ) ? $location->country_slug : '';

-				$gd_region  = isset( $location->region_slug ) ? $location->region_slug : '';

-				$gd_city    = isset( $location->city_slug ) ? $location->city_slug : '';

+				$gd_country = isset($location->country_slug) ? $location->country_slug : '';

+				$gd_region  = isset($location->region_slug) ? $location->region_slug : '';

+				$gd_city    = isset($location->city_slug) ? $location->city_slug : '';

 			}

 

-			if ( $geodir_show_location_url == 'all' ) {

+			if ($geodir_show_location_url == 'all') {

 				$location_url[] = $gd_country;

 				$location_url[] = $gd_region;

-			} else if ( $geodir_show_location_url == 'country_city' ) {

+			} else if ($geodir_show_location_url == 'country_city') {

 				$location_url[] = $gd_country;

-			} else if ( $geodir_show_location_url == 'region_city' ) {

+			} else if ($geodir_show_location_url == 'region_city') {

 				$location_url[] = $gd_region;

 			}

 

 			$location_url[] = $gd_city;

 

-			$location_url = implode( '/', $location_url );

+			$location_url = implode('/', $location_url);

 		}

 

 

-		if ( ! empty( $category ) ) {

+		if (!empty($category)) {

 			global $geodir_add_location_url;

 			$geodir_add_location_url = '0';

-			if ( $add_location_filter != '0' ) {

+			if ($add_location_filter != '0') {

 				$geodir_add_location_url = '1';

 			}

-			$viewall_url             = get_term_link( (int) $category[0], $post_type . $category_taxonomy );

+			$viewall_url             = get_term_link((int) $category[0], $post_type.$category_taxonomy);

 			$geodir_add_location_url = null;

 		}

 		ob_start();

@@ -865,24 +865,24 @@ 
 		<div class="geodir_locations geodir_location_listing">

 

 			<?php

-			if ( isset( $request['is_widget'] ) && $request['is_widget'] == '1' ) {

+			if (isset($request['is_widget']) && $request['is_widget'] == '1') {

 				/** geodir_before_title filter Documented in geodirectory_widgets.php */

-				$before_title = isset( $before_title ) ? $before_title : apply_filters( 'geodir_before_title', '<h3 class="widget-title">' );

+				$before_title = isset($before_title) ? $before_title : apply_filters('geodir_before_title', '<h3 class="widget-title">');

 				/** geodir_after_title filter Documented in geodirectory_widgets.php */

-				$after_title = isset( $after_title ) ? $after_title : apply_filters( 'geodir_after_title', '</h3>' );

+				$after_title = isset($after_title) ? $after_title : apply_filters('geodir_after_title', '</h3>');

 				?>

 				<div class="location_list_heading clearfix">

-					<?php echo $before_title . $title . $after_title; ?>

+					<?php echo $before_title.$title.$after_title; ?>

 				</div>

 				<?php

 			}

 			$query_args = array(

 				'posts_per_page'   => $post_number,

 				'is_geodir_loop'   => true,

-				'gd_location'      => ( $add_location_filter ) ? true : false,

+				'gd_location'      => ($add_location_filter) ? true : false,

 				'post_type'        => $post_type,

 				'order_by'         => $list_sort,

-				'post__not_in'     => array( $post_id ),

+				'post__not_in'     => array($post_id),

 				'excerpt_length'   => $character_count,

 				'related_listings' => $is_display

 			);

@@ -893,24 +893,24 @@ 
 				'terms'    => $category

 			);

 

-			$query_args['tax_query'] = array( $tax_query );

+			$query_args['tax_query'] = array($tax_query);

 

 			global $gridview_columns, $post;

 

 

-			query_posts( $query_args );

+			query_posts($query_args);

 

-			if ( strstr( $layout, 'gridview' ) ) {

-				$listing_view_exp = explode( '_', $layout );

+			if (strstr($layout, 'gridview')) {

+				$listing_view_exp = explode('_', $layout);

 				$gridview_columns = $layout;

 				$layout           = $listing_view_exp[0];

-			} else if ( $layout == 'list' ) {

+			} else if ($layout == 'list') {

 				$gridview_columns = '';

 			}

 			$related_posts = true;

 

 			$related_nearest = false;

-			if ( $list_sort == 'nearest' ) {

+			if ($list_sort == 'nearest') {

 				$related_nearest = true;

 			}

 

@@ -920,14 +920,14 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			$template = apply_filters( "geodir_template_part-related-listing-listview", geodir_locate_template( 'listing-listview' ) );

+			$template = apply_filters("geodir_template_part-related-listing-listview", geodir_locate_template('listing-listview'));

 

 			/**

 			 * Includes related listing listview template.

 			 *

 			 * @since 1.0.0

 			 */

-			include( $template );

+			include($template);

 

 			wp_reset_query();

 			$post            = $origi_post;

@@ -955,12 +955,12 @@ 
 function geodir_category_count_script() {

 	global $geodir_post_category_str;

 

-	if ( ! empty( $geodir_post_category_str ) ) {

-		$geodir_post_category_str = serialize( $geodir_post_category_str );

+	if (!empty($geodir_post_category_str)) {

+		$geodir_post_category_str = serialize($geodir_post_category_str);

 	}

 

-	$all_var['post_category_array'] = html_entity_decode( (string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8' );

-	$script                         = "var post_category_array = " . json_encode( $all_var ) . ';';

+	$all_var['post_category_array'] = html_entity_decode((string) $geodir_post_category_str, ENT_QUOTES, 'UTF-8');

+	$script                         = "var post_category_array = ".json_encode($all_var).';';

 	echo '<script>';

 	echo $script;

 	echo '</script>';

@@ -975,8 +975,8 @@ 
  * @return string Returns the default language.

  */

 function geodir_get_map_default_language() {

-	$geodir_default_map_language = get_option( 'geodir_default_map_language' );

-	if ( empty( $geodir_default_map_language ) ) {

+	$geodir_default_map_language = get_option('geodir_default_map_language');

+	if (empty($geodir_default_map_language)) {

 		$geodir_default_map_language = 'en';

 	}

 

@@ -987,7 +987,7 @@ 
 	 *

 	 * @param string $geodir_default_map_language Default map language.

 	 */

-	return apply_filters( 'geodir_default_map_language', $geodir_default_map_language );

+	return apply_filters('geodir_default_map_language', $geodir_default_map_language);

 }

 

 /**

@@ -998,7 +998,7 @@ 
  * @return string Returns the api key.

  */

 function geodir_get_map_api_key() {

-	$key = get_option( 'geodir_google_api_key' );

+	$key = get_option('geodir_google_api_key');

 

 	/**

 	 * Filter Google maps api key.

@@ -1007,7 +1007,7 @@ 
 	 *

 	 * @param string $key Google maps api key.

 	 */

-	return apply_filters( 'geodir_google_api_key', $key );

+	return apply_filters('geodir_google_api_key', $key);

 }

 

 

@@ -1026,20 +1026,20 @@ 
 	global $wp, $post, $wp_query, $wpdb, $geodir_addon_list;

 

 	$is_geodir_page = geodir_is_geodir_page();

-	if ( ! $is_geodir_page ) {

+	if (!$is_geodir_page) {

 		return;

 	}// if non GD page, bail

 

 	$use_gd_meta = true;

-	if ( class_exists( 'WPSEO_Frontend' ) || class_exists( 'All_in_One_SEO_Pack' ) ) {

+	if (class_exists('WPSEO_Frontend') || class_exists('All_in_One_SEO_Pack')) {

 		$use_gd_meta = false;

 

-		if ( geodir_is_page( 'search' ) ) {

+		if (geodir_is_page('search')) {

 			$use_gd_meta = true;

 		}

 	}

 

-	if ( ! $use_gd_meta ) {

+	if (!$use_gd_meta) {

 		return;

 	}// bail if Yoast Wordpress SEO or All_in_One_SEO_Pack active.

 

@@ -1047,170 +1047,170 @@ 
 

 	$all_postypes = geodir_get_posttypes();

 

-	$geodir_taxonomies = geodir_get_taxonomies( '', true );

+	$geodir_taxonomies = geodir_get_taxonomies('', true);

 

 	$meta_desc = '';

 	$meta_key  = '';

-	if ( isset( $current_term->ID ) && $current_term->ID == geodir_location_page_id() ) {

+	if (isset($current_term->ID) && $current_term->ID == geodir_location_page_id()) {

 		/**

 		 * Filter SEO meta location description.

 		 *

 		 * @since 1.0.0

 		 */

-		$meta_desc = apply_filters( 'geodir_seo_meta_location_description', '' );

+		$meta_desc = apply_filters('geodir_seo_meta_location_description', '');

 		$meta_desc .= '';

 	}

-	if ( have_posts() && is_single() OR is_page() ) {

-		while ( have_posts() ) {

+	if (have_posts() && is_single() OR is_page()) {

+		while (have_posts()) {

 			the_post();

 

-			if ( has_excerpt() ) {

-				$out_excerpt = strip_tags( strip_shortcodes( get_the_excerpt() ) );

-				if ( empty( $out_excerpt ) ) {

-					$out_excerpt = strip_tags( do_shortcode( get_the_excerpt() ) );

+			if (has_excerpt()) {

+				$out_excerpt = strip_tags(strip_shortcodes(get_the_excerpt()));

+				if (empty($out_excerpt)) {

+					$out_excerpt = strip_tags(do_shortcode(get_the_excerpt()));

 				}

-				$out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $out_excerpt );

+				$out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $out_excerpt);

 			} else {

-				$out_excerpt = str_replace( array( "\r\n", "\r", "\n" ), "", $post->post_content );

-				$out_excerpt = strip_tags( strip_shortcodes( $out_excerpt ) );

-				if ( empty( $out_excerpt ) ) {

-					$out_excerpt = strip_tags( do_shortcode( $out_excerpt ) ); // parse short code from content

+				$out_excerpt = str_replace(array("\r\n", "\r", "\n"), "", $post->post_content);

+				$out_excerpt = strip_tags(strip_shortcodes($out_excerpt));

+				if (empty($out_excerpt)) {

+					$out_excerpt = strip_tags(do_shortcode($out_excerpt)); // parse short code from content

 				}

-				$out_excerpt = trim( wp_trim_words( $out_excerpt, 35, '' ), '.!?,;:-' );

+				$out_excerpt = trim(wp_trim_words($out_excerpt, 35, ''), '.!?,;:-');

 			}

 

 			$meta_desc .= $out_excerpt;

 		}

-	} elseif ( ( is_category() || is_tag() ) && isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {

-		if ( is_category() ) {

-			$meta_desc .= __( "Posts related to Category:", 'geodirectory' ) . " " . ucfirst( single_cat_title( "", false ) );

-		} elseif ( is_tag() ) {

-			$meta_desc .= __( "Posts related to Tag:", 'geodirectory' ) . " " . ucfirst( single_tag_title( "", false ) );

+	} elseif ((is_category() || is_tag()) && isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {

+		if (is_category()) {

+			$meta_desc .= __("Posts related to Category:", 'geodirectory')." ".ucfirst(single_cat_title("", false));

+		} elseif (is_tag()) {

+			$meta_desc .= __("Posts related to Tag:", 'geodirectory')." ".ucfirst(single_tag_title("", false));

 		}

-	} elseif ( isset( $current_term->taxonomy ) && in_array( $current_term->taxonomy, $geodir_taxonomies ) ) {

-		$meta_desc .= isset( $current_term->description ) ? $current_term->description : '';

+	} elseif (isset($current_term->taxonomy) && in_array($current_term->taxonomy, $geodir_taxonomies)) {

+		$meta_desc .= isset($current_term->description) ? $current_term->description : '';

 	}

 

 

 	$geodir_post_type       = geodir_get_current_posttype();

-	$geodir_post_type_info  = get_post_type_object( $geodir_post_type );

-	$geodir_is_page_listing = geodir_is_page( 'listing' ) ? true : false;

-

-	$category_taxonomy = geodir_get_taxonomies( $geodir_post_type );

-	$tag_taxonomy      = geodir_get_taxonomies( $geodir_post_type, true );

-

-	$geodir_is_category = isset( $category_taxonomy[0] ) && get_query_var( $category_taxonomy[0] ) ? get_query_var( $category_taxonomy[0] ) : false;

-	$geodir_is_tag      = isset( $tag_taxonomy[0] ) && get_query_var( $tag_taxonomy[0] ) ? true : false;

-

-	$geodir_is_search        = geodir_is_page( 'search' ) ? true : false;

-	$geodir_is_location      = geodir_is_page( 'location' ) ? true : false;

-	$geodir_location_manager = isset( $geodir_addon_list['geodir_location_manager'] ) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false;

-	$godir_location_terms    = geodir_get_current_location_terms( 'query_vars' );

-	$gd_city                 = $geodir_location_manager && isset( $godir_location_terms['gd_city'] ) ? $godir_location_terms['gd_city'] : null;

-	$gd_region               = $geodir_location_manager && isset( $godir_location_terms['gd_region'] ) ? $godir_location_terms['gd_region'] : null;

-	$gd_country              = $geodir_location_manager && isset( $godir_location_terms['gd_country'] ) ? $godir_location_terms['gd_country'] : null;

-	$replace_location        = __( 'Everywhere', 'geodirectory' );

+	$geodir_post_type_info  = get_post_type_object($geodir_post_type);

+	$geodir_is_page_listing = geodir_is_page('listing') ? true : false;

+

+	$category_taxonomy = geodir_get_taxonomies($geodir_post_type);

+	$tag_taxonomy      = geodir_get_taxonomies($geodir_post_type, true);

+

+	$geodir_is_category = isset($category_taxonomy[0]) && get_query_var($category_taxonomy[0]) ? get_query_var($category_taxonomy[0]) : false;

+	$geodir_is_tag      = isset($tag_taxonomy[0]) && get_query_var($tag_taxonomy[0]) ? true : false;

+

+	$geodir_is_search        = geodir_is_page('search') ? true : false;

+	$geodir_is_location      = geodir_is_page('location') ? true : false;

+	$geodir_location_manager = isset($geodir_addon_list['geodir_location_manager']) && $geodir_addon_list['geodir_location_manager'] = 'yes' ? true : false;

+	$godir_location_terms    = geodir_get_current_location_terms('query_vars');

+	$gd_city                 = $geodir_location_manager && isset($godir_location_terms['gd_city']) ? $godir_location_terms['gd_city'] : null;

+	$gd_region               = $geodir_location_manager && isset($godir_location_terms['gd_region']) ? $godir_location_terms['gd_region'] : null;

+	$gd_country              = $geodir_location_manager && isset($godir_location_terms['gd_country']) ? $godir_location_terms['gd_country'] : null;

+	$replace_location        = __('Everywhere', 'geodirectory');

 	$location_id             = null;

-	if ( $geodir_location_manager ) {

-		$sql           = $wpdb->prepare( "SELECT location_id FROM " . POST_LOCATION_TABLE . " WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array( $gd_city ) );

-		$location_id   = (int) $wpdb->get_var( $sql );

+	if ($geodir_location_manager) {

+		$sql           = $wpdb->prepare("SELECT location_id FROM ".POST_LOCATION_TABLE." WHERE city_slug=%s ORDER BY location_id ASC LIMIT 1", array($gd_city));

+		$location_id   = (int) $wpdb->get_var($sql);

 		$location_type = geodir_what_is_current_location();

-		if ( $location_type == 'city' ) {

-			$replace_location = geodir_get_current_location( array( 'what' => 'city', 'echo' => false ) );

-		} elseif ( $location_type == 'region' ) {

-			$replace_location = geodir_get_current_location( array( 'what' => 'region', 'echo' => false ) );

-		} elseif ( $location_type == 'country' ) {

-			$replace_location = geodir_get_current_location( array( 'what' => 'country', 'echo' => false ) );

-			$replace_location = __( $replace_location, 'geodirectory' );

+		if ($location_type == 'city') {

+			$replace_location = geodir_get_current_location(array('what' => 'city', 'echo' => false));

+		} elseif ($location_type == 'region') {

+			$replace_location = geodir_get_current_location(array('what' => 'region', 'echo' => false));

+		} elseif ($location_type == 'country') {

+			$replace_location = geodir_get_current_location(array('what' => 'country', 'echo' => false));

+			$replace_location = __($replace_location, 'geodirectory');

 		}

-		$country          = get_query_var( 'gd_country' );

-		$region           = get_query_var( 'gd_region' );

-		$city             = get_query_var( 'gd_city' );

+		$country          = get_query_var('gd_country');

+		$region           = get_query_var('gd_region');

+		$city             = get_query_var('gd_city');

 		$current_location = '';

-		if ( $country != '' ) {

-			$current_location = get_actual_location_name( 'country', $country, true );

+		if ($country != '') {

+			$current_location = get_actual_location_name('country', $country, true);

 		}

-		if ( $region != '' ) {

-			$current_location = get_actual_location_name( 'region', $region );

+		if ($region != '') {

+			$current_location = get_actual_location_name('region', $region);

 		}

-		if ( $city != '' ) {

-			$current_location = get_actual_location_name( 'city', $city );

+		if ($city != '') {

+			$current_location = get_actual_location_name('city', $city);

 		}

 		$replace_location = $current_location != '' ? $current_location : $replace_location;

 	}

 

 	$geodir_meta_keys = '';

 	$geodir_meta_desc = '';

-	if ( $is_geodir_page && ! empty( $geodir_post_type_info ) ) {

-		if ( $geodir_is_page_listing || $geodir_is_search || geodir_is_page( 'add-listing' ) ) {

-			$geodir_meta_keys = isset( $geodir_post_type_info->seo['meta_keyword'] ) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys;

+	if ($is_geodir_page && !empty($geodir_post_type_info)) {

+		if ($geodir_is_page_listing || $geodir_is_search || geodir_is_page('add-listing')) {

+			$geodir_meta_keys = isset($geodir_post_type_info->seo['meta_keyword']) && $geodir_post_type_info->seo['meta_keyword'] != '' ? $geodir_post_type_info->seo['meta_keyword'] : $geodir_meta_keys;

 

-			$geodir_meta_desc = isset( $geodir_post_type_info->description ) ? $geodir_post_type_info->description : $geodir_meta_desc;

-			$geodir_meta_desc = isset( $geodir_post_type_info->seo['meta_description'] ) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc;

+			$geodir_meta_desc = isset($geodir_post_type_info->description) ? $geodir_post_type_info->description : $geodir_meta_desc;

+			$geodir_meta_desc = isset($geodir_post_type_info->seo['meta_description']) && $geodir_post_type_info->seo['meta_description'] != '' ? $geodir_post_type_info->seo['meta_description'] : $geodir_meta_desc;

 

-			if ( $geodir_is_category ) {

-				$category = $geodir_is_category ? get_term_by( 'slug', $geodir_is_category, $category_taxonomy[0] ) : null;

-				if ( isset( $category->term_id ) && ! empty( $category->term_id ) ) {

+			if ($geodir_is_category) {

+				$category = $geodir_is_category ? get_term_by('slug', $geodir_is_category, $category_taxonomy[0]) : null;

+				if (isset($category->term_id) && !empty($category->term_id)) {

 					$category_id   = $category->term_id;

-					$category_desc = trim( $category->description ) != '' ? trim( $category->description ) : get_tax_meta( $category_id, 'ct_cat_top_desc', false, $geodir_post_type );

-					if ( $location_id ) {

-						$option_name    = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id;

-						$cat_loc_option = get_option( $option_name );

-

-						$gd_cat_loc_default = ! empty( $cat_loc_option ) && isset( $cat_loc_option['gd_cat_loc_default'] ) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false;

-						if ( ! $gd_cat_loc_default ) {

-							$option_name   = 'geodir_cat_loc_' . $geodir_post_type . '_' . $category_id . '_' . $location_id;

-							$option        = get_option( $option_name );

-							$category_desc = isset( $option['gd_cat_loc_desc'] ) && trim( $option['gd_cat_loc_desc'] ) != '' ? trim( $option['gd_cat_loc_desc'] ) : $category_desc;

+					$category_desc = trim($category->description) != '' ? trim($category->description) : get_tax_meta($category_id, 'ct_cat_top_desc', false, $geodir_post_type);

+					if ($location_id) {

+						$option_name    = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id;

+						$cat_loc_option = get_option($option_name);

+

+						$gd_cat_loc_default = !empty($cat_loc_option) && isset($cat_loc_option['gd_cat_loc_default']) && $cat_loc_option['gd_cat_loc_default'] > 0 ? true : false;

+						if (!$gd_cat_loc_default) {

+							$option_name   = 'geodir_cat_loc_'.$geodir_post_type.'_'.$category_id.'_'.$location_id;

+							$option        = get_option($option_name);

+							$category_desc = isset($option['gd_cat_loc_desc']) && trim($option['gd_cat_loc_desc']) != '' ? trim($option['gd_cat_loc_desc']) : $category_desc;

 						}

 					}

-					$geodir_meta_desc = __( "Posts related to Category:", 'geodirectory' ) . " " . ucfirst( single_cat_title( "", false ) ) . '. ' . $category_desc;

+					$geodir_meta_desc = __("Posts related to Category:", 'geodirectory')." ".ucfirst(single_cat_title("", false)).'. '.$category_desc;

 				}

-			} else if ( $geodir_is_tag ) {

-				$geodir_meta_desc = __( "Posts related to Tag:", 'geodirectory' ) . " " . ucfirst( single_tag_title( "", false ) ) . '. ' . $geodir_meta_desc;

+			} else if ($geodir_is_tag) {

+				$geodir_meta_desc = __("Posts related to Tag:", 'geodirectory')." ".ucfirst(single_tag_title("", false)).'. '.$geodir_meta_desc;

 			}

 		}

 	}

 

 

 	$gd_page = '';

-	if ( geodir_is_page( 'home' ) ) {

+	if (geodir_is_page('home')) {

 		$gd_page   = 'home';

-		$meta_desc = ( get_option( 'geodir_meta_desc_homepage' ) ) ? get_option( 'geodir_meta_desc_homepage' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'detail' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_homepage')) ? get_option('geodir_meta_desc_homepage') : $meta_desc;

+	} elseif (geodir_is_page('detail')) {

 		$gd_page   = 'detail';

-		$meta_desc = ( get_option( 'geodir_meta_desc_detail' ) ) ? get_option( 'geodir_meta_desc_detail' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'pt' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_detail')) ? get_option('geodir_meta_desc_detail') : $meta_desc;

+	} elseif (geodir_is_page('pt')) {

 		$gd_page   = 'pt';

-		$meta_desc = ( get_option( 'geodir_meta_desc_pt' ) ) ? get_option( 'geodir_meta_desc_pt' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'listing' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_pt')) ? get_option('geodir_meta_desc_pt') : $meta_desc;

+	} elseif (geodir_is_page('listing')) {

 		$gd_page   = 'listing';

-		$meta_desc = ( get_option( 'geodir_meta_desc_listing' ) ) ? get_option( 'geodir_meta_desc_listing' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'location' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_listing')) ? get_option('geodir_meta_desc_listing') : $meta_desc;

+	} elseif (geodir_is_page('location')) {

 		$gd_page   = 'location';

-		$meta_desc = ( get_option( 'geodir_meta_desc_location' ) ) ? get_option( 'geodir_meta_desc_location' ) : $meta_desc;

-		$meta_desc = apply_filters( 'geodir_seo_meta_location_description', $meta_desc );

+		$meta_desc = (get_option('geodir_meta_desc_location')) ? get_option('geodir_meta_desc_location') : $meta_desc;

+		$meta_desc = apply_filters('geodir_seo_meta_location_description', $meta_desc);

 

-	} elseif ( geodir_is_page( 'search' ) ) {

+	} elseif (geodir_is_page('search')) {

 		$gd_page   = 'search';

-		$meta_desc = ( get_option( 'geodir_meta_desc_search' ) ) ? get_option( 'geodir_meta_desc_search' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'add-listing' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_search')) ? get_option('geodir_meta_desc_search') : $meta_desc;

+	} elseif (geodir_is_page('add-listing')) {

 		$gd_page   = 'add-listing';

-		$meta_desc = ( get_option( 'geodir_meta_desc_add-listing' ) ) ? get_option( 'geodir_meta_desc_add-listing' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'author' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_add-listing')) ? get_option('geodir_meta_desc_add-listing') : $meta_desc;

+	} elseif (geodir_is_page('author')) {

 		$gd_page   = 'author';

-		$meta_desc = ( get_option( 'geodir_meta_desc_author' ) ) ? get_option( 'geodir_meta_desc_author' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'login' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_author')) ? get_option('geodir_meta_desc_author') : $meta_desc;

+	} elseif (geodir_is_page('login')) {

 		$gd_page   = 'login';

-		$meta_desc = ( get_option( 'geodir_meta_desc_login' ) ) ? get_option( 'geodir_meta_desc_login' ) : $meta_desc;

-	} elseif ( geodir_is_page( 'listing-success' ) ) {

+		$meta_desc = (get_option('geodir_meta_desc_login')) ? get_option('geodir_meta_desc_login') : $meta_desc;

+	} elseif (geodir_is_page('listing-success')) {

 		$gd_page   = 'listing-success';

-		$meta_desc = ( get_option( 'geodir_meta_desc_listing-success' ) ) ? get_option( 'geodir_meta_desc_listing-success' ) : $meta_desc;

+		$meta_desc = (get_option('geodir_meta_desc_listing-success')) ? get_option('geodir_meta_desc_listing-success') : $meta_desc;

 	}

 

 

-	if ( $meta_desc ) {

-		$meta_desc = stripslashes_deep( $meta_desc );

+	if ($meta_desc) {

+		$meta_desc = stripslashes_deep($meta_desc);

 		/**

 		 * Filter page description to replace variables.

 		 *

@@ -1219,7 +1219,7 @@ 
 		 * @param string $title   The page description including variables.

 		 * @param string $gd_page The GeoDirectory page type if any.

 		 */

-		$meta_desc = apply_filters( 'geodir_seo_meta_description_pre', __( $meta_desc, 'geodirectory' ), $gd_page, '' );

+		$meta_desc = apply_filters('geodir_seo_meta_description_pre', __($meta_desc, 'geodirectory'), $gd_page, '');

 

 		/**

 		 * Filter SEO meta description.

@@ -1228,49 +1228,49 @@ 
 		 *

 		 * @param string $meta_desc Meta description content.

 		 */

-		echo apply_filters( 'geodir_seo_meta_description', '<meta name="description" content="' . $meta_desc . '" />', $meta_desc );

+		echo apply_filters('geodir_seo_meta_description', '<meta name="description" content="'.$meta_desc.'" />', $meta_desc);

 	}

 

 	// meta keywords

-	if ( isset( $post->post_type ) && in_array( $post->post_type, $all_postypes ) ) {

-		$place_tags = wp_get_post_terms( $post->ID, $post->post_type . '_tags', array( "fields" => "names" ) );

-		$place_cats = wp_get_post_terms( $post->ID, $post->post_type . 'category', array( "fields" => "names" ) );

+	if (isset($post->post_type) && in_array($post->post_type, $all_postypes)) {

+		$place_tags = wp_get_post_terms($post->ID, $post->post_type.'_tags', array("fields" => "names"));

+		$place_cats = wp_get_post_terms($post->ID, $post->post_type.'category', array("fields" => "names"));

 

-		$meta_key .= implode( ", ", array_merge( (array) $place_cats, (array) $place_tags ) );

+		$meta_key .= implode(", ", array_merge((array) $place_cats, (array) $place_tags));

 	} else {

 		$posttags = get_the_tags();

-		if ( $posttags ) {

-			foreach ( $posttags as $tag ) {

-				$meta_key .= $tag->name . ' ';

+		if ($posttags) {

+			foreach ($posttags as $tag) {

+				$meta_key .= $tag->name.' ';

 			}

 		} else {

-			$tags = get_tags( array( 'orderby' => 'count', 'order' => 'DESC' ) );

+			$tags = get_tags(array('orderby' => 'count', 'order' => 'DESC'));

 			$xt   = 1;

 

-			foreach ( $tags as $tag ) {

-				if ( $xt <= 20 ) {

-					$meta_key .= $tag->name . ", ";

+			foreach ($tags as $tag) {

+				if ($xt <= 20) {

+					$meta_key .= $tag->name.", ";

 				}

 

-				$xt ++;

+				$xt++;

 			}

 		}

 	}

 

-	$meta_key         = $meta_key != '' ? rtrim( trim( $meta_key ), "," ) : $meta_key;

-	$geodir_meta_keys = $geodir_meta_keys != '' ? ( $meta_key != '' ? $meta_key . ', ' . $geodir_meta_keys : $geodir_meta_keys ) : $meta_key;

-	if ( $geodir_meta_keys != '' ) {

-		$geodir_meta_keys = strip_tags( $geodir_meta_keys );

-		$geodir_meta_keys = esc_html( $geodir_meta_keys );

-		$geodir_meta_keys = geodir_strtolower( $geodir_meta_keys );

-		$geodir_meta_keys = wp_html_excerpt( $geodir_meta_keys, 1000, '' );

-		$geodir_meta_keys = str_replace( '%location%', $replace_location, $geodir_meta_keys );

+	$meta_key         = $meta_key != '' ? rtrim(trim($meta_key), ",") : $meta_key;

+	$geodir_meta_keys = $geodir_meta_keys != '' ? ($meta_key != '' ? $meta_key.', '.$geodir_meta_keys : $geodir_meta_keys) : $meta_key;

+	if ($geodir_meta_keys != '') {

+		$geodir_meta_keys = strip_tags($geodir_meta_keys);

+		$geodir_meta_keys = esc_html($geodir_meta_keys);

+		$geodir_meta_keys = geodir_strtolower($geodir_meta_keys);

+		$geodir_meta_keys = wp_html_excerpt($geodir_meta_keys, 1000, '');

+		$geodir_meta_keys = str_replace('%location%', $replace_location, $geodir_meta_keys);

 

-		$meta_key = rtrim( trim( $geodir_meta_keys ), "," );

+		$meta_key = rtrim(trim($geodir_meta_keys), ",");

 	}

 

-	if ( $meta_key ) {

-		$meta_key = stripslashes_deep( $meta_key );

+	if ($meta_key) {

+		$meta_key = stripslashes_deep($meta_key);

 		/**

 		 * Filter SEO meta keywords.

 		 *

@@ -1278,7 +1278,7 @@ 
 		 *

 		 * @param string $meta_desc Meta keywords.

 		 */

-		echo apply_filters( 'geodir_seo_meta_keywords', '<meta name="keywords" content="' . $meta_key . '" />', $meta_key );

+		echo apply_filters('geodir_seo_meta_keywords', '<meta name="keywords" content="'.$meta_key.'" />', $meta_key);

 	}

 

 }

@@ -1298,8 +1298,8 @@ 
 

 	$geodir_detail_page_tabs_array = geodir_detail_page_tabs_array();

 

-	foreach ( $geodir_detail_page_tabs_array as $key => $tabs_obj ) {

-		$geodir_detail_page_tabs_key_value_array[ $key ] = $tabs_obj['heading_text'];

+	foreach ($geodir_detail_page_tabs_array as $key => $tabs_obj) {

+		$geodir_detail_page_tabs_key_value_array[$key] = $tabs_obj['heading_text'];

 	}

 

 	return $geodir_detail_page_tabs_key_value_array;

@@ -1321,57 +1321,57 @@ 
 	 * @since 1.0.0

 	 */

 	$arr_tabs['post_profile'] = array(

-		'heading_text'  => __( 'Profile', 'geodirectory' ),

+		'heading_text'  => __('Profile', 'geodirectory'),

 		'is_active_tab' => true,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_profile' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_profile'),

 		'tab_content'   => ''

 	);

-	$arr_tabs['post_info']    = array(

-		'heading_text'  => __( 'More Info', 'geodirectory' ),

+	$arr_tabs['post_info'] = array(

+		'heading_text'  => __('More Info', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_info' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_info'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['post_images'] = array(

-		'heading_text'  => __( 'Photo', 'geodirectory' ),

+		'heading_text'  => __('Photo', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_images' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_images'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['post_video'] = array(

-		'heading_text'  => __( 'Video', 'geodirectory' ),

+		'heading_text'  => __('Video', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_video' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_video'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['special_offers'] = array(

-		'heading_text'  => __( 'Special Offers', 'geodirectory' ),

+		'heading_text'  => __('Special Offers', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'special_offers' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'special_offers'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['post_map'] = array(

-		'heading_text'  => __( 'Map', 'geodirectory' ),

+		'heading_text'  => __('Map', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'post_map' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'post_map'),

 		'tab_content'   => ''

 	);

 

 	$arr_tabs['reviews'] = array(

-		'heading_text'  => __( 'Reviews', 'geodirectory' ),

+		'heading_text'  => __('Reviews', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'reviews' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'reviews'),

 		'tab_content'   => 'review display'

 	);

 

 	$arr_tabs['related_listing'] = array(

-		'heading_text'  => __( 'Related Listing', 'geodirectory' ),

+		'heading_text'  => __('Related Listing', 'geodirectory'),

 		'is_active_tab' => false,

-		'is_display'    => apply_filters( 'geodir_detail_page_tab_is_display', true, 'related_listing' ),

+		'is_display'    => apply_filters('geodir_detail_page_tab_is_display', true, 'related_listing'),

 		'tab_content'   => ''

 	);

 

@@ -1380,7 +1380,7 @@ 
 	 *

 	 * @since 1.0.0

 	 */

-	return apply_filters( 'geodir_detail_page_tab_list_extend', $arr_tabs );

+	return apply_filters('geodir_detail_page_tab_list_extend', $arr_tabs);

 

 

 }

@@ -1394,13 +1394,13 @@ 
  * @return mixed|array Tabs array.

  */

 function geodir_detail_page_tabs_list() {

-	$tabs_excluded = get_option( 'geodir_detail_page_tabs_excluded' );

+	$tabs_excluded = get_option('geodir_detail_page_tabs_excluded');

 	$tabs_array    = geodir_detail_page_tabs_array();

 

-	if ( ! empty( $tabs_excluded ) ) {

-		foreach ( $tabs_excluded as $tab ) {

-			if ( array_key_exists( $tab, $tabs_array ) ) {

-				unset( $tabs_array[ $tab ] );

+	if (!empty($tabs_excluded)) {

+		foreach ($tabs_excluded as $tab) {

+			if (array_key_exists($tab, $tabs_array)) {

+				unset($tabs_array[$tab]);

 			}

 		}

 	}

@@ -1424,58 +1424,58 @@ 
 function geodir_show_detail_page_tabs() {

 	global $post, $post_images, $video, $special_offers, $related_listing, $geodir_post_detail_fields, $preview;

 

-	$post_id            = ! empty( $post ) && isset( $post->ID ) ? (int) $post->ID : 0;

-	$request_post_id    = ! empty( $_REQUEST['p'] ) ? (int) $_REQUEST['p'] : 0;

-	$is_backend_preview = ( is_single() && ! empty( $_REQUEST['post_type'] ) && ! empty( $_REQUEST['preview'] ) && ! empty( $_REQUEST['p'] ) ) && is_super_admin() ? true : false; // skip if preview from backend

+	$post_id            = !empty($post) && isset($post->ID) ? (int) $post->ID : 0;

+	$request_post_id    = !empty($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0;

+	$is_backend_preview = (is_single() && !empty($_REQUEST['post_type']) && !empty($_REQUEST['preview']) && !empty($_REQUEST['p'])) && is_super_admin() ? true : false; // skip if preview from backend

 

-	if ( $is_backend_preview && ! $post_id > 0 && $request_post_id > 0 ) {

-		$post = geodir_get_post_info( $request_post_id );

-		setup_postdata( $post );

+	if ($is_backend_preview && !$post_id > 0 && $request_post_id > 0) {

+		$post = geodir_get_post_info($request_post_id);

+		setup_postdata($post);

 	}

 

-	$geodir_post_detail_fields = geodir_show_listing_info( 'moreinfo' );

+	$geodir_post_detail_fields = geodir_show_listing_info('moreinfo');

 

 

-	if ( geodir_is_page( 'detail' ) ) {

-		$video                 = geodir_get_video( $post->ID );

-		$special_offers        = geodir_get_special_offers( $post->ID );

+	if (geodir_is_page('detail')) {

+		$video                 = geodir_get_video($post->ID);

+		$special_offers        = geodir_get_special_offers($post->ID);

 		$related_listing_array = array();

-		if ( get_option( 'geodir_add_related_listing_posttypes' ) ) {

-			$related_listing_array = get_option( 'geodir_add_related_listing_posttypes' );

+		if (get_option('geodir_add_related_listing_posttypes')) {

+			$related_listing_array = get_option('geodir_add_related_listing_posttypes');

 		}

 

 

-		$excluded_tabs = get_option( 'geodir_detail_page_tabs_excluded' );

-		if ( ! $excluded_tabs ) {

+		$excluded_tabs = get_option('geodir_detail_page_tabs_excluded');

+		if (!$excluded_tabs) {

 			$excluded_tabs = array();

 		}

 

 		$related_listing = '';

-		if ( in_array( $post->post_type, $related_listing_array ) && ! in_array( 'related_listing', $excluded_tabs ) ) {

+		if (in_array($post->post_type, $related_listing_array) && !in_array('related_listing', $excluded_tabs)) {

 			$request = array(

-				'post_number'         => get_option( 'geodir_related_post_count' ),

-				'relate_to'           => get_option( 'geodir_related_post_relate_to' ),

-				'layout'              => get_option( 'geodir_related_post_listing_view' ),

-				'add_location_filter' => get_option( 'geodir_related_post_location_filter' ),

-				'list_sort'           => get_option( 'geodir_related_post_sortby' ),

-				'character_count'     => get_option( 'geodir_related_post_excerpt' )

+				'post_number'         => get_option('geodir_related_post_count'),

+				'relate_to'           => get_option('geodir_related_post_relate_to'),

+				'layout'              => get_option('geodir_related_post_listing_view'),

+				'add_location_filter' => get_option('geodir_related_post_location_filter'),

+				'list_sort'           => get_option('geodir_related_post_sortby'),

+				'character_count'     => get_option('geodir_related_post_excerpt')

 			);

 

-			if ( $post->post_type == 'gd_event' && defined( 'GDEVENTS_VERSION' ) ) {

-				$related_listing = geodir_get_detail_page_related_events( $request );

+			if ($post->post_type == 'gd_event' && defined('GDEVENTS_VERSION')) {

+				$related_listing = geodir_get_detail_page_related_events($request);

 			} else {

-				$related_listing = geodir_related_posts_display( $request );

+				$related_listing = geodir_related_posts_display($request);

 			}

 

 		}

 

-		$post_images = geodir_get_images( $post->ID, 'thumbnail' );

+		$post_images = geodir_get_images($post->ID, 'thumbnail');

 		$thumb_image = '';

-		if ( ! empty( $post_images ) ) {

-			foreach ( $post_images as $image ) {

-				$caption = ( ! empty( $image->caption ) ) ? $image->caption : '';

-				$thumb_image .= '<a href="' . $image->src . '" title="' . $caption . '">';

-				$thumb_image .= geodir_show_image( $image, 'thumbnail', true, false );

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				$caption = (!empty($image->caption)) ? $image->caption : '';

+				$thumb_image .= '<a href="'.$image->src.'" title="'.$caption.'">';

+				$thumb_image .= geodir_show_image($image, 'thumbnail', true, false);

 				$thumb_image .= '</a>';

 			}

 		}

@@ -1484,11 +1484,11 @@ 
 		$map_args['map_canvas_name'] = 'detail_page_map_canvas';

 		$map_args['width']           = '600';

 		$map_args['height']          = '300';

-		if ( $post->post_mapzoom ) {

-			$map_args['zoom'] = '' . $post->post_mapzoom . '';

+		if ($post->post_mapzoom) {

+			$map_args['zoom'] = ''.$post->post_mapzoom.'';

 		}

 		$map_args['autozoom']                 = false;

-		$map_args['scrollwheel']              = ( get_option( 'geodir_add_listing_mouse_scroll' ) ) ? 0 : 1;

+		$map_args['scrollwheel']              = (get_option('geodir_add_listing_mouse_scroll')) ? 0 : 1;

 		$map_args['child_collapse']           = '0';

 		$map_args['enable_cat_filters']       = false;

 		$map_args['enable_text_search']       = false;

@@ -1497,43 +1497,43 @@ 
 		$map_args['enable_jason_on_load']     = true;

 		$map_args['enable_map_direction']     = true;

 		$map_args['map_class_name']           = 'geodir-map-detail-page';

-		$map_args['maptype']                  = ( ! empty( $post->post_mapview ) ) ? $post->post_mapview : 'ROADMAP';

-	} else if ( geodir_is_page( 'preview' ) ) {

-		$video          = isset( $post->geodir_video ) ? $post->geodir_video : '';

-		$special_offers = isset( $post->geodir_special_offers ) ? $post->geodir_special_offers : '';

+		$map_args['maptype']                  = (!empty($post->post_mapview)) ? $post->post_mapview : 'ROADMAP';

+	} else if (geodir_is_page('preview')) {

+		$video          = isset($post->geodir_video) ? $post->geodir_video : '';

+		$special_offers = isset($post->geodir_special_offers) ? $post->geodir_special_offers : '';

 

-		if ( isset( $post->post_images ) ) {

-			$post->post_images = trim( $post->post_images, "," );

+		if (isset($post->post_images)) {

+			$post->post_images = trim($post->post_images, ",");

 		}

 

-		if ( isset( $post->post_images ) && ! empty( $post->post_images ) ) {

-			$post_images = explode( ",", $post->post_images );

+		if (isset($post->post_images) && !empty($post->post_images)) {

+			$post_images = explode(",", $post->post_images);

 		}

 

 		$thumb_image = '';

-		if ( ! empty( $post_images ) ) {

-			foreach ( $post_images as $image ) {

-				if ( $image != '' ) {

-					$thumb_image .= '<a href="' . $image . '">';

-					$thumb_image .= geodir_show_image( array( 'src' => $image ), 'thumbnail', true, false );

+		if (!empty($post_images)) {

+			foreach ($post_images as $image) {

+				if ($image != '') {

+					$thumb_image .= '<a href="'.$image.'">';

+					$thumb_image .= geodir_show_image(array('src' => $image), 'thumbnail', true, false);

 					$thumb_image .= '</a>';

 				}

 			}

 		}

 

 		global $map_jason;

-		$marker_json      = $post->marker_json != '' ? json_decode( $post->marker_json, true ) : array();

-		$marker_icon      = ( ! empty( $marker_json ) && ! empty( $marker_json['i'] ) ) ? $marker_json['i'] : '';

-		$icon_size        = geodir_get_marker_size( $marker_icon );

+		$marker_json      = $post->marker_json != '' ? json_decode($post->marker_json, true) : array();

+		$marker_icon      = (!empty($marker_json) && !empty($marker_json['i'])) ? $marker_json['i'] : '';

+		$icon_size        = geodir_get_marker_size($marker_icon);

 		$marker_json['w'] = $icon_size['w'];

 		$marker_json['h'] = $icon_size['h'];

-		$map_jason[]      = json_encode( $marker_json );

+		$map_jason[]      = json_encode($marker_json);

 

-		$address_latitude  = isset( $post->post_latitude ) ? $post->post_latitude : '';

-		$address_longitude = isset( $post->post_longitude ) ? $post->post_longitude : '';

-		$mapview           = isset( $post->post_mapview ) ? $post->post_mapview : '';

-		$mapzoom           = isset( $post->post_mapzoom ) ? $post->post_mapzoom : '';

-		if ( ! $mapzoom ) {

+		$address_latitude  = isset($post->post_latitude) ? $post->post_latitude : '';

+		$address_longitude = isset($post->post_longitude) ? $post->post_longitude : '';

+		$mapview           = isset($post->post_mapview) ? $post->post_mapview : '';

+		$mapzoom           = isset($post->post_mapzoom) ? $post->post_mapzoom : '';

+		if (!$mapzoom) {

 			$mapzoom = 12;

 		}

 

@@ -1556,37 +1556,37 @@ 
 		$map_args['map_class_name']           = 'geodir-map-preview-page';

 	}

 

-	$arr_detail_page_tabs = geodir_detail_page_tabs_list();// get this sooner so we can get the active tab for the user

+	$arr_detail_page_tabs = geodir_detail_page_tabs_list(); // get this sooner so we can get the active tab for the user

 

 	$active_tab       = '';

 	$active_tab_name  = '';

 	$default_tab      = '';

 	$default_tab_name = '';

-	foreach ( $arr_detail_page_tabs as $tab_index => $tabs ) {

-		if ( isset( $tabs['is_active_tab'] ) && $tabs['is_active_tab'] && ! empty( $tabs['is_display'] ) && isset( $tabs['heading_text'] ) && $tabs['heading_text'] ) {

+	foreach ($arr_detail_page_tabs as $tab_index => $tabs) {

+		if (isset($tabs['is_active_tab']) && $tabs['is_active_tab'] && !empty($tabs['is_display']) && isset($tabs['heading_text']) && $tabs['heading_text']) {

 			$active_tab      = $tab_index;

-			$active_tab_name = __( $tabs['heading_text'], 'geodirectory' );

+			$active_tab_name = __($tabs['heading_text'], 'geodirectory');

 		}

 

-		if ( $default_tab === '' && ! empty( $tabs['is_display'] ) && ! empty( $tabs['heading_text'] ) ) {

+		if ($default_tab === '' && !empty($tabs['is_display']) && !empty($tabs['heading_text'])) {

 			$default_tab      = $tab_index;

-			$default_tab_name = __( $tabs['heading_text'], 'geodirectory' );

+			$default_tab_name = __($tabs['heading_text'], 'geodirectory');

 		}

 	}

 

-	if ( $active_tab === '' && $default_tab !== '' ) { // Make first tab acs a active tab if not any tab is active.

-		if ( isset( $arr_detail_page_tabs[ $active_tab ] ) && isset( $arr_detail_page_tabs[ $active_tab ]['is_active_tab'] ) ) {

-			$arr_detail_page_tabs[ $active_tab ]['is_active_tab'] = false;

+	if ($active_tab === '' && $default_tab !== '') { // Make first tab acs a active tab if not any tab is active.

+		if (isset($arr_detail_page_tabs[$active_tab]) && isset($arr_detail_page_tabs[$active_tab]['is_active_tab'])) {

+			$arr_detail_page_tabs[$active_tab]['is_active_tab'] = false;

 		}

 

-		$arr_detail_page_tabs[ $default_tab ]['is_active_tab'] = true;

+		$arr_detail_page_tabs[$default_tab]['is_active_tab'] = true;

 		$active_tab                                            = $default_tab;

 		$active_tab_name                                       = $default_tab_name;

 	}

-	$tab_list = ( get_option( 'geodir_disable_tabs', false ) ) ? true : false;

+	$tab_list = (get_option('geodir_disable_tabs', false)) ? true : false;

 	?>

 	<div class="geodir-tabs" id="gd-tabs" style="position:relative;">

-		<?php if ( ! $tab_list ){ ?>

+		<?php if (!$tab_list) { ?>

 		<div id="geodir-tab-mobile-menu">

 			<i class="fa fa-bars"></i>

 			<span class="geodir-mobile-active-tab"><?php echo $active_tab_name; ?></span>

@@ -1601,26 +1601,26 @@ 
 			 * @since 1.0.0

 			 * @see   'geodir_after_tab_list'

 			 */

-			do_action( 'geodir_before_tab_list' ); ?>

+			do_action('geodir_before_tab_list'); ?>

 			<?php

 

-			foreach ( $arr_detail_page_tabs as $tab_index => $detail_page_tab ) {

-				if ( $detail_page_tab['is_display'] ) {

+			foreach ($arr_detail_page_tabs as $tab_index => $detail_page_tab) {

+				if ($detail_page_tab['is_display']) {

 

-					if ( ! $tab_list ) {

+					if (!$tab_list) {

 						?>

 						<dt></dt> <!-- added to comply with validation -->

-						<dd <?php if ( $detail_page_tab['is_active_tab'] ){ ?>class="geodir-tab-active"<?php } ?> ><a

+						<dd <?php if ($detail_page_tab['is_active_tab']) { ?>class="geodir-tab-active"<?php } ?> ><a

 								data-tab="#<?php echo $tab_index; ?>"

-								data-status="enable"><?php _e( $detail_page_tab['heading_text'], 'geodirectory' ); ?></a>

+								data-status="enable"><?php _e($detail_page_tab['heading_text'], 'geodirectory'); ?></a>

 						</dd>

 						<?php

 					}

 					ob_start() // start tab content buffering

 					?>

 					<li id="<?php echo $tab_index; ?>Tab">

-						<?php if ( $tab_list ) {

-							$tab_title = '<span class="gd-tab-list-title" ><a href="#' . $tab_index . '">' . __( $detail_page_tab['heading_text'], 'geodirectory' ) . '</a></span><hr />';

+						<?php if ($tab_list) {

+							$tab_title = '<span class="gd-tab-list-title" ><a href="#'.$tab_index.'">'.__($detail_page_tab['heading_text'], 'geodirectory').'</a></span><hr />';

 							/**

 							 * Filter the tab list title html.

 							 *

@@ -1630,7 +1630,7 @@ 
 							 * @param string $tab_index      The tab index type.

 							 * @param array $detail_page_tab The array of values including title text.

 							 */

-							echo apply_filters( 'geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab );

+							echo apply_filters('geodir_tab_list_title', $tab_title, $tab_index, $detail_page_tab);

 						} ?>

 						<div id="<?php echo $tab_index; ?>" class="hash-offset"></div>

 						<?php

@@ -1641,7 +1641,7 @@ 
 						 *

 						 * @param string $tab_index The tab name ID.

 						 */

-						do_action( 'geodir_before_tab_content', $tab_index );

+						do_action('geodir_before_tab_content', $tab_index);

 

 						/**

 						 * Called before the details tab content is output per tab.

@@ -1651,21 +1651,21 @@ 
 						 * @since 1.0.0

 						 * @todo  do we need this if we have the hook above? 'geodir_before_tab_content'

 						 */

-						do_action( 'geodir_before_' . $tab_index . '_tab_content' );

+						do_action('geodir_before_'.$tab_index.'_tab_content');

 						/// write a code to generate content of each tab

-						switch ( $tab_index ) {

+						switch ($tab_index) {

 							case 'post_profile':

 								/**

 								 * Called before the listing description content on the details page tab.

 								 *

 								 * @since 1.0.0

 								 */

-								do_action( 'geodir_before_description_on_listing_detail' );

-								if ( geodir_is_page( 'detail' ) ) {

+								do_action('geodir_before_description_on_listing_detail');

+								if (geodir_is_page('detail')) {

 									the_content();

 								} else {

 									/** This action is documented in geodirectory_template_actions.php */

-									echo apply_filters( 'the_content', stripslashes( $post->post_desc ) );

+									echo apply_filters('the_content', stripslashes($post->post_desc));

 								}

 

 								/**

@@ -1673,7 +1673,7 @@ 
 								 *

 								 * @since 1.0.0

 								 */

-								do_action( 'geodir_after_description_on_listing_detail' );

+								do_action('geodir_after_description_on_listing_detail');

 								break;

 							case 'post_info':

 								echo $geodir_post_detail_fields;

@@ -1683,21 +1683,21 @@ 
 								break;

 							case 'post_video':

 								// some browsers hide $_POST data if used for embeds so we repalce with a placeholder

-								if ( $preview ) {

-									if ( $video ) {

-										echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fa fa-video-camera\" aria-hidden=\"true\"></i><br />" . __( 'Video Preview Placeholder', 'geodirectory' ) . "</p></span>";

+								if ($preview) {

+									if ($video) {

+										echo "<span class='gd-video-embed-preview' ><p class='gd-video-preview-text'><i class=\"fa fa-video-camera\" aria-hidden=\"true\"></i><br />".__('Video Preview Placeholder', 'geodirectory')."</p></span>";

 									}

 								} else {

 									/** This action is documented in geodirectory_template_actions.php */

-									echo apply_filters( 'the_content', stripslashes( $video ) );// we apply the_content filter so oembed works also;

+									echo apply_filters('the_content', stripslashes($video)); // we apply the_content filter so oembed works also;

 								}

 								break;

 							case 'special_offers':

-								echo apply_filters( 'gd_special_offers_content', wpautop( stripslashes( $special_offers ) ) );

+								echo apply_filters('gd_special_offers_content', wpautop(stripslashes($special_offers)));

 

 								break;

 							case 'post_map':

-								geodir_draw_map( $map_args );

+								geodir_draw_map($map_args);

 								break;

 							case 'reviews':

 								comments_template();

@@ -1706,7 +1706,7 @@ 
 								echo $related_listing;

 								break;

 							default: {

-								if ( ( isset( $post->{$tab_index} ) || ( ! isset( $post->{$tab_index} ) && ( strpos( $tab_index, 'gd_tab_' ) !== false || $tab_index == 'link_business' ) ) ) && ! empty( $detail_page_tab['tab_content'] ) ) {

+								if ((isset($post->{$tab_index} ) || (!isset($post->{$tab_index} ) && (strpos($tab_index, 'gd_tab_') !== false || $tab_index == 'link_business'))) && !empty($detail_page_tab['tab_content'])) {

 									echo $detail_page_tab['tab_content'];

 								}

 							}

@@ -1718,7 +1718,7 @@ 
 						 *

 						 * @since 1.0.0

 						 */

-						do_action( 'geodir_after_tab_content', $tab_index );

+						do_action('geodir_after_tab_content', $tab_index);

 

 						/**

 						 * Called after the details tab content is output per tab.

@@ -1728,7 +1728,7 @@ 
 						 * @since 1.0.0

 						 * @todo  do we need this if we have the hook above? 'geodir_after_tab_content'

 						 */

-						do_action( 'geodir_after_' . $tab_index . '_tab_content' );

+						do_action('geodir_after_'.$tab_index.'_tab_content');

 						?> </li>

 					<?php

 					/**

@@ -1736,7 +1736,7 @@ 
 					 *

 					 * @since 1.0.0

 					 */

-					$arr_detail_page_tabs[ $tab_index ]['tab_content'] = apply_filters( "geodir_modify_" . $detail_page_tab['tab_content'] . "_tab_content", ob_get_clean() );

+					$arr_detail_page_tabs[$tab_index]['tab_content'] = apply_filters("geodir_modify_".$detail_page_tab['tab_content']."_tab_content", ob_get_clean());

 				} // end of if for is_display

 			}// end of foreach

 

@@ -1746,14 +1746,14 @@ 
 			 * @since 1.0.0

 			 * @see   'geodir_before_tab_list'

 			 */

-			do_action( 'geodir_after_tab_list' );

+			do_action('geodir_after_tab_list');

 			?>

-			<?php if ( ! $tab_list ){ ?></dl><?php } ?>

-		<ul class="geodir-tabs-content entry-content <?php if ( $tab_list ) { ?>geodir-tabs-list<?php } ?>"

+			<?php if (!$tab_list) { ?></dl><?php } ?>

+		<ul class="geodir-tabs-content entry-content <?php if ($tab_list) { ?>geodir-tabs-list<?php } ?>"

 		    style="position:relative;">

 			<?php

-			foreach ( $arr_detail_page_tabs as $detail_page_tab ) {

-				if ( $detail_page_tab['is_display'] && ! empty( $detail_page_tab['tab_content'] ) ) {

+			foreach ($arr_detail_page_tabs as $detail_page_tab) {

+				if ($detail_page_tab['is_display'] && !empty($detail_page_tab['tab_content'])) {

 					echo $detail_page_tab['tab_content'];

 				}// end of if

 			}// end of foreach

@@ -1763,11 +1763,11 @@ 
 			 *

 			 * @since 1.0.0

 			 */

-			do_action( 'geodir_add_tab_content' ); ?>

+			do_action('geodir_add_tab_content'); ?>

 		</ul>

 		<!--gd-tabs-content ul end-->

 	</div>

-	<?php if ( ! $tab_list ) { ?>

+	<?php if (!$tab_list) { ?>

 		<script>

 			if (window.location.hash && window.location.hash.indexOf('&') === -1 && jQuery(window.location.hash + 'Tab').length) {

 				hashVal = window.location.hash;

@@ -1799,31 +1799,31 @@ 
  *

  * @return mixed Image file.

  */

-function geodir_exif( $file ) {

-	if ( empty( $file ) || ! is_array( $file ) ) {

+function geodir_exif($file) {

+	if (empty($file) || !is_array($file)) {

 		return $file;

 	}

 

-	$file_path = ! empty( $file['tmp_name'] ) ? sanitize_text_field( $file['tmp_name'] ) : '';

-	if ( ! ( $file_path && file_exists( $file_path ) ) ) {

+	$file_path = !empty($file['tmp_name']) ? sanitize_text_field($file['tmp_name']) : '';

+	if (!($file_path && file_exists($file_path))) {

 		return $file;

 	}

 	$file['file'] = $file_path;

 

-	if ( ! file_is_valid_image( $file_path ) ) {

+	if (!file_is_valid_image($file_path)) {

 		return $file; // Bail if file is not an image.

 	}

 

-	if ( ! function_exists( 'wp_get_image_editor' ) ) {

+	if (!function_exists('wp_get_image_editor')) {

 		return $file;

 	}

 

 	$mime_type = $file['type'];

 	$exif      = array();

-	if ( $mime_type == 'image/jpeg' && function_exists( 'exif_read_data' ) ) {

+	if ($mime_type == 'image/jpeg' && function_exists('exif_read_data')) {

 		try {

-			$exif = exif_read_data( $file_path );

-		} catch ( Exception $e ) {

+			$exif = exif_read_data($file_path);

+		} catch (Exception $e) {

 			$exif = array();

 		}

 	}

@@ -1832,13 +1832,13 @@ 
 	$flip        = false;

 	$modify      = false;

 	$orientation = 0;

-	if ( ! empty( $exif ) && isset( $exif['Orientation'] ) ) {

-		switch ( (int) $exif['Orientation'] ) {

+	if (!empty($exif) && isset($exif['Orientation'])) {

+		switch ((int) $exif['Orientation']) {

 			case 1:

 				// do nothing

 				break;

 			case 2:

-				$flip   = array( false, true );

+				$flip   = array(false, true);

 				$modify = true;

 				break;

 			case 3:

@@ -1847,13 +1847,13 @@ 
 				$modify      = true;

 				break;

 			case 4:

-				$flip   = array( true, false );

+				$flip   = array(true, false);

 				$modify = true;

 				break;

 			case 5:

 				$orientation = - 90;

 				$rotate      = true;

-				$flip        = array( false, true );

+				$flip        = array(false, true);

 				$modify      = true;

 				break;

 			case 6:

@@ -1864,7 +1864,7 @@ 
 			case 7:

 				$orientation = - 270;

 				$rotate      = true;

-				$flip        = array( false, true );

+				$flip        = array(false, true);

 				$modify      = true;

 				break;

 			case 8:

@@ -1890,31 +1890,31 @@ 
 	 * @param int|null $quality Image Compression quality between 1-100% scale. Default null.

 	 * @param string $quality   Image mime type.

 	 */

-	$quality = apply_filters( 'geodir_image_upload_set_quality', $quality, $mime_type );

-	if ( $quality !== null ) {

+	$quality = apply_filters('geodir_image_upload_set_quality', $quality, $mime_type);

+	if ($quality !== null) {

 		$modify = true;

 	}

 

-	if ( ! $modify ) {

+	if (!$modify) {

 		return $file; // no change

 	}

 

-	$image = wp_get_image_editor( $file_path );

-	if ( ! is_wp_error( $image ) ) {

-		if ( $rotate ) {

-			$image->rotate( $orientation );

+	$image = wp_get_image_editor($file_path);

+	if (!is_wp_error($image)) {

+		if ($rotate) {

+			$image->rotate($orientation);

 		}

 

-		if ( ! empty( $flip ) ) {

-			$image->flip( $flip[0], $flip[1] );

+		if (!empty($flip)) {

+			$image->flip($flip[0], $flip[1]);

 		}

 

-		if ( $quality !== null ) {

-			$image->set_quality( (int) $quality );

+		if ($quality !== null) {

+			$image->set_quality((int) $quality);

 		}

 

-		$result = $image->save( $file_path );

-		if ( ! is_wp_error( $result ) ) {

+		$result = $image->save($file_path);

+		if (!is_wp_error($result)) {

 			$file['file']     = $result['path'];

 			$file['tmp_name'] = $result['path'];

 		}

@@ -1941,7 +1941,7 @@ 
  *

  * @return string Returns the recent reviews html.

  */

-function geodir_get_recent_reviews( $g_size = 60, $no_comments = 10, $comment_lenth = 60, $show_pass_post = false ) {

+function geodir_get_recent_reviews($g_size = 60, $no_comments = 10, $comment_lenth = 60, $show_pass_post = false) {

 	global $wpdb, $tablecomments, $tableposts, $rating_table_name, $gd_session;

 	$tablecomments = $wpdb->comments;

 	$tableposts    = $wpdb->posts;

@@ -1951,28 +1951,28 @@ 
 	$region_filter  = '';

 	$country_filter = '';

 

-	if ( $gd_session->get( 'gd_multi_location' ) ) {

-		if ( $gd_ses_country = $gd_session->get( 'gd_country' ) ) {

-			$country_filter = $wpdb->prepare( " AND r.post_country=%s ", str_replace( "-", " ", $gd_ses_country ) );

+	if ($gd_session->get('gd_multi_location')) {

+		if ($gd_ses_country = $gd_session->get('gd_country')) {

+			$country_filter = $wpdb->prepare(" AND r.post_country=%s ", str_replace("-", " ", $gd_ses_country));

 		}

 

-		if ( $gd_ses_region = $gd_session->get( 'gd_region' ) ) {

-			$region_filter = $wpdb->prepare( " AND r.post_region=%s ", str_replace( "-", " ", $gd_ses_region ) );

+		if ($gd_ses_region = $gd_session->get('gd_region')) {

+			$region_filter = $wpdb->prepare(" AND r.post_region=%s ", str_replace("-", " ", $gd_ses_region));

 		}

 

-		if ( $gd_ses_city = $gd_session->get( 'gd_city' ) ) {

-			$city_filter = $wpdb->prepare( " AND r.post_city=%s ", str_replace( "-", " ", $gd_ses_city ) );

+		if ($gd_ses_city = $gd_session->get('gd_city')) {

+			$city_filter = $wpdb->prepare(" AND r.post_city=%s ", str_replace("-", " ", $gd_ses_city));

 		}

 	}

 

 	$review_table = GEODIR_REVIEW_TABLE;

 	$request      = "SELECT r.id as ID, r.post_type, r.comment_id as comment_ID, r.post_date as comment_date,r.overall_rating, r.user_id, r.post_id FROM $review_table as r WHERE r.post_status = 1 AND r.status =1 AND r.overall_rating>=1 $country_filter $region_filter $city_filter ORDER BY r.post_date DESC, r.id DESC LIMIT $no_comments";

 

-	$comments = $wpdb->get_results( $request );

+	$comments = $wpdb->get_results($request);

 

-	foreach ( $comments as $comment ) {

+	foreach ($comments as $comment) {

 		// Set the extra comment info needed.

-		$comment_extra = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID" );

+		$comment_extra = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID");

 		//echo "SELECT * FROM $wpdb->comments WHERE comment_ID =$comment->comment_ID";

 		$comment->comment_content      = $comment_extra->comment_content;

 		$comment->comment_author       = $comment_extra->comment_author;

@@ -1980,75 +1980,75 @@ 
 

 		$comment_id      = '';

 		$comment_id      = $comment->comment_ID;

-		$comment_content = strip_tags( $comment->comment_content );

+		$comment_content = strip_tags($comment->comment_content);

 

-		$comment_content = preg_replace( '#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content );

+		$comment_content = preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_content);

 

-		$permalink            = get_permalink( $comment->ID ) . "#comment-" . $comment->comment_ID;

+		$permalink            = get_permalink($comment->ID)."#comment-".$comment->comment_ID;

 		$comment_author_email = $comment->comment_author_email;

 		$comment_post_ID      = $comment->post_id;

 

 		$na = true;

-		if ( function_exists( 'icl_object_id' ) && icl_object_id( $comment_post_ID, $comment->post_type, true ) ) {

-			$comment_post_ID2 = icl_object_id( $comment_post_ID, $comment->post_type, false );

-			if ( $comment_post_ID == $comment_post_ID2 ) {

+		if (function_exists('icl_object_id') && icl_object_id($comment_post_ID, $comment->post_type, true)) {

+			$comment_post_ID2 = icl_object_id($comment_post_ID, $comment->post_type, false);

+			if ($comment_post_ID == $comment_post_ID2) {

 			} else {

 				$na = false;

 			}

 		}

 

-		$post_title        = get_the_title( $comment_post_ID );

-		$permalink         = get_permalink( $comment_post_ID );

-		$comment_permalink = $permalink . "#comment-" . $comment->comment_ID;

-		$read_more         = '<a class="comment_excerpt" href="' . $comment_permalink . '">' . __( 'Read more', 'geodirectory' ) . '</a>';

+		$post_title        = get_the_title($comment_post_ID);

+		$permalink         = get_permalink($comment_post_ID);

+		$comment_permalink = $permalink."#comment-".$comment->comment_ID;

+		$read_more         = '<a class="comment_excerpt" href="'.$comment_permalink.'">'.__('Read more', 'geodirectory').'</a>';

 

-		$comment_content_length = strlen( $comment_content );

-		if ( $comment_content_length > $comment_lenth ) {

-			$comment_excerpt = mb_substr( $comment_content, 0, $comment_lenth ) . '... ' . $read_more;

+		$comment_content_length = strlen($comment_content);

+		if ($comment_content_length > $comment_lenth) {

+			$comment_excerpt = mb_substr($comment_content, 0, $comment_lenth).'... '.$read_more;

 		} else {

 			$comment_excerpt = $comment_content;

 		}

 

-		if ( $comment->user_id ) {

-			$user_profile_url = get_author_posts_url( $comment->user_id );

+		if ($comment->user_id) {

+			$user_profile_url = get_author_posts_url($comment->user_id);

 		} else {

 			$user_profile_url = '';

 		}

 

-		if ( $comment_id && $na ) {

+		if ($comment_id && $na) {

 			$comments_echo .= '<li class="clearfix">';

-			$comments_echo .= "<span class=\"li" . $comment_id . " geodir_reviewer_image\">";

-			if ( function_exists( 'get_avatar' ) ) {

-				if ( ! isset( $comment->comment_type ) ) {

-					if ( $user_profile_url ) {

-						$comments_echo .= '<a href="' . $user_profile_url . '">';

+			$comments_echo .= "<span class=\"li".$comment_id." geodir_reviewer_image\">";

+			if (function_exists('get_avatar')) {

+				if (!isset($comment->comment_type)) {

+					if ($user_profile_url) {

+						$comments_echo .= '<a href="'.$user_profile_url.'">';

 					}

-					$comments_echo .= get_avatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

-					if ( $user_profile_url ) {

+					$comments_echo .= get_avatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

+					if ($user_profile_url) {

 						$comments_echo .= '</a>';

 					}

-				} elseif ( ( isset( $comment->comment_type ) && $comment->comment_type == 'trackback' ) || ( isset( $comment->comment_type ) && $comment->comment_type == 'pingback' ) ) {

-					if ( $user_profile_url ) {

-						$comments_echo .= '<a href="' . $user_profile_url . '">';

+				} elseif ((isset($comment->comment_type) && $comment->comment_type == 'trackback') || (isset($comment->comment_type) && $comment->comment_type == 'pingback')) {

+					if ($user_profile_url) {

+						$comments_echo .= '<a href="'.$user_profile_url.'">';

 					}

-					$comments_echo .= get_avatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

+					$comments_echo .= get_avatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

 				}

-			} elseif ( function_exists( 'gravatar' ) ) {

-				if ( $user_profile_url ) {

-					$comments_echo .= '<a href="' . $user_profile_url . '">';

+			} elseif (function_exists('gravatar')) {

+				if ($user_profile_url) {

+					$comments_echo .= '<a href="'.$user_profile_url.'">';

 				}

 				$comments_echo .= "<img src=\"";

-				if ( '' == $comment->comment_type ) {

-					$comments_echo .= gravatar( $comment->comment_author_email, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

-					if ( $user_profile_url ) {

+				if ('' == $comment->comment_type) {

+					$comments_echo .= gravatar($comment->comment_author_email, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

+					if ($user_profile_url) {

 						$comments_echo .= '</a>';

 					}

-				} elseif ( ( 'trackback' == $comment->comment_type ) || ( 'pingback' == $comment->comment_type ) ) {

-					if ( $user_profile_url ) {

-						$comments_echo .= '<a href="' . $user_profile_url . '">';

+				} elseif (('trackback' == $comment->comment_type) || ('pingback' == $comment->comment_type)) {

+					if ($user_profile_url) {

+						$comments_echo .= '<a href="'.$user_profile_url.'">';

 					}

-					$comments_echo .= gravatar( $comment->comment_author_url, $g_size, geodir_plugin_url() . '/geodirectory-assets/images/gravatar2.png' );

-					if ( $user_profile_url ) {

+					$comments_echo .= gravatar($comment->comment_author_url, $g_size, geodir_plugin_url().'/geodirectory-assets/images/gravatar2.png');

+					if ($user_profile_url) {

 						$comments_echo .= '</a>';

 					}

 				}

@@ -2058,17 +2058,17 @@ 
 			$comments_echo .= "</span>\n";

 

 			$comments_echo .= '<span class="geodir_reviewer_content">';

-			if ( $comment->user_id ) {

-				$comments_echo .= '<a href="' . get_author_posts_url( $comment->user_id ) . '">';

+			if ($comment->user_id) {

+				$comments_echo .= '<a href="'.get_author_posts_url($comment->user_id).'">';

 			}

-			$comments_echo .= '<span class="geodir_reviewer_author">' . $comment->comment_author . '</span> ';

-			if ( $comment->user_id ) {

+			$comments_echo .= '<span class="geodir_reviewer_author">'.$comment->comment_author.'</span> ';

+			if ($comment->user_id) {

 				$comments_echo .= '</a>';

 			}

-			$comments_echo .= '<span class="geodir_reviewer_reviewed">' . __( 'reviewed', 'geodirectory' ) . '</span> ';

-			$comments_echo .= '<a href="' . $permalink . '" class="geodir_reviewer_title">' . $post_title . '</a>';

-			$comments_echo .= geodir_get_rating_stars( $comment->overall_rating, $comment_post_ID );

-			$comments_echo .= '<p class="geodir_reviewer_text">' . $comment_excerpt . '';

+			$comments_echo .= '<span class="geodir_reviewer_reviewed">'.__('reviewed', 'geodirectory').'</span> ';

+			$comments_echo .= '<a href="'.$permalink.'" class="geodir_reviewer_title">'.$post_title.'</a>';

+			$comments_echo .= geodir_get_rating_stars($comment->overall_rating, $comment_post_ID);

+			$comments_echo .= '<p class="geodir_reviewer_text">'.$comment_excerpt.'';

 			//echo preg_replace('#(\\[img\\]).+(\\[\\/img\\])#', '', $comment_excerpt);

 			$comments_echo .= '</p>';

 

@@ -2088,25 +2088,25 @@ 
  * @return array Returns post categories as an array.

  */

 function geodir_home_map_cats_key_value_array() {

-	$post_types = geodir_get_posttypes( 'object' );

+	$post_types = geodir_get_posttypes('object');

 

 	$return = array();

-	if ( ! empty( $post_types ) ) {

-		foreach ( $post_types as $key => $post_type ) {

-			$cpt_name       = __( $post_type->labels->singular_name, 'geodirectory' );

-			$post_type_name = sprintf( __( '%s Categories', 'geodirectory' ), $cpt_name );

-			$taxonomies     = geodir_get_taxonomies( $key );

-			$cat_taxonomy   = ! empty( $taxonomies[0] ) ? $taxonomies[0] : null;

-			$cat_terms      = $cat_taxonomy ? get_terms( $cat_taxonomy ) : null;

-

-			if ( ! empty( $cat_terms ) ) {

-				$return[ 'optgroup_start-' . $key ] = $post_type_name;

-

-				foreach ( $cat_terms as $cat_term ) {

-					$return[ $key . '_' . $cat_term->term_id ] = $cat_term->name;

+	if (!empty($post_types)) {

+		foreach ($post_types as $key => $post_type) {

+			$cpt_name       = __($post_type->labels->singular_name, 'geodirectory');

+			$post_type_name = sprintf(__('%s Categories', 'geodirectory'), $cpt_name);

+			$taxonomies     = geodir_get_taxonomies($key);

+			$cat_taxonomy   = !empty($taxonomies[0]) ? $taxonomies[0] : null;

+			$cat_terms      = $cat_taxonomy ? get_terms($cat_taxonomy) : null;

+

+			if (!empty($cat_terms)) {

+				$return['optgroup_start-'.$key] = $post_type_name;

+

+				foreach ($cat_terms as $cat_term) {

+					$return[$key.'_'.$cat_term->term_id] = $cat_term->name;

 				}

 

-				$return[ 'optgroup_end-' . $key ] = $post_type_name;

+				$return['optgroup_end-'.$key] = $post_type_name;

 			}

 		}

 	}

@@ -2122,14 +2122,14 @@ 
  * @package GeoDirectory

  */

 function geodir_twitter_tweet_button() {

-	if ( isset( $_GET['gde'] ) ) {

-		$link = '?url=' . urlencode( geodir_curPageURL() );

+	if (isset($_GET['gde'])) {

+		$link = '?url='.urlencode(geodir_curPageURL());

 	} else {

 		$link = '';

 	}

 	?>

 	<a href="http://twitter.com/share<?php echo $link; ?>"

-	   class="twitter-share-button"><?php _e( 'Tweet', 'geodirectory' ); ?></a>

+	   class="twitter-share-button"><?php _e('Tweet', 'geodirectory'); ?></a>

 	<script type="text/javascript" src="//platform.twitter.com/widgets.js"></script>

 	<?php

 }

@@ -2146,10 +2146,10 @@ 
 function geodir_fb_like_button() {

 	global $post;

 	?>

-	<iframe <?php if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false ) ) {

+	<iframe <?php if (isset($_SERVER['HTTP_USER_AGENT']) && (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false)) {

 		echo 'allowtransparency="true"';

 	} ?> class="facebook"

-	     src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode( get_permalink( $post->ID ) ); ?>&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light"

+	     src="//www.facebook.com/plugins/like.php?href=<?php echo urlencode(get_permalink($post->ID)); ?>&amp;layout=button_count&amp;show_faces=false&amp;width=100&amp;action=like&amp;colorscheme=light"

 	     style="border:none; overflow:hidden; width:100px; height:20px"></iframe>

 	<?php

 }

@@ -2203,10 +2203,10 @@ 
 			stWidget.addEntry({

 				"service": "sharethis",

 				"element": document.getElementById('st_sharethis'),

-				"url": "<?php echo geodir_curPageURL();?>",

-				"title": "<?php echo $post->post_title;?>",

+				"url": "<?php echo geodir_curPageURL(); ?>",

+				"title": "<?php echo $post->post_title; ?>",

 				"type": "chicklet",

-				"text": "<?php _e( 'Share', 'geodirectory' );?>"

+				"text": "<?php _e('Share', 'geodirectory'); ?>"

 			});

 		</script>

 	</div>

@@ -2214,7 +2214,7 @@ 
 }

 

 function geodir_listing_bounce_map_pin_on_hover() {

-	if ( get_option( 'geodir_listing_hover_bounce_map_pin', true ) ) {

+	if (get_option('geodir_listing_hover_bounce_map_pin', true)) {

 		?>

 		<script>

 			jQuery(function ($) {

@@ -2237,38 +2237,38 @@ 
 	}

 }

 

-add_action( 'geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10 );

+add_action('geodir_after_listing_listview', 'geodir_listing_bounce_map_pin_on_hover', 10);

 

-add_action( 'geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1 );

-function geodir_output_favourite_html_listings( $post_id ) {

-	geodir_favourite_html( '', $post_id );

+add_action('geodir_after_favorite_html', 'geodir_output_favourite_html_listings', 1, 1);

+function geodir_output_favourite_html_listings($post_id) {

+	geodir_favourite_html('', $post_id);

 }

 

-add_action( 'geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2 );

-function geodir_output_pinpoint_html_listings( $post_id, $post ) {

+add_action('geodir_listing_after_pinpoint', 'geodir_output_pinpoint_html_listings', 1, 2);

+function geodir_output_pinpoint_html_listings($post_id, $post) {

 	global $wp_query;

 

 	$show_pin_point = $wp_query->is_main_query();

 

-	if ( ! empty( $show_pin_point ) && is_active_widget( false, "", "geodir_map_v3_listing_map" ) ) {

-		$term_icon_url = get_tax_meta( $post->default_category, 'ct_cat_icon', false, $post->post_type );

-		$marker_icon   = isset( $term_icon_url['src'] ) ? $term_icon_url['src'] : get_option( 'geodir_default_marker_icon' );

+	if (!empty($show_pin_point) && is_active_widget(false, "", "geodir_map_v3_listing_map")) {

+		$term_icon_url = get_tax_meta($post->default_category, 'ct_cat_icon', false, $post->post_type);

+		$marker_icon   = isset($term_icon_url['src']) ? $term_icon_url['src'] : get_option('geodir_default_marker_icon');

 		?>

 		<span class="geodir-pinpoint"

-		      style="background:url('<?php echo $marker_icon; ?>') no-repeat scroll left top transparent;background-size:auto 100%; -webkit-background-size:auto 100%;-moz-background-size:auto 100%;height:9px;width:14px;"><?php echo apply_filters( 'geodir_listing_listview_pinpoint_inner_content', '', 'listing' ); ?></span>

+		      style="background:url('<?php echo $marker_icon; ?>') no-repeat scroll left top transparent;background-size:auto 100%; -webkit-background-size:auto 100%;-moz-background-size:auto 100%;height:9px;width:14px;"><?php echo apply_filters('geodir_listing_listview_pinpoint_inner_content', '', 'listing'); ?></span>

 		<a class="geodir-pinpoint-link" href="javascript:void(0)"

 		   onclick="openMarker('listing_map_canvas' ,'<?php echo $post->ID; ?>')"

 		   onmouseover="animate_marker('listing_map_canvas' ,'<?php echo $post->ID; ?>')"

-		   onmouseout="stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')"><?php _e( 'Pinpoint', 'geodirectory' ); ?></a>

+		   onmouseout="stop_marker_animation('listing_map_canvas' ,'<?php echo $post->ID; ?>')"><?php _e('Pinpoint', 'geodirectory'); ?></a>

 		<?php

 	}

 }

 

 function geodir_search_form_submit_button() {

 

-	$default_search_button_label = __( '&#xf002;', 'geodirectory' );

-	if ( get_option( 'geodir_search_button_label' ) && get_option( 'geodir_search_button_label' ) != 'Search' ) {

-		$default_search_button_label = __( get_option( 'geodir_search_button_label' ), 'geodirectory' );

+	$default_search_button_label = __('&#xf002;', 'geodirectory');

+	if (get_option('geodir_search_button_label') && get_option('geodir_search_button_label') != 'Search') {

+		$default_search_button_label = __(get_option('geodir_search_button_label'), 'geodirectory');

 	}

 

 	/**

@@ -2280,83 +2280,83 @@ 
 	 *

 	 * @param string $default_search_button_label The current search button text.

 	 */

-	$default_search_button_label = apply_filters( 'geodir_search_default_search_button_text', $default_search_button_label );

+	$default_search_button_label = apply_filters('geodir_search_default_search_button_text', $default_search_button_label);

 

 	$fa_class = '';

-	if ( strpos( $default_search_button_label, '&#' ) !== false ) {

+	if (strpos($default_search_button_label, '&#') !== false) {

 		$fa_class = 'fa';

 	}

 	?>

-	<input type="button" value="<?php esc_attr_e( $default_search_button_label ); ?>"

+	<input type="button" value="<?php esc_attr_e($default_search_button_label); ?>"

 	       class="geodir_submit_search <?php echo $fa_class; ?>"/>

 	<?php

 }

 

-add_action( 'geodir_before_search_button', 'geodir_search_form_submit_button', 5000 );

+add_action('geodir_before_search_button', 'geodir_search_form_submit_button', 5000);

 

 function geodir_search_form_post_type_input() {

-	$post_types     = apply_filters( 'geodir_search_form_post_types', geodir_get_posttypes( 'object' ) );

+	$post_types     = apply_filters('geodir_search_form_post_types', geodir_get_posttypes('object'));

 	$curr_post_type = geodir_get_current_posttype();

-	if ( ! empty( $post_types ) && count( (array) $post_types ) > 1 ){

+	if (!empty($post_types) && count((array) $post_types) > 1) {

 

-		$new_style = get_option( 'geodir_show_search_old_search_from' ) ? false : true;

-		if ( $new_style ) {

+		$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

+		if ($new_style) {

 			echo "<div class='gd-search-input-wrapper gd-search-field-cpt'>";

 		}

 		?>

 		<select name="stype" class="search_by_post">

-			<?php foreach ( $post_types as $post_type => $info ):

+			<?php foreach ($post_types as $post_type => $info):

 				global $wpdb;

 				$has_posts = '';

-				$has_posts = $wpdb->get_row( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type ) );

-				if ( ! $has_posts ) {

+				$has_posts = $wpdb->get_row($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_status='publish' LIMIT 1", $post_type));

+				if (!$has_posts) {

 					continue;

 				}

 				?>

 

-				<option data-label="<?php echo get_post_type_archive_link( $post_type ); ?>"

-				        value="<?php echo $post_type; ?>" <?php if ( isset( $_REQUEST['stype'] ) ) {

-					if ( $post_type == $_REQUEST['stype'] ) {

+				<option data-label="<?php echo get_post_type_archive_link($post_type); ?>"

+				        value="<?php echo $post_type; ?>" <?php if (isset($_REQUEST['stype'])) {

+					if ($post_type == $_REQUEST['stype']) {

 						echo 'selected="selected"';

 					}

-				} elseif ( $curr_post_type == $post_type ) {

+				} elseif ($curr_post_type == $post_type) {

 					echo 'selected="selected"';

-				} ?>><?php _e( ucfirst( $info->labels->name ), 'geodirectory' ); ?></option>

+				} ?>><?php _e(ucfirst($info->labels->name), 'geodirectory'); ?></option>

 

 			<?php endforeach; ?>

 		</select>

 		<?php

-		if ( $new_style ) {

+		if ($new_style) {

 			echo "</div>";

 		}

-	}elseif ( ! empty( $post_types ) ) {

-		echo '<input type="hidden" name="stype" value="' . key( $post_types ) . '"  />';

+	}elseif (!empty($post_types)) {

+		echo '<input type="hidden" name="stype" value="'.key($post_types).'"  />';

 	}

 }

 

 function geodir_search_form_search_input() {

 

 	$default_search_for_text = SEARCH_FOR_TEXT;

-	if ( get_option( 'geodir_search_field_default_text' ) ) {

-		$default_search_for_text = __( get_option( 'geodir_search_field_default_text' ), 'geodirectory' );

+	if (get_option('geodir_search_field_default_text')) {

+		$default_search_for_text = __(get_option('geodir_search_field_default_text'), 'geodirectory');

 	}

 

 	$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

-	if($new_style){

+	if ($new_style) {

 		echo "<div class='gd-search-input-wrapper gd-search-field-search'>";

 	}

 	?>

 	<input class="search_text" name="s"

-	       value="<?php if ( isset( $_REQUEST['s'] ) && trim( $_REQUEST['s'] ) != '' ) {

-		       echo esc_attr( stripslashes_deep( $_REQUEST['s'] ) );

+	       value="<?php if (isset($_REQUEST['s']) && trim($_REQUEST['s']) != '') {

+		       echo esc_attr(stripslashes_deep($_REQUEST['s']));

 	       } else {

 		       echo $default_search_for_text;

 	       } ?>" type="text"

-	       onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql( $default_search_for_text ); ?>';}"

-	       onfocus="if (this.value == '<?php echo esc_sql( $default_search_for_text ); ?>') {this.value = '';}"

+	       onblur="if (this.value.trim() == '') {this.value = '<?php echo esc_sql($default_search_for_text); ?>';}"

+	       onfocus="if (this.value == '<?php echo esc_sql($default_search_for_text); ?>') {this.value = '';}"

 	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);">

 	<?php

-	if($new_style){

+	if ($new_style) {

 		echo "</div>";

 	}

 }

@@ -2364,12 +2364,12 @@ 
 function geodir_search_form_near_input() {

 

 	$default_near_text = NEAR_TEXT;

-	if ( get_option( 'geodir_near_field_default_text' ) ) {

-		$default_near_text = __( get_option( 'geodir_near_field_default_text' ), 'geodirectory' );

+	if (get_option('geodir_near_field_default_text')) {

+		$default_near_text = __(get_option('geodir_near_field_default_text'), 'geodirectory');

 	}

 

-	if ( isset( $_REQUEST['snear'] ) && $_REQUEST['snear'] != '' ) {

-		$near = esc_attr( stripslashes_deep( $_REQUEST['snear'] ) );

+	if (isset($_REQUEST['snear']) && $_REQUEST['snear'] != '') {

+		$near = esc_attr(stripslashes_deep($_REQUEST['snear']));

 	} else {

 		$near = $default_near_text;

 	}

@@ -2383,7 +2383,7 @@ 
 	 * @param string $near              The current near value.

 	 * @param string $default_near_text The default near value.

 	 */

-	$near = apply_filters( 'geodir_search_near_text', $near, $default_near_text );

+	$near = apply_filters('geodir_search_near_text', $near, $default_near_text);

 	/**

 	 * Filter the default "Near" text value for the search form.

 	 *

@@ -2394,7 +2394,7 @@ 
 	 * @param string $near              The current near value.

 	 * @param string $default_near_text The default near value.

 	 */

-	$default_near_text = apply_filters( 'geodir_search_default_near_text', $default_near_text, $near );

+	$default_near_text = apply_filters('geodir_search_default_near_text', $default_near_text, $near);

 	/**

 	 * Filter the class for the near search input.

 	 *

@@ -2402,26 +2402,26 @@ 
 	 *

 	 * @param string $class The class for the HTML near input, default is blank.

 	 */

-	$near_class = apply_filters( 'geodir_search_near_class', '' );

+	$near_class = apply_filters('geodir_search_near_class', '');

 

 	$new_style = get_option('geodir_show_search_old_search_from') ? false : true;

-	if($new_style){

+	if ($new_style) {

 		echo "<div class='gd-search-input-wrapper gd-search-field-near'>";

 		echo "<div class='gd-append-near-wrapper'>";

 	}

 	?>

 	<input name="snear" class="snear <?php echo $near_class; ?>" type="text" value="<?php echo $near; ?>"

-	       onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql( $near ); ?>' != '' ? '<?php echo esc_sql( $near ); ?>' : '<?php echo $default_near_text; ?>');}"

-	       onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql( $near ); ?>') {this.value = '';}"

+	       onblur="if (this.value.trim() == '') {this.value = ('<?php echo esc_sql($near); ?>' != '' ? '<?php echo esc_sql($near); ?>' : '<?php echo $default_near_text; ?>');}"

+	       onfocus="if (this.value == '<?php echo $default_near_text; ?>' || this.value =='<?php echo esc_sql($near); ?>') {this.value = '';}"

 	       onkeydown="javascript: if(event.keyCode == 13) geodir_click_search(this);"/>

 	<?php

-	if($new_style){

+	if ($new_style) {

 		echo '<span class="near-compass gd-search-near-input" data-dropdown=".gd-near-me-dropdown" ><i class="fa fa-compass" aria-hidden="true"></i></span>';

 		echo "</div>";

 		echo "</div>";

 	}

 }

 

-add_action( 'geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10 );

-add_action( 'geodir_search_form_inputs', 'geodir_search_form_search_input', 20 );

-add_action( 'geodir_search_form_inputs', 'geodir_search_form_near_input', 30 );
\ No newline at end of file
+add_action('geodir_search_form_inputs', 'geodir_search_form_post_type_input', 10);

+add_action('geodir_search_form_inputs', 'geodir_search_form_search_input', 20);

+add_action('geodir_search_form_inputs', 'geodir_search_form_near_input', 30);
\ No newline at end of file

Braces +1 added lines, -1 removed lines

@@ -2329,7 +2329,7 @@
 		if ( $new_style ) {

 			echo "</div>";

 		}

-	}elseif ( ! empty( $post_types ) ) {

+	} elseif ( ! empty( $post_types ) ) {

 		echo '<input type="hidden" name="stype" value="' . key( $post_types ) . '"  />';

 	}

 }

geodirectory-functions/custom_taxonomy_hooks_actions.php

Doc Comments +3 added lines, -4 removed lines

@@ -325,7 +325,7 @@ 
  * @global wpdb $wpdb WordPress database abstraction object.

  * @deprecated 1.5.0 No longer required.

  * @param string $rules mod_rewrite Rewrite rules formatted for .htaccess.

- * @return array Rewrite rules.

+ * @return string Rewrite rules.

  */

 function geodir_htaccess_contents($rules)

 {

@@ -350,7 +350,7 @@ 
  * @since 1.0.0

  *

  * @param array $public_query_vars The array of query variables.

- * @return array Query variables.

+ * @return string[] Query variables.

  */

 function geodir_add_location_var($public_query_vars)

 {

@@ -366,7 +366,7 @@ 
  * @since 1.0.0

  *

  * @param array $public_query_vars The array of query variables.

- * @return array Query variables.

+ * @return string[] Query variables.

  */

 function geodir_add_geodir_page_var($public_query_vars)

 {

@@ -793,7 +793,6 @@ 
  *

  * @since 1.0.0

  *

- * @param object $wp The WordPress object.

  */

 function geodir_custom_post_status()

 {

Braces +103 added lines, -70 removed lines

@@ -106,24 +106,30 @@ 
         $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));

 

         if ($post_type == 'gd_place') {

-            if (array_key_exists('has_archive', $args))

-                $args['has_archive'] = $listing_slug;

+            if (array_key_exists('has_archive', $args)) {
+                            $args['has_archive'] = $listing_slug;
+            }
 

             if (array_key_exists('rewrite', $args)) {

-                if (array_key_exists('slug', $args['rewrite']))

-                    $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+                if (array_key_exists('slug', $args['rewrite'])) {
+                                    $args['rewrite']['slug'] = $listing_slug;
+                }
+                // . '/%gd_taxonomy%';

             }

 

             $geodir_post_types = get_option('geodir_post_types');

 

             if (array_key_exists($post_type, $geodir_post_types)) {

 

-                if (array_key_exists('has_archive', $geodir_post_types[$post_type]))

-                    $geodir_post_types[$post_type]['has_archive'] = $listing_slug;

+                if (array_key_exists('has_archive', $geodir_post_types[$post_type])) {
+                                    $geodir_post_types[$post_type]['has_archive'] = $listing_slug;
+                }
 

-                if (array_key_exists('rewrite', $geodir_post_types[$post_type]))

-                    if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

-                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+                if (array_key_exists('rewrite', $geodir_post_types[$post_type])) {
+                                    if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

+                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;
+                }
+                // . '/%gd_taxonomy%';

 

                 update_option('geodir_post_types', $geodir_post_types);

 

@@ -138,10 +144,11 @@ 
             if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {

                 $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;

 

-                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

+                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category'])) {
+                                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

                         if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))

-                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;

+                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;
+                }
 

                 update_option('geodir_taxonomies', $geodir_taxonomies);

 

@@ -152,10 +159,11 @@ 
             if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {

                 $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';

 

-                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

+                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags'])) {
+                                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

                         if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))

-                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';

+                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';
+                }
 

                 update_option('geodir_taxonomies', $geodir_taxonomies_tag);

 

@@ -221,8 +229,9 @@ 
         global $wpdb;

         $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));

     }

-    if (!isset($location_prefix))

-        $location_prefix = 'location';

+    if (!isset($location_prefix)) {
+            $location_prefix = 'location';
+    }
 

 	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

 	if ($location_manager) {

@@ -441,14 +450,17 @@ 
         $gd_country = '';

         $gd_region = '';

         $gd_city = '';

-        if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '')

-            $gd_country = urldecode($wp->query_vars['gd_country']);

+        if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') {
+                    $gd_country = urldecode($wp->query_vars['gd_country']);
+        }
 

-        if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '')

-            $gd_region = urldecode($wp->query_vars['gd_region']);

+        if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') {
+                    $gd_region = urldecode($wp->query_vars['gd_region']);
+        }
 

-        if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '')

-            $gd_city = urldecode($wp->query_vars['gd_city']);

+        if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') {
+                    $gd_city = urldecode($wp->query_vars['gd_city']);
+        }
 

         if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {

             $default_location = geodir_get_default_location();

@@ -456,17 +468,19 @@ 
             if (get_option('geodir_add_location_url')) {

                 if ($geodir_show_location_url != 'all') {

                     if ($gd_region == '') {

-                        if ($gd_ses_region = $gd_session->get('gd_region'))

-                            $gd_region = $gd_ses_region;

-                        else

-                            $gd_region = $default_location->region_slug;

+                        if ($gd_ses_region = $gd_session->get('gd_region')) {
+                                                    $gd_region = $gd_ses_region;
+                        } else {
+                                                    $gd_region = $default_location->region_slug;
+                        }
                     }

 

                     if ($gd_city == '') {

-                        if ($gd_ses_city = $gd_session->get('gd_city'))

-                            $gd_city = $gd_ses_city;

-                        else

-                            $gd_city = $default_location->city_slug;

+                        if ($gd_ses_city = $gd_session->get('gd_city')) {
+                                                    $gd_city = $gd_ses_city;
+                        } else {
+                                                    $gd_city = $default_location->city_slug;
+                        }
 

                         $base_location_link = geodir_get_location_link('base');

                         wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);

@@ -585,8 +599,9 @@ 
 

 

 				$geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count);

-				if (!$post_title_replace_count)

-					$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);

+				if (!$post_title_replace_count) {
+									$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);
+				}
 				$geodir_terms = explode('/', $geodir_term);

 				$geodir_last_term = end($geodir_terms);

 

@@ -622,8 +637,9 @@ 
                     if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

                         geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) &&

                         geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)

-                    )

-                        $is_geodir_location_found = true;

+                    ) {
+                                            $is_geodir_location_found = true;
+                    }
 

                     // if location has not been found for country , region and city then search for country and region only

 

@@ -631,8 +647,9 @@ 
                         $gd_city = '';

                         if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

                             geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)

-                        )

-                            $is_geodir_location_found = true;

+                        ) {
+                                                    $is_geodir_location_found = true;
+                        }
 

                     }

 

@@ -640,8 +657,9 @@ 
                     if (!$is_geodir_location_found) {

                         $gd_city = '';

                         $gd_region = '';

-                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

-                            $is_geodir_location_found = true;

+                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) {
+                                                    $is_geodir_location_found = true;
+                        }
                     }

                 } else if ($geodir_show_location_url == 'country_city') {

                     if (count($geodir_terms) >= 2) {

@@ -651,17 +669,19 @@ 
                         $gd_country = urldecode($geodir_terms[0]);

                     }

 

-                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

-                        $is_geodir_location_found = true;

+                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {
+                                            $is_geodir_location_found = true;
+                    }
 

                     // if location has not been found for country and city  then search for country only

                     if (!$is_geodir_location_found) {

                         $gd_city = '';

                         

-						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

-                            $is_geodir_location_found = true;

+						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country)) {
+						                            $is_geodir_location_found = true;
+						}
                     }

-                }  else if ($geodir_show_location_url == 'region_city') {

+                } else if ($geodir_show_location_url == 'region_city') {

                     if (count($geodir_terms) >= 2) {

                         $gd_region = urldecode($geodir_terms[0]);

                         $gd_city = urldecode($geodir_terms[1]);

@@ -669,15 +689,17 @@ 
                         $gd_region = urldecode($geodir_terms[0]);

                     }

 

-                    if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

-                        $is_geodir_location_found = true;

+                    if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {
+                                            $is_geodir_location_found = true;
+                    }
 

                     // if location has not been found for region and city  then search for region only

                     if (!$is_geodir_location_found) {

                         $gd_city = '';

                         

-						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region))

-                            $is_geodir_location_found = true;

+						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)) {
+						                            $is_geodir_location_found = true;
+						}
                     }

                 } else {

                     $gd_city = $geodir_terms[0];

@@ -719,14 +741,17 @@ 
 

             $wp->query_vars[$geodir_taxonomy] = $geodir_term;

             // eliminate location related terms from taxonomy term

-            if ($gd_country != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+            if ($gd_country != '') {
+                            $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
+            }
 

-            if ($gd_region != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+            if ($gd_region != '') {
+                            $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
+            }
 

-            if ($gd_city != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+            if ($gd_city != '') {
+                            $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);
+            }
 

 

             $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);

@@ -762,27 +787,34 @@ 
     if (get_option('geodir_add_location_url')) {        

 		if ($geodir_show_location_url == 'all') {

 		} else if ($geodir_show_location_url == 'country_city') {

-			 if (isset($wp->query_vars['gd_region']))

-                $wp->query_vars['gd_region'] = '';

+			 if (isset($wp->query_vars['gd_region'])) {
+			                 $wp->query_vars['gd_region'] = '';
+			 }
 		} else if ($geodir_show_location_url == 'region_city') {

-			if (isset($wp->query_vars['gd_country']))

-                $wp->query_vars['gd_country'] = '';

+			if (isset($wp->query_vars['gd_country'])) {
+			                $wp->query_vars['gd_country'] = '';
+			}
 		} else {

-			if (isset($wp->query_vars['gd_country']))

-                $wp->query_vars['gd_country'] = '';

+			if (isset($wp->query_vars['gd_country'])) {
+			                $wp->query_vars['gd_country'] = '';
+			}
 

-            if (isset($wp->query_vars['gd_region']))

-                $wp->query_vars['gd_region'] = '';

+            if (isset($wp->query_vars['gd_region'])) {
+                            $wp->query_vars['gd_region'] = '';
+            }
 		}

     } else {

-        if (isset($wp->query_vars['gd_country']))

-            $wp->query_vars['gd_country'] = '';

+        if (isset($wp->query_vars['gd_country'])) {
+                    $wp->query_vars['gd_country'] = '';
+        }
 

-        if (isset($wp->query_vars['gd_region']))

-            $wp->query_vars['gd_region'] = '';

+        if (isset($wp->query_vars['gd_region'])) {
+                    $wp->query_vars['gd_region'] = '';
+        }
 

-        if (isset($wp->query_vars['gd_city']))

-            $wp->query_vars['gd_city'] = '';

+        if (isset($wp->query_vars['gd_city'])) {
+                    $wp->query_vars['gd_city'] = '';
+        }
     }

 }

 

@@ -894,8 +926,9 @@ 
 function geodir_exclude_page_where($where)

 {

     global $wpdb;

-    if (is_admin())

-        $where .= " AND $wpdb->posts.post_status != 'virtual'";

+    if (is_admin()) {
+            $where .= " AND $wpdb->posts.post_status != 'virtual'";
+    }
 

     return $where;

 }

Indentation +462 added lines, -462 removed lines

@@ -13,29 +13,29 @@ 
  */

 function geodir_register_taxonomies()

 {

-    $taxonomies = array();

-    $taxonomies = get_option('geodir_taxonomies');

-    // If custom taxonomies are present, register them

-    if (is_array($taxonomies)) {

-        // Sort taxonomies

-        ksort($taxonomies);

-

-        // Register taxonomies

-        foreach ($taxonomies as $taxonomy => $args) {

-            // Allow taxonomie names to be translated

-            if (!empty($args['args']['labels'])) {

-                foreach ($args['args']['labels'] as $key => $tax_label) {

-                    $args['args']['labels'][$key] = __($tax_label, 'geodirectory');

-                }

-            }

-

-            $tax = register_taxonomy($taxonomy, $args['object_type'], $args['args']);

-

-            if (taxonomy_exists($taxonomy)) {

-                $tax = register_taxonomy_for_object_type($taxonomy, $args['object_type']);

-            }

-        }

-    }

+	$taxonomies = array();

+	$taxonomies = get_option('geodir_taxonomies');

+	// If custom taxonomies are present, register them

+	if (is_array($taxonomies)) {

+		// Sort taxonomies

+		ksort($taxonomies);

+

+		// Register taxonomies

+		foreach ($taxonomies as $taxonomy => $args) {

+			// Allow taxonomie names to be translated

+			if (!empty($args['args']['labels'])) {

+				foreach ($args['args']['labels'] as $key => $tax_label) {

+					$args['args']['labels'][$key] = __($tax_label, 'geodirectory');

+				}

+			}

+

+			$tax = register_taxonomy($taxonomy, $args['object_type'], $args['args']);

+

+			if (taxonomy_exists($taxonomy)) {

+				$tax = register_taxonomy_for_object_type($taxonomy, $args['object_type']);

+			}

+		}

+	}

 }

 

 

@@ -53,40 +53,40 @@ 
  */

 function geodir_register_post_types() 

 {

-    global $wp_post_types;

+	global $wp_post_types;

 

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

 

-    // Register each post type if array of data is returned

-    if (is_array($post_types)):

+	// Register each post type if array of data is returned

+	if (is_array($post_types)):

 

-        foreach ($post_types as $post_type => $args):

+		foreach ($post_types as $post_type => $args):

 

-            if (!empty($args['rewrite']['slug'])) {

-                $args['rewrite']['slug'] = _x($args['rewrite']['slug'], 'URL slug', 'geodirectory');

-            }

-            $args = stripslashes_deep($args);

+			if (!empty($args['rewrite']['slug'])) {

+				$args['rewrite']['slug'] = _x($args['rewrite']['slug'], 'URL slug', 'geodirectory');

+			}

+			$args = stripslashes_deep($args);

 

-            if (!empty($args['labels'])) {

-                foreach ($args['labels'] as $key => $val) {

-                    $args['labels'][$key] = __($val, 'geodirectory');// allow translation

-                }

-            }

+			if (!empty($args['labels'])) {

+				foreach ($args['labels'] as $key => $val) {

+					$args['labels'][$key] = __($val, 'geodirectory');// allow translation

+				}

+			}

 

-            /**

-             * Filter post type args.

-             *

-             * @since 1.0.0

-             * @param string $args Post type args.

-             * @param string $post_type The post type.

-             */

-            $args = apply_filters('geodir_post_type_args', $args, $post_type);

+			/**

+			 * Filter post type args.

+			 *

+			 * @since 1.0.0

+			 * @param string $args Post type args.

+			 * @param string $post_type The post type.

+			 */

+			$args = apply_filters('geodir_post_type_args', $args, $post_type);

 

-            $post_type = register_post_type($post_type, $args);

+			$post_type = register_post_type($post_type, $args);

 

-        endforeach;

-    endif;

+		endforeach;

+	endif;

 }

 

 /**

@@ -100,72 +100,72 @@ 
  */

 function geodir_post_type_args_modify($args, $post_type)

 {

-    $geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix');

+	$geodir_location_prefix = isset($_REQUEST['geodir_location_prefix']) ? trim($_REQUEST['geodir_location_prefix']) : get_option('geodir_location_prefix');

 	if (isset($_REQUEST['geodir_listing_prefix']) && $_REQUEST['geodir_listing_prefix'] != '' && geodir_strtolower($_REQUEST['geodir_listing_prefix']) != geodir_strtolower($geodir_location_prefix)) {

 

-        $listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));

+		$listing_slug = htmlentities(trim($_REQUEST['geodir_listing_prefix']));

 

-        if ($post_type == 'gd_place') {

-            if (array_key_exists('has_archive', $args))

-                $args['has_archive'] = $listing_slug;

+		if ($post_type == 'gd_place') {

+			if (array_key_exists('has_archive', $args))

+				$args['has_archive'] = $listing_slug;

 

-            if (array_key_exists('rewrite', $args)) {

-                if (array_key_exists('slug', $args['rewrite']))

-                    $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

-            }

+			if (array_key_exists('rewrite', $args)) {

+				if (array_key_exists('slug', $args['rewrite']))

+					$args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+			}

 

-            $geodir_post_types = get_option('geodir_post_types');

+			$geodir_post_types = get_option('geodir_post_types');

 

-            if (array_key_exists($post_type, $geodir_post_types)) {

+			if (array_key_exists($post_type, $geodir_post_types)) {

 

-                if (array_key_exists('has_archive', $geodir_post_types[$post_type]))

-                    $geodir_post_types[$post_type]['has_archive'] = $listing_slug;

+				if (array_key_exists('has_archive', $geodir_post_types[$post_type]))

+					$geodir_post_types[$post_type]['has_archive'] = $listing_slug;

 

-                if (array_key_exists('rewrite', $geodir_post_types[$post_type]))

-                    if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

-                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+				if (array_key_exists('rewrite', $geodir_post_types[$post_type]))

+					if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

+						$geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

 

-                update_option('geodir_post_types', $geodir_post_types);

+				update_option('geodir_post_types', $geodir_post_types);

 

-            }

+			}

 

-            $geodir_post_types = get_option('geodir_post_types');

+			$geodir_post_types = get_option('geodir_post_types');

 

-            /* --- update taxonomies (category) --- */

+			/* --- update taxonomies (category) --- */

 

-            $geodir_taxonomies = get_option('geodir_taxonomies');

+			$geodir_taxonomies = get_option('geodir_taxonomies');

 

-            if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {

-                $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;

+			if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {

+				$geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;

 

-                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

-                        if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))

-                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;

+				if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))

+					if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

+						if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))

+							$geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;

 

-                update_option('geodir_taxonomies', $geodir_taxonomies);

+				update_option('geodir_taxonomies', $geodir_taxonomies);

 

-            }

+			}

 

-            /* --- update taxonomies (tags) --- */

-            $geodir_taxonomies_tag = get_option('geodir_taxonomies');

-            if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {

-                $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';

+			/* --- update taxonomies (tags) --- */

+			$geodir_taxonomies_tag = get_option('geodir_taxonomies');

+			if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {

+				$geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';

 

-                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

-                        if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))

-                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';

+				if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))

+					if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

+						if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))

+							$geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';

 

-                update_option('geodir_taxonomies', $geodir_taxonomies_tag);

+				update_option('geodir_taxonomies', $geodir_taxonomies_tag);

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

-    return $args;

+	return $args;

 }

 

 /**

@@ -178,8 +178,8 @@ 
  */

 function geodir_flush_rewrite_rules()

 {

-    global $wp_rewrite;

-    $wp_rewrite->flush_rules(false);

+	global $wp_rewrite;

+	$wp_rewrite->flush_rules(false);

 }

 

 /**

@@ -194,35 +194,35 @@ 
  * @return array Rewrite rules.

  */

 function geodir_listing_rewrite_rules($rules) {

-    $newrules = array();

-    $taxonomies = get_option('geodir_taxonomies');

-    $detail_url_seprator = get_option('geodir_detailurl_separator');

+	$newrules = array();

+	$taxonomies = get_option('geodir_taxonomies');

+	$detail_url_seprator = get_option('geodir_detailurl_separator');

     

 	// create rules for post listing

-    if (is_array($taxonomies)):

-        foreach ($taxonomies as $taxonomy => $args):

-            $post_type = $args['object_type'];

-            $listing_slug = $args['listing_slug'];

-

-            if (strpos($taxonomy, 'tags')) {

-                $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';

-                $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';

-            } else {

-                // use this loop to add paging for details page comments paging

-                $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';

-            }

-        endforeach;

-    endif;

-

-    // create rules for location listing

-    $location_page = get_option('geodir_location_page');

+	if (is_array($taxonomies)):

+		foreach ($taxonomies as $taxonomy => $args):

+			$post_type = $args['object_type'];

+			$listing_slug = $args['listing_slug'];

+

+			if (strpos($taxonomy, 'tags')) {

+				$newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';

+				$newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';

+			} else {

+				// use this loop to add paging for details page comments paging

+				$newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';

+			}

+		endforeach;

+	endif;

+

+	// create rules for location listing

+	$location_page = get_option('geodir_location_page');

 	

-    if($location_page) {

-        global $wpdb;

-        $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));

-    }

-    if (!isset($location_prefix))

-        $location_prefix = 'location';

+	if($location_page) {

+		global $wpdb;

+		$location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));

+	}

+	if (!isset($location_prefix))

+		$location_prefix = 'location';

 

 	$location_manager = function_exists('geodir_location_plugin_activated') ? true : false; // Check location manager installed & active.

 	if ($location_manager) {

@@ -266,12 +266,12 @@ 
 		$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]';

 	}

 

-    if ($location_page && function_exists('icl_object_id')) {

-        foreach(icl_get_languages('skip_missing=N') as $lang){

-            $alt_page_id = '';

-            $alt_page_id = icl_object_id($location_page, 'page', false,$lang['language_code']);

-            if($alt_page_id){

-                $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));

+	if ($location_page && function_exists('icl_object_id')) {

+		foreach(icl_get_languages('skip_missing=N') as $lang){

+			$alt_page_id = '';

+			$alt_page_id = icl_object_id($location_page, 'page', false,$lang['language_code']);

+			if($alt_page_id){

+				$location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));

 

 				if ($location_manager && ($hide_country_part || $hide_region_part)) {

 					$matches2 = '';

@@ -307,14 +307,14 @@ 
 					$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]';

 					$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]';

 				}

-            }

-        }

-    }

+			}

+		}

+	}

 

-    $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page;

+	$newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page;

 

-    $rules = array_merge($newrules, $rules);

-    return $rules;

+	$rules = array_merge($newrules, $rules);

+	return $rules;

 }

 

 /**

@@ -329,18 +329,18 @@ 
  */

 function geodir_htaccess_contents($rules)

 {

-    global $wpdb;

-    $location_prefix = get_option('geodir_location_prefix');

-    // if location page slug changed then add redirect

-    if ($location_prefix == 'location') {

-        return $rules;

-    }

-    $my_content = <<<EOD

+	global $wpdb;

+	$location_prefix = get_option('geodir_location_prefix');

+	// if location page slug changed then add redirect

+	if ($location_prefix == 'location') {

+		return $rules;

+	}

+	$my_content = <<<EOD

 \n# BEGIN GeoDirectory Rules

 #Redirect 301 /location/ /$location_prefix/

 # END GeoDirectory Rules\n\n

 EOD;

-    return $my_content . $rules;

+	return $my_content . $rules;

 }

 //add_filter('mod_rewrite_rules', 'geodir_htaccess_contents');

 

@@ -354,10 +354,10 @@ 
  */

 function geodir_add_location_var($public_query_vars)

 {

-    $public_query_vars[] = 'gd_country';

-    $public_query_vars[] = 'gd_region';

-    $public_query_vars[] = 'gd_city';

-    return $public_query_vars;

+	$public_query_vars[] = 'gd_country';

+	$public_query_vars[] = 'gd_region';

+	$public_query_vars[] = 'gd_city';

+	return $public_query_vars;

 }

 

 /**

@@ -370,8 +370,8 @@ 
  */

 function geodir_add_geodir_page_var($public_query_vars)

 {

-    $public_query_vars[] = 'gd_is_geodir_page';

-    return $public_query_vars;

+	$public_query_vars[] = 'gd_is_geodir_page';

+	return $public_query_vars;

 }

 

 /**

@@ -383,20 +383,20 @@ 
  */

 function geodir_add_page_id_in_query_var()

 {

-    global $wp_query;

+	global $wp_query;

 

-    $page_id = $wp_query->get_queried_object_id();

+	$page_id = $wp_query->get_queried_object_id();

 

-    if (!get_query_var('page_id')) {

-        // fix for WP tags conflict with enfold theme

-        $theme_name = geodir_strtolower(wp_get_theme());

-        if (!geodir_is_geodir_page() && strpos($theme_name, 'enfold') !== false) {

-            return $wp_query;

-        }

-        $wp_query->set('page_id', $page_id);

-    }

+	if (!get_query_var('page_id')) {

+		// fix for WP tags conflict with enfold theme

+		$theme_name = geodir_strtolower(wp_get_theme());

+		if (!geodir_is_geodir_page() && strpos($theme_name, 'enfold') !== false) {

+			return $wp_query;

+		}

+		$wp_query->set('page_id', $page_id);

+	}

 

-    return $wp_query;

+	return $wp_query;

 }

 

 /**

@@ -411,24 +411,24 @@ 
 function geodir_set_location_var_in_session_in_core($wp) {

 	global $gd_session;

 	

-    // Fix for WPML removing page_id query var:

-    if (isset($wp->query_vars['page']) && !isset($wp->query_vars['page_id']) && isset($wp->query_vars['pagename']) && !is_home()) {

-        global $wpdb;

-

-        $page_for_posts = get_option('page_for_posts');

-        $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));

-

-        if (function_exists('icl_object_id')) {

-            $real_page_id = icl_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);

-        }

-        if ($real_page_id && $real_page_id!=$page_for_posts) {

-            $wp->query_vars['page_id'] = $real_page_id;

-        }

-    }

+	// Fix for WPML removing page_id query var:

+	if (isset($wp->query_vars['page']) && !isset($wp->query_vars['page_id']) && isset($wp->query_vars['pagename']) && !is_home()) {

+		global $wpdb;

+

+		$page_for_posts = get_option('page_for_posts');

+		$real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));

+

+		if (function_exists('icl_object_id')) {

+			$real_page_id = icl_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);

+		}

+		if ($real_page_id && $real_page_id!=$page_for_posts) {

+			$wp->query_vars['page_id'] = $real_page_id;

+		}

+	}

 	

 	// Query Vars will have page_id parameter

 	// check if query var has page_id and that page id is location page

-    geodir_set_is_geodir_page($wp);

+	geodir_set_is_geodir_page($wp);

 	// if is GD homepage set the page ID

 	if (geodir_is_page('home')) {

 		$wp->query_vars['page_id'] = get_option('page_on_front');

@@ -437,118 +437,118 @@ 
 	// The location url format (all or country_city or region_city or city).

 	$geodir_show_location_url = get_option('geodir_show_location_url');

 

-    if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id()) {

-        $gd_country = '';

-        $gd_region = '';

-        $gd_city = '';

-        if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '')

-            $gd_country = urldecode($wp->query_vars['gd_country']);

-

-        if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '')

-            $gd_region = urldecode($wp->query_vars['gd_region']);

-

-        if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '')

-            $gd_city = urldecode($wp->query_vars['gd_city']);

-

-        if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {

-            $default_location = geodir_get_default_location();

-

-            if (get_option('geodir_add_location_url')) {

-                if ($geodir_show_location_url != 'all') {

-                    if ($gd_region == '') {

-                        if ($gd_ses_region = $gd_session->get('gd_region'))

-                            $gd_region = $gd_ses_region;

-                        else

-                            $gd_region = $default_location->region_slug;

-                    }

-

-                    if ($gd_city == '') {

-                        if ($gd_ses_city = $gd_session->get('gd_city'))

-                            $gd_city = $gd_ses_city;

-                        else

-                            $gd_city = $default_location->city_slug;

-

-                        $base_location_link = geodir_get_location_link('base');

-                        wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);

-                        exit();

-                    }

-                }

-            }

-

-            $args = array(

-                'what' => 'city',

-                'city_val' => $gd_city,

-                'region_val' => $gd_region,

-                'country_val' => $gd_country,

-                'country_column_name' => 'country_slug',

-                'region_column_name' => 'region_slug',

-                'city_column_name' => 'city_slug',

-                'location_link_part' => false,

-                'compare_operator' => ''

-            );

-

-            $location_array = function_exists('geodir_get_location_array') ? geodir_get_location_array($args) : array();

-            if (!empty($location_array)) {

-                $gd_session->set('gd_multi_location', 1);

-                $gd_session->set('gd_country', $gd_country);

-                $gd_session->set('gd_region', $gd_region);

-                $gd_session->set('gd_city', $gd_city);

+	if (isset($wp->query_vars['page_id']) && $wp->query_vars['page_id'] == geodir_location_page_id()) {

+		$gd_country = '';

+		$gd_region = '';

+		$gd_city = '';

+		if (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '')

+			$gd_country = urldecode($wp->query_vars['gd_country']);

+

+		if (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '')

+			$gd_region = urldecode($wp->query_vars['gd_region']);

+

+		if (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '')

+			$gd_city = urldecode($wp->query_vars['gd_city']);

+

+		if (!($gd_country == '' && $gd_region == '' && $gd_city == '')) {

+			$default_location = geodir_get_default_location();

+

+			if (get_option('geodir_add_location_url')) {

+				if ($geodir_show_location_url != 'all') {

+					if ($gd_region == '') {

+						if ($gd_ses_region = $gd_session->get('gd_region'))

+							$gd_region = $gd_ses_region;

+						else

+							$gd_region = $default_location->region_slug;

+					}

+

+					if ($gd_city == '') {

+						if ($gd_ses_city = $gd_session->get('gd_city'))

+							$gd_city = $gd_ses_city;

+						else

+							$gd_city = $default_location->city_slug;

+

+						$base_location_link = geodir_get_location_link('base');

+						wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);

+						exit();

+					}

+				}

+			}

+

+			$args = array(

+				'what' => 'city',

+				'city_val' => $gd_city,

+				'region_val' => $gd_region,

+				'country_val' => $gd_country,

+				'country_column_name' => 'country_slug',

+				'region_column_name' => 'region_slug',

+				'city_column_name' => 'city_slug',

+				'location_link_part' => false,

+				'compare_operator' => ''

+			);

+

+			$location_array = function_exists('geodir_get_location_array') ? geodir_get_location_array($args) : array();

+			if (!empty($location_array)) {

+				$gd_session->set('gd_multi_location', 1);

+				$gd_session->set('gd_country', $gd_country);

+				$gd_session->set('gd_region', $gd_region);

+				$gd_session->set('gd_city', $gd_city);

                 

 				$wp->query_vars['gd_country'] = $gd_country;

-                $wp->query_vars['gd_region'] = $gd_region;

-                $wp->query_vars['gd_city'] = $gd_city;

-            } else {

-                $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

-            }

-        } else {

-            $gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

-        }

-

-    } else if (isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {

-        if (!is_admin()) {

-            $requested_post_type = $wp->query_vars['post_type'];

-            // check if this post type is geodirectory post types

-            $post_type_array = geodir_get_posttypes();

+				$wp->query_vars['gd_region'] = $gd_region;

+				$wp->query_vars['gd_city'] = $gd_city;

+			} else {

+				$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

+			}

+		} else {

+			$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

+		}

+

+	} else if (isset($wp->query_vars['post_type']) && $wp->query_vars['post_type'] != '') {

+		if (!is_admin()) {

+			$requested_post_type = $wp->query_vars['post_type'];

+			// check if this post type is geodirectory post types

+			$post_type_array = geodir_get_posttypes();

             

 			if (in_array($requested_post_type, $post_type_array)) {

-                // now u can apply geodirectory related manipulation.

-            }

-        }

-    } else {

-        // check if a geodirectory taxonomy is set

-        $gd_country = '';

-        $gd_region = '';

-        $gd_city = '';

+				// now u can apply geodirectory related manipulation.

+			}

+		}

+	} else {

+		// check if a geodirectory taxonomy is set

+		$gd_country = '';

+		$gd_region = '';

+		$gd_city = '';

         

 		$is_geodir_taxonomy = false;

-        $is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not

-        $is_geodir_location_found = false;

+		$is_geodir_taxonomy_term = false; // the last term is real geodirectory taxonomy term or not

+		$is_geodir_location_found = false;

 		

 		$geodir_taxonomy = '';

-        $geodir_post_type = '';

-        $geodir_term = '';

-        $geodir_set_location_session = true;

-        $geodir_taxonomis = geodir_get_taxonomies('', true);

-

-        if(!empty($geodir_taxonomis)){

-            foreach ($geodir_taxonomis as $taxonomy) {

-                if (array_key_exists($taxonomy, $wp->query_vars)) {

-                    $is_geodir_taxonomy = true;

-                    $geodir_taxonomy = $taxonomy;

-                    $geodir_post_type = str_replace('category', '', $taxonomy);

-                    $geodir_post_type = str_replace('_tags', '', $geodir_post_type);

-                    $geodir_term = $wp->query_vars[$geodir_taxonomy];

-                    break;

-                }

-            }

-        }

-

-        // now get an array of all terms seperated by '/'

-        $geodir_terms = explode('/', $geodir_term);

-        $geodir_last_term = end($geodir_terms);

-

-        if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy

-            $wp->query_vars['post_type'] = $geodir_post_type;

+		$geodir_post_type = '';

+		$geodir_term = '';

+		$geodir_set_location_session = true;

+		$geodir_taxonomis = geodir_get_taxonomies('', true);

+

+		if(!empty($geodir_taxonomis)){

+			foreach ($geodir_taxonomis as $taxonomy) {

+				if (array_key_exists($taxonomy, $wp->query_vars)) {

+					$is_geodir_taxonomy = true;

+					$geodir_taxonomy = $taxonomy;

+					$geodir_post_type = str_replace('category', '', $taxonomy);

+					$geodir_post_type = str_replace('_tags', '', $geodir_post_type);

+					$geodir_term = $wp->query_vars[$geodir_taxonomy];

+					break;

+				}

+			}

+		}

+

+		// now get an array of all terms seperated by '/'

+		$geodir_terms = explode('/', $geodir_term);

+		$geodir_last_term = end($geodir_terms);

+

+		if ($is_geodir_taxonomy) { // do all these only when it is a geodirectory taxonomy

+			$wp->query_vars['post_type'] = $geodir_post_type;

 

 			// now check if last term is a post of geodirectory post types

 			$geodir_post = get_posts(array(

@@ -597,196 +597,196 @@ 
 				//return ;

 			}

 

-            $geodir_location_terms = '';

-            // if last term is not a post then check if last term is a term of the specific texonomy or not

-            if (geodir_term_exists($geodir_last_term, $geodir_taxonomy)) {

-                $is_geodir_taxonomy_term = true;

+			$geodir_location_terms = '';

+			// if last term is not a post then check if last term is a term of the specific texonomy or not

+			if (geodir_term_exists($geodir_last_term, $geodir_taxonomy)) {

+				$is_geodir_taxonomy_term = true;

 

-                $geodir_set_location_session = false;

-            }

+				$geodir_set_location_session = false;

+			}

 

 

-            // now check if there is location parts in the url or not

-            if (get_option('geodir_add_location_url')) {				

+			// now check if there is location parts in the url or not

+			if (get_option('geodir_add_location_url')) {				

 				$default_location = geodir_get_default_location();

                 

 				if ($geodir_show_location_url == 'all') {

-                    if (count($geodir_terms) >= 3) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                        $gd_region = urldecode($geodir_terms[1]);

-                        $gd_city = urldecode($geodir_terms[2]);

-                    } else if (count($geodir_terms) >= 2) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                        $gd_region = urldecode($geodir_terms[1]);

-                    } else if (count($geodir_terms) >= 1) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                    }

-

-                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

-                        geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) &&

-                        geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)

-                    )

-                        $is_geodir_location_found = true;

-

-                    // if location has not been found for country , region and city then search for country and region only

-

-                    if (!$is_geodir_location_found) {

-                        $gd_city = '';

-                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

-                            geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)

-                        )

-                            $is_geodir_location_found = true;

-

-                    }

-

-                    // if location has not been found for country , region  then search for country only

-                    if (!$is_geodir_location_found) {

-                        $gd_city = '';

-                        $gd_region = '';

-                        if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

-                            $is_geodir_location_found = true;

-                    }

-                } else if ($geodir_show_location_url == 'country_city') {

-                    if (count($geodir_terms) >= 2) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                        $gd_city = urldecode($geodir_terms[1]);

-                    } else if (count($geodir_terms) >= 1) {

-                        $gd_country = urldecode($geodir_terms[0]);

-                    }

-

-                    if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

-                        $is_geodir_location_found = true;

-

-                    // if location has not been found for country and city  then search for country only

-                    if (!$is_geodir_location_found) {

-                        $gd_city = '';

+					if (count($geodir_terms) >= 3) {

+						$gd_country = urldecode($geodir_terms[0]);

+						$gd_region = urldecode($geodir_terms[1]);

+						$gd_city = urldecode($geodir_terms[2]);

+					} else if (count($geodir_terms) >= 2) {

+						$gd_country = urldecode($geodir_terms[0]);

+						$gd_region = urldecode($geodir_terms[1]);

+					} else if (count($geodir_terms) >= 1) {

+						$gd_country = urldecode($geodir_terms[0]);

+					}

+

+					if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

+						geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) &&

+						geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)

+					)

+						$is_geodir_location_found = true;

+

+					// if location has not been found for country , region and city then search for country and region only

+

+					if (!$is_geodir_location_found) {

+						$gd_city = '';

+						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) &&

+							geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region)

+						)

+							$is_geodir_location_found = true;

+

+					}

+

+					// if location has not been found for country , region  then search for country only

+					if (!$is_geodir_location_found) {

+						$gd_city = '';

+						$gd_region = '';

+						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

+							$is_geodir_location_found = true;

+					}

+				} else if ($geodir_show_location_url == 'country_city') {

+					if (count($geodir_terms) >= 2) {

+						$gd_country = urldecode($geodir_terms[0]);

+						$gd_city = urldecode($geodir_terms[1]);

+					} else if (count($geodir_terms) >= 1) {

+						$gd_country = urldecode($geodir_terms[0]);

+					}

+

+					if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

+						$is_geodir_location_found = true;

+

+					// if location has not been found for country and city  then search for country only

+					if (!$is_geodir_location_found) {

+						$gd_city = '';

                         

 						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

-                            $is_geodir_location_found = true;

-                    }

-                }  else if ($geodir_show_location_url == 'region_city') {

-                    if (count($geodir_terms) >= 2) {

-                        $gd_region = urldecode($geodir_terms[0]);

-                        $gd_city = urldecode($geodir_terms[1]);

-                    } else if (count($geodir_terms) >= 1) {

-                        $gd_region = urldecode($geodir_terms[0]);

-                    }

-

-                    if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

-                        $is_geodir_location_found = true;

-

-                    // if location has not been found for region and city  then search for region only

-                    if (!$is_geodir_location_found) {

-                        $gd_city = '';

+							$is_geodir_location_found = true;

+					}

+				}  else if ($geodir_show_location_url == 'region_city') {

+					if (count($geodir_terms) >= 2) {

+						$gd_region = urldecode($geodir_terms[0]);

+						$gd_city = urldecode($geodir_terms[1]);

+					} else if (count($geodir_terms) >= 1) {

+						$gd_region = urldecode($geodir_terms[0]);

+					}

+

+					if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region) && geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city))

+						$is_geodir_location_found = true;

+

+					// if location has not been found for region and city  then search for region only

+					if (!$is_geodir_location_found) {

+						$gd_city = '';

                         

 						if (geodir_strtolower($default_location->region_slug) == geodir_strtolower($gd_region))

-                            $is_geodir_location_found = true;

-                    }

-                } else {

-                    $gd_city = $geodir_terms[0];

-

-                    if (geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {

-                        $is_geodir_location_found = true;

-                        $gd_region = $default_location->region_slug;

-                        $gd_country = $default_location->country_slug;

-                    }

-                }

-                // if locaton still not found then clear location related session variables

-                if ($is_geodir_location_found && $geodir_set_location_session) {

-                    $gd_session->set('gd_multi_location', 1);

-                    $gd_session->set('gd_country', $gd_country);

-                    $gd_session->set('gd_region', $gd_region);

-                    $gd_session->set('gd_city', $gd_city);

-                }

-

-                if ($geodir_show_location_url == 'all') {

+							$is_geodir_location_found = true;

+					}

+				} else {

+					$gd_city = $geodir_terms[0];

+

+					if (geodir_strtolower($default_location->city_slug) == geodir_strtolower($gd_city)) {

+						$is_geodir_location_found = true;

+						$gd_region = $default_location->region_slug;

+						$gd_country = $default_location->country_slug;

+					}

+				}

+				// if locaton still not found then clear location related session variables

+				if ($is_geodir_location_found && $geodir_set_location_session) {

+					$gd_session->set('gd_multi_location', 1);

+					$gd_session->set('gd_country', $gd_country);

+					$gd_session->set('gd_region', $gd_region);

+					$gd_session->set('gd_city', $gd_city);

+				}

+

+				if ($geodir_show_location_url == 'all') {

 				} else if ($geodir_show_location_url == 'country_city') {

 					$gd_region = '';

 				} else if ($geodir_show_location_url == 'region_city') {

 					$gd_country = '';

 				} else {

 					$gd_country = '';

-                    $gd_region = '';

+					$gd_region = '';

+				}

+

+				if ($is_geodir_location_found) {

+					$wp->query_vars['gd_country'] = $gd_country;

+					$wp->query_vars['gd_region'] = $gd_region;

+					$wp->query_vars['gd_city'] = $gd_city;

+				} else {

+					$gd_country = '';

+					$gd_region = '';

+					$gd_city = '';

 				}

+			}

+

+			$wp->query_vars[$geodir_taxonomy] = $geodir_term;

+			// eliminate location related terms from taxonomy term

+			if ($gd_country != '')

+				$wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+

+			if ($gd_region != '')

+				$wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+

+			if ($gd_city != '')

+				$wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+

+

+			$wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);

+			$wp->query_vars[$geodir_taxonomy] = str_replace('//', '', $wp->query_vars[$geodir_taxonomy]);

 

-                if ($is_geodir_location_found) {

-                    $wp->query_vars['gd_country'] = $gd_country;

-                    $wp->query_vars['gd_region'] = $gd_region;

-                    $wp->query_vars['gd_city'] = $gd_city;

-                } else {

-                    $gd_country = '';

-                    $gd_region = '';

-                    $gd_city = '';

-                }

-            }

-

-            $wp->query_vars[$geodir_taxonomy] = $geodir_term;

-            // eliminate location related terms from taxonomy term

-            if ($gd_country != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

-

-            if ($gd_region != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

-

-            if ($gd_city != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

-

-

-            $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);

-            $wp->query_vars[$geodir_taxonomy] = str_replace('//', '', $wp->query_vars[$geodir_taxonomy]);

-

-            $wp->query_vars[$geodir_taxonomy] = trim($wp->query_vars[$geodir_taxonomy], '/');

-

-            if ($wp->query_vars[$geodir_taxonomy] == '') {

-                unset($wp->query_vars[$geodir_taxonomy]);

-            } else {

-                if (!$is_geodir_taxonomy_term) {

-                    foreach ($wp->query_vars as $key => $vars) {

-                        unset($wp->query_vars[$key]);

-                    }

-                    $wp->query_vars['error'] = '404';

-                }

-            }

-        }

-    }

+			$wp->query_vars[$geodir_taxonomy] = trim($wp->query_vars[$geodir_taxonomy], '/');

+

+			if ($wp->query_vars[$geodir_taxonomy] == '') {

+				unset($wp->query_vars[$geodir_taxonomy]);

+			} else {

+				if (!$is_geodir_taxonomy_term) {

+					foreach ($wp->query_vars as $key => $vars) {

+						unset($wp->query_vars[$key]);

+					}

+					$wp->query_vars['error'] = '404';

+				}

+			}

+		}

+	}

 	

 	// Unset location session if gd page and location not set.

 	if (isset($wp->query_vars['gd_is_geodir_page']) && !isset($wp->query_vars['gd_country'])) {

 		$gd_session->un_set(array('gd_multi_location', 'gd_city', 'gd_region', 'gd_country'));

 	}

 

-    if ($gd_session->get('gd_multi_location') == 1) {

-        $wp->query_vars['gd_country'] = $gd_session->get('gd_country');

-        $wp->query_vars['gd_region'] = $gd_session->get('gd_region');

-        $wp->query_vars['gd_city'] = $gd_session->get('gd_city');

-    }

+	if ($gd_session->get('gd_multi_location') == 1) {

+		$wp->query_vars['gd_country'] = $gd_session->get('gd_country');

+		$wp->query_vars['gd_region'] = $gd_session->get('gd_region');

+		$wp->query_vars['gd_city'] = $gd_session->get('gd_city');

+	}

 

-    // now check if there is location parts in the url or not

-    if (get_option('geodir_add_location_url')) {        

+	// now check if there is location parts in the url or not

+	if (get_option('geodir_add_location_url')) {        

 		if ($geodir_show_location_url == 'all') {

 		} else if ($geodir_show_location_url == 'country_city') {

 			 if (isset($wp->query_vars['gd_region']))

-                $wp->query_vars['gd_region'] = '';

+				$wp->query_vars['gd_region'] = '';

 		} else if ($geodir_show_location_url == 'region_city') {

 			if (isset($wp->query_vars['gd_country']))

-                $wp->query_vars['gd_country'] = '';

+				$wp->query_vars['gd_country'] = '';

 		} else {

 			if (isset($wp->query_vars['gd_country']))

-                $wp->query_vars['gd_country'] = '';

+				$wp->query_vars['gd_country'] = '';

 

-            if (isset($wp->query_vars['gd_region']))

-                $wp->query_vars['gd_region'] = '';

+			if (isset($wp->query_vars['gd_region']))

+				$wp->query_vars['gd_region'] = '';

 		}

-    } else {

-        if (isset($wp->query_vars['gd_country']))

-            $wp->query_vars['gd_country'] = '';

+	} else {

+		if (isset($wp->query_vars['gd_country']))

+			$wp->query_vars['gd_country'] = '';

 

-        if (isset($wp->query_vars['gd_region']))

-            $wp->query_vars['gd_region'] = '';

+		if (isset($wp->query_vars['gd_region']))

+			$wp->query_vars['gd_region'] = '';

 

-        if (isset($wp->query_vars['gd_city']))

-            $wp->query_vars['gd_city'] = '';

-    }

+		if (isset($wp->query_vars['gd_city']))

+			$wp->query_vars['gd_city'] = '';

+	}

 }

 

 /**

@@ -800,24 +800,24 @@ 
  */

 function geodir_custom_post_status()

 {

-    // Vertual Page Status

-    register_post_status('virtual', array(

-        'label' => _x('Virtual', 'page', 'geodirectory'),

-        'public' => true,

-        'exclude_from_search' => true,

-        'show_in_admin_all_list' => true,

-        'show_in_admin_status_list' => true,

-        'label_count' => _n_noop('Virtual <span class="count">(%s)</span>', 'Virtual <span class="count">(%s)</span>', 'geodirectory'),

-    ));

-

-    /**

-     * Called after we register the custom post status 'Virtual'.

-     *

-     * Can be use to add more post statuses.

-     *

-     * @since 1.0.0

-     */

-    do_action('geodir_custom_post_status');

+	// Vertual Page Status

+	register_post_status('virtual', array(

+		'label' => _x('Virtual', 'page', 'geodirectory'),

+		'public' => true,

+		'exclude_from_search' => true,

+		'show_in_admin_all_list' => true,

+		'show_in_admin_status_list' => true,

+		'label_count' => _n_noop('Virtual <span class="count">(%s)</span>', 'Virtual <span class="count">(%s)</span>', 'geodirectory'),

+	));

+

+	/**

+	 * Called after we register the custom post status 'Virtual'.

+	 *

+	 * Can be use to add more post statuses.

+	 *

+	 * @since 1.0.0

+	 */

+	do_action('geodir_custom_post_status');

 }

 

 /**

@@ -832,7 +832,7 @@ 
  */

 function geodir_get_term_link($termlink, $term, $taxonomy)

 {

-    return geodir_term_link($termlink, $term, $taxonomy); // taxonomy_functions.php

+	return geodir_term_link($termlink, $term, $taxonomy); // taxonomy_functions.php

 }

 

 /**

@@ -846,7 +846,7 @@ 
  */

 function geodir_get_posttype_link($link, $post_type)

 {

-    return geodir_posttype_link($link, $post_type); // taxonomy_functions.php

+	return geodir_posttype_link($link, $post_type); // taxonomy_functions.php

 }

 

 /**

@@ -861,13 +861,13 @@ 
  */

 function exclude_from_wp_list_pages($exclude_array)

 {

-    $pages_ids = array();

-    $pages_array = get_posts(array('post_type' => 'page', 'post_status' => 'virtual'));

-    foreach ($pages_array as $page) {

-        $pages_ids[] = $page->ID;

-    }

-    $exclude_array = $exclude_array + $pages_ids;

-    return $exclude_array;

+	$pages_ids = array();

+	$pages_array = get_posts(array('post_type' => 'page', 'post_status' => 'virtual'));

+	foreach ($pages_array as $page) {

+		$pages_ids[] = $page->ID;

+	}

+	$exclude_array = $exclude_array + $pages_ids;

+	return $exclude_array;

 }

 

 /**

@@ -880,8 +880,8 @@ 
  */

 function geodir_exclude_page($query)

 {

-    add_filter('posts_where', 'geodir_exclude_page_where', 100);

-    return $query;

+	add_filter('posts_where', 'geodir_exclude_page_where', 100);

+	return $query;

 }

 

 /**

@@ -896,9 +896,9 @@ 
  */

 function geodir_exclude_page_where($where)

 {

-    global $wpdb;

-    if (is_admin())

-        $where .= " AND $wpdb->posts.post_status != 'virtual'";

+	global $wpdb;

+	if (is_admin())

+		$where .= " AND $wpdb->posts.post_status != 'virtual'";

 

-    return $where;

+	return $where;

 }

Spacing +49 added lines, -49 removed lines

@@ -70,7 +70,7 @@ 
 

             if (!empty($args['labels'])) {

                 foreach ($args['labels'] as $key => $val) {

-                    $args['labels'][$key] = __($val, 'geodirectory');// allow translation

+                    $args['labels'][$key] = __($val, 'geodirectory'); // allow translation

                 }

             }

 

@@ -111,7 +111,7 @@ 
 

             if (array_key_exists('rewrite', $args)) {

                 if (array_key_exists('slug', $args['rewrite']))

-                    $args['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+                    $args['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%';

             }

 

             $geodir_post_types = get_option('geodir_post_types');

@@ -123,7 +123,7 @@ 
 

                 if (array_key_exists('rewrite', $geodir_post_types[$post_type]))

                     if (array_key_exists('slug', $geodir_post_types[$post_type]['rewrite']))

-                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug;// . '/%gd_taxonomy%';

+                        $geodir_post_types[$post_type]['rewrite']['slug'] = $listing_slug; // . '/%gd_taxonomy%';

 

                 update_option('geodir_post_types', $geodir_post_types);

 

@@ -135,13 +135,13 @@ 
 

             $geodir_taxonomies = get_option('geodir_taxonomies');

 

-            if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type . 'category'])) {

-                $geodir_taxonomies[$post_type . 'category']['listing_slug'] = $listing_slug;

+            if (array_key_exists('listing_slug', $geodir_taxonomies[$post_type.'category'])) {

+                $geodir_taxonomies[$post_type.'category']['listing_slug'] = $listing_slug;

 

-                if (array_key_exists('args', $geodir_taxonomies[$post_type . 'category']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type . 'category']['args']))

-                        if (array_key_exists('slug', $geodir_taxonomies[$post_type . 'category']['args']['rewrite']))

-                            $geodir_taxonomies[$post_type . 'category']['args']['rewrite']['slug'] = $listing_slug;

+                if (array_key_exists('args', $geodir_taxonomies[$post_type.'category']))

+                    if (array_key_exists('rewrite', $geodir_taxonomies[$post_type.'category']['args']))

+                        if (array_key_exists('slug', $geodir_taxonomies[$post_type.'category']['args']['rewrite']))

+                            $geodir_taxonomies[$post_type.'category']['args']['rewrite']['slug'] = $listing_slug;

 

                 update_option('geodir_taxonomies', $geodir_taxonomies);

 

@@ -149,13 +149,13 @@ 
 

             /* --- update taxonomies (tags) --- */

             $geodir_taxonomies_tag = get_option('geodir_taxonomies');

-            if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type . '_tags'])) {

-                $geodir_taxonomies_tag[$post_type . '_tags']['listing_slug'] = $listing_slug . '/tags';

+            if (array_key_exists('listing_slug', $geodir_taxonomies_tag[$post_type.'_tags'])) {

+                $geodir_taxonomies_tag[$post_type.'_tags']['listing_slug'] = $listing_slug.'/tags';

 

-                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type . '_tags']))

-                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type . '_tags']['args']))

-                        if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']))

-                            $geodir_taxonomies_tag[$post_type . '_tags']['args']['rewrite']['slug'] = $listing_slug . '/tags';

+                if (array_key_exists('args', $geodir_taxonomies_tag[$post_type.'_tags']))

+                    if (array_key_exists('rewrite', $geodir_taxonomies_tag[$post_type.'_tags']['args']))

+                        if (array_key_exists('slug', $geodir_taxonomies_tag[$post_type.'_tags']['args']['rewrite']))

+                            $geodir_taxonomies_tag[$post_type.'_tags']['args']['rewrite']['slug'] = $listing_slug.'/tags';

 

                 update_option('geodir_taxonomies', $geodir_taxonomies_tag);

 

@@ -205,11 +205,11 @@ 
             $listing_slug = $args['listing_slug'];

 

             if (strpos($taxonomy, 'tags')) {

-                $newrules[$listing_slug . '/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&paged=$matches[2]';

-                $newrules[$listing_slug . '/(.+?)/?$'] = 'index.php?' . $taxonomy . '=$matches[1]';

+                $newrules[$listing_slug.'/(.+?)/page/?([0-9]{1,})/?$'] = 'index.php?'.$taxonomy.'=$matches[1]&paged=$matches[2]';

+                $newrules[$listing_slug.'/(.+?)/?$'] = 'index.php?'.$taxonomy.'=$matches[1]';

             } else {

                 // use this loop to add paging for details page comments paging

-                $newrules[str_replace("/tags","",$listing_slug) . '/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?' . $taxonomy . '=$matches[1]&cpage=$matches[2]';

+                $newrules[str_replace("/tags", "", $listing_slug).'/(.+?)/comment-page-([0-9]{1,})/?$'] = 'index.php?'.$taxonomy.'=$matches[1]&cpage=$matches[2]';

             }

         endforeach;

     endif;

@@ -217,7 +217,7 @@ 
     // create rules for location listing

     $location_page = get_option('geodir_location_page');

 	

-    if($location_page) {

+    if ($location_page) {

         global $wpdb;

         $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $location_page));

     }

@@ -247,30 +247,30 @@ 
 		

 		if ($matches2) {

 			if ($neighbourhood_active) {

-				$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]';

+				$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]&gd_neighbourhood=$matches[3]';

 			}

-			$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]';

+			$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]';

 		} else {

 			if ($neighbourhood_active) {

-				$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]';

+				$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]&gd_neighbourhood=$matches[2]';

 			}

 		}

 		

-		$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&' . $matches1 . '=$matches[1]';

+		$newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&'.$matches1.'=$matches[1]';

 	} else { // country/region/city

 		if ($neighbourhood_active) {

-			$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';

+			$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';

 		}

-		$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';

-		$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]&gd_region=$matches[2]';

-		$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $location_page . '&gd_country=$matches[1]';

+		$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';

+		$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]&gd_region=$matches[2]';

+		$newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$location_page.'&gd_country=$matches[1]';

 	}

 

     if ($location_page && function_exists('icl_object_id')) {

-        foreach(icl_get_languages('skip_missing=N') as $lang){

+        foreach (icl_get_languages('skip_missing=N') as $lang) {

             $alt_page_id = '';

-            $alt_page_id = icl_object_id($location_page, 'page', false,$lang['language_code']);

-            if($alt_page_id){

+            $alt_page_id = icl_object_id($location_page, 'page', false, $lang['language_code']);

+            if ($alt_page_id) {

                 $location_prefix = $wpdb->get_var($wpdb->prepare("SELECT post_name FROM $wpdb->posts WHERE post_type='page' AND ID=%d", $alt_page_id));

 

 				if ($location_manager && ($hide_country_part || $hide_region_part)) {

@@ -289,29 +289,29 @@ 
 					

 					if ($matches2) {

 						if ($neighbourhood_active) {

-							$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]&gd_neighbourhood=$matches[3]';

+							$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]&gd_neighbourhood=$matches[3]';

 						}

-						$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&' . $matches2 . '=$matches[2]';

+						$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&'.$matches2.'=$matches[2]';

 					} else {

 						if ($neighbourhood_active) {

-							$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]&gd_neighbourhood=$matches[2]';

+							$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]&gd_neighbourhood=$matches[2]';

 						}

 					}

 					

-					$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&' . $matches1 . '=$matches[1]';

+					$newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&'.$matches1.'=$matches[1]';

 				} else { // country/region/city

 					if ($neighbourhood_active) {

-						$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';

+						$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]&gd_neighbourhood=$matches[4]';

 					}

-					$newrules[$location_prefix . '/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';

-					$newrules[$location_prefix . '/([^/]+)/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]&gd_region=$matches[2]';

-					$newrules[$location_prefix . '/([^/]+)/?$'] = 'index.php?page_id=' . $alt_page_id . '&gd_country=$matches[1]';

+					$newrules[$location_prefix.'/([^/]+)/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]&gd_city=$matches[3]';

+					$newrules[$location_prefix.'/([^/]+)/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]&gd_region=$matches[2]';

+					$newrules[$location_prefix.'/([^/]+)/?$'] = 'index.php?page_id='.$alt_page_id.'&gd_country=$matches[1]';

 				}

             }

         }

     }

 

-    $newrules[$location_prefix . '/?$'] = 'index.php?page_id=' . $location_page;

+    $newrules[$location_prefix.'/?$'] = 'index.php?page_id='.$location_page;

 

     $rules = array_merge($newrules, $rules);

     return $rules;

@@ -340,7 +340,7 @@ 
 #Redirect 301 /location/ /$location_prefix/

 # END GeoDirectory Rules\n\n

 EOD;

-    return $my_content . $rules;

+    return $my_content.$rules;

 }

 //add_filter('mod_rewrite_rules', 'geodir_htaccess_contents');

 

@@ -416,12 +416,12 @@ 
         global $wpdb;

 

         $page_for_posts = get_option('page_for_posts');

-        $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s",$wp->query_vars['pagename']));

+        $real_page_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type='page' AND post_name=%s", $wp->query_vars['pagename']));

 

         if (function_exists('icl_object_id')) {

             $real_page_id = icl_object_id($real_page_id, 'page', true, ICL_LANGUAGE_CODE);

         }

-        if ($real_page_id && $real_page_id!=$page_for_posts) {

+        if ($real_page_id && $real_page_id != $page_for_posts) {

             $wp->query_vars['page_id'] = $real_page_id;

         }

     }

@@ -469,7 +469,7 @@ 
                             $gd_city = $default_location->city_slug;

 

                         $base_location_link = geodir_get_location_link('base');

-                        wp_redirect($base_location_link . '/' . $gd_country . '/' . $gd_region . '/' . $gd_city);

+                        wp_redirect($base_location_link.'/'.$gd_country.'/'.$gd_region.'/'.$gd_city);

                         exit();

                     }

                 }

@@ -530,7 +530,7 @@ 
         $geodir_set_location_session = true;

         $geodir_taxonomis = geodir_get_taxonomies('', true);

 

-        if(!empty($geodir_taxonomis)){

+        if (!empty($geodir_taxonomis)) {

             foreach ($geodir_taxonomis as $taxonomy) {

                 if (array_key_exists($taxonomy, $wp->query_vars)) {

                     $is_geodir_taxonomy = true;

@@ -587,7 +587,7 @@ 
 				}

 

 

-				$geodir_term = str_replace('/' . $geodir_last_term, '', $geodir_term, $post_title_replace_count);

+				$geodir_term = str_replace('/'.$geodir_last_term, '', $geodir_term, $post_title_replace_count);

 				if (!$post_title_replace_count)

 					$geodir_term = str_replace($geodir_last_term, '', $geodir_term, $post_title_replace_count);

 				$geodir_terms = explode('/', $geodir_term);

@@ -664,7 +664,7 @@ 
 						if (geodir_strtolower($default_location->country_slug) == geodir_strtolower($gd_country))

                             $is_geodir_location_found = true;

                     }

-                }  else if ($geodir_show_location_url == 'region_city') {

+                } else if ($geodir_show_location_url == 'region_city') {

                     if (count($geodir_terms) >= 2) {

                         $gd_region = urldecode($geodir_terms[0]);

                         $gd_city = urldecode($geodir_terms[1]);

@@ -723,13 +723,13 @@ 
             $wp->query_vars[$geodir_taxonomy] = $geodir_term;

             // eliminate location related terms from taxonomy term

             if ($gd_country != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_country) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+                $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_country).'/', '', $wp->query_vars[$geodir_taxonomy], 1);

 

             if ($gd_region != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_region) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+                $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_region).'/', '', $wp->query_vars[$geodir_taxonomy], 1);

 

             if ($gd_city != '')

-                $wp->query_vars[$geodir_taxonomy] = preg_replace('/' . urlencode($gd_city) . '/', '', $wp->query_vars[$geodir_taxonomy], 1);

+                $wp->query_vars[$geodir_taxonomy] = preg_replace('/'.urlencode($gd_city).'/', '', $wp->query_vars[$geodir_taxonomy], 1);

 

 

             $wp->query_vars[$geodir_taxonomy] = str_replace('///', '', $wp->query_vars[$geodir_taxonomy]);

geodirectory-functions/geodir-class-session.php

Doc Comments +2 added lines, -4 removed lines

@@ -151,8 +151,7 @@ 
 	 * @since 1.5.7
 	 *
 	 * @param string|array $key Session key.
-	 * @param integer $value Session variable.
-	 * @return string Session variable.
+	 * @return boolean Session variable.
 	 */
 	public function un_set( $key ) {
 		if ( empty( $key ) ) {
@@ -188,8 +187,7 @@ 
 	 * @since 1.5.7
 	 *
 	 * @param string $key Session key.
-	 * @param integer $value Session variable.
-	 * @return string Session variable.
+	 * @return boolean Session variable.
 	 */
 	public function is_set( $key ) {
 		$key = sanitize_key( $key );

Braces +3 added lines, -1 removed lines

@@ -1,6 +1,8 @@
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Geodir_Session Class.

Spacing +61 added lines, -61 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Exit if accessed directly.
-if (!defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
 /**
  * Geodir_Session Class.
@@ -46,36 +46,36 @@ 
 	public function __construct() {
 		$this->use_php_sessions = $this->use_php_sessions();
 
-		if ( $this->use_php_sessions ) {
-			if ( is_multisite() ) {
-				$this->prefix = '_' . get_current_blog_id();
+		if ($this->use_php_sessions) {
+			if (is_multisite()) {
+				$this->prefix = '_'.get_current_blog_id();
 			}
 
 			// Use PHP SESSION (must be enabled via the GEODIR_USE_PHP_SESSIONS constant)
-			add_action( 'init', array( $this, 'maybe_start_session' ), -2 );
+			add_action('init', array($this, 'maybe_start_session'), -2);
 		} else {
 			// Use WP_Session (default)
-			if ( !defined( 'WP_SESSION_COOKIE' ) ) {
-				define( 'WP_SESSION_COOKIE', 'geodir_wp_session' );
+			if (!defined('WP_SESSION_COOKIE')) {
+				define('WP_SESSION_COOKIE', 'geodir_wp_session');
 			}
 
-			if ( !class_exists( 'Recursive_ArrayAccess' ) ) {
-				require_once GEODIRECTORY_PLUGIN_DIR . 'geodirectory-functions/wp-session/class-recursive-arrayaccess.php';
+			if (!class_exists('Recursive_ArrayAccess')) {
+				require_once GEODIRECTORY_PLUGIN_DIR.'geodirectory-functions/wp-session/class-recursive-arrayaccess.php';
 			}
 
-			if ( !class_exists( 'WP_Session' ) ) {
-				require_once GEODIRECTORY_PLUGIN_DIR . 'geodirectory-functions/wp-session/class-wp-session.php';
-				require_once GEODIRECTORY_PLUGIN_DIR . 'geodirectory-functions/wp-session/wp-session.php';
+			if (!class_exists('WP_Session')) {
+				require_once GEODIRECTORY_PLUGIN_DIR.'geodirectory-functions/wp-session/class-wp-session.php';
+				require_once GEODIRECTORY_PLUGIN_DIR.'geodirectory-functions/wp-session/wp-session.php';
 			}
 
-			add_filter( 'wp_session_expiration_variant', array( $this, 'set_expiration_variant_time' ), 99999 );
-			add_filter( 'wp_session_expiration', array( $this, 'set_expiration_time' ), 99999 );
+			add_filter('wp_session_expiration_variant', array($this, 'set_expiration_variant_time'), 99999);
+			add_filter('wp_session_expiration', array($this, 'set_expiration_time'), 99999);
 		}
 
-		if ( empty( $this->session ) && ! $this->use_php_sessions ) {
-			add_action( 'plugins_loaded', array( $this, 'init' ), -1 );
+		if (empty($this->session) && !$this->use_php_sessions) {
+			add_action('plugins_loaded', array($this, 'init'), -1);
 		} else {
-			add_action( 'init', array( $this, 'init' ), -1 );
+			add_action('init', array($this, 'init'), -1);
 		}
 	}
 
@@ -87,8 +87,8 @@ 
 	 * @return void
 	 */
 	public function init() {
-		if ( $this->use_php_sessions ) {
-			$this->session = isset( $_SESSION['gd' . $this->prefix ] ) && is_array( $_SESSION['gd' . $this->prefix ] ) ? $_SESSION['gd' . $this->prefix ] : array();
+		if ($this->use_php_sessions) {
+			$this->session = isset($_SESSION['gd'.$this->prefix]) && is_array($_SESSION['gd'.$this->prefix]) ? $_SESSION['gd'.$this->prefix] : array();
 		} else {
 			$this->session = WP_Session::get_instance();
 		}
@@ -115,9 +115,9 @@ 
 	 * @param string $key Session key
 	 * @return string Session variable
 	 */
-	public function get( $key ) {
-		$key = sanitize_key( $key );
-		return isset( $this->session[ $key ] ) ? maybe_unserialize( $this->session[ $key ] ) : false;
+	public function get($key) {
+		$key = sanitize_key($key);
+		return isset($this->session[$key]) ? maybe_unserialize($this->session[$key]) : false;
 	}
 
 	/**
@@ -129,20 +129,20 @@ 
 	 * @param integer $value Session variable
 	 * @return string Session variable
 	 */
-	public function set( $key, $value ) {
-		$key = sanitize_key( $key );
+	public function set($key, $value) {
+		$key = sanitize_key($key);
 
-		if ( is_array( $value ) ) {
-			$this->session[ $key ] = maybe_serialize( $value );
+		if (is_array($value)) {
+			$this->session[$key] = maybe_serialize($value);
 		} else {
-			$this->session[ $key ] = $value;
+			$this->session[$key] = $value;
 		}
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['gd' . $this->prefix ] = $this->session;
+		if ($this->use_php_sessions) {
+			$_SESSION['gd'.$this->prefix] = $this->session;
 		}
 
-		return $this->session[ $key ];
+		return $this->session[$key];
 	}
 	
 	/**
@@ -154,29 +154,29 @@ 
 	 * @param integer $value Session variable.
 	 * @return string Session variable.
 	 */
-	public function un_set( $key ) {
-		if ( empty( $key ) ) {
+	public function un_set($key) {
+		if (empty($key)) {
 			return false;
 		}
 		
-		if ( is_array( $key ) ) {
+		if (is_array($key)) {
 			foreach ($key as $index) {
-				$index = sanitize_key( $index );
+				$index = sanitize_key($index);
 			
-				if ( $index && isset( $this->session[ $index ] ) ) {
-					unset( $this->session[ $index ] );
+				if ($index && isset($this->session[$index])) {
+					unset($this->session[$index]);
 				}
 			}
 		} else {
-			$key = sanitize_key( $key );
+			$key = sanitize_key($key);
 			
-			if ( isset( $this->session[ $key ] ) ) {
-				unset( $this->session[ $key ] );
+			if (isset($this->session[$key])) {
+				unset($this->session[$key]);
 			}
 		}
 
-		if ( $this->use_php_sessions ) {
-			$_SESSION['gd' . $this->prefix ] = $this->session;
+		if ($this->use_php_sessions) {
+			$_SESSION['gd'.$this->prefix] = $this->session;
 		}
 
 		return true;
@@ -191,14 +191,14 @@ 
 	 * @param integer $value Session variable.
 	 * @return string Session variable.
 	 */
-	public function is_set( $key ) {
-		$key = sanitize_key( $key );
+	public function is_set($key) {
+		$key = sanitize_key($key);
 		
-		if ( empty( $key ) ) {
+		if (empty($key)) {
 			return false;
 		}
 
-		if ( isset( $this->session[ $key ] ) ) {
+		if (isset($this->session[$key])) {
 			return true;
 		}
 
@@ -213,8 +213,8 @@ 
 	 * @param int $exp Default expiration (1 hour)
 	 * @return int
 	 */
-	public function set_expiration_variant_time( $exp ) {
-		return ( 30 * 60 * 23 );
+	public function set_expiration_variant_time($exp) {
+		return (30 * 60 * 23);
 	}
 
 	/**
@@ -225,8 +225,8 @@ 
 	 * @param int $exp Default expiration (1 hour)
 	 * @return int
 	 */
-	public function set_expiration_time( $exp ) {
-		return ( 30 * 60 * 24 );
+	public function set_expiration_time($exp) {
+		return (30 * 60 * 24);
 	}
 
 	/**
@@ -244,18 +244,18 @@ 
 		$ret = false;
 
 		// If the database variable is already set, no need to run autodetection
-		$geodir_use_php_sessions = (bool)get_option( 'geodir_use_php_sessions' );
+		$geodir_use_php_sessions = (bool) get_option('geodir_use_php_sessions');
 
-		if (!$geodir_use_php_sessions ) {
+		if (!$geodir_use_php_sessions) {
 			// Attempt to detect if the server supports PHP sessions
-			if ( function_exists( 'session_start' ) && ! ini_get( 'safe_mode' ) ) {
-				$this->set( 'geodir_use_php_sessions', 1 );
+			if (function_exists('session_start') && !ini_get('safe_mode')) {
+				$this->set('geodir_use_php_sessions', 1);
 				
-				if ( $this->get( 'geodir_use_php_sessions' ) ) {
+				if ($this->get('geodir_use_php_sessions')) {
 					$ret = true;
 
 					// Set the database option
-					update_option( 'geodir_use_php_sessions', true );
+					update_option('geodir_use_php_sessions', true);
 				}
 			}
 		} else {
@@ -263,20 +263,20 @@ 
 		}
 
 		// Enable or disable PHP Sessions based on the GEODIR_USE_PHP_SESSIONS constant
-		if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && GEODIR_USE_PHP_SESSIONS ) {
+		if (defined('GEODIR_USE_PHP_SESSIONS') && GEODIR_USE_PHP_SESSIONS) {
 			$ret = true;
-		} else if ( defined( 'GEODIR_USE_PHP_SESSIONS' ) && ! GEODIR_USE_PHP_SESSIONS ) {
+		} else if (defined('GEODIR_USE_PHP_SESSIONS') && !GEODIR_USE_PHP_SESSIONS) {
 			$ret = false;
 		}
 
-		return (bool) apply_filters( 'geodir_use_php_sessions', $ret );
+		return (bool) apply_filters('geodir_use_php_sessions', $ret);
 	}
 
 	/**
 	 * Starts a new session if one hasn't started yet.
 	 */
 	public function maybe_start_session() {
-		if ( !session_id() && !headers_sent() ) {
+		if (!session_id() && !headers_sent()) {
 			session_start();
 		}
 	}
@@ -290,11 +290,11 @@ 
 	public function use_cart_cookie() {
 		$ret = true;
 
-		if ( defined( 'GEODIR_USE_CART_COOKIE' ) && ! GEODIR_USE_CART_COOKIE ) {
+		if (defined('GEODIR_USE_CART_COOKIE') && !GEODIR_USE_CART_COOKIE) {
 			$ret = false;
 		}
 
-		return (bool) apply_filters( 'geodir_use_cart_cookie', $ret );
+		return (bool) apply_filters('geodir_use_cart_cookie', $ret);
 	}
 }
 

geodirectory-functions/location_functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
  *

  * @since 1.0.0

  * @package GeoDirectory

- * @return object

+ * @return string

  */

 function geodir_get_default_location()

 {

@@ -323,7 +323,7 @@ 
  * @package GeoDirectory

  * @param int $min The minimum number. Default: 0.

  * @param int $max The maximum number. Default: 1.

- * @return float

+ * @return integer

  */

 function geodir_random_float($min = 0, $max = 1)

 {

Braces +31 added lines, -22 removed lines

@@ -61,11 +61,12 @@ 
 function geodir_is_default_location_set()

 {

     $default_location = geodir_get_default_location();

-    if (!empty($default_location))

-        return true;

-    else

-        return false;

-}

+    if (!empty($default_location)) {
+            return true;
+    } else {
+            return false;
+    }
+    }

 

 /**

  * Returns location slug using location string.

@@ -258,8 +259,9 @@ 
 

         }

 

-        if ($geodir_location->is_default)

-            update_option('geodir_default_location', $geodir_location);

+        if ($geodir_location->is_default) {
+                    update_option('geodir_default_location', $geodir_location);
+        }
 

         return $geodir_location->location_id;

 

@@ -307,9 +309,10 @@ 
     $status = $data->status;

     if ($status == "OK") {

         return $data->results[0]->address_components;

-    } else

-        return false;

-}

+    } else {
+            return false;
+    }
+    }

 

 /**

  * Returns current location terms.

@@ -333,16 +336,19 @@ 
         }

 

         $country = $gd_session->get('gd_country');

-        if ($country != '' && $country)

-            $location_array['gd_country'] = urldecode($country);

+        if ($country != '' && $country) {
+                    $location_array['gd_country'] = urldecode($country);
+        }
 

         $region = $gd_session->get('gd_region');

-        if ($region != '' && $region)

-            $location_array['gd_region'] = urldecode($region);

+        if ($region != '' && $region) {
+                    $location_array['gd_region'] = urldecode($region);
+        }
 

         $city = $gd_session->get('gd_city');

-        if ($city != '' && $city)

-            $location_array['gd_city'] = urldecode($city);

+        if ($city != '' && $city) {
+                    $location_array['gd_city'] = urldecode($city);
+        }
     } else {

         if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

             return $location_array;

@@ -354,14 +360,17 @@ 
 

         $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

 

-        if ($country != '')

-            $location_array['gd_country'] = urldecode($country);

+        if ($country != '') {
+                    $location_array['gd_country'] = urldecode($country);
+        }
 

-        if ($region != '')

-            $location_array['gd_region'] = urldecode($region);

+        if ($region != '') {
+                    $location_array['gd_region'] = urldecode($region);
+        }
 

-        if ($city != '')

-            $location_array['gd_city'] = urldecode($city);

+        if ($city != '') {
+                    $location_array['gd_city'] = urldecode($city);
+        }
 			

 		// Fix category link in ajax popular category widget on change post type

 		if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {

Indentation +218 added lines, -218 removed lines

@@ -9,10 +9,10 @@ 
  */

 function geodir_get_current_city_lat()

 {

-    $location = geodir_get_default_location();

-    $lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484';

+	$location = geodir_get_default_location();

+	$lat = isset($location_result->city_latitude) ? $location_result->city_latitude : '39.952484';

 

-    return $lat;

+	return $lat;

 }

 

 /**

@@ -25,9 +25,9 @@ 
  */

 function geodir_get_current_city_lng()

 {

-    $location = geodir_get_default_location();

-    $lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786';

-    return $lng;

+	$location = geodir_get_default_location();

+	$lng = isset($location_result->city_longitude) ? $location_result->city_longitude : '-75.163786';

+	return $lng;

 }

 

 

@@ -40,15 +40,15 @@ 
  */

 function geodir_get_default_location()

 {

-    /**

-     * Filter the default location.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $location_result The default location object.

-     */

-    return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));

+	/**

+	 * Filter the default location.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $location_result The default location object.

+	 */

+	return $location_result = apply_filters('geodir_get_default_location', get_option('geodir_default_location'));

 }

 

 /**

@@ -60,11 +60,11 @@ 
  */

 function geodir_is_default_location_set()

 {

-    $default_location = geodir_get_default_location();

-    if (!empty($default_location))

-        return true;

-    else

-        return false;

+	$default_location = geodir_get_default_location();

+	if (!empty($default_location))

+		return true;

+	else

+		return false;

 }

 

 /**

@@ -78,15 +78,15 @@ 
 function create_location_slug($location_string)

 {

 

-    /**

-     * Filter the location slug.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $location_string Sanitized location string.

-     */

-    return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));

+	/**

+	 * Filter the location slug.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $location_string Sanitized location string.

+	 */

+	return urldecode(apply_filters('geodir_location_slug_check', sanitize_title($location_string)));

 

 }

 

@@ -100,15 +100,15 @@ 
  */

 function geodir_get_location($id = '')

 {

-    /**

-     * Filter the location information.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     *

-     * @param string $id The location ID.

-     */

-    return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);

+	/**

+	 * Filter the location information.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 *

+	 * @param string $id The location ID.

+	 */

+	return $location_result = apply_filters('geodir_get_location_by_id', get_option('geodir_default_location'), $id);

 }

 

 /**

@@ -122,28 +122,28 @@ 
  */

 function geodir_get_country_dl($post_country = '', $prefix = '')

 {

-    global $wpdb;

+	global $wpdb;

 

-    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

+	$rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

     

-    $ISO2 = array();

-    $countries = array();

+	$ISO2 = array();

+	$countries = array();

     

-    foreach ($rows as $row) {

-        $ISO2[$row->Country] = $row->ISO2;

-        $countries[$row->Country] = __($row->Country, 'geodirectory');

-    }

+	foreach ($rows as $row) {

+		$ISO2[$row->Country] = $row->ISO2;

+		$countries[$row->Country] = __($row->Country, 'geodirectory');

+	}

     

-    asort($countries);

+	asort($countries);

     

-    $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

-    foreach ($countries as $country => $name) {

-        $ccode = $ISO2[$country];

+	$out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

+	foreach ($countries as $country => $name) {

+		$ccode = $ISO2[$country];

 

-        $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

-    }

+		$out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

+	}

 

-    echo $out_put;

+	echo $out_put;

 }

 

 

@@ -158,40 +158,40 @@ 
 function geodir_location_form_submit()

 {

 

-    global $wpdb, $plugin_prefix;

-    if (isset($_REQUEST['add_location'])) {

+	global $wpdb, $plugin_prefix;

+	if (isset($_REQUEST['add_location'])) {

 

-        $location_info = array(

-            'city' => $_REQUEST['city'],

-            'region' => $_REQUEST['region'],

-            'country' => $_REQUEST['country'],

-            'geo_lat' => $_REQUEST['latitude'],

-            'geo_lng' => $_REQUEST['longitude'],

-            'is_default' => $_REQUEST['is_default'],

-            'update_city' => $_REQUEST['update_city']

-        );

+		$location_info = array(

+			'city' => $_REQUEST['city'],

+			'region' => $_REQUEST['region'],

+			'country' => $_REQUEST['country'],

+			'geo_lat' => $_REQUEST['latitude'],

+			'geo_lng' => $_REQUEST['longitude'],

+			'is_default' => $_REQUEST['is_default'],

+			'update_city' => $_REQUEST['update_city']

+		);

 

-        $old_location = geodir_get_default_location();

+		$old_location = geodir_get_default_location();

 

-        $locationid = geodir_add_new_location($location_info);

+		$locationid = geodir_add_new_location($location_info);

 

-        $default_location = geodir_get_location($locationid);

+		$default_location = geodir_get_location($locationid);

 

-        //UPDATE AND DELETE LISTING

-        $posttype = geodir_get_posttypes();

-        if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

+		//UPDATE AND DELETE LISTING

+		$posttype = geodir_get_posttypes();

+		if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

 

-            foreach ($posttype as $posttypeobj) {

-                $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

+			foreach ($posttype as $posttypeobj) {

+				$post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

 

-                $sql = $wpdb->prepare(

-                    "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

-                    array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

-                );

-                $wpdb->query($sql);

-            }

-        }

-    }

+				$sql = $wpdb->prepare(

+					"UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

+					array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

+				);

+				$wpdb->query($sql);

+			}

+		}

+	}

 }

 

 /**

@@ -214,58 +214,58 @@ 
  */

 function geodir_add_new_location($location_info = array())

 {

-    global $wpdb;

+	global $wpdb;

 

-    if (!empty($location_info)) {

+	if (!empty($location_info)) {

 

-        $location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';

-        $location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';

-        $location_country = ($location_info['country'] != '') ? $location_info['country'] : 'all';

-        $location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : '';

-        $location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : '';

-        $is_default = isset($location_info['is_default']) ? $location_info['is_default'] : '';

-        $country_slug = create_location_slug(__($location_country, 'geodirectory'));

-        $region_slug = create_location_slug($location_region);

-        $city_slug = create_location_slug($location_city);

+		$location_city = ($location_info['city'] != '') ? $location_info['city'] : 'all';

+		$location_region = ($location_info['region'] != '') ? $location_info['region'] : 'all';

+		$location_country = ($location_info['country'] != '') ? $location_info['country'] : 'all';

+		$location_lat = ($location_info['geo_lat'] != '') ? $location_info['geo_lat'] : '';

+		$location_lng = ($location_info['geo_lng'] != '') ? $location_info['geo_lng'] : '';

+		$is_default = isset($location_info['is_default']) ? $location_info['is_default'] : '';

+		$country_slug = create_location_slug(__($location_country, 'geodirectory'));

+		$region_slug = create_location_slug($location_region);

+		$city_slug = create_location_slug($location_city);

 

-        /**

-         * Filter add new location data.

-         *

-         * @since 1.0.0

-         */

-        $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

-            'country' => $location_country,

-            'region' => $location_region,

-            'city' => $location_city,

-            'country_slug' => $country_slug,

-            'region_slug' => $region_slug,

-            'city_slug' => $city_slug,

-            'city_latitude' => $location_lat,

-            'city_longitude' => $location_lng,

-            'is_default' => $is_default

-        ));

+		/**

+		 * Filter add new location data.

+		 *

+		 * @since 1.0.0

+		 */

+		$geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

+			'country' => $location_country,

+			'region' => $location_region,

+			'city' => $location_city,

+			'country_slug' => $country_slug,

+			'region_slug' => $region_slug,

+			'city_slug' => $city_slug,

+			'city_latitude' => $location_lat,

+			'city_longitude' => $location_lng,

+			'is_default' => $is_default

+		));

 

 

-        if ($geodir_location->country) {

+		if ($geodir_location->country) {

 

-            $get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s", array($geodir_location->country)));

+			$get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s", array($geodir_location->country)));

 

-            if (empty($get_country)) {

+			if (empty($get_country)) {

 

-                $wpdb->query($wpdb->prepare("INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (Country, Title) VALUES (%s,%s)", array($geodir_location->country, $geodir_location->country)));

+				$wpdb->query($wpdb->prepare("INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (Country, Title) VALUES (%s,%s)", array($geodir_location->country, $geodir_location->country)));

 

-            }

+			}

 

-        }

+		}

 

-        if ($geodir_location->is_default)

-            update_option('geodir_default_location', $geodir_location);

+		if ($geodir_location->is_default)

+			update_option('geodir_default_location', $geodir_location);

 

-        return $geodir_location->location_id;

+		return $geodir_location->location_id;

 

-    } else {

-        return false;

-    }

+	} else {

+		return false;

+	}

 }

 

 /**

@@ -279,7 +279,7 @@ 
  */

 function geodir_random_float($min = 0, $max = 1)

 {

-    return $min + mt_rand() / mt_getrandmax() * ($max - $min);

+	return $min + mt_rand() / mt_getrandmax() * ($max - $min);

 }

 

 /**

@@ -293,22 +293,22 @@ 
  */

 function geodir_get_address_by_lat_lan($lat, $lng)

 {

-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;

-

-    $ch = curl_init();

-    curl_setopt($ch, CURLOPT_URL, $url);

-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-    curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

-    $response = curl_exec($ch);

-    curl_close($ch);

-    $data = json_decode($response);

-    $status = $data->status;

-    if ($status == "OK") {

-        return $data->results[0]->address_components;

-    } else

-        return false;

+	$url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;

+

+	$ch = curl_init();

+	curl_setopt($ch, CURLOPT_URL, $url);

+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

+	curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

+	$response = curl_exec($ch);

+	curl_close($ch);

+	$data = json_decode($response);

+	$status = $data->status;

+	if ($status == "OK") {

+		return $data->results[0]->address_components;

+	} else

+		return false;

 }

 

 /**

@@ -325,70 +325,70 @@ 
  */

 function geodir_get_current_location_terms($location_array_from = 'session', $gd_post_type = '')

 {

-    global $wp, $gd_session;

-    $location_array = array();

-    if ($location_array_from == 'session') {

-        if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {

-            return $location_array;

-        }

+	global $wp, $gd_session;

+	$location_array = array();

+	if ($location_array_from == 'session') {

+		if ($gd_session->get('gd_country') == 'me' || $gd_session->get('gd_region') == 'me' || $gd_session->get('gd_city') == 'me') {

+			return $location_array;

+		}

 

-        $country = $gd_session->get('gd_country');

-        if ($country != '' && $country)

-            $location_array['gd_country'] = urldecode($country);

+		$country = $gd_session->get('gd_country');

+		if ($country != '' && $country)

+			$location_array['gd_country'] = urldecode($country);

 

-        $region = $gd_session->get('gd_region');

-        if ($region != '' && $region)

-            $location_array['gd_region'] = urldecode($region);

+		$region = $gd_session->get('gd_region');

+		if ($region != '' && $region)

+			$location_array['gd_region'] = urldecode($region);

 

-        $city = $gd_session->get('gd_city');

-        if ($city != '' && $city)

-            $location_array['gd_city'] = urldecode($city);

-    } else {

-        if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

-            return $location_array;

-        }

+		$city = $gd_session->get('gd_city');

+		if ($city != '' && $city)

+			$location_array['gd_city'] = urldecode($city);

+	} else {

+		if ((isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] == 'me') || (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] == 'me') || (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] == 'me')) {

+			return $location_array;

+		}

 

-        $country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

+		$country = (isset($wp->query_vars['gd_country']) && $wp->query_vars['gd_country'] != '') ? $wp->query_vars['gd_country'] : '';

 

-        $region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

+		$region = (isset($wp->query_vars['gd_region']) && $wp->query_vars['gd_region'] != '') ? $wp->query_vars['gd_region'] : '';

 

-        $city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

+		$city = (isset($wp->query_vars['gd_city']) && $wp->query_vars['gd_city'] != '') ? $wp->query_vars['gd_city'] : '';

 

-        if ($country != '')

-            $location_array['gd_country'] = urldecode($country);

+		if ($country != '')

+			$location_array['gd_country'] = urldecode($country);

 

-        if ($region != '')

-            $location_array['gd_region'] = urldecode($region);

+		if ($region != '')

+			$location_array['gd_region'] = urldecode($region);

 

-        if ($city != '')

-            $location_array['gd_city'] = urldecode($city);

+		if ($city != '')

+			$location_array['gd_city'] = urldecode($city);

 			

 		// Fix category link in ajax popular category widget on change post type

 		if (empty($location_array) && defined('DOING_AJAX') && DOING_AJAX) {

 			$location_array = geodir_get_current_location_terms('session');

 		}

-    }

+	}

 

 	/**

 	 * Filter the location terms.

 	 *

 	 * @since 1.4.6

-     * @package GeoDirectory

+	 * @package GeoDirectory

+	 *

+	 * @param array $location_array {

+	 *    Attributes of the location_array.

+	 *

+	 *    @type string $gd_country The country slug.

+	 *    @type string $gd_region The region slug.

+	 *    @type string $gd_city The city slug.

 	 *

-     * @param array $location_array {

-     *    Attributes of the location_array.

-     *

-     *    @type string $gd_country The country slug.

-     *    @type string $gd_region The region slug.

-     *    @type string $gd_city The city slug.

-     *

-     * }

+	 * }

 	 * @param string $location_array_from Source type of location terms. Default session.

 	 * @param string $gd_post_type WP post type.

 	 */

 	$location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type );

 

-    return $location_array;

+	return $location_array;

 

 }

 

@@ -401,24 +401,24 @@ 
  * @return bool|string

  */

 function geodir_get_location_link($which_location = 'current') {

-    $location_link = get_permalink(geodir_location_page_id());

-

-    if ($which_location == 'base') {

-        return $location_link;

-    } else {

-        $location_terms = geodir_get_current_location_terms();

-

-        if (!empty($location_terms)) {

-            if (get_option('permalink_structure') != '') {

-                $location_terms = implode("/", $location_terms);

-                $location_terms = rtrim($location_terms, '/');

-                $location_link .= $location_terms;

-            } else {

-                $location_link = geodir_getlink($location_link, $location_terms);

-            }

-        }

-    }

-    return $location_link;

+	$location_link = get_permalink(geodir_location_page_id());

+

+	if ($which_location == 'base') {

+		return $location_link;

+	} else {

+		$location_terms = geodir_get_current_location_terms();

+

+		if (!empty($location_terms)) {

+			if (get_option('permalink_structure') != '') {

+				$location_terms = implode("/", $location_terms);

+				$location_terms = rtrim($location_terms, '/');

+				$location_link .= $location_terms;

+			} else {

+				$location_link = geodir_getlink($location_link, $location_terms);

+			}

+		}

+	}

+	return $location_link;

 }

 

 /**

@@ -431,32 +431,32 @@ 
  * @return array|bool Returns address on success.

  */

 function geodir_get_osm_address_by_lat_lan($lat, $lng) {

-    $url = is_ssl() ? 'https:' : 'http:';

-    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

-

-    $ch = curl_init();

-    curl_setopt($ch, CURLOPT_URL, $url);

-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

-    curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

-    curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

-    $response = curl_exec($ch);

-    curl_close($ch);

-    $data = json_decode($response);

+	$url = is_ssl() ? 'https:' : 'http:';

+	$url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

+

+	$ch = curl_init();

+	curl_setopt($ch, CURLOPT_URL, $url);

+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

+	curl_setopt($ch, CURLOPT_PROXYPORT, 3128);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);

+	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);

+	$response = curl_exec($ch);

+	curl_close($ch);

+	$data = json_decode($response);

     

-    if (!empty($data) && !empty($data->address)) {

-        $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

-        $formatted_address = (array)$data->address;

+	if (!empty($data) && !empty($data->address)) {

+		$address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

+		$formatted_address = (array)$data->address;

         

-        foreach ( $data->address as $key => $value ) {

-            if (!in_array($key, $address_fields)) {

-                unset($formatted_address[$key]);

-            }

-        }

-        $data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';

+		foreach ( $data->address as $key => $value ) {

+			if (!in_array($key, $address_fields)) {

+				unset($formatted_address[$key]);

+			}

+		}

+		$data->formatted_address = !empty($formatted_address) ? implode(', ', $formatted_address) : '';

         

-        return $data;

-    } else {

-        return false;

-    }

+		return $data;

+	} else {

+		return false;

+	}

 }

Spacing +13 added lines, -13 removed lines

@@ -124,7 +124,7 @@ 
 {

     global $wpdb;

 

-    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM " . GEODIR_COUNTRIES_TABLE . " ORDER BY Country ASC");

+    $rows = $wpdb->get_results("SELECT Country,ISO2 FROM ".GEODIR_COUNTRIES_TABLE." ORDER BY Country ASC");

     

     $ISO2 = array();

     $countries = array();

@@ -136,11 +136,11 @@ 
     

     asort($countries);

     

-    $out_put = '<option ' . selected('', $post_country, false) . ' value="">' . __('Select Country', 'geodirectory') . '</option>';

+    $out_put = '<option '.selected('', $post_country, false).' value="">'.__('Select Country', 'geodirectory').'</option>';

     foreach ($countries as $country => $name) {

         $ccode = $ISO2[$country];

 

-        $out_put .= '<option ' . selected($post_country, $country, false) . ' value="' . esc_attr($country) . '" data-country_code="' . $ccode . '">' . $name . '</option>';

+        $out_put .= '<option '.selected($post_country, $country, false).' value="'.esc_attr($country).'" data-country_code="'.$ccode.'">'.$name.'</option>';

     }

 

     echo $out_put;

@@ -182,10 +182,10 @@ 
         if (isset($_REQUEST['listing_action']) && $_REQUEST['listing_action'] == 'delete') {

 

             foreach ($posttype as $posttypeobj) {

-                $post_locations = '[' . $default_location->city_slug . '],[' . $default_location->region_slug . '],[' . $default_location->country_slug . ']'; // set all overall post location

+                $post_locations = '['.$default_location->city_slug.'],['.$default_location->region_slug.'],['.$default_location->country_slug.']'; // set all overall post location

 

                 $sql = $wpdb->prepare(

-                    "UPDATE " . $plugin_prefix . $posttypeobj . "_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

+                    "UPDATE ".$plugin_prefix.$posttypeobj."_detail SET post_city=%s, post_region=%s, post_country=%s, post_locations=%s WHERE post_location_id=%d AND ( post_city!=%s OR post_region!=%s OR post_country!=%s OR post_locations!=%s OR post_locations IS NULL)",

                     array($_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations, $locationid, $_REQUEST['city'], $_REQUEST['region'], $_REQUEST['country'], $post_locations)

                 );

                 $wpdb->query($sql);

@@ -233,7 +233,7 @@ 
          *

          * @since 1.0.0

          */

-        $geodir_location = (object)apply_filters('geodir_add_new_location', array('location_id' => 0,

+        $geodir_location = (object) apply_filters('geodir_add_new_location', array('location_id' => 0,

             'country' => $location_country,

             'region' => $location_region,

             'city' => $location_city,

@@ -248,11 +248,11 @@ 
 

         if ($geodir_location->country) {

 

-            $get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM " . GEODIR_COUNTRIES_TABLE . " WHERE Country=%s", array($geodir_location->country)));

+            $get_country = $wpdb->get_var($wpdb->prepare("SELECT Country FROM ".GEODIR_COUNTRIES_TABLE." WHERE Country=%s", array($geodir_location->country)));

 

             if (empty($get_country)) {

 

-                $wpdb->query($wpdb->prepare("INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (Country, Title) VALUES (%s,%s)", array($geodir_location->country, $geodir_location->country)));

+                $wpdb->query($wpdb->prepare("INSERT INTO ".GEODIR_COUNTRIES_TABLE." (Country, Title) VALUES (%s,%s)", array($geodir_location->country, $geodir_location->country)));

 

             }

 

@@ -293,7 +293,7 @@ 
  */

 function geodir_get_address_by_lat_lan($lat, $lng)

 {

-    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng=' . trim($lat) . ',' . trim($lng) ;

+    $url = 'https://maps.googleapis.com/maps/api/geocode/json?latlng='.trim($lat).','.trim($lng);

 

     $ch = curl_init();

     curl_setopt($ch, CURLOPT_URL, $url);

@@ -386,7 +386,7 @@ 
 	 * @param string $location_array_from Source type of location terms. Default session.

 	 * @param string $gd_post_type WP post type.

 	 */

-	$location_array = apply_filters( 'geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type );

+	$location_array = apply_filters('geodir_current_location_terms', $location_array, $location_array_from, $gd_post_type);

 

     return $location_array;

 

@@ -432,7 +432,7 @@ 
  */

 function geodir_get_osm_address_by_lat_lan($lat, $lng) {

     $url = is_ssl() ? 'https:' : 'http:';

-    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat=' . trim($lat) . '&lon=' . trim($lng) . '&zoom=16&addressdetails=1&email=' . get_option('admin_email');

+    $url .= '//nominatim.openstreetmap.org/reverse?format=json&lat='.trim($lat).'&lon='.trim($lng).'&zoom=16&addressdetails=1&email='.get_option('admin_email');

 

     $ch = curl_init();

     curl_setopt($ch, CURLOPT_URL, $url);

@@ -446,9 +446,9 @@ 
     

     if (!empty($data) && !empty($data->address)) {

         $address_fields = array('public_building', 'house', 'house_number', 'bakery', 'footway', 'street', 'road', 'village', 'attraction', 'pedestrian', 'neighbourhood', 'suburb');

-        $formatted_address = (array)$data->address;

+        $formatted_address = (array) $data->address;

         

-        foreach ( $data->address as $key => $value ) {

+        foreach ($data->address as $key => $value) {

             if (!in_array($key, $address_fields)) {

                 unset($formatted_address[$key]);

             }

geodirectory-functions/shortcode_functions.php

Doc Comments +1 added lines, -2 removed lines

@@ -46,7 +46,6 @@ 
  * @since 1.0.0
  * @since 1.5.2 Added TERRAIN map type.
  *
- * @param string $value Input value to validate measurement.
  * @return string The measurement valud in valid format.
  */
 function gdsc_validate_map_args($params)
@@ -95,7 +94,7 @@ 
  * @param mixed $in The variable to check
  * @param bool $strict If set to false, consider everything that is not false to be true.
  *
- * @return bool The boolean equivalent or null
+ * @return null|boolean The boolean equivalent or null
  */
 function gdsc_to_bool_val($in, $strict = false)
 {

Indentation +412 added lines, -412 removed lines

@@ -9,7 +9,7 @@ 
  
 // If this file is called directly, abort.
 if (!defined('WPINC')) {
-    die;
+	die;
 }
 
 /**
@@ -22,22 +22,22 @@ 
  */
 function gdsc_validate_measurements($value)
 {
-    if ((strlen($value) - 1) == strpos(trim($value), '%')) {
-        // $value is entered as a percent, so it can't be less than 0 or more than 100
-        $value = preg_replace('/\D/', '', $value);
-        if (100 < $value) {
-            $value = 100;
-        }
-        // Re-add the percent symbol
-        $value = $value . '%';
-    } elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
-        // Get the absint & re-add the 'px'
-        $value = preg_replace('/\D/', '', $value) . 'px';
-    } else {
-        $value = preg_replace('/\D/', '', $value);
-    }
+	if ((strlen($value) - 1) == strpos(trim($value), '%')) {
+		// $value is entered as a percent, so it can't be less than 0 or more than 100
+		$value = preg_replace('/\D/', '', $value);
+		if (100 < $value) {
+			$value = 100;
+		}
+		// Re-add the percent symbol
+		$value = $value . '%';
+	} elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
+		// Get the absint & re-add the 'px'
+		$value = preg_replace('/\D/', '', $value) . 'px';
+	} else {
+		$value = preg_replace('/\D/', '', $value);
+	}
 
-    return $value;
+	return $value;
 }
 
 /**
@@ -52,35 +52,35 @@ 
 function gdsc_validate_map_args($params)
 {
 
-    $params['width'] = gdsc_validate_measurements($params['width']);
-    $params['height'] = gdsc_validate_measurements($params['height']);
+	$params['width'] = gdsc_validate_measurements($params['width']);
+	$params['height'] = gdsc_validate_measurements($params['height']);
 
-    // Only accept our 4 maptypes. Otherwise, revert to the default.
-    if (!(in_array(geodir_strtoupper($params['maptype']), array('HYBRID', 'SATELLITE', 'ROADMAP', 'TERRAIN')))) {
-        $params['maptype'] = 'ROADMAP';
-    } else {
-        $params['maptype'] = geodir_strtoupper($params['maptype']);
-    }
+	// Only accept our 4 maptypes. Otherwise, revert to the default.
+	if (!(in_array(geodir_strtoupper($params['maptype']), array('HYBRID', 'SATELLITE', 'ROADMAP', 'TERRAIN')))) {
+		$params['maptype'] = 'ROADMAP';
+	} else {
+		$params['maptype'] = geodir_strtoupper($params['maptype']);
+	}
 
-    // Zoom accepts a value between 1 and 19
-    $params['zoom'] = absint($params['zoom']);
-    if (19 < $params['zoom']) {
-        $params['zoom'] = '19';
-    }
-    if (0 == $params['zoom']) {
-        $params['zoom'] = '1';
-    }
+	// Zoom accepts a value between 1 and 19
+	$params['zoom'] = absint($params['zoom']);
+	if (19 < $params['zoom']) {
+		$params['zoom'] = '19';
+	}
+	if (0 == $params['zoom']) {
+		$params['zoom'] = '1';
+	}
 
-    // Child_collapse must be boolean
-    $params['child_collapse'] = gdsc_to_bool_val($params['child_collapse']);
+	// Child_collapse must be boolean
+	$params['child_collapse'] = gdsc_to_bool_val($params['child_collapse']);
 
-    // Scrollwheel must be boolean
-    $params['scrollwheel'] = gdsc_to_bool_val($params['scrollwheel']);
+	// Scrollwheel must be boolean
+	$params['scrollwheel'] = gdsc_to_bool_val($params['scrollwheel']);
 
-    // Scrollwheel must be boolean
-    $params['autozoom'] = gdsc_to_bool_val($params['autozoom']);
+	// Scrollwheel must be boolean
+	$params['autozoom'] = gdsc_to_bool_val($params['autozoom']);
 
-    return $params;
+	return $params;
 }
 
 /**
@@ -99,52 +99,52 @@ 
  */
 function gdsc_to_bool_val($in, $strict = false)
 {
-    $out = null;
-
-    // if not strict, we only have to check if something is false
-    if (in_array($in, array(
-        'false',
-        'False',
-        'FALSE',
-        'no',
-        'No',
-        'n',
-        'N',
-        '0',
-        'off',
-        'Off',
-        'OFF',
-        false,
-        0,
-        null
-    ), true)) {
-        $out = false;
-    } else if ($strict) {
-        // if strict, check the equivalent true values
-        if (in_array($in, array(
-            'true',
-            'True',
-            'TRUE',
-            'yes',
-            'Yes',
-            'y',
-            'Y',
-            '1',
-            'on',
-            'On',
-            'ON',
-            true,
-            1
-        ), true)) {
-            $out = true;
-        }
-    } else {
-        // not strict? let the regular php bool check figure it out (will
-        //     largely default to true)
-        $out = ($in ? true : false);
-    }
+	$out = null;
+
+	// if not strict, we only have to check if something is false
+	if (in_array($in, array(
+		'false',
+		'False',
+		'FALSE',
+		'no',
+		'No',
+		'n',
+		'N',
+		'0',
+		'off',
+		'Off',
+		'OFF',
+		false,
+		0,
+		null
+	), true)) {
+		$out = false;
+	} else if ($strict) {
+		// if strict, check the equivalent true values
+		if (in_array($in, array(
+			'true',
+			'True',
+			'TRUE',
+			'yes',
+			'Yes',
+			'y',
+			'Y',
+			'1',
+			'on',
+			'On',
+			'ON',
+			true,
+			1
+		), true)) {
+			$out = true;
+		}
+	} else {
+		// not strict? let the regular php bool check figure it out (will
+		//     largely default to true)
+		$out = ($in ? true : false);
+	}
 
-    return $out;
+	return $out;
 }
 
 /**
@@ -157,16 +157,16 @@ 
  */
 function gdsc_is_post_type_valid($incoming_post_type)
 {
-    $post_types = geodir_get_posttypes();
-    $post_types = array_map('geodir_strtolower', $post_types);
-    $post_type_found = false;
-    foreach ($post_types as $type) {
-        if (geodir_strtolower($incoming_post_type) == geodir_strtolower($type)) {
-            $post_type_found = true;
-        }
-    }
+	$post_types = geodir_get_posttypes();
+	$post_types = array_map('geodir_strtolower', $post_types);
+	$post_type_found = false;
+	foreach ($post_types as $type) {
+		if (geodir_strtolower($incoming_post_type) == geodir_strtolower($type)) {
+			$post_type_found = true;
+		}
+	}
 
-    return $post_type_found;
+	return $post_type_found;
 }
 
 /**
@@ -186,52 +186,52 @@ 
  */
 function gdsc_listing_loop_filter($query)
 {
-    global $wp_query, $geodir_post_type, $table, $plugin_prefix, $term;
-
-    $geodir_post_type = geodir_get_current_posttype();
-
-    if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
-        $taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');
-
-        if (isset($wp_query->query[$taxonomies[0]])) {
-            $request_term = explode("/", $wp_query->query[$taxonomies[0]]);
-            $request_term = end($request_term);
-            if (!term_exists($request_term)) {
-                $args = array('number' => '1',);
-                $terms_arr = get_terms($taxonomies[0], $args);
-                foreach ($terms_arr as $location_term) {
-                    $term_arr = $location_term;
-                    $term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
-                }
-                $wp_query->queried_object_id = 1;
-                $wp_query->queried_object = $term_arr;
-            }
-        }
+	global $wp_query, $geodir_post_type, $table, $plugin_prefix, $term;
+
+	$geodir_post_type = geodir_get_current_posttype();
+
+	if (isset($wp_query->tax_query->queries) && $wp_query->tax_query->queries) {
+		$taxonomies = wp_list_pluck($wp_query->tax_query->queries, 'taxonomy');
+
+		if (isset($wp_query->query[$taxonomies[0]])) {
+			$request_term = explode("/", $wp_query->query[$taxonomies[0]]);
+			$request_term = end($request_term);
+			if (!term_exists($request_term)) {
+				$args = array('number' => '1',);
+				$terms_arr = get_terms($taxonomies[0], $args);
+				foreach ($terms_arr as $location_term) {
+					$term_arr = $location_term;
+					$term_arr->name = geodir_ucwords(str_replace('-', ' ', $request_term));
+				}
+				$wp_query->queried_object_id = 1;
+				$wp_query->queried_object = $term_arr;
+			}
+		}
 
-    }
-    if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
+	}
+	if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
 
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
+		$table = $plugin_prefix . $geodir_post_type . '_detail';
 
-        add_filter('posts_fields', 'geodir_posts_fields', 1);
-        add_filter('posts_join', 'geodir_posts_join', 1);
-        geodir_post_where();
-        if (!is_admin()) {
-            add_filter('posts_orderby', 'geodir_posts_orderby', 1);
-        }
+		add_filter('posts_fields', 'geodir_posts_fields', 1);
+		add_filter('posts_join', 'geodir_posts_join', 1);
+		geodir_post_where();
+		if (!is_admin()) {
+			add_filter('posts_orderby', 'geodir_posts_orderby', 1);
+		}
 
-        // advanced filter for popular post view widget
-        global $wp_query;
-        if (!is_admin()) {
-            if (!empty($wp_query->query['with_pics_only'])) {
-                add_filter('posts_join', 'geodir_filter_widget_join', 1000);
-            }
-            add_filter('posts_where', 'geodir_filter_widget_where', 1000);
-        }
+		// advanced filter for popular post view widget
+		global $wp_query;
+		if (!is_admin()) {
+			if (!empty($wp_query->query['with_pics_only'])) {
+				add_filter('posts_join', 'geodir_filter_widget_join', 1000);
+			}
+			add_filter('posts_where', 'geodir_filter_widget_where', 1000);
+		}
 
-    }
+	}
 
-    return $query;
+	return $query;
 }
 
 /**
@@ -245,40 +245,40 @@ 
  */
 function gdsc_manage_category_choice($post_type, $category)
 {
-    if (0 == $category || '' == $category) {
-        return '';
-    }
+	if (0 == $category || '' == $category) {
+		return '';
+	}
 
-    if (!(gdsc_is_post_type_valid($post_type))) {
-        return '';
-    }
+	if (!(gdsc_is_post_type_valid($post_type))) {
+		return '';
+	}
 
-    $taxonomies = geodir_get_taxonomies($post_type);
+	$taxonomies = geodir_get_taxonomies($post_type);
 
-    $categories = get_terms(array('taxonomy' => $taxonomies[0]));
+	$categories = get_terms(array('taxonomy' => $taxonomies[0]));
 
-    $cat_id = 0;
+	$cat_id = 0;
 
-    foreach ($categories as $cat) {
-        if (is_numeric($category)) {
-            if (absint($category) == $cat->term_id) {
-                $cat_id = $cat->term_id;
-                break;
-            }
-        } else {
-            if ($category == $cat->slug) {
-                $cat_id = $cat->term_id;
-                break;
-            }
+	foreach ($categories as $cat) {
+		if (is_numeric($category)) {
+			if (absint($category) == $cat->term_id) {
+				$cat_id = $cat->term_id;
+				break;
+			}
+		} else {
+			if ($category == $cat->slug) {
+				$cat_id = $cat->term_id;
+				break;
+			}
 
-            if ($category == $cat->name) {
-                $cat_id = $cat->term_id;
-                break;
-            }
-        }
-    }
+			if ($category == $cat->name) {
+				$cat_id = $cat->term_id;
+				break;
+			}
+		}
+	}
 
-    return $cat_id;
+	return $cat_id;
 }
 
 // @todo: Extract this
@@ -288,11 +288,11 @@ 
 	 * Adds the script in the page footer for the home page google map.
 	 *
 	 * @since 1.0.0
-     * @return string Print the script in page footer.
+	 * @return string Print the script in page footer.
 	 */
 	function geodir_home_map_add_script()
-    {
-        ?>
+	{
+		?>
         <script type="text/javascript">
             jQuery(document).ready(function () {
                 geoDirMapSlide();
@@ -365,7 +365,7 @@ 
             }
         </script>
     <?php
-    }
+	}
 }
 
 /**
@@ -376,7 +376,7 @@ 
  */
 function geodir_popular_category_add_scripts()
 {
-    ?>
+	?>
     <script type="text/javascript">
         jQuery(function ($) {
             $('.geodir-showcat').click(function () {
@@ -406,56 +406,56 @@ 
  */
 function gdsc_validate_layout_choice($layout_choice)
 {
-    switch (geodir_strtolower($layout_choice)) {
-        case 'list';
-        case 'one';
-        case 'one_column';
-        case 'onecolumn';
-        case '1';
-            $layout_choice = 'list';
-            break;
-        case 'gridview_onehalf';
-        case 'two';
-        case 'two_column';
-        case 'two_columns';
-        case 'twocolumn';
-        case 'twocolumns';
-        case '2';
-            $layout_choice = 'gridview_onehalf';
-            break;
-        case 'gridview_onethird';
-        case 'three';
-        case 'three_column';
-        case 'three_columns';
-        case 'threecolumn';
-        case 'threecolumns';
-        case '3';
-            $layout_choice = 'gridview_onethird';
-            break;
-        case 'gridview_onefourth';
-        case 'four';
-        case 'four_column';
-        case 'four_columns';
-        case 'fourcolumn';
-        case 'fourcolumns';
-        case '4';
-            $layout_choice = 'gridview_onefourth';
-            break;
-        case 'gridview_onefifth';
-        case 'five';
-        case 'five_column';
-        case 'five_columns';
-        case 'fivecolumn';
-        case 'fivecolumns';
-        case '5';
-            $layout_choice = 'gridview_onefifth';
-            break;
-        default:
-            $layout_choice = 'gridview_onehalf';
-            break;
-    }
+	switch (geodir_strtolower($layout_choice)) {
+		case 'list';
+		case 'one';
+		case 'one_column';
+		case 'onecolumn';
+		case '1';
+			$layout_choice = 'list';
+			break;
+		case 'gridview_onehalf';
+		case 'two';
+		case 'two_column';
+		case 'two_columns';
+		case 'twocolumn';
+		case 'twocolumns';
+		case '2';
+			$layout_choice = 'gridview_onehalf';
+			break;
+		case 'gridview_onethird';
+		case 'three';
+		case 'three_column';
+		case 'three_columns';
+		case 'threecolumn';
+		case 'threecolumns';
+		case '3';
+			$layout_choice = 'gridview_onethird';
+			break;
+		case 'gridview_onefourth';
+		case 'four';
+		case 'four_column';
+		case 'four_columns';
+		case 'fourcolumn';
+		case 'fourcolumns';
+		case '4';
+			$layout_choice = 'gridview_onefourth';
+			break;
+		case 'gridview_onefifth';
+		case 'five';
+		case 'five_column';
+		case 'five_columns';
+		case 'fivecolumn';
+		case 'fivecolumns';
+		case '5';
+			$layout_choice = 'gridview_onefifth';
+			break;
+		default:
+			$layout_choice = 'gridview_onehalf';
+			break;
+	}
 
-    return $layout_choice;
+	return $layout_choice;
 }
 
 /**
@@ -468,20 +468,20 @@ 
  */
 function gdsc_validate_sort_choice($sort_choice)
 {
-    $sorts = array(
-        'az',
-        'latest',
-        'featured',
-        'high_review',
-        'high_rating',
-        'random',
-    );
-
-    if (!(in_array($sort_choice, $sorts))) {
-        $sort_choice = 'latest';
-    }
+	$sorts = array(
+		'az',
+		'latest',
+		'featured',
+		'high_review',
+		'high_rating',
+		'random',
+	);
+
+	if (!(in_array($sort_choice, $sorts))) {
+		$sort_choice = 'latest';
+	}
 
-    return $sort_choice;
+	return $sort_choice;
 }
 
 /**
@@ -494,22 +494,22 @@ 
  */
 function gdsc_validate_listing_width($width_choice)
 {
-    if (!(empty($width_choice))) {
-        $width_choice = absint($width_choice);
-    } else {
-        return '';
-    }
+	if (!(empty($width_choice))) {
+		$width_choice = absint($width_choice);
+	} else {
+		return '';
+	}
 
-    if (100 < $width_choice) {
-        $width_choice = 100;
-    }
+	if (100 < $width_choice) {
+		$width_choice = 100;
+	}
 
-    // If listing_width is too narrow, it won't work, arbitrarily set to 10% here
-    if (10 > $width_choice) {
-        $width_choice = 10;
-    }
+	// If listing_width is too narrow, it won't work, arbitrarily set to 10% here
+	if (10 > $width_choice) {
+		$width_choice = 10;
+	}
 
-    return $width_choice;
+	return $width_choice;
 }
 
 /**
@@ -522,18 +522,18 @@ 
  */
 function gdsc_validate_list_filter_choice($filter_choice)
 {
-    $filters = array(
-        'all',
-        'today',
-        'upcoming',
-        'past',
-    );
-
-    if (!(in_array($filter_choice, $filters))) {
-        $filter_choice = 'all';
-    }
+	$filters = array(
+		'all',
+		'today',
+		'upcoming',
+		'past',
+	);
+
+	if (!(in_array($filter_choice, $filters))) {
+		$filter_choice = 'all';
+	}
 
-    return $filter_choice;
+	return $filter_choice;
 }
 
 /**
@@ -554,7 +554,7 @@ 
  * @return string Listings HTML content.
  */
 function geodir_sc_gd_listings_output($args = array()) {
-    $title				 = !empty($args['title']) ? __($args['title'], 'geodirectory') : '';
+	$title				 = !empty($args['title']) ? __($args['title'], 'geodirectory') : '';
 	$post_type 			 = !empty($args['post_type']) ? $args['post_type'] : 'gd_place';
 	$category 			 = !empty($args['category']) ? $args['category'] : '0';
 	$post_number		 = !empty($args['post_number']) ? $args['post_number'] : 10;
@@ -564,17 +564,17 @@ 
 	$layout 			 = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
 	$with_pagination 	 = !empty($args['with_pagination']) ? true : false;
 	$event_type 	 	 = !empty($args['event_type']) ? $args['event_type'] : '';
-    $shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
-    $tags                = !empty($args['tags']) ? $args['tags'] : array();
-    /**
-     * Filter the content text displayed when no listings found.
-     *
-     * @since 1.6.0
-     *
-     * @param string $shortcode_content The shortcode content text.
-     * @param array $args Array of arguements to filter listings.
-     */
-    $shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
+	$shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
+	$tags                = !empty($args['tags']) ? $args['tags'] : array();
+	/**
+	 * Filter the content text displayed when no listings found.
+	 *
+	 * @since 1.6.0
+	 *
+	 * @param string $shortcode_content The shortcode content text.
+	 * @param array $args Array of arguements to filter listings.
+	 */
+	$shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
 		
 	$top_pagination 	 = $with_pagination && !empty($args['top_pagination']) ? true : false;
 	$bottom_pagination 	 = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
@@ -586,87 +586,87 @@ 
 	$pageno 	 		 = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
 	
 	$query_args = array(
-        'posts_per_page' => $post_number,
-        'is_geodir_loop' => true,
-        'gd_location' => $add_location_filter,
-        'post_type' => $post_type,
-        'order_by' => $list_sort,
+		'posts_per_page' => $post_number,
+		'is_geodir_loop' => true,
+		'gd_location' => $add_location_filter,
+		'post_type' => $post_type,
+		'order_by' => $list_sort,
 		'pageno' => $pageno
-    );
+	);
 
-    if ($character_count >= 0) {
-        $query_args['excerpt_length'] = $character_count;
-    }
+	if ($character_count >= 0) {
+		$query_args['excerpt_length'] = $character_count;
+	}
     
-    if (!empty($args['post_author'])) {
-        $query_args['post_author'] = $args['post_author'];
-    }
+	if (!empty($args['post_author'])) {
+		$query_args['post_author'] = $args['post_author'];
+	}
 
-    if (!empty($args['show_featured_only'])) {
-        $query_args['show_featured_only'] = 1;
-    }
+	if (!empty($args['show_featured_only'])) {
+		$query_args['show_featured_only'] = 1;
+	}
 
-    if (!empty($args['show_special_only'])) {
-        $query_args['show_special_only'] = 1;
-    }
+	if (!empty($args['show_special_only'])) {
+		$query_args['show_special_only'] = 1;
+	}
 
-    if (!empty($args['with_pics_only'])) {
-        $query_args['with_pics_only'] = 0;
-        $query_args['featured_image_only'] = 1;
-    }
+	if (!empty($args['with_pics_only'])) {
+		$query_args['with_pics_only'] = 0;
+		$query_args['featured_image_only'] = 1;
+	}
 
-    if (!empty($args['with_videos_only'])) {
-        $query_args['with_videos_only'] = 1;
-    }
-    $with_no_results = !empty($args['without_no_results']) ? false : true;
+	if (!empty($args['with_videos_only'])) {
+		$query_args['with_videos_only'] = 1;
+	}
+	$with_no_results = !empty($args['without_no_results']) ? false : true;
 
-    if (!empty($category) && isset($category[0]) && $category[0] != '0') {
-        $category_taxonomy = geodir_get_taxonomies($post_type);
+	if (!empty($category) && isset($category[0]) && $category[0] != '0') {
+		$category_taxonomy = geodir_get_taxonomies($post_type);
 
-        ######### WPML #########
-        if (function_exists('icl_object_id')) {
-            $category = gd_lang_object_ids($category, $category_taxonomy[0]);
-        }
-        ######### WPML #########
+		######### WPML #########
+		if (function_exists('icl_object_id')) {
+			$category = gd_lang_object_ids($category, $category_taxonomy[0]);
+		}
+		######### WPML #########
 
-        $tax_query = array(
-            'taxonomy' => $category_taxonomy[0],
-            'field' => 'id',
-            'terms' => $category
-        );
+		$tax_query = array(
+			'taxonomy' => $category_taxonomy[0],
+			'field' => 'id',
+			'terms' => $category
+		);
 
-        $query_args['tax_query'] = array($tax_query);
-    }
+		$query_args['tax_query'] = array($tax_query);
+	}
     
-    if (!empty($tags)) {
-        // Clean tags
-        if (!is_array($tags)) {
-            $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
-                $tags = str_replace($comma, ',', $tags);
-            }
-            $tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
-            $tags = array_map('trim', $tags);
-        }
+	if (!empty($tags)) {
+		// Clean tags
+		if (!is_array($tags)) {
+			$comma = _x(',', 'tag delimiter');
+			if ( ',' !== $comma ) {
+				$tags = str_replace($comma, ',', $tags);
+			}
+			$tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
+			$tags = array_map('trim', $tags);
+		}
         
-        if (!empty($tags)) {
-            $tag_query = array(
-                'taxonomy' => $post_type . '_tags',
-                'field' => 'name',
-                'terms' => $tags
-            );
-
-            if (!empty($query_args['tax_query'])) {
-                $query_args['tax_query'][] = $tag_query;
-            } else {
-                $query_args['tax_query'] = array($tag_query);
-            }
-        }
-    }
+		if (!empty($tags)) {
+			$tag_query = array(
+				'taxonomy' => $post_type . '_tags',
+				'field' => 'name',
+				'terms' => $tags
+			);
+
+			if (!empty($query_args['tax_query'])) {
+				$query_args['tax_query'][] = $tag_query;
+			} else {
+				$query_args['tax_query'] = array($tag_query);
+			}
+		}
+	}
 
-    global $gridview_columns_widget, $geodir_is_widget_listing;
+	global $gridview_columns_widget, $geodir_is_widget_listing;
 
-    if ($post_type == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
+	if ($post_type == 'gd_event' && function_exists('geodir_event_get_widget_events')) {
 		global $geodir_event_widget_listview;
 		$geodir_event_widget_listview = true;
 		
@@ -681,16 +681,16 @@ 
 		$widget_listings = $total_posts > 0 ? geodir_get_widget_listings($query_args) : array();
 	}
 	$current_gridview_columns_widget = $gridview_columns_widget;
-    $identifier = ' gd-wgt-pagi-' . mt_rand();
-    ob_start();
+	$identifier = ' gd-wgt-pagi-' . mt_rand();
+	ob_start();
 	if (!empty($widget_listings) || $with_no_results) {
 		if (!$geodir_ajax) {
-        /**
-         * Called before the shortcode [gd_listings] content is output.
-         *
-         * @since 1.0.0
-         */
-        do_action('geodir_before_sc_gd_listings');
+		/**
+		 * Called before the shortcode [gd_listings] content is output.
+		 *
+		 * @since 1.0.0
+		 */
+		do_action('geodir_before_sc_gd_listings');
 		?>
         <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings <?php echo $identifier;?>">
             <?php if ($title != '') { ?>
@@ -701,63 +701,63 @@ 
             <div class="gd-sc-loader">
                 <div class="gd-sc-content">
             <?php }
-            if (!(empty($widget_listings) && !empty($shortcode_content))) {
-                if (strstr($layout, 'gridview')) {
-                    $listing_view_exp = explode('_', $layout);
-                    $gridview_columns_widget = $layout;
-                    $layout = $listing_view_exp[0];
-                } else {
-                    $gridview_columns_widget = '';
-                }
-
-                /**
-                 * Filter the widget listing listview template.
-                 *
-                 * @since 1.0.0
-                 *
-                 * @param string The template file to display listing.
-                 */
-                $template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
+			if (!(empty($widget_listings) && !empty($shortcode_content))) {
+				if (strstr($layout, 'gridview')) {
+					$listing_view_exp = explode('_', $layout);
+					$gridview_columns_widget = $layout;
+					$layout = $listing_view_exp[0];
+				} else {
+					$gridview_columns_widget = '';
+				}
+
+				/**
+				 * Filter the widget listing listview template.
+				 *
+				 * @since 1.0.0
+				 *
+				 * @param string The template file to display listing.
+				 */
+				$template = apply_filters("geodir_template_part-widget-listing-listview", geodir_locate_template('widget-listing-listview'));
                             
-                global $post, $map_jason, $map_canvas_arr, $gd_session;
-
-                $current_post = $post;
-                $current_map_jason = $map_jason;
-                $current_map_canvas_arr = $map_canvas_arr;
-                $geodir_is_widget_listing = true;
-                $gd_session->un_set('gd_listing_view');
-
-                if ($with_pagination && $top_pagination) {				
-                    echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
-                }
-
-                /**
-                 * Includes listing listview template.
-                 *
-                 * @since 1.0.0
-                 */
-                include($template);
+				global $post, $map_jason, $map_canvas_arr, $gd_session;
+
+				$current_post = $post;
+				$current_map_jason = $map_jason;
+				$current_map_canvas_arr = $map_canvas_arr;
+				$geodir_is_widget_listing = true;
+				$gd_session->un_set('gd_listing_view');
+
+				if ($with_pagination && $top_pagination) {				
+					echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
+				}
+
+				/**
+				 * Includes listing listview template.
+				 *
+				 * @since 1.0.0
+				 */
+				include($template);
                 
-                if ($with_pagination && $bottom_pagination) {				
-                    echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
-                }
-
-                $geodir_is_widget_listing = false;
-
-                $GLOBALS['post'] = $current_post;
-                if (!empty($current_post)) {
-                    setup_postdata($current_post);
-                }
-                $map_jason = $current_map_jason;
-                $map_canvas_arr = $current_map_canvas_arr;
-                global $gridview_columns_widget;
-                $gridview_columns_widget = $current_gridview_columns_widget;
-            } else {
-                echo $shortcode_content;
-            }
+				if ($with_pagination && $bottom_pagination) {				
+					echo geodir_sc_listings_pagination($total_posts, $post_number, $pageno);
+				}
+
+				$geodir_is_widget_listing = false;
+
+				$GLOBALS['post'] = $current_post;
+				if (!empty($current_post)) {
+					setup_postdata($current_post);
+				}
+				$map_jason = $current_map_jason;
+				$map_canvas_arr = $current_map_canvas_arr;
+				global $gridview_columns_widget;
+				$gridview_columns_widget = $current_gridview_columns_widget;
+			} else {
+				echo $shortcode_content;
+			}
 			?>
 			<?php
-            if (!$geodir_ajax) { 
+			if (!$geodir_ajax) { 
 			?>
             </div><p class="geodir-sclisting-loading" style="display:none;"><i class="fa fa-cog fa-spin"></i></p></div>
 <script type="text/javascript">
@@ -795,10 +795,10 @@ 
             loading.hide();
             jQuery(items).html(response);
             <?php
-              /**
-               * if lazyload images enabled then refresh them once ajax page changed.
-               */
-              if (get_option('geodir_lazy_load', 1)) { ?>
+			  /**
+			   * if lazyload images enabled then refresh them once ajax page changed.
+			   */
+			  if (get_option('geodir_lazy_load', 1)) { ?>
               geodir_init_lazy_load();
               <?php } ?>
         }
@@ -808,11 +808,11 @@ 
 </div>
 		<?php } ?>
     <?php
-    }
+	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -839,15 +839,15 @@ 
  * @return string Listings pagination HTML content.
  */
 function geodir_sc_listings_pagination($total_posts, $posts_per_page, $pageno, $before = '', $after = '', $prelabel = '', $nxtlabel = '', $pages_to_show = 5, $always_show = false) {
-    if (empty($prelabel)) {
-        $prelabel = '<strong>&laquo;</strong>';
-    }
+	if (empty($prelabel)) {
+		$prelabel = '<strong>&laquo;</strong>';
+	}
 
-    if (empty($nxtlabel)) {
-        $nxtlabel = '<strong>&raquo;</strong>';
-    }
+	if (empty($nxtlabel)) {
+		$nxtlabel = '<strong>&raquo;</strong>';
+	}
 
-    $half_pages_to_show = round($pages_to_show / 2);
+	$half_pages_to_show = round($pages_to_show / 2);
 
 	$numposts = $total_posts;
 
@@ -880,7 +880,7 @@ 
 		}
 		
 		if (($pageno - 1) > 0) {
-            echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="' . (int)($pageno - 1) . '" href="javascript:void(0);">' . $prelabel . '</a>&nbsp;';
+			echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="' . (int)($pageno - 1) . '" href="javascript:void(0);">' . $prelabel . '</a>&nbsp;';
 		}
 		
 		for ($i = $pageno - $half_pages_to_show; $i <= $pageno + $half_pages_to_show; $i++) {
@@ -903,9 +903,9 @@ 
 		echo "</div> $after </div>";
 	}
 	$output = ob_get_contents();
-    ob_end_clean();
+	ob_end_clean();
 
-    return trim($output);
+	return trim($output);
 }
 
 /**
@@ -916,10 +916,10 @@ 
  * @return string Listings HTML content.
  */
 function geodir_sclistings_callback() {
-    check_ajax_referer('geodir-sclistings-nonce', 'geodir_sclistings_nonce');
-    //set variables
-    $scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
-    $pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
+	check_ajax_referer('geodir-sclistings-nonce', 'geodir_sclistings_nonce');
+	//set variables
+	$scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
+	$pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
 	
 	$shortcode_atts = !empty($scatts) ? (array)json_decode(stripslashes_deep($scatts)) : NULL;
 	
@@ -931,7 +931,7 @@ 
 	} else {
 		echo 0;
 	}
-    wp_die();
+	wp_die();
 }
 add_action('wp_ajax_geodir_sclistings', 'geodir_sclistings_callback');
 add_action('wp_ajax_nopriv_geodir_sclistings', 'geodir_sclistings_callback');
\ No newline at end of file

Spacing +26 added lines, -26 removed lines

@@ -29,10 +29,10 @@ 
             $value = 100;
         }
         // Re-add the percent symbol
-        $value = $value . '%';
+        $value = $value.'%';
     } elseif ((strlen($value) - 2) == strpos(trim($value), 'px')) {
         // Get the absint & re-add the 'px'
-        $value = preg_replace('/\D/', '', $value) . 'px';
+        $value = preg_replace('/\D/', '', $value).'px';
     } else {
         $value = preg_replace('/\D/', '', $value);
     }
@@ -211,7 +211,7 @@ 
     }
     if (isset($query->query_vars['is_geodir_loop']) && $query->query_vars['is_geodir_loop']) {
 
-        $table = $plugin_prefix . $geodir_post_type . '_detail';
+        $table = $plugin_prefix.$geodir_post_type.'_detail';
 
         add_filter('posts_fields', 'geodir_posts_fields', 1);
         add_filter('posts_join', 'geodir_posts_join', 1);
@@ -560,10 +560,10 @@ 
 	$post_number		 = !empty($args['post_number']) ? $args['post_number'] : 10;
 	$add_location_filter = !empty($args['add_location_filter']) ? true : false;
 	$list_sort 			 = !empty($args['list_sort']) ? $args['list_sort'] : 'latest';
-	$character_count	 = isset($args['character_count']) ? $args['character_count'] : '';
-	$layout 			 = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
-	$with_pagination 	 = !empty($args['with_pagination']) ? true : false;
-	$event_type 	 	 = !empty($args['event_type']) ? $args['event_type'] : '';
+	$character_count = isset($args['character_count']) ? $args['character_count'] : '';
+	$layout = !empty($args['layout']) ? $args['layout'] : 'gridview_onehalf';
+	$with_pagination = !empty($args['with_pagination']) ? true : false;
+	$event_type = !empty($args['event_type']) ? $args['event_type'] : '';
     $shortcode_content   = !empty($args['shortcode_content']) ? trim($args['shortcode_content']) : '';
     $tags                = !empty($args['tags']) ? $args['tags'] : array();
     /**
@@ -577,13 +577,13 @@ 
     $shortcode_content = apply_filters('geodir_sc_gd_listings_not_found_content', $shortcode_content, $args);
 		
 	$top_pagination 	 = $with_pagination && !empty($args['top_pagination']) ? true : false;
-	$bottom_pagination 	 = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
+	$bottom_pagination = $with_pagination && !empty($args['bottom_pagination']) ? true : false;
 	
 	$shortcode_atts		 = !empty($args['shortcode_atts']) ? $args['shortcode_atts'] : array();
 
 	// ajax mode
-	$geodir_ajax		 = !empty($args['geodir_ajax']) ? true : false;
-	$pageno 	 		 = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
+	$geodir_ajax = !empty($args['geodir_ajax']) ? true : false;
+	$pageno = $geodir_ajax && !empty($args['pageno']) ? $args['pageno'] : 1;
 	
 	$query_args = array(
         'posts_per_page' => $post_number,
@@ -642,7 +642,7 @@ 
         // Clean tags
         if (!is_array($tags)) {
             $comma = _x(',', 'tag delimiter');
-            if ( ',' !== $comma ) {
+            if (',' !== $comma) {
                 $tags = str_replace($comma, ',', $tags);
             }
             $tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
@@ -651,7 +651,7 @@ 
         
         if (!empty($tags)) {
             $tag_query = array(
-                'taxonomy' => $post_type . '_tags',
+                'taxonomy' => $post_type.'_tags',
                 'field' => 'name',
                 'terms' => $tags
             );
@@ -681,7 +681,7 @@ 
 		$widget_listings = $total_posts > 0 ? geodir_get_widget_listings($query_args) : array();
 	}
 	$current_gridview_columns_widget = $gridview_columns_widget;
-    $identifier = ' gd-wgt-pagi-' . mt_rand();
+    $identifier = ' gd-wgt-pagi-'.mt_rand();
     ob_start();
 	if (!empty($widget_listings) || $with_no_results) {
 		if (!$geodir_ajax) {
@@ -692,7 +692,7 @@ 
          */
         do_action('geodir_before_sc_gd_listings');
 		?>
-        <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings <?php echo $identifier;?>">
+        <div class="geodir_locations geodir_location_listing geodir-sc-gd-listings <?php echo $identifier; ?>">
             <?php if ($title != '') { ?>
             <div class="geodir_list_heading clearfix">
                 <?php echo $title; ?>
@@ -761,8 +761,8 @@ 
 			?>
             </div><p class="geodir-sclisting-loading" style="display:none;"><i class="fa fa-cog fa-spin"></i></p></div>
 <script type="text/javascript">
-jQuery(document).on('click', '.<?php echo trim($identifier);?> .gd-wgt-page', function(e) {
-    var container = jQuery( '.<?php echo trim($identifier);?>');
+jQuery(document).on('click', '.<?php echo trim($identifier); ?> .gd-wgt-page', function(e) {
+    var container = jQuery( '.<?php echo trim($identifier); ?>');
     var obj = this;
     var pid = parseInt(jQuery(this).data('page'));
     var items = jQuery(obj).closest('.gd-sc-content');
@@ -772,7 +772,7 @@ 
         return false;
     }
     
-    var scatts = "<?php echo addslashes(json_encode($shortcode_atts));?>";
+    var scatts = "<?php echo addslashes(json_encode($shortcode_atts)); ?>";
     
     var data = {
       'action': 'geodir_sclistings',
@@ -861,16 +861,16 @@ 
 	if ($max_page > 1 || $always_show) {
 		// Extra pagination info
 		$geodir_pagination_more_info = get_option('geodir_pagination_advance_info');
-		$start_no = ( $pageno - 1 ) * $posts_per_page + 1;
+		$start_no = ($pageno - 1) * $posts_per_page + 1;
 		$end_no = min($pageno * $posts_per_page, $numposts);
 		
 		if ($geodir_pagination_more_info != '') {
-			$pagination_info = '<div class="gd-pagination-details gd-pagination-details-' . $geodir_pagination_more_info . '">' . wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts) . '</div>';
+			$pagination_info = '<div class="gd-pagination-details gd-pagination-details-'.$geodir_pagination_more_info.'">'.wp_sprintf(__('Showing listings %d-%d of %d', 'geodirectory'), $start_no, $end_no, $numposts).'</div>';
 			
 			if ($geodir_pagination_more_info == 'before') {
-				$before = $before . $pagination_info;
+				$before = $before.$pagination_info;
 			} else if ($geodir_pagination_more_info == 'after') {
-				$after = $pagination_info . $after;
+				$after = $pagination_info.$after;
 			}
 		}
 			
@@ -880,7 +880,7 @@ 
 		}
 		
 		if (($pageno - 1) > 0) {
-            echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="' . (int)($pageno - 1) . '" href="javascript:void(0);">' . $prelabel . '</a>&nbsp;';
+            echo '<a class="gd-page-sc-prev gd-wgt-page" data-page="'.(int) ($pageno - 1).'" href="javascript:void(0);">'.$prelabel.'</a>&nbsp;';
 		}
 		
 		for ($i = $pageno - $half_pages_to_show; $i <= $pageno + $half_pages_to_show; $i++) {
@@ -888,17 +888,17 @@ 
 				if ($i == $pageno) {
 					echo "<strong class='on' class='gd-page-sc-act'>$i</strong>";
 				} else {
-					echo ' <a class="gd-page-sc-no gd-wgt-page" data-page="' . (int)$i . '" href="javascript:void(0);">' . $i . '</a> ';
+					echo ' <a class="gd-page-sc-no gd-wgt-page" data-page="'.(int) $i.'" href="javascript:void(0);">'.$i.'</a> ';
 				}
 			}
 		}
 		
 		if (($pageno + 1) <= $max_page) {
-			echo '&nbsp;<a class="gd-page-sc-nxt gd-wgt-page" data-page="' . (int)($pageno + 1) . '" href="javascript:void(0);">' . $nxtlabel . '</a>';
+			echo '&nbsp;<a class="gd-page-sc-nxt gd-wgt-page" data-page="'.(int) ($pageno + 1).'" href="javascript:void(0);">'.$nxtlabel.'</a>';
 		}
 		
 		if ($pageno < $max_page) {
-			echo '&nbsp;<a class="gd-page-sc-lst gd-wgt-page" data-page="' . (int)$max_page . '" href="javascript:void(0);">&raquo;</a>';
+			echo '&nbsp;<a class="gd-page-sc-lst gd-wgt-page" data-page="'.(int) $max_page.'" href="javascript:void(0);">&raquo;</a>';
 		}
 		echo "</div> $after </div>";
 	}
@@ -921,7 +921,7 @@ 
     $scatts = isset($_POST['scatts']) ? $_POST['scatts'] : NULL;
     $pageno = isset($_POST['pageno']) ? absint($_POST['pageno']) : 1;
 	
-	$shortcode_atts = !empty($scatts) ? (array)json_decode(stripslashes_deep($scatts)) : NULL;
+	$shortcode_atts = !empty($scatts) ? (array) json_decode(stripslashes_deep($scatts)) : NULL;
 	
 	if (!empty($shortcode_atts) && is_array($shortcode_atts)) {
 		$shortcode_atts['pageno'] = $pageno;