GeoDirectory / geodirectory

geodirectory-functions/post_functions.php

Doc Comments +4 added lines, -4 removed lines

@@ -721,7 +721,7 @@ 
      * @param int $post_id The post ID.

      * @param string $postmeta Detail table column name.

      * @param string $meta_value Detail table column value.

-     * @return void|bool

+     * @return null|false

      */

     function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')

     {

@@ -775,7 +775,7 @@ 
      * @param string $postmeta Detail table column name.

      * @todo check if this is depreciated

      * @todo Fix unknown variable mval

-     * @return bool

+     * @return boolean|null

      */

     function geodir_delete_post_meta($post_id, $postmeta)

     {

@@ -2124,7 +2124,7 @@ 
      * @global string $plugin_prefix Geodirectory plugin table prefix.

      * @param int $deleted_postid The post ID.

      * @param bool $force Optional. Do you want to force delete it? Default: false.

-     * @return bool|void

+     * @return null|false

      */

     function geodir_delete_listing_info($deleted_postid, $force = false)

     {

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

  * @package GeoDirectory

  * @global object $current_user Current user object.

- * @param int|string $listing_id The post ID.

+ * @param integer $listing_id The post ID.

  * @param bool $exclude_admin Optional. Do you want to exclude admin from the check?. Default true.

  * @return bool

  */

Braces +174 added lines, -123 removed lines

@@ -21,12 +21,13 @@ 
 {

 

     $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);

-    if (!empty($post_cat_ids))

-        $post_cat_array = explode(",", trim($post_cat_ids, ","));

+    if (!empty($post_cat_ids)) {
+            $post_cat_array = explode(",", trim($post_cat_ids, ","));
+    }
 

     if (!isset($default_cat) || empty($default_cat)) {

         $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

-    }else{

+    } else{

         if(!is_int($default_cat)){

             $category = get_term_by('name', $default_cat, $taxonomy);

             if(isset($category->term_id)){

@@ -372,8 +373,9 @@ 
             } elseif (trim($type) == 'file') {

                 if (isset($request_info[$name])) {

                     $request_files = array();

-                    if ($request_info[$name] != '')

-                        $request_files = explode(",", $request_info[$name]);

+                    if ($request_info[$name] != '') {
+                                            $request_files = explode(",", $request_info[$name]);
+                    }
 

                     $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;

                     geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);

@@ -399,7 +401,7 @@ 
 

                         $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];

 

-                    }else{

+                    } else{

                         $post_htmlvar_value = $request_info[$name];

                     }

 

@@ -439,15 +441,17 @@ 
 

             foreach ($request_info['post_category'] as $taxonomy => $cat) {

 

-                if ($dummy)

-                    $post_category = $cat;

-                else {

+                if ($dummy) {
+                                    $post_category = $cat;
+                } else {

 

-                    if (!is_array($cat) && strstr($cat, ','))

-                        $cat = explode(',', $cat);

+                    if (!is_array($cat) && strstr($cat, ',')) {
+                                            $cat = explode(',', $cat);
+                    }
 

-                    if (!empty($cat) && is_array($cat))

-                        $post_category = array_map('intval', $cat);

+                    if (!empty($cat) && is_array($cat)) {
+                                            $post_category = array_map('intval', $cat);
+                    }
                 }

 

                 wp_set_object_terms($last_post_id, $post_category, $taxonomy);

@@ -465,11 +469,13 @@ 
         if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {

             $post_tags = explode(",", $request_info['post_tags']);

         } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {

-            if ($dummy)

-                $post_tags = $request_info['post_tags'];

+            if ($dummy) {
+                            $post_tags = $request_info['post_tags'];
+            }
         } else {

-            if ($dummy)

-                $post_tags = array($request_info['post_title']);

+            if ($dummy) {
+                            $post_tags = array($request_info['post_title']);
+            }
         }

 

         if (is_array($post_tags)) {

@@ -556,15 +562,17 @@ 
 

     global $wpdb, $plugin_prefix, $post, $post_info;

 

-    if ($post_id == '' && !empty($post))

-        $post_id = $post->ID;

+    if ($post_id == '' && !empty($post)) {
+            $post_id = $post->ID;
+    }
 

     $post_type = get_post_type($post_id);

 

     $all_postypes = geodir_get_posttypes();

 

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

-        return false;

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

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

 

@@ -714,8 +722,9 @@ 
             do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);

 

             return true;

-        } else

-            return false;

+        } else {
+                    return false;
+        }
 

     }

 }

@@ -769,8 +778,9 @@ 
             }

 

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -801,8 +811,9 @@ 
             $post_meta_set_query = '';

 

             foreach ($postmeta as $mkey) {

-                if ($mval != '')

-                    $post_meta_set_query .= $mkey . " = '', ";

+                if ($mval != '') {
+                                    $post_meta_set_query .= $mkey . " = '', ";
+                }
             }

 

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

@@ -832,8 +843,9 @@ 
                 return true;

             }

 

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -863,8 +875,9 @@ 
 

         $post_type = get_post_type($post_id);

 

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

-            return false;

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

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

 

@@ -873,8 +886,9 @@ 
             

             if ($meta_value && $meta_value !== '') {

                 return maybe_serialize($meta_value);

-            } else

-                return $meta_value;

+            } else {
+                            return $meta_value;
+            }
         } else {

             return false;

         }

@@ -1008,7 +1022,7 @@ 
                             if (isset($uploaded['error']) && empty($uploaded['error'])) {

                                 $new_name = basename($uploaded['file']);

                                 $uploaded_file = $uploaded;

-                            }else{

+                            } else{

                                 print_r($uploaded);exit;

                             }

                             $external_img = false;

@@ -1033,8 +1047,9 @@ 
                                 $file_path = $curr_img_dir . '/' . $filename;

                             }

 

-                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

-                                unlink($img_path);

+                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path)) {
+                                                            unlink($img_path);
+                            }
                         }

 

                         if (!empty($uploaded_file)) {

@@ -1063,8 +1078,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, ", ");

@@ -1089,8 +1105,9 @@ 
                         )

                     );

 

-                    if ($menu_order == 1)

-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

+                    if ($menu_order == 1) {
+                                            $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));
+                    }
 

                 }

 

@@ -1131,8 +1148,9 @@ 
 

         $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

+        if (!empty($invalid_files)) {
+                    geodir_remove_attachments($invalid_files);
+        }
     }

 

 }

@@ -1185,16 +1203,19 @@ 
 function geodir_delete_directory($dirname)

 {

     $dir_handle = '';

-    if (is_dir($dirname))

-        $dir_handle = opendir($dirname);

-    if (!$dir_handle)

-        return false;

+    if (is_dir($dirname)) {
+            $dir_handle = opendir($dirname);
+    }
+    if (!$dir_handle) {
+            return false;
+    }
     while ($file = readdir($dir_handle)) {

         if ($file != "." && $file != "..") {

-            if (!is_dir($dirname . "/" . $file))

-                unlink($dirname . "/" . $file);

-            else

-                geodir_delete_directory($dirname . '/' . $file);

+            if (!is_dir($dirname . "/" . $file)) {
+                            unlink($dirname . "/" . $file);
+            } else {
+                            geodir_delete_directory($dirname . '/' . $file);
+            }
         }

     }

     closedir($dir_handle);

@@ -1223,8 +1244,9 @@ 
             foreach ($postcurr_images as $postimg) {

                 $image_name_arr = explode('/', $postimg->src);

                 $filename = end($image_name_arr);

-                if (file_exists($uploads_dir . '/' . $filename))

-                    unlink($uploads_dir . '/' . $filename);

+                if (file_exists($uploads_dir . '/' . $filename)) {
+                                    unlink($uploads_dir . '/' . $filename);
+                }
             }

 

         } // endif

@@ -1283,8 +1305,9 @@ 
 

             $file_info = pathinfo($file);

             $sub_dir = '';

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

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

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

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

             $uploads_baseurl = $uploads['baseurl'];

@@ -1328,9 +1351,9 @@ 
                 $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

             }

 

-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

-                $default_img = $default_catimg['src'];

-            elseif ($no_image) {

+            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) {
+                            $default_img = $default_catimg['src'];
+            } elseif ($no_image) {

                 $default_img = get_option('geodir_listing_no_img');

             }

 

@@ -1362,10 +1385,13 @@ 
             }

         }

 

-        if (!empty($img_arr))

-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

-        else

-            return false;

+        if (!empty($img_arr)) {
+                    return (object)$img_arr;
+        }
+        //return (object)array( 'src' => $file_url, 'path' => $file_path );

+        else {
+                    return false;
+        }
     }

 }

 

@@ -1392,8 +1418,9 @@ 
             echo $html;

         } elseif (!empty($html)) {

             return $html;

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -1421,8 +1448,9 @@ 
         }

         $not_featured = '';

         $sub_dir = '';

-        if (!$add_featured)

-            $not_featured = " AND is_featured = 0 ";

+        if (!$add_featured) {
+                    $not_featured = " AND is_featured = 0 ";
+        }
 

         $arrImages = $wpdb->get_results(

             $wpdb->prepare(

@@ -1443,8 +1471,9 @@ 
 

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

 

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

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

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

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

                 $uploads_baseurl = $uploads['baseurl'];

@@ -1489,9 +1518,9 @@ 
             $default_img = '';

             $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

             $post_type = get_post_type($post_id);

-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

-                $default_img = $default_catimg['src'];

-            elseif ($no_images) {

+            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type)) {
+                            $default_img = $default_catimg['src'];
+            } elseif ($no_images) {

                 $default_img = get_option('geodir_listing_no_img');

             }

 

@@ -1526,8 +1555,9 @@ 
                 $return_arr[] = (object)$img_arr;

 

                 return $return_arr;

-            } else

-                return false;

+            } else {
+                            return false;
+            }
         }

     }

 }

@@ -1588,8 +1618,9 @@ 
                         $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);

                     } else if ($image->width < ($max_size->h)) {

                         $width_per = round((($image->width / $max_size->w) * 100), 2);

-                    } else

-                        $width_per = 100;

+                    } else {
+                                            $width_per = 100;
+                    }
                 }

 

                 if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

@@ -1597,7 +1628,7 @@ 
                 } else {

                     if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){

                         $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

-                    }else{

+                    } else{

                         //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

                         //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';

                         $html = '<div data-src="'.$image->src.'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

@@ -1612,8 +1643,9 @@ 
             echo $html;

         } elseif (!empty($html)) {

             return $html;

-        } else

-            return false;

+        } else {
+                    return false;
+        }
     }

 }

 

@@ -1651,8 +1683,9 @@ 
                 $post_obj = get_post($post_id);

 

                 $cat_ids = array('0');

-                if (is_array($tt_ids))

-                    $cat_ids = $tt_ids;

+                if (is_array($tt_ids)) {
+                                    $cat_ids = $tt_ids;
+                }
 

 

                 if (!empty($cat_ids)) {

@@ -1709,8 +1742,9 @@ 
                         $json .= '}';

 

 

-                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))

-                            $post_marker_json = $json;

+                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true)) {
+                                                    $post_marker_json = $json;
+                        }
 

 

                         if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

@@ -1741,10 +1775,13 @@ 
                 if (!empty($post_term) && is_array($post_term)) {

                     $categories = implode(',', $post_term);

 

-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';

+                    if ($categories != '' && $categories != 0) {
+                    	$categories = ',' . $categories . ',';
+                    }
 

-                    if (empty($post_marker_json))

-                        $post_marker_json = isset($json) ? $json : '';

+                    if (empty($post_marker_json)) {
+                                            $post_marker_json = isset($json) ? $json : '';
+                    }
 

                     if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

 

@@ -1783,8 +1820,9 @@ 
 

                                 }

 

-                                if ($default_category == '')

-                                    $default_category = $categories[0];

+                                if ($default_category == '') {
+                                                                    $default_category = $categories[0];
+                                }
 

                                 geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');

 

@@ -1928,7 +1966,7 @@ 
                                     } ?>"><img alt="bubble image" style="max-height:50px;"

                                                src="<?php echo $post_images[0]; ?>"/></a></div>

                             <?php

-                            }else{

+                            } else{

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         } else {

@@ -1936,7 +1974,7 @@ 
                                 ?>

                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>

                             <?php

-                            }else{

+                            } else{

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         }

@@ -2038,10 +2076,11 @@ 
      */

     function geodir_new_post_default_status()

     {

-        if (get_option('geodir_new_post_default_status'))

-            return get_option('geodir_new_post_default_status');

-        else

-            return 'publish';

+        if (get_option('geodir_new_post_default_status')) {
+                    return get_option('geodir_new_post_default_status');
+        } else {
+                    return 'publish';
+        }
 

     }

 }

@@ -2192,8 +2231,9 @@ 
 

         $all_postypes = geodir_get_posttypes();

 

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

-            return false;

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

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

 

@@ -2461,8 +2501,9 @@ 
         $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');

 

         $user_meta_data = '';

-        if (isset($current_user->data->ID))

-            $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+        if (isset($current_user->data->ID)) {
+                    $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);
+        }
 

         if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

             ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

@@ -2475,8 +2516,9 @@ 
 

             if (!isset($current_user->data->ID) || $current_user->data->ID == '') {

                 $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';

-            } else

-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

+            } else {
+                            $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';
+            }
 

             ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

                                                                                         href="javascript:void(0);"

@@ -2539,14 +2581,16 @@ 
 							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;

 

             $cat_post_count = $wpdb->get_var($count_query);

-            if (empty($cat_post_count) || is_wp_error($cat_post_count))

-                $cat_post_count = 0;

+            if (empty($cat_post_count) || is_wp_error($cat_post_count)) {
+                            $cat_post_count = 0;
+            }
 

             return $cat_post_count;

 

-        } else

-

-            return $term->count;

+        } else {
+        

+            return $term->count;
+        }
     }

     return false;

 

@@ -2593,13 +2637,15 @@ 
 		return $length;

 	}

 	

-    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))

-        $length = get_option('geodir_desc_word_limit');

-    elseif (get_query_var('excerpt_length'))

-        $length = get_query_var('excerpt_length');

+    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit')) {
+            $length = get_option('geodir_desc_word_limit');
+    } elseif (get_query_var('excerpt_length')) {
+            $length = get_query_var('excerpt_length');
+    }
 

-    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))

-        $length = get_option('geodir_author_desc_word_limit');

+    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit')) {
+            $length = get_option('geodir_author_desc_word_limit');
+    }
 

     return $length;

 }

@@ -2732,10 +2778,11 @@ 
 function geodir_lisiting_belong_to_user($listing_id, $user_id)

 {

     $listing_author_id = geodir_get_listing_author($listing_id);

-    if ($listing_author_id == $user_id)

-        return true;

-    else

-        return false;

+    if ($listing_author_id == $user_id) {
+            return true;
+    } else {
+            return false;
+    }
 

 }

 

@@ -2784,10 +2831,11 @@ 
     $pattern = '/-\d+x\d+\./';

     preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);

 

-    if (empty($matches))

-        return '';

-    else

-        return $file;

+    if (empty($matches)) {
+            return '';
+    } else {
+            return $file;
+    }
 

 }

 

@@ -2872,8 +2920,9 @@ 
     } else {

         //set_post_thumbnail($post_id,-1);

 

-        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))

-            wp_delete_attachment($post_thumbnail_id);

+        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {
+                    wp_delete_attachment($post_thumbnail_id);
+        }
 

     }

 }

@@ -2958,8 +3007,9 @@ 
 

     global $wpdb;

 

-    if ($listing_type == '')

-        $listing_type = 'gd_place';

+    if ($listing_type == '') {
+            $listing_type = 'gd_place';
+    }
 

     $fields_info = array();

 

@@ -2982,8 +3032,9 @@ 
 

                 $fields_info[$prefix . 'address'] = $data->field_type;

 

-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])

-                    $fields_info[$prefix . 'zip'] = $data->field_type;

+                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip']) {
+                                    $fields_info[$prefix . 'zip'] = $data->field_type;
+                }
 

             } else {

 

Spacing +204 added lines, -204 removed lines

@@ -26,11 +26,11 @@ 
 

     if (!isset($default_cat) || empty($default_cat)) {

         $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

-    }else{

-        if(!is_int($default_cat)){

+    } else {

+        if (!is_int($default_cat)) {

             $category = get_term_by('name', $default_cat, $taxonomy);

-            if(isset($category->term_id)){

-                $default_cat =  $category->term_id;

+            if (isset($category->term_id)) {

+                $default_cat = $category->term_id;

             }

         }

 

@@ -58,7 +58,7 @@ 
 

     if ($default_pos === false) {

 

-        $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);

+        $change_cat_str = str_replace($default_cat.',y:', $default_cat.',y,d:', $change_cat_str);

 

     }

 

@@ -227,7 +227,7 @@ 
         $send_post_submit_mail = false;

 

         // unhook this function so it doesn't loop infinitely

-        remove_action('save_post', 'geodir_post_information_save',10,2);

+        remove_action('save_post', 'geodir_post_information_save', 10, 2);

 

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

             $post['ID'] = $request_info['pid'];

@@ -251,13 +251,13 @@ 
         }

 

         // re-hook this function

-        add_action('save_post', 'geodir_post_information_save',10,2);

+        add_action('save_post', 'geodir_post_information_save', 10, 2);

 

         $post_tags = '';

         if (!isset($request_info['post_tags'])) {

 

             $post_type = $request_info['listing_type'];

-            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));

+            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type.'_tags', array('fields' => 'names')));

 

         }

 

@@ -275,13 +275,13 @@ 
         $payment_info = array();

         $package_info = array();

 

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

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

 

         $post_package_id = geodir_get_post_meta($last_post_id, 'package_id');

 

         if (!empty($package_info) && !$post_package_id) {

             if (isset($package_info['days']) && $package_info['days'] != 0) {

-                $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));

+                $payment_info['expire_date'] = date('Y-m-d', strtotime("+".$package_info['days']." days"));

             } else {

                 $payment_info['expire_date'] = 'Never';

             }

@@ -302,8 +302,8 @@ 
             $extrafields = $val['extra_fields'];

 

             if (trim($type) == 'address') {

-                $prefix = $name . '_';

-                $address = $prefix . 'address';

+                $prefix = $name.'_';

+                $address = $prefix.'address';

 

                 if (isset($request_info[$address]) && $request_info[$address] != '') {

                     $gd_post_info[$address] = wp_slash($request_info[$address]);

@@ -313,59 +313,59 @@ 
                     $extrafields = unserialize($extrafields);

 

 

-                    if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {

+                    if (!isset($request_info[$prefix.'city']) || $request_info[$prefix.'city'] == '') {

 

                         $location_result = geodir_get_default_location();

 

-                        $gd_post_info[$prefix . 'city'] = $location_result->city;

-                        $gd_post_info[$prefix . 'region'] = $location_result->region;

-                        $gd_post_info[$prefix . 'country'] = $location_result->country;

+                        $gd_post_info[$prefix.'city'] = $location_result->city;

+                        $gd_post_info[$prefix.'region'] = $location_result->region;

+                        $gd_post_info[$prefix.'country'] = $location_result->country;

 

-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

+                        $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location

 

                     } else {

 

-                        $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];

-                        $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];

-                        $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];

+                        $gd_post_info[$prefix.'city'] = $request_info[$prefix.'city'];

+                        $gd_post_info[$prefix.'region'] = $request_info[$prefix.'region'];

+                        $gd_post_info[$prefix.'country'] = $request_info[$prefix.'country'];

 

                         //----------set post locations when import dummy data-------

                         $location_result = geodir_get_default_location();

 

-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

+                        $gd_post_info['post_locations'] = '['.$location_result->city_slug.'],['.$location_result->region_slug.'],['.$location_result->country_slug.']'; // set all overall post location

                         //-----------------------------------------------------------------

 

                     }

 

 

-                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {

-                        $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];

+                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix.'zip'])) {

+                        $gd_post_info[$prefix.'zip'] = $request_info[$prefix.'zip'];

                     }

 

 

                     if (isset($extrafields['show_map']) && $extrafields['show_map']) {

 

-                        if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {

-                            $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];

+                        if (isset($request_info[$prefix.'latitude']) && $request_info[$prefix.'latitude'] != '') {

+                            $gd_post_info[$prefix.'latitude'] = $request_info[$prefix.'latitude'];

                         }

 

-                        if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {

-                            $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];

+                        if (isset($request_info[$prefix.'longitude']) && $request_info[$prefix.'longitude'] != '') {

+                            $gd_post_info[$prefix.'longitude'] = $request_info[$prefix.'longitude'];

                         }

 

-                        if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {

-                            $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];

+                        if (isset($request_info[$prefix.'mapview']) && $request_info[$prefix.'mapview'] != '') {

+                            $gd_post_info[$prefix.'mapview'] = $request_info[$prefix.'mapview'];

                         }

 

-                        if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {

-                            $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];

+                        if (isset($request_info[$prefix.'mapzoom']) && $request_info[$prefix.'mapzoom'] != '') {

+                            $gd_post_info[$prefix.'mapzoom'] = $request_info[$prefix.'mapzoom'];

                         }

 

                     }

 

                     // show lat lng

-                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {

-                        $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];

+                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix.'latlng'])) {

+                        $gd_post_info[$prefix.'latlng'] = $request_info[$prefix.'latlng'];

                     }

                 }

 

@@ -390,16 +390,16 @@ 
 

                     // check if we need to change the format or not

                     $date_format_len = strlen(str_replace(' ', '', $date_format));

-                    if($date_format_len>5){// if greater then 5 then it's the old style format.

+                    if ($date_format_len > 5) {// if greater then 5 then it's the old style format.

 

-                        $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

-                        $replace = array('d','j','l','m','n','F','Y');//PHP date format

+                        $search = array('dd', 'd', 'DD', 'mm', 'm', 'MM', 'yy'); //jQuery UI datepicker format

+                        $replace = array('d', 'j', 'l', 'm', 'n', 'F', 'Y'); //PHP date format

 

                         $date_format = str_replace($search, $replace, $date_format);

 

                         $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];

 

-                    }else{

+                    } else {

                         $post_htmlvar_value = $request_info[$name];

                     }

 

@@ -414,7 +414,7 @@ 
                 if (isset($request_info[$name])) {

                     $gd_post_info[$name] = $request_info[$name];

                 } else {

-                    if (isset($request_info['gd_field_' . $name])) {

+                    if (isset($request_info['gd_field_'.$name])) {

                         $gd_post_info[$name] = ''; /* fix de-select for multiselect */

                     }

                 }

@@ -474,7 +474,7 @@ 
         }

 

         if (is_array($post_tags)) {

-            $taxonomy = $request_info['listing_type'] . '_tags';

+            $taxonomy = $request_info['listing_type'].'_tags';

             wp_set_object_terms($last_post_id, $post_tags, $taxonomy);

         }

 

@@ -486,7 +486,7 @@ 
                 $tmpimgArr = trim($request_info['post_images'], ",");

                 $tmpimgArr = explode(",", $tmpimgArr);

                 geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);

-            } else{

+            } else {

                 geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);

             }

 

@@ -567,7 +567,7 @@ 
     if (!in_array($post_type, $all_postypes))

         return false;

 

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

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

 

     /**

      * Apply Filter to change Post info

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

      * @package GeoDirectory

      */

-    $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd

+    $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM ".$wpdb->posts." p,".$table." pd

 			  WHERE p.ID = pd.post_id

 			  AND post_id = " . $post_id);

 

@@ -640,7 +640,7 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         /**

          * Filter to change Post info

@@ -663,13 +663,13 @@ 
                         $mval = implode(",", $mval);

                     }

 

-                    $post_meta_set_query .= $mkey . " = '" . $mval . "', ";

+                    $post_meta_set_query .= $mkey." = '".$mval."', ";

                 }

             }

 

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

 

-            $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %

+            $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query); // escape %

 

             /**

              * Called before saving the listing info.

@@ -681,11 +681,11 @@ 
              */

             do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);

 

-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {

 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id =%d",

+                        "UPDATE ".$table." SET ".$post_meta_set_query." where post_id =%d",

                         array($post_id)

                     )

                 );

@@ -695,7 +695,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "INSERT INTO " . $table . " SET post_id = %d," . $post_meta_set_query,

+                        "INSERT INTO ".$table." SET post_id = %d,".$post_meta_set_query,

                         array($post_id)

                     )

                 );

@@ -741,7 +741,7 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {

 

@@ -749,11 +749,11 @@ 
                 $meta_value = implode(",", $meta_value);

             }

 

-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {

 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",

+                        "UPDATE ".$table." SET ".$postmeta." = '".$meta_value."' where post_id =%d",

                         array($post_id)

                     )

                 );

@@ -762,7 +762,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",

+                        "INSERT INTO ".$table." SET post_id = %d, ".$postmeta." = '".$meta_value."'",

                         array($post_id)

                     )

                 );

@@ -795,23 +795,23 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         if (is_array($postmeta) && !empty($postmeta) && $post_id) {

             $post_meta_set_query = '';

 

             foreach ($postmeta as $mkey) {

                 if ($mval != '')

-                    $post_meta_set_query .= $mkey . " = '', ";

+                    $post_meta_set_query .= $mkey." = '', ";

             }

 

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

 

-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

+            if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {

 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",

+                        "UPDATE ".$table." SET ".$post_meta_set_query." where post_id = %d",

                         array($post_id)

                     )

                 );

@@ -820,11 +820,11 @@ 
             }

 

         } elseif ($postmeta != '' && $post_id) {

-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

+            if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$postmeta."'") != '') {

 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",

+                        "UPDATE ".$table." SET ".$postmeta."= '' where post_id = %d",

                         array($post_id)

                     )

                 );

@@ -866,10 +866,10 @@ 
         if (!in_array($post_type, $all_postypes))

             return false;

 

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

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

 

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {

-            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));

+        if ($wpdb->get_var("SHOW COLUMNS FROM ".$table." WHERE field = '".$meta_key."'") != '') {

+            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT ".$meta_key." from ".$table." where post_id = %d", array($post_id)));

             

             if ($meta_value && $meta_value !== '') {

                 return maybe_serialize($meta_value);

@@ -903,13 +903,13 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         $post_images = geodir_get_images($post_id);

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $table . " SET featured_image = '' where post_id =%d",

+                "UPDATE ".$table." SET featured_image = '' where post_id =%d",

                 array($post_id)

             )

         );

@@ -939,12 +939,12 @@ 
                 $file_path = '';

                 /* --------- start ------- */

 

-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));

+                $split_img_path = explode(str_replace(array('http://', 'https://'), '', $uploads['baseurl']), str_replace(array('http://', 'https://'), '', $post_image[$m]));

 

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

 

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {

+                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM ".GEODIR_ATTACHMENT_TABLE." WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {

 

                     /* --------- end ------- */

                     $curr_img_url = $post_image[$m];

@@ -988,7 +988,7 @@ 
                     // If the uploaded file is the right format

                     if (in_array($uploaded_file_type, $allowed_file_types)) {

                         if (!function_exists('wp_handle_upload')) {

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

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

                         }

 

                         if (!is_dir($geodir_uploadpath)) {

@@ -996,41 +996,41 @@ 
                         }

 

                         $external_img = false;

-                        if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {

+                        if (strpos(str_replace(array('http://', 'https://'), '', $curr_img_url), str_replace(array('http://', 'https://'), '', $uploads['baseurl'])) !== false) {

                         } else {

                             $external_img = true;

                         }

 

                         if ($dummy || $external_img) {

                             $uploaded_file = array();

-                            $uploaded = (array)fetch_remote_file($curr_img_url);

+                            $uploaded = (array) fetch_remote_file($curr_img_url);

 

                             if (isset($uploaded['error']) && empty($uploaded['error'])) {

                                 $new_name = basename($uploaded['file']);

                                 $uploaded_file = $uploaded;

-                            }else{

-                                print_r($uploaded);exit;

+                            } else {

+                                print_r($uploaded); exit;

                             }

                             $external_img = false;

                         } else {

-                            $new_name = $post_id . '_' . $file_name;

+                            $new_name = $post_id.'_'.$file_name;

 

                             if ($curr_img_dir == $sub_dir) {

-                                $img_path = $geodir_uploadpath . '/' . $filename;

-                                $img_url = $geodir_uploadurl . '/' . $filename;

+                                $img_path = $geodir_uploadpath.'/'.$filename;

+                                $img_url = $geodir_uploadurl.'/'.$filename;

                             } else {

-                                $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-                                $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+                                $img_path = $uploads_dir.'/temp_'.$current_user->data->ID.'/'.$filename;

+                                $img_url = $uploads['url'].'/temp_'.$current_user->data->ID.'/'.$filename;

                             }

 

                             $uploaded_file = '';

 

                             if (file_exists($img_path)) {

-                                $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+                                $uploaded_file = copy($img_path, $geodir_uploadpath.'/'.$new_name);

                                 $file_path = '';

-                            } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {

+                            } else if (file_exists($uploads['basedir'].$curr_img_dir.$filename)) {

                                 $uploaded_file = true;

-                                $file_path = $curr_img_dir . '/' . $filename;

+                                $file_path = $curr_img_dir.'/'.$filename;

                             }

 

                             if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

@@ -1039,14 +1039,14 @@ 
 

                         if (!empty($uploaded_file)) {

                             if (!isset($file_path) || !$file_path) {

-                                $file_path = $sub_dir . '/' . $new_name;

+                                $file_path = $sub_dir.'/'.$new_name;

                             }

 

-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);

+                            $postcurr_images[] = str_replace(array('http://', 'https://'), '', $uploads['baseurl'].$file_path);

 

                             if ($menu_order == 1) {

 

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

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

 

                             }

 

@@ -1064,12 +1064,12 @@ 
 

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

 

                             $valid_file_ids[] = $wpdb->insert_id;

                         }

@@ -1080,17 +1080,17 @@ 
                 } else {

                     $valid_file_ids[] = $find_image;

 

-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);

+                    $postcurr_images[] = str_replace(array('http://', 'https://'), '', $post_image[$m]);

 

                     $wpdb->query(

                         $wpdb->prepare(

-                            "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",

+                            "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET menu_order = %d where file =%s AND post_id =%d",

                             array($menu_order, $split_img_path[1], $post_id)

                         )

                     );

 

                     if ($menu_order == 1)

-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

+                        $wpdb->query($wpdb->prepare("UPDATE ".$table." SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

 

                 }

 

@@ -1114,9 +1114,9 @@ 
 

                 foreach ($post_images as $img) {

 

-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {

+                    if (!in_array(str_replace(array('http://', 'https://'), '', $img->src), $postcurr_images)) {

 

-                        $invalid_files[] = (object)array('src' => $img->src);

+                        $invalid_files[] = (object) array('src' => $img->src);

 

                     }

 

@@ -1124,12 +1124,12 @@ 
 

             }

 

-            $invalid_files = (object)$invalid_files;

+            $invalid_files = (object) $invalid_files;

         }

 

         $remove_files[] = $post_id;

 

-        $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));

+        $wpdb->query($wpdb->prepare("DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE ".$valid_files_condition." post_id = %d", $remove_files));

 

         if (!empty($invalid_files))

             geodir_remove_attachments($invalid_files);

@@ -1169,7 +1169,7 @@ 
 			rmdir($dirPath);

 	}	*/

 

-    $dirname = $uploads_dir . '/temp_' . $current_user->ID;

+    $dirname = $uploads_dir.'/temp_'.$current_user->ID;

     geodir_delete_directory($dirname);

 }

 

@@ -1191,10 +1191,10 @@ 
         return false;

     while ($file = readdir($dir_handle)) {

         if ($file != "." && $file != "..") {

-            if (!is_dir($dirname . "/" . $file))

-                unlink($dirname . "/" . $file);

+            if (!is_dir($dirname."/".$file))

+                unlink($dirname."/".$file);

             else

-                geodir_delete_directory($dirname . '/' . $file);

+                geodir_delete_directory($dirname.'/'.$file);

         }

     }

     closedir($dir_handle);

@@ -1223,8 +1223,8 @@ 
             foreach ($postcurr_images as $postimg) {

                 $image_name_arr = explode('/', $postimg->src);

                 $filename = end($image_name_arr);

-                if (file_exists($uploads_dir . '/' . $filename))

-                    unlink($uploads_dir . '/' . $filename);

+                if (file_exists($uploads_dir.'/'.$filename))

+                    unlink($uploads_dir.'/'.$filename);

             }

 

         } // endif

@@ -1265,16 +1265,16 @@ 
         }

 

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

-            return false;// if not a GD CPT return;

+            return false; // if not a GD CPT return;

         }

 

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

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

 

         if (!$file) {

             if (isset($post->featured_image)) {

                 $file = $post->featured_image;

             } else {

-                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));

+                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM ".$table." WHERE post_id = %d", array($post_id)));

             }

         }

 

@@ -1292,7 +1292,7 @@ 
 

             $file_name = $file_info['basename'];

 

-            $uploads_url = $uploads_baseurl . $sub_dir;

+            $uploads_url = $uploads_baseurl.$sub_dir;

             /*

              * Allows the filter of image src for such things as CDN change.

              *

@@ -1302,8 +1302,8 @@ 
              * @param string $uploads_url The server upload directory url.

              * @param string $uploads_baseurl The uploads dir base url.

              */

-            $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

-            $img_arr['path'] = $uploads_path . '/' . $file_name;

+            $img_arr['src'] = apply_filters('geodir_get_featured_image_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);

+            $img_arr['path'] = $uploads_path.'/'.$file_name;

             $width = 0;

             $height = 0;

             if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

@@ -1346,7 +1346,7 @@ 
                 $file_name = $file_info['basename'];

 

                 $img_arr['src'] = $default_img;

-                $img_arr['path'] = $uploads_path . '/' . $file_name;

+                $img_arr['path'] = $uploads_path.'/'.$file_name;

 

                 $width = 0;

                 $height = 0;

@@ -1363,7 +1363,7 @@ 
         }

 

         if (!empty($img_arr))

-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

+            return (object) $img_arr; //return (object)array( 'src' => $file_url, 'path' => $file_path );

         else

             return false;

     }

@@ -1426,7 +1426,7 @@ 
 

         $arrImages = $wpdb->get_results(

             $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",

+                "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d".$not_featured." ORDER BY menu_order ASC, ID DESC $limit_q ",

                 array('%image%', $post_id)

             )

         );

@@ -1452,7 +1452,7 @@ 
 

                 $file_name = $file_info['basename'];

 

-                $uploads_url = $uploads_baseurl . $sub_dir;

+                $uploads_url = $uploads_baseurl.$sub_dir;

                 /*

                 * Allows the filter of image src for such things as CDN change.

                 *

@@ -1462,8 +1462,8 @@ 
                 * @param string $uploads_url The server upload directory url.

                 * @param string $uploads_baseurl The uploads dir base url.

                 */

-                $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

-                $img_arr['path'] = $uploads_path . '/' . $file_name;

+                $img_arr['src'] = apply_filters('geodir_get_images_src', $uploads_url.'/'.$file_name, $file_name, $uploads_url, $uploads_baseurl);

+                $img_arr['path'] = $uploads_path.'/'.$file_name;

                 $width = 0;

                 $height = 0;

                 if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

@@ -1480,11 +1480,11 @@ 
                 $img_arr['content'] = $attechment->content; // add the description to the array

                 $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.

 

-                $return_arr[] = (object)$img_arr;

+                $return_arr[] = (object) $img_arr;

 

                 $counter++;

             }

-            return (object)$return_arr;

+            return (object) $return_arr;

         } else if ($no_images) {

             $default_img = '';

             $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

@@ -1523,7 +1523,7 @@ 
                 $img_arr['title'] = $file_info['filename']; // add the title to the array

                 $img_arr['content'] = $file_info['filename']; // add the description to the array

 

-                $return_arr[] = (object)$img_arr;

+                $return_arr[] = (object) $img_arr;

 

                 return $return_arr;

             } else

@@ -1550,8 +1550,8 @@ 
 

         $html = '';

         if (!empty($request)) {

-            if (!is_object($request)){

-                $request = (object)$request;

+            if (!is_object($request)) {

+                $request = (object) $request;

             }

 

             if (isset($request->src) && !isset($request->path)) {

@@ -1565,7 +1565,7 @@ 
             $img_no_http = str_replace(array("http://", "https://"), "", $request->path);

             $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);

             if (strpos($img_no_http, $upload_no_http) !== false) {

-                $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);

+                $request->path = str_replace($img_no_http, $upload_dir['basedir'], $request->path);

             }

             

             $width = 0;

@@ -1580,7 +1580,7 @@ 
             $image->width = $width;

             $image->height = $height;

 

-            $max_size = (object)geodir_get_imagesize($size);

+            $max_size = (object) geodir_get_imagesize($size);

 

             if (!is_wp_error($max_size)) {

                 if ($image->width) {

@@ -1592,15 +1592,15 @@ 
                         $width_per = 100;

                 }

 

-                if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

-                    $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';

+                if (is_admin() && !isset($_REQUEST['geodir_ajax'])) {

+                    $html = '<div class="geodir_thumbnail"><img style="max-height:'.$max_size->h.'px;" alt="place image" src="'.$image->src.'"  /></div>';

                 } else {

-                    if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){

-                        $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

-                    }else{

+                    if ($size == 'widget-thumb' || !get_option('geodir_lazy_load', 1)) {

+                        $html = '<div class="geodir_thumbnail" style="background-image:url(\''.$image->src.'\');"></div>';

+                    } else {

                         //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

                         //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';

-                        $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

+                        $html = '<div data-src="'.str_replace(' ', '%20', $image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

 

                     }

 

@@ -1636,15 +1636,15 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {

 

-            if ($taxonomy == $post_type . '_tags') {

+            if ($taxonomy == $post_type.'_tags') {

                 if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

                     geodir_save_post_meta($post_id, 'post_tags', $terms);

                 }

-            } elseif ($taxonomy == $post_type . 'category') {

+            } elseif ($taxonomy == $post_type.'category') {

                 $srcharr = array('"', '\\');

                 $replarr = array("&quot;", '');

 

@@ -1666,7 +1666,7 @@ 
 

                     $wpdb->get_var(

                         $wpdb->prepare(

-                            "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",

+                            "DELETE from ".GEODIR_ICON_TABLE." WHERE cat_id NOT IN ($format) AND post_id = %d ",

                             $cat_ids_array_del

                         )

                     );

@@ -1674,7 +1674,7 @@ 
 

                     $post_term = $wpdb->get_col(

                         $wpdb->prepare(

-                            "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",

+                            "SELECT term_id FROM ".$wpdb->term_taxonomy." WHERE term_taxonomy_id IN($format) GROUP BY term_id",

                             $cat_ids_array

                         )

                     );

@@ -1696,16 +1696,16 @@ 
                         $lat = geodir_get_post_meta($post_id, 'post_latitude', true);

                         $lng = geodir_get_post_meta($post_id, 'post_longitude', true);

 

-                        $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));

-                        $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);

+                        $timing = ' - '.date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));

+                        $timing .= ' - '.geodir_get_post_meta($post_id, 'st_time', true);

 

                         $json = '{';

-                        $json .= '"id":"' . $post_id . '",';

-                        $json .= '"lat_pos": "' . $lat . '",';

-                        $json .= '"long_pos": "' . $lng . '",';

-                        $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';

-                        $json .= '"icon":"' . $term_icon . '",';

-                        $json .= '"group":"catgroup' . $cat_id . '"';

+                        $json .= '"id":"'.$post_id.'",';

+                        $json .= '"lat_pos": "'.$lat.'",';

+                        $json .= '"long_pos": "'.$lng.'",';

+                        $json .= '"marker_id":"'.$post_id.'_'.$cat_id.'",';

+                        $json .= '"icon":"'.$term_icon.'",';

+                        $json .= '"group":"catgroup'.$cat_id.'"';

                         $json .= '}';

 

 

@@ -1713,9 +1713,9 @@ 
                             $post_marker_json = $json;

 

 

-                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

+                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".GEODIR_ICON_TABLE." WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

 

-                            $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET

+                            $json_query = $wpdb->prepare("UPDATE ".GEODIR_ICON_TABLE." SET

 										post_title = %s,

 										json = %s

 										WHERE post_id = %d AND cat_id = %d ",

@@ -1723,7 +1723,7 @@ 
 

                         } else {

 

-                            $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET

+                            $json_query = $wpdb->prepare("INSERT INTO ".GEODIR_ICON_TABLE." SET

 										post_id = %d,

 										post_title = %s,

 										cat_id = %d,

@@ -1741,17 +1741,17 @@ 
                 if (!empty($post_term) && is_array($post_term)) {

                     $categories = implode(',', $post_term);

 

-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';

+                    if ($categories != '' && $categories != 0) $categories = ','.$categories.',';

 

                     if (empty($post_marker_json))

                         $post_marker_json = isset($json) ? $json : '';

 

-                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from ".$table." where post_id = %d", array($post_id)))) {

 

                         $wpdb->query(

                             $wpdb->prepare(

-                                "UPDATE " . $table . " SET

-								" . $taxonomy . " = %s,

+                                "UPDATE ".$table." SET

+								" . $taxonomy." = %s,

 								marker_json = %s

 								where post_id = %d",

                                 array($categories, $post_marker_json, $post_id)

@@ -1772,7 +1772,7 @@ 
 

                                     $wpdb->query(

                                         $wpdb->prepare(

-                                            "UPDATE " . $table . " SET

+                                            "UPDATE ".$table." SET

 											default_category = %s

 											where post_id = %d",

                                             array($categories[0], $post_id)

@@ -1797,9 +1797,9 @@ 
 

                         $wpdb->query(

                             $wpdb->prepare(

-                                "INSERT INTO " . $table . " SET

+                                "INSERT INTO ".$table." SET

 								post_id = %d,

-								" . $taxonomy . " = %s,

+								" . $taxonomy." = %s,

 								marker_json = %s ",

 

                                 array($post_id, $categories, $post_marker_json)

@@ -1922,7 +1922,7 @@ 
                                     } ?>"><img alt="bubble image" style="max-height:50px;"

                                                src="<?php echo $post_images[0]; ?>"/></a></div>

                             <?php

-                            }else{

+                            } else {

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         } else {

@@ -1930,7 +1930,7 @@ 
                                 ?>

                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>

                             <?php

-                            }else{

+                            } else {

                                 echo '<div class="geodir-bubble_image"></div>';

                             }

                         }

@@ -1963,7 +1963,7 @@ 
                              * @param object $postinfo_obj The posts info as an object.

                              * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

                              */

-                            do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );

+                            do_action('geodir_infowindow_meta_after', $postinfo_obj, $post_preview);

                             ?>

                         </div>

                         <?php

@@ -1975,10 +1975,10 @@ 
                             <div class="geodir-bubble-meta-fade"></div>

 

                             <div class="geodir-bubble-meta-bottom">

-                                <span class="geodir-bubble-rating"><?php echo $rating_star;?></span>

+                                <span class="geodir-bubble-rating"><?php echo $rating_star; ?></span>

 

                                 <span

-                                    class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID);?></span>

+                                    class="geodir-bubble-fav"><?php echo geodir_favourite_html($post_author, $ID); ?></span>

                   <span class="geodir-bubble-reviews"><a href="<?php echo get_comments_link($ID); ?>"

                                                          class="geodir-pcomments"><i class="fa fa-comments"></i>

                           <?php echo get_comments_number($ID); ?>

@@ -2043,11 +2043,11 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",

+                "UPDATE ".$table." SET post_status=%s WHERE post_id=%d",

                 array($status, $post_id)

             )

         );

@@ -2119,18 +2119,18 @@ 
 

         $post_type = get_post_type($post_id);

 

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

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

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",

+                "UPDATE ".$table." SET `post_id` = %d WHERE `post_id` = %d",

                 array($updatingpost, $temppost)

             )

         );

 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

+                "UPDATE ".GEODIR_ICON_TABLE." SET `post_id` = %d WHERE `post_id` = %d",

                 array($updatingpost, $temppost)

             )

         );

@@ -2139,7 +2139,7 @@ 
 

         $wpdb->query(

             $wpdb->prepare(

-                "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

+                "UPDATE ".GEODIR_ATTACHMENT_TABLE." SET `post_id` = %d WHERE `post_id` = %d",

                 array($updatingpost, $temppost)

             )

         );

@@ -2177,12 +2177,12 @@ 
         if (!in_array($post_type, $all_postypes))

             return false;

 

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

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

 

         /* Delete custom post meta*/

         $wpdb->query(

             $wpdb->prepare(

-                "DELETE FROM " . $table . " WHERE `post_id` = %d",

+                "DELETE FROM ".$table." WHERE `post_id` = %d",

                 array($deleted_postid)

             )

         );

@@ -2191,7 +2191,7 @@ 
 

         $wpdb->query(

             $wpdb->prepare(

-                "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",

+                "DELETE FROM ".GEODIR_ICON_TABLE." WHERE `post_id` = %d",

                 array($deleted_postid)

             )

         );

@@ -2201,7 +2201,7 @@ 
 

         $wpdb->query(

             $wpdb->prepare(

-                "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",

+                "DELETE FROM ".GEODIR_ATTACHMENT_TABLE." WHERE `post_id` = %d",

                 array($deleted_postid)

             )

         );

@@ -2273,7 +2273,7 @@ 
          */

         do_action('geodir_before_add_from_favorite', $post_id);

 

-        echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';

+        echo '<a href="javascript:void(0);" title="'.$remove_favourite_text.'" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'remove\');"><i class="'.$favourite_icon.'"></i> '.$unfavourite_text.'</a>';

 

         /**

          * Called after adding the post from favourites.

@@ -2352,7 +2352,7 @@ 
          */

         do_action('geodir_before_remove_from_favorite', $post_id);

 

-        echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';

+        echo '<a href="javascript:void(0);"  title="'.$add_favourite_text.'" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\''.$post_id.'\',\'add\');"><i class="'.$favourite_icon.'"></i> '.$favourite_text.'</a>';

 

         /**

          * Called after removing the post from favourites.

@@ -2447,24 +2447,24 @@ 
             $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

 

         if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"  ><a

                 class="geodir-removetofav-icon" href="javascript:void(0);"

-                onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');"

-                title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?>

+                onclick="javascript:addToFavourite(<?php echo $post_id; ?>,'remove');"

+                title="<?php echo $remove_favourite_text; ?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text; ?>

             </a>   </span><?php

 

         } else {

 

             if (!isset($current_user->data->ID) || $current_user->data->ID == '') {

-                $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';

+                $script_text = 'javascript:window.location.href=\''.geodir_login_url().'\'';

             } else

-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

+                $script_text = 'javascript:addToFavourite('.$post_id.',\'add\')';

 

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

+            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id; ?>"><a class="geodir-addtofav-icon"

                                                                                         href="javascript:void(0);"

-                                                                                        onclick="<?php echo $script_text;?>"

-                                                                                        title="<?php echo $add_favourite_text;?>"><i

-                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span>

+                                                                                        onclick="<?php echo $script_text; ?>"

+                                                                                        title="<?php echo $add_favourite_text; ?>"><i

+                    class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text; ?></a></span>

         <?php }

     }

 }

@@ -2494,7 +2494,7 @@ 
 

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

 

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

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

 

             /**

              * Filter to modify the 'join' query

@@ -2517,8 +2517,8 @@ 
             $where = apply_filters('geodir_cat_post_count_where', $where, $term);

 

             $count_query = "SELECT count(post_id) FROM

-							" . $table . " as pd " . $join . "

-							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;

+							" . $table." as pd ".$join."

+							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id."',".$term->taxonomy.") ".$where;

 

             $cat_post_count = $wpdb->get_var($count_query);

             if (empty($cat_post_count) || is_wp_error($cat_post_count))

@@ -2601,7 +2601,7 @@ 
     global $post;

     $all_postypes = geodir_get_posttypes();

     if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {

-        return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';

+        return ' <a href="'.get_permalink($post->ID).'">'.READ_MORE_TXT.'</a>';

     }

 

     return $more;

@@ -2628,14 +2628,14 @@ 
     if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {

 

         $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);

-        $table = $plugin_prefix . $geodir_post_type . '_detail';

+        $table = $plugin_prefix.$geodir_post_type.'_detail';

 

         $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);

-        $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';

+        $term_icon = $path_parts['dirname'].'/cat_icon_'.$term_id.'.png';

 

         $posts = $wpdb->get_results(

             $wpdb->prepare(

-                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",

+                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM ".$table." WHERE FIND_IN_SET(%s,%1\$s ) ",

                 array($term_id, $taxonomy)

             )

         );

@@ -2647,19 +2647,19 @@ 
                 $lng = $post_obj->post_longitude;

 

                 $json = '{';

-                $json .= '"id":"' . $post_obj->post_id . '",';

-                $json .= '"lat_pos": "' . $lat . '",';

-                $json .= '"long_pos": "' . $lng . '",';

-                $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';

-                $json .= '"icon":"' . $term_icon . '",';

-                $json .= '"group":"catgroup' . $term_id . '"';

+                $json .= '"id":"'.$post_obj->post_id.'",';

+                $json .= '"lat_pos": "'.$lat.'",';

+                $json .= '"long_pos": "'.$lng.'",';

+                $json .= '"marker_id":"'.$post_obj->post_id.'_'.$term_id.'",';

+                $json .= '"icon":"'.$term_icon.'",';

+                $json .= '"group":"catgroup'.$term_id.'"';

                 $json .= '}';

 

                 if ($post_obj->default_category == $term_id) {

 

                     $wpdb->query(

                         $wpdb->prepare(

-                            "UPDATE " . $table . " SET marker_json = %s where post_id = %d",

+                            "UPDATE ".$table." SET marker_json = %s where post_id = %d",

                             array($json, $post_obj->post_id)

                         )

                     );

@@ -2667,7 +2667,7 @@ 
 

                 $wpdb->query(

                     $wpdb->prepare(

-                        "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",

+                        "UPDATE ".GEODIR_ICON_TABLE." SET json = %s WHERE post_id = %d AND cat_id = %d",

                         array($json, $post_obj->post_id, $term_id)

                     )

                 );

@@ -2791,7 +2791,7 @@ 
 //	print_r($uploads ) ;

     $post_first_image = $wpdb->get_results(

         $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)

+            "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE post_id = %d and menu_order = 1  ", array($post_id)

         )

     );

 

@@ -2812,9 +2812,9 @@ 
 

         $post_type = get_post_type($post_id);

 

-        $table_name = $plugin_prefix . $post_type . '_detail';

+        $table_name = $plugin_prefix.$post_type.'_detail';

 

-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);

+        $wpdb->query("UPDATE ".$table_name." SET featured_image='".$post_first_image[0]->file."' WHERE post_id =".$post_id);

 

         $new_attachment_name = basename($post_first_image[0]->file);

 

@@ -2827,11 +2827,11 @@ 
                 wp_delete_attachment($post_thumbnail_id);

 

             }

-            $filename = $uploads['basedir'] . $post_first_image[0]->file;

+            $filename = $uploads['basedir'].$post_first_image[0]->file;

 

             $attachment = array(

                 'post_mime_type' => $post_first_image[0]->mime_type,

-                'guid' => $uploads['baseurl'] . $post_first_image[0]->file,

+                'guid' => $uploads['baseurl'].$post_first_image[0]->file,

                 'post_parent' => $post_id,

                 'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),

                 'post_content' => ''

@@ -2844,7 +2844,7 @@ 
 

                 set_post_thumbnail($post_id, $id);

 

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

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

                 wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));

 

             }

@@ -2877,35 +2877,35 @@ 
         $post_id = absint($_POST['post_id']);

         $upload_dir = wp_upload_dir();

         $post_type = get_post_type($_POST['post_id']);

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

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

 

         $post_arr = $wpdb->get_results($wpdb->prepare(

-            "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",

+            "SELECT * FROM $wpdb->posts p JOIN ".$table." gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",

             array($post_id)

         )

             , ARRAY_A);

 

         $arrImages = $wpdb->get_results(

             $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",

+                "SELECT * FROM ".GEODIR_ATTACHMENT_TABLE." WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",

                 array('%image%', $post_id)

             )

         );

         if ($arrImages) {

             $image_arr = array();

             foreach ($arrImages as $img) {

-                $image_arr[] = $upload_dir['baseurl'] . $img->file;

+                $image_arr[] = $upload_dir['baseurl'].$img->file;

             }

             $comma_separated = implode(",", $image_arr);

             $post_arr[0]['post_images'] = $comma_separated;

         }

 

 

-        $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];

+        $cats = $post_arr[0][$post_arr[0]['post_type'].'category'];

         $cat_arr = array_filter(explode(",", $cats));

         $trans_cat = array();

         foreach ($cat_arr as $cat) {

-            $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false);

+            $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'].'category', false);

         }

 

 

@@ -2947,7 +2947,7 @@ 
 

     $get_data = $wpdb->get_results(

         $wpdb->prepare(

-            "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",

+            "SELECT htmlvar_name, field_type, extra_fields FROM ".GEODIR_CUSTOM_FIELDS_TABLE." WHERE post_type=%s AND is_active='1'",

             array($listing_type)

         )

     );

@@ -2960,12 +2960,12 @@ 
 

                 $extra_fields = unserialize($data->extra_fields);

 

-                $prefix = $data->htmlvar_name . '_';

+                $prefix = $data->htmlvar_name.'_';

 

-                $fields_info[$prefix . 'address'] = $data->field_type;

+                $fields_info[$prefix.'address'] = $data->field_type;

 

                 if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])

-                    $fields_info[$prefix . 'zip'] = $data->field_type;

+                    $fields_info[$prefix.'zip'] = $data->field_type;

 

             } else {

 

@@ -3063,13 +3063,13 @@ 
  * @since 1.4.9

  * @package GeoDirectory

  */

-function geodir_fb_like_thumbnail(){

+function geodir_fb_like_thumbnail() {

 

     // return if not a single post

-    if(!is_single()){return;}

+    if (!is_single()) {return; }

 

     global $post;

-    if(isset($post->featured_image) && $post->featured_image){

+    if (isset($post->featured_image) && $post->featured_image) {

         $upload_dir = wp_upload_dir();

         $thumb = $upload_dir['baseurl'].$post->featured_image;

         echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";

Indentation +2220 added lines, -2220 removed lines

@@ -20,480 +20,480 @@ 
 function geodir_set_postcat_structure($post_id, $taxonomy, $default_cat = '', $category_str = '')

 {

 

-    $post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);

-    if (!empty($post_cat_ids))

-        $post_cat_array = explode(",", trim($post_cat_ids, ","));

-

-    if (!isset($default_cat) || empty($default_cat)) {

-        $default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

-    }else{

-        if(!is_int($default_cat)){

-            $category = get_term_by('name', $default_cat, $taxonomy);

-            if(isset($category->term_id)){

-                $default_cat =  $category->term_id;

-            }

-        }

+	$post_cat_ids = geodir_get_post_meta($post_id, $taxonomy);

+	if (!empty($post_cat_ids))

+		$post_cat_array = explode(",", trim($post_cat_ids, ","));

+

+	if (!isset($default_cat) || empty($default_cat)) {

+		$default_cat = isset($post_cat_array[0]) ? $post_cat_array[0] : '';

+	}else{

+		if(!is_int($default_cat)){

+			$category = get_term_by('name', $default_cat, $taxonomy);

+			if(isset($category->term_id)){

+				$default_cat =  $category->term_id;

+			}

+		}

 

-    }

+	}

 

 

-    geodir_save_post_meta($post_id, 'default_category', $default_cat);

+	geodir_save_post_meta($post_id, 'default_category', $default_cat);

 

-    if (isset($category_str) && empty($category_str)) {

+	if (isset($category_str) && empty($category_str)) {

 

-        $post_cat_str = '';

-        $post_categories = array();

-        if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {

-            $post_cat_str = implode(",y:#", $post_cat_array);

-            $post_cat_str .= ",y:";

-            $post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));

-        }

-        $post_categories[$taxonomy] = $post_cat_str;

-        $category_str = $post_categories;

-    }

+		$post_cat_str = '';

+		$post_categories = array();

+		if (isset($post_cat_array) && is_array($post_cat_array) && !empty($post_cat_array)) {

+			$post_cat_str = implode(",y:#", $post_cat_array);

+			$post_cat_str .= ",y:";

+			$post_cat_str = substr_replace($post_cat_str, ',y,d:', strpos($post_cat_str, ',y:'), strlen(',y:'));

+		}

+		$post_categories[$taxonomy] = $post_cat_str;

+		$category_str = $post_categories;

+	}

 

-    $change_cat_str = $category_str[$taxonomy];

+	$change_cat_str = $category_str[$taxonomy];

 

-    $default_pos = strpos($change_cat_str, 'd:');

+	$default_pos = strpos($change_cat_str, 'd:');

 

-    if ($default_pos === false) {

+	if ($default_pos === false) {

 

-        $change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);

+		$change_cat_str = str_replace($default_cat . ',y:', $default_cat . ',y,d:', $change_cat_str);

 

-    }

+	}

 

-    $category_str[$taxonomy] = $change_cat_str;

+	$category_str[$taxonomy] = $change_cat_str;

 

-    update_post_meta($post_id, 'post_categories', $category_str);

+	update_post_meta($post_id, 'post_categories', $category_str);

 

 }

 

 

 if (!function_exists('geodir_save_listing')) {

-    /**

-     * Saves listing in the database using given information.

-     *

-     * @since 1.0.0

-     * @since 1.5.4 New parameter $wp_error added.

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post The current post object.

-     * @global object $current_user Current user object.

+	/**

+	 * Saves listing in the database using given information.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.4 New parameter $wp_error added.

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post The current post object.

+	 * @global object $current_user Current user object.

 	 * @global object $gd_session GeoDirectory Session object.

-     * @param array $request_info {

-     *    Array of request info arguments.

-     *

-     *    @type string $action                                  Ajax action name.

-     *    @type string $geodir_ajax                             Ajax type.

-     *    @type string $ajax_action                             Ajax action.

-     *    @type string $listing_type                            Listing type.

-     *    @type string $pid                                     Default Post ID.

-     *    @type string $preview                                 Todo Desc needed.

-     *    @type string $add_listing_page_id                     Add listing page ID.

-     *    @type string $post_title                              Listing title.

-     *    @type string $post_desc                               Listing Description.

-     *    @type string $post_tags                               Listing tags.

-     *    @type array  $cat_limit                               Category limit.

-     *    @type array  $post_category                           Category IDs.

-     *    @type array  $post_category_str                       Category string.

-     *    @type string $post_default_category                   Default category ID.

-     *    @type string $post_address                            Listing address.

-     *    @type string $geodir_location_add_listing_country_val Add listing country value.

-     *    @type string $post_country                            Listing country.

-     *    @type string $geodir_location_add_listing_region_val  Add listing region value.

-     *    @type string $post_region                             Listing region.

-     *    @type string $geodir_location_add_listing_city_val    Add listing city value.

-     *    @type string $post_city                               Listing city.

-     *    @type string $post_zip                                Listing zip.

-     *    @type string $post_latitude                           Listing latitude.

-     *    @type string $post_longitude                          Listing longitude.

-     *    @type string $post_mapview                            Listing mapview. Default "ROADMAP".

-     *    @type string $post_mapzoom                            Listing mapzoom Default "9".

-     *    @type string $geodir_timing                           Business timing info.

-     *    @type string $geodir_contact                          Contact number.

-     *    @type string $geodir_email                            Business contact email.

-     *    @type string $geodir_website                          Business website.

-     *    @type string $geodir_twitter                          Twitter link.

-     *    @type string $geodir_facebook                         Facebook link.

-     *    @type string $geodir_video                            Video link.

-     *    @type string $geodir_special_offers                   Speacial offers.

-     *    @type string $post_images                             Post image urls.

-     *    @type string $post_imagesimage_limit                  Post images limit.

-     *    @type string $post_imagestotImg                       Todo Desc needed.

-     *    @type string $geodir_accept_term_condition            Has accepted terms and conditions?.

-     *    @type string $geodir_spamblocker                      Todo Desc needed.

-     *    @type string $geodir_filled_by_spam_bot               Todo Desc needed.

-     *

-     * }

-     * @param bool $dummy Optional. Is this a dummy listing? Default false.

-     * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false.

-     * @return int|string|WP_Error Created post id or WP_Error on failure.

-     */

-    function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false)

-    {

-        global $wpdb, $current_user, $gd_session;

-

-        $last_post_id = '';

-

-        if ($gd_session->get('listing') && !$dummy) {

-            $request_info = array();

-            $request_session = $gd_session->get('listing');

-            $request_info = array_merge($_REQUEST, $request_session);

-        } else if (!$gd_session->get('listing') && !$dummy) {

-            global $post;

-            $request_info['pid'] = !empty($post->ID) ? $post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL);

-            $request_info['post_title'] = $request_info['post_title'];

-            $request_info['listing_type'] = $post->post_type;

-            $request_info['post_desc'] = $request_info['content'];

-        } else if (!$dummy) {

-            return false;

-        }

-

-        /**

-         * Filter the request_info array.

-         *

-         * You can use this filter to modify request_info array.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param array $request_info See {@see geodir_save_listing()} for accepted args.

-         */

-        $request_info = apply_filters('geodir_action_get_request_info', $request_info);

-

-        // Check if we need to save post location as new location

-        $location_result = geodir_get_default_location();

-

-        if ($location_result->location_id > 0) {

-            if (isset($request_info['post_city']) && isset($request_info['post_region'])) {

-                $request_info['post_location'] = array(

-                    'city' => $request_info['post_city'],

-                    'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '',

-                    'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '',

-                    'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '',

-                    'geo_lng' => isset($request_info['post_longitude']) ? $request_info['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 = $location_result->location_id;

-            }

-        } else {

-            $post_location_id = $location_result->location_id;

-        }

-

-        if ($dummy) {

-            $post_status = 'publish';

-        } else {

-            $post_status = geodir_new_post_default_status();

-        }

-

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

-            $post_status = get_post_status($request_info['pid']);

-        }

-

-        /* fix change of slug on every title edit */

-        if (!isset($request_info['post_name'])) {

-            $request_info['post_name'] = $request_info['post_title'];

-

-            if (!empty($request_info['pid'])) {

-                $post_info = get_post($request_info['pid']);

-

-                if (!empty($post_info) && isset($post_info->post_name)) {

-                    $request_info['post_name'] = $post_info->post_name;

-                }

-            }

-        }

-

-        $post = array(

-            'post_content' => $request_info['post_desc'],

-            'post_status' => $post_status,

-            'post_title' => $request_info['post_title'],

-            'post_name' => $request_info['post_name'],

-            'post_type' => $request_info['listing_type']

-        );

-

-        /**

-         * Called before a listing is saved to the database.

-         *

-         * @since 1.0.0

-         * @param object $post The post object.

-         */

-        do_action_ref_array('geodir_before_save_listing', $post);

+	 * @param array $request_info {

+	 *    Array of request info arguments.

+	 *

+	 *    @type string $action                                  Ajax action name.

+	 *    @type string $geodir_ajax                             Ajax type.

+	 *    @type string $ajax_action                             Ajax action.

+	 *    @type string $listing_type                            Listing type.

+	 *    @type string $pid                                     Default Post ID.

+	 *    @type string $preview                                 Todo Desc needed.

+	 *    @type string $add_listing_page_id                     Add listing page ID.

+	 *    @type string $post_title                              Listing title.

+	 *    @type string $post_desc                               Listing Description.

+	 *    @type string $post_tags                               Listing tags.

+	 *    @type array  $cat_limit                               Category limit.

+	 *    @type array  $post_category                           Category IDs.

+	 *    @type array  $post_category_str                       Category string.

+	 *    @type string $post_default_category                   Default category ID.

+	 *    @type string $post_address                            Listing address.

+	 *    @type string $geodir_location_add_listing_country_val Add listing country value.

+	 *    @type string $post_country                            Listing country.

+	 *    @type string $geodir_location_add_listing_region_val  Add listing region value.

+	 *    @type string $post_region                             Listing region.

+	 *    @type string $geodir_location_add_listing_city_val    Add listing city value.

+	 *    @type string $post_city                               Listing city.

+	 *    @type string $post_zip                                Listing zip.

+	 *    @type string $post_latitude                           Listing latitude.

+	 *    @type string $post_longitude                          Listing longitude.

+	 *    @type string $post_mapview                            Listing mapview. Default "ROADMAP".

+	 *    @type string $post_mapzoom                            Listing mapzoom Default "9".

+	 *    @type string $geodir_timing                           Business timing info.

+	 *    @type string $geodir_contact                          Contact number.

+	 *    @type string $geodir_email                            Business contact email.

+	 *    @type string $geodir_website                          Business website.

+	 *    @type string $geodir_twitter                          Twitter link.

+	 *    @type string $geodir_facebook                         Facebook link.

+	 *    @type string $geodir_video                            Video link.

+	 *    @type string $geodir_special_offers                   Speacial offers.

+	 *    @type string $post_images                             Post image urls.

+	 *    @type string $post_imagesimage_limit                  Post images limit.

+	 *    @type string $post_imagestotImg                       Todo Desc needed.

+	 *    @type string $geodir_accept_term_condition            Has accepted terms and conditions?.

+	 *    @type string $geodir_spamblocker                      Todo Desc needed.

+	 *    @type string $geodir_filled_by_spam_bot               Todo Desc needed.

+	 *

+	 * }

+	 * @param bool $dummy Optional. Is this a dummy listing? Default false.

+	 * @param bool $wp_error Optional. Allow return of WP_Error on failure. Default false.

+	 * @return int|string|WP_Error Created post id or WP_Error on failure.

+	 */

+	function geodir_save_listing($request_info = array(), $dummy = false, $wp_error = false)

+	{

+		global $wpdb, $current_user, $gd_session;

+

+		$last_post_id = '';

+

+		if ($gd_session->get('listing') && !$dummy) {

+			$request_info = array();

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

+			$request_info = array_merge($_REQUEST, $request_session);

+		} else if (!$gd_session->get('listing') && !$dummy) {

+			global $post;

+			$request_info['pid'] = !empty($post->ID) ? $post->ID : (!empty($request_info['post_id']) ? $request_info['post_id'] : NULL);

+			$request_info['post_title'] = $request_info['post_title'];

+			$request_info['listing_type'] = $post->post_type;

+			$request_info['post_desc'] = $request_info['content'];

+		} else if (!$dummy) {

+			return false;

+		}

+

+		/**

+		 * Filter the request_info array.

+		 *

+		 * You can use this filter to modify request_info array.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param array $request_info See {@see geodir_save_listing()} for accepted args.

+		 */

+		$request_info = apply_filters('geodir_action_get_request_info', $request_info);

+

+		// Check if we need to save post location as new location

+		$location_result = geodir_get_default_location();

+

+		if ($location_result->location_id > 0) {

+			if (isset($request_info['post_city']) && isset($request_info['post_region'])) {

+				$request_info['post_location'] = array(

+					'city' => $request_info['post_city'],

+					'region' => isset($request_info['post_region']) ? $request_info['post_region'] : '',

+					'country' => isset($request_info['post_country']) ? $request_info['post_country'] : '',

+					'geo_lat' => isset($request_info['post_latitude']) ? $request_info['post_latitude'] : '',

+					'geo_lng' => isset($request_info['post_longitude']) ? $request_info['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 = $location_result->location_id;

+			}

+		} else {

+			$post_location_id = $location_result->location_id;

+		}

 

-        $send_post_submit_mail = false;

+		if ($dummy) {

+			$post_status = 'publish';

+		} else {

+			$post_status = geodir_new_post_default_status();

+		}

 

-        // unhook this function so it doesn't loop infinitely

-        remove_action('save_post', 'geodir_post_information_save',10,2);

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

+			$post_status = get_post_status($request_info['pid']);

+		}

 

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

-            $post['ID'] = $request_info['pid'];

+		/* fix change of slug on every title edit */

+		if (!isset($request_info['post_name'])) {

+			$request_info['post_name'] = $request_info['post_title'];

 

-            $last_post_id = wp_update_post($post, $wp_error);

-        } else {

-            $last_post_id = wp_insert_post($post, $wp_error);

+			if (!empty($request_info['pid'])) {

+				$post_info = get_post($request_info['pid']);

 

-            if (!$dummy && $last_post_id) {

-                $send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email)

-                //geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);

-            }

-        }

+				if (!empty($post_info) && isset($post_info->post_name)) {

+					$request_info['post_name'] = $post_info->post_name;

+				}

+			}

+		}

+

+		$post = array(

+			'post_content' => $request_info['post_desc'],

+			'post_status' => $post_status,

+			'post_title' => $request_info['post_title'],

+			'post_name' => $request_info['post_name'],

+			'post_type' => $request_info['listing_type']

+		);

+

+		/**

+		 * Called before a listing is saved to the database.

+		 *

+		 * @since 1.0.0

+		 * @param object $post The post object.

+		 */

+		do_action_ref_array('geodir_before_save_listing', $post);

+

+		$send_post_submit_mail = false;

+

+		// unhook this function so it doesn't loop infinitely

+		remove_action('save_post', 'geodir_post_information_save',10,2);

+

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

+			$post['ID'] = $request_info['pid'];

+

+			$last_post_id = wp_update_post($post, $wp_error);

+		} else {

+			$last_post_id = wp_insert_post($post, $wp_error);

+

+			if (!$dummy && $last_post_id) {

+				$send_post_submit_mail = true; // we move post_submit email from here so the rest of the variables are added to the db first(was breaking permalink in email)

+				//geodir_sendEmail('','',$current_user->user_email,$current_user->display_name,'','',$request_info,'post_submit',$last_post_id,$current_user->ID);

+			}

+		}

 

-        if ($wp_error && is_wp_error($last_post_id)) {

-            return $last_post_id; // Return WP_Error on save failure.

-        }

+		if ($wp_error && is_wp_error($last_post_id)) {

+			return $last_post_id; // Return WP_Error on save failure.

+		}

 

-        if (!$last_post_id) {

-            return false; // Save failure.

-        }

+		if (!$last_post_id) {

+			return false; // Save failure.

+		}

 

-        // re-hook this function

-        add_action('save_post', 'geodir_post_information_save',10,2);

+		// re-hook this function

+		add_action('save_post', 'geodir_post_information_save',10,2);

 

-        $post_tags = '';

-        if (!isset($request_info['post_tags'])) {

+		$post_tags = '';

+		if (!isset($request_info['post_tags'])) {

 

-            $post_type = $request_info['listing_type'];

-            $post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));

+			$post_type = $request_info['listing_type'];

+			$post_tags = implode(",", wp_get_object_terms($last_post_id, $post_type . '_tags', array('fields' => 'names')));

 

-        }

+		}

 

-        $gd_post_info = array(

-            "post_title" => $request_info['post_title'],

-            "post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags,

-            "post_status" => $post_status,

-            "post_location_id" => $post_location_id,

-            "claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '',

-            "businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '',

-            "submit_time" => time(),

-            "submit_ip" => $_SERVER['REMOTE_ADDR'],

-        );

+		$gd_post_info = array(

+			"post_title" => $request_info['post_title'],

+			"post_tags" => isset($request_info['post_tags']) ? $request_info['post_tags'] : $post_tags,

+			"post_status" => $post_status,

+			"post_location_id" => $post_location_id,

+			"claimed" => isset($request_info['claimed']) ? $request_info['claimed'] : '',

+			"businesses" => isset($request_info['a_businesses']) ? $request_info['a_businesses'] : '',

+			"submit_time" => time(),

+			"submit_ip" => $_SERVER['REMOTE_ADDR'],

+		);

 

-        $payment_info = array();

-        $package_info = array();

+		$payment_info = array();

+		$package_info = array();

 

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

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

 

-        $post_package_id = geodir_get_post_meta($last_post_id, 'package_id');

+		$post_package_id = geodir_get_post_meta($last_post_id, 'package_id');

 

-        if (!empty($package_info) && !$post_package_id) {

-            if (isset($package_info['days']) && $package_info['days'] != 0) {

-                $payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));

-            } else {

-                $payment_info['expire_date'] = 'Never';

-            }

+		if (!empty($package_info) && !$post_package_id) {

+			if (isset($package_info['days']) && $package_info['days'] != 0) {

+				$payment_info['expire_date'] = date('Y-m-d', strtotime("+" . $package_info['days'] . " days"));

+			} else {

+				$payment_info['expire_date'] = 'Never';

+			}

 

-            $payment_info['package_id'] = $package_info['pid'];

-            $payment_info['alive_days'] = $package_info['days'];

-            $payment_info['is_featured'] = $package_info['is_featured'];

+			$payment_info['package_id'] = $package_info['pid'];

+			$payment_info['alive_days'] = $package_info['days'];

+			$payment_info['is_featured'] = $package_info['is_featured'];

 

-            $gd_post_info = array_merge($gd_post_info, $payment_info);

-        }

+			$gd_post_info = array_merge($gd_post_info, $payment_info);

+		}

 

-        $custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);

+		$custom_metaboxes = geodir_post_custom_fields('', 'all', $request_info['listing_type']);

 

-        foreach ($custom_metaboxes as $key => $val):

+		foreach ($custom_metaboxes as $key => $val):

 

-            $name = $val['name'];

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

-            $extrafields = $val['extra_fields'];

+			$name = $val['name'];

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

+			$extrafields = $val['extra_fields'];

 

-            if (trim($type) == 'address') {

-                $prefix = $name . '_';

-                $address = $prefix . 'address';

+			if (trim($type) == 'address') {

+				$prefix = $name . '_';

+				$address = $prefix . 'address';

 

-                if (isset($request_info[$address]) && $request_info[$address] != '') {

-                    $gd_post_info[$address] = wp_slash($request_info[$address]);

-                }

+				if (isset($request_info[$address]) && $request_info[$address] != '') {

+					$gd_post_info[$address] = wp_slash($request_info[$address]);

+				}

 

-                if ($extrafields != '') {

-                    $extrafields = unserialize($extrafields);

+				if ($extrafields != '') {

+					$extrafields = unserialize($extrafields);

 

 

-                    if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {

+					if (!isset($request_info[$prefix . 'city']) || $request_info[$prefix . 'city'] == '') {

 

-                        $location_result = geodir_get_default_location();

+						$location_result = geodir_get_default_location();

 

-                        $gd_post_info[$prefix . 'city'] = $location_result->city;

-                        $gd_post_info[$prefix . 'region'] = $location_result->region;

-                        $gd_post_info[$prefix . 'country'] = $location_result->country;

+						$gd_post_info[$prefix . 'city'] = $location_result->city;

+						$gd_post_info[$prefix . 'region'] = $location_result->region;

+						$gd_post_info[$prefix . 'country'] = $location_result->country;

 

-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

+						$gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

 

-                    } else {

+					} else {

 

-                        $gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];

-                        $gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];

-                        $gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];

+						$gd_post_info[$prefix . 'city'] = $request_info[$prefix . 'city'];

+						$gd_post_info[$prefix . 'region'] = $request_info[$prefix . 'region'];

+						$gd_post_info[$prefix . 'country'] = $request_info[$prefix . 'country'];

 

-                        //----------set post locations when import dummy data-------

-                        $location_result = geodir_get_default_location();

+						//----------set post locations when import dummy data-------

+						$location_result = geodir_get_default_location();

 

-                        $gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

-                        //-----------------------------------------------------------------

+						$gd_post_info['post_locations'] = '[' . $location_result->city_slug . '],[' . $location_result->region_slug . '],[' . $location_result->country_slug . ']'; // set all overall post location

+						//-----------------------------------------------------------------

 

-                    }

+					}

 

 

-                    if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {

-                        $gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];

-                    }

+					if (isset($extrafields['show_zip']) && $extrafields['show_zip'] && isset($request_info[$prefix . 'zip'])) {

+						$gd_post_info[$prefix . 'zip'] = $request_info[$prefix . 'zip'];

+					}

 

 

-                    if (isset($extrafields['show_map']) && $extrafields['show_map']) {

+					if (isset($extrafields['show_map']) && $extrafields['show_map']) {

 

-                        if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {

-                            $gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];

-                        }

+						if (isset($request_info[$prefix . 'latitude']) && $request_info[$prefix . 'latitude'] != '') {

+							$gd_post_info[$prefix . 'latitude'] = $request_info[$prefix . 'latitude'];

+						}

 

-                        if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {

-                            $gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];

-                        }

+						if (isset($request_info[$prefix . 'longitude']) && $request_info[$prefix . 'longitude'] != '') {

+							$gd_post_info[$prefix . 'longitude'] = $request_info[$prefix . 'longitude'];

+						}

 

-                        if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {

-                            $gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];

-                        }

+						if (isset($request_info[$prefix . 'mapview']) && $request_info[$prefix . 'mapview'] != '') {

+							$gd_post_info[$prefix . 'mapview'] = $request_info[$prefix . 'mapview'];

+						}

 

-                        if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {

-                            $gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];

-                        }

+						if (isset($request_info[$prefix . 'mapzoom']) && $request_info[$prefix . 'mapzoom'] != '') {

+							$gd_post_info[$prefix . 'mapzoom'] = $request_info[$prefix . 'mapzoom'];

+						}

 

-                    }

+					}

 

-                    // show lat lng

-                    if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {

-                        $gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];

-                    }

-                }

+					// show lat lng

+					if (isset($extrafields['show_latlng']) && $extrafields['show_latlng'] && isset($request_info[$prefix . 'latlng'])) {

+						$gd_post_info[$prefix . 'latlng'] = $request_info[$prefix . 'latlng'];

+					}

+				}

 

-            } elseif (trim($type) == 'file') {

-                if (isset($request_info[$name])) {

-                    $request_files = array();

-                    if ($request_info[$name] != '')

-                        $request_files = explode(",", $request_info[$name]);

+			} elseif (trim($type) == 'file') {

+				if (isset($request_info[$name])) {

+					$request_files = array();

+					if ($request_info[$name] != '')

+						$request_files = explode(",", $request_info[$name]);

 

-                    $extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;

-                    geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);

+					$extrafields = $extrafields != '' ? maybe_unserialize($extrafields) : NULL;

+					geodir_save_post_file_fields($last_post_id, $name, $request_files, $extrafields);

 

-                }

-            } elseif (trim($type) == 'datepicker') {

-                $datetime = '';

-                if (isset($request_info[$name]) && $request_info[$name] != '') {

-                    $date_format = geodir_default_date_format();

-                    if (isset($val['extra_fields']) && $val['extra_fields'] != '') {

-                        $extra_fields = unserialize($val['extra_fields']);

-                        $date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format;

-                    }

+				}

+			} elseif (trim($type) == 'datepicker') {

+				$datetime = '';

+				if (isset($request_info[$name]) && $request_info[$name] != '') {

+					$date_format = geodir_default_date_format();

+					if (isset($val['extra_fields']) && $val['extra_fields'] != '') {

+						$extra_fields = unserialize($val['extra_fields']);

+						$date_format = isset($extra_fields['date_format']) && $extra_fields['date_format'] != '' ? $extra_fields['date_format'] : $date_format;

+					}

 

-                    // check if we need to change the format or not

-                    $date_format_len = strlen(str_replace(' ', '', $date_format));

-                    if($date_format_len>5){// if greater then 5 then it's the old style format.

+					// check if we need to change the format or not

+					$date_format_len = strlen(str_replace(' ', '', $date_format));

+					if($date_format_len>5){// if greater then 5 then it's the old style format.

 

-                        $search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

-                        $replace = array('d','j','l','m','n','F','Y');//PHP date format

+						$search = array('dd','d','DD','mm','m','MM','yy'); //jQuery UI datepicker format

+						$replace = array('d','j','l','m','n','F','Y');//PHP date format

 

-                        $date_format = str_replace($search, $replace, $date_format);

+						$date_format = str_replace($search, $replace, $date_format);

 

-                        $post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];

+						$post_htmlvar_value = $date_format == 'd/m/Y' ? str_replace('/', '-', $request_info[$name]) : $request_info[$name];

 

-                    }else{

-                        $post_htmlvar_value = $request_info[$name];

-                    }

+					}else{

+						$post_htmlvar_value = $request_info[$name];

+					}

 

-                    $post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d

-                    $datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated

+					$post_htmlvar_value = geodir_date($post_htmlvar_value, 'Y-m-d', $date_format); // save as sql format Y-m-d

+					$datetime = geodir_maybe_untranslate_date($post_htmlvar_value); // maybe untranslate date string if it was translated

 

-                    //$datetime = date_i18n("Y-m-d", strtotime($post_htmlvar_value)); // save as sql format Y-m-d

+					//$datetime = date_i18n("Y-m-d", strtotime($post_htmlvar_value)); // save as sql format Y-m-d

 

-                }

-                $gd_post_info[$name] = $datetime;

-            } else if ($type == 'multiselect') {

-                if (isset($request_info[$name])) {

-                    $gd_post_info[$name] = $request_info[$name];

-                } else {

-                    if (isset($request_info['gd_field_' . $name])) {

-                        $gd_post_info[$name] = ''; /* fix de-select for multiselect */

-                    }

-                }

-            } else if (isset($request_info[$name])) {

-                $gd_post_info[$name] = $request_info[$name];

-            }

+				}

+				$gd_post_info[$name] = $datetime;

+			} else if ($type == 'multiselect') {

+				if (isset($request_info[$name])) {

+					$gd_post_info[$name] = $request_info[$name];

+				} else {

+					if (isset($request_info['gd_field_' . $name])) {

+						$gd_post_info[$name] = ''; /* fix de-select for multiselect */

+					}

+				}

+			} else if (isset($request_info[$name])) {

+				$gd_post_info[$name] = $request_info[$name];

+			}

 

-        endforeach;

+		endforeach;

 

-        if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {

-            $gd_post_info['post_dummy'] = $request_info['post_dummy'];

-        }

+		if (isset($request_info['post_dummy']) && $request_info['post_dummy'] != '') {

+			$gd_post_info['post_dummy'] = $request_info['post_dummy'];

+		}

 

-        // Save post detail info in detail table

-        if (!empty($gd_post_info)) {

-            geodir_save_post_info($last_post_id, $gd_post_info);

-        }

+		// Save post detail info in detail table

+		if (!empty($gd_post_info)) {

+			geodir_save_post_info($last_post_id, $gd_post_info);

+		}

 

 

-        // Set categories to the listing

-        if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {

-            $post_category = array();

+		// Set categories to the listing

+		if (isset($request_info['post_category']) && !empty($request_info['post_category'])) {

+			$post_category = array();

 

-            foreach ($request_info['post_category'] as $taxonomy => $cat) {

+			foreach ($request_info['post_category'] as $taxonomy => $cat) {

 

-                if ($dummy)

-                    $post_category = $cat;

-                else {

+				if ($dummy)

+					$post_category = $cat;

+				else {

 

-                    if (!is_array($cat) && strstr($cat, ','))

-                        $cat = explode(',', $cat);

+					if (!is_array($cat) && strstr($cat, ','))

+						$cat = explode(',', $cat);

 

-                    if (!empty($cat) && is_array($cat))

-                        $post_category = array_map('intval', $cat);

-                }

+					if (!empty($cat) && is_array($cat))

+						$post_category = array_map('intval', $cat);

+				}

 

-                wp_set_object_terms($last_post_id, $post_category, $taxonomy);

-            }

+				wp_set_object_terms($last_post_id, $post_category, $taxonomy);

+			}

 

-            $post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : '';

+			$post_default_category = isset($request_info['post_default_category']) ? $request_info['post_default_category'] : '';

 

-            $post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : '';

-            geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str);

+			$post_category_str = isset($request_info['post_category_str']) ? $request_info['post_category_str'] : '';

+			geodir_set_postcat_structure($last_post_id, $taxonomy, $post_default_category, $post_category_str);

 

-        }

+		}

 

-        $post_tags = '';

-        // Set tags to the listing

-        if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {

-            $post_tags = explode(",", $request_info['post_tags']);

-        } elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {

-            if ($dummy)

-                $post_tags = $request_info['post_tags'];

-        } else {

-            if ($dummy)

-                $post_tags = array($request_info['post_title']);

-        }

+		$post_tags = '';

+		// Set tags to the listing

+		if (isset($request_info['post_tags']) && !is_array($request_info['post_tags']) && !empty($request_info['post_tags'])) {

+			$post_tags = explode(",", $request_info['post_tags']);

+		} elseif (isset($request_info['post_tags']) && is_array($request_info['post_tags'])) {

+			if ($dummy)

+				$post_tags = $request_info['post_tags'];

+		} else {

+			if ($dummy)

+				$post_tags = array($request_info['post_title']);

+		}

 

-        if (is_array($post_tags)) {

-            $taxonomy = $request_info['listing_type'] . '_tags';

-            wp_set_object_terms($last_post_id, $post_tags, $taxonomy);

-        }

+		if (is_array($post_tags)) {

+			$taxonomy = $request_info['listing_type'] . '_tags';

+			wp_set_object_terms($last_post_id, $post_tags, $taxonomy);

+		}

 

 

-        // Insert attechment

+		// Insert attechment

 

-        if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {

-            if (!$dummy) {

-                $tmpimgArr = trim($request_info['post_images'], ",");

-                $tmpimgArr = explode(",", $tmpimgArr);

-                geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);

-            } else{

-                geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);

-            }

+		if (isset($request_info['post_images']) && !is_wp_error($last_post_id)) {

+			if (!$dummy) {

+				$tmpimgArr = trim($request_info['post_images'], ",");

+				$tmpimgArr = explode(",", $tmpimgArr);

+				geodir_save_post_images($last_post_id, $tmpimgArr, $dummy);

+			} else{

+				geodir_save_post_images($last_post_id, $request_info['post_images'], $dummy);

+			}

 

 

-        } elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {

+		} elseif (!isset($request_info['post_images']) || $request_info['post_images'] == '') {

 

-            /* Delete Attachments

+			/* Delete Attachments

 			$postcurr_images = geodir_get_images($last_post_id);

 

 			$wpdb->query(

@@ -509,34 +509,34 @@ 
 			geodir_save_post_info($last_post_id, $gd_post_featured_img);

 			*/

 

-        }

+		}

 

-        geodir_remove_temp_images();

-        geodir_set_wp_featured_image($last_post_id);

+		geodir_remove_temp_images();

+		geodir_set_wp_featured_image($last_post_id);

 

-        /**

-         * Called after a listing is saved to the database and before any email have been sent.

-         *

-         * @since 1.0.0

-         * @param int $last_post_id The saved post ID.

-         * @param array $request_info The post details in an array.

-         * @see 'geodir_after_save_listinginfo'

-         */

-        do_action('geodir_after_save_listing', $last_post_id, $request_info);

+		/**

+		 * Called after a listing is saved to the database and before any email have been sent.

+		 *

+		 * @since 1.0.0

+		 * @param int $last_post_id The saved post ID.

+		 * @param array $request_info The post details in an array.

+		 * @see 'geodir_after_save_listinginfo'

+		 */

+		do_action('geodir_after_save_listing', $last_post_id, $request_info);

 

-        //die;

+		//die;

 

-        if ($send_post_submit_mail) { // if new post send out email

-            $to_name = geodir_get_client_name($current_user->ID);

-            geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);

-        }

-        /*

+		if ($send_post_submit_mail) { // if new post send out email

+			$to_name = geodir_get_client_name($current_user->ID);

+			geodir_sendEmail('', '', $current_user->user_email, $to_name, '', '', $request_info, 'post_submit', $last_post_id, $current_user->ID);

+		}

+		/*

          * Unset the session so we don't loop.

          */

-        $gd_session->un_set('listing');

-        return $last_post_id;

+		$gd_session->un_set('listing');

+		return $last_post_id;

 

-    }

+	}

 

 }

 

@@ -555,593 +555,593 @@ 
 function geodir_get_post_info($post_id = '')

 {

 

-    global $wpdb, $plugin_prefix, $post, $post_info;

+	global $wpdb, $plugin_prefix, $post, $post_info;

 

-    if ($post_id == '' && !empty($post))

-        $post_id = $post->ID;

+	if ($post_id == '' && !empty($post))

+		$post_id = $post->ID;

 

-    $post_type = get_post_type($post_id);

+	$post_type = get_post_type($post_id);

 

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

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

-        return false;

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

+		return false;

 

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

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

 

-    /**

-     * Apply Filter to change Post info

-     *

-     * You can use this filter to change Post info.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    $query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd

+	/**

+	 * Apply Filter to change Post info

+	 *

+	 * You can use this filter to change Post info.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	$query = apply_filters('geodir_post_info_query', "SELECT p.*,pd.* FROM " . $wpdb->posts . " p," . $table . " pd

 			  WHERE p.ID = pd.post_id

 			  AND post_id = " . $post_id);

 

-    $post_detail = $wpdb->get_row($query);

+	$post_detail = $wpdb->get_row($query);

 

-    return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false;

+	return (!empty($post_detail)) ? $post_info = $post_detail : $post_info = false;

 

 }

 

 

 if (!function_exists('geodir_save_post_info')) {

-    /**

-     * Saves post detail info in detail table.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $post_id The post ID.

-     * @param array $postinfo_array {

-     *    Post info that needs to be saved in detail table.

-     *

-     *    @type string $post_title              Listing title.

-     *    @type string $post_tags               Listing tags.

-     *    @type string $post_status             Listing post status.

-     *    @type string $post_location_id        Listing location ID.

-     *    @type string $claimed                 Todo Desc needed.

-     *    @type string $businesses              Todo Desc needed.

-     *    @type int    $submit_time             Submitted time in unix timestamp.

-     *    @type string $submit_ip               Submitted IP.

-     *    @type string $expire_date             Listing expiration date.

-     *    @type int    $package_id              Listing package ID.

-     *    @type int    $alive_days              Todo Desc needed.

-     *    @type int    $is_featured             Is this a featured listing?.

-     *    @type string $post_address            Listing address.

-     *    @type string $post_city               Listing city.

-     *    @type string $post_region             Listing region.

-     *    @type string $post_country            Listing country.

-     *    @type string $post_locations          Listing locations.

-     *    @type string $post_zip                Listing zip.

-     *    @type string $post_latitude           Listing latitude.

-     *    @type string $post_longitude          Listing longitude.

-     *    @type string $post_mapview            Listing mapview. Default "ROADMAP".

-     *    @type string $post_mapzoom            Listing mapzoom Default "9".

-     *    @type string $geodir_timing           Business timing info.

-     *    @type string $geodir_contact          Contact number.

-     *    @type string $geodir_email            Business contact email.

-     *    @type string $geodir_website          Business website.

-     *    @type string $geodir_twitter          Twitter link.

-     *    @type string $geodir_facebook         Facebook link.

-     *    @type string $geodir_video            Video link.

-     *    @type string $geodir_special_offers   Speacial offers.

-     *

-     * }

-     * @return bool

-     */

-    function geodir_save_post_info($post_id, $postinfo_array = array())

-    {

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        /**

-         * Filter to change Post info

-         *

-         * You can use this filter to change Post info.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.

-         * @param int $post_id The post ID.

-         */

-        $postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);

+	/**

+	 * Saves post detail info in detail table.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $post_id The post ID.

+	 * @param array $postinfo_array {

+	 *    Post info that needs to be saved in detail table.

+	 *

+	 *    @type string $post_title              Listing title.

+	 *    @type string $post_tags               Listing tags.

+	 *    @type string $post_status             Listing post status.

+	 *    @type string $post_location_id        Listing location ID.

+	 *    @type string $claimed                 Todo Desc needed.

+	 *    @type string $businesses              Todo Desc needed.

+	 *    @type int    $submit_time             Submitted time in unix timestamp.

+	 *    @type string $submit_ip               Submitted IP.

+	 *    @type string $expire_date             Listing expiration date.

+	 *    @type int    $package_id              Listing package ID.

+	 *    @type int    $alive_days              Todo Desc needed.

+	 *    @type int    $is_featured             Is this a featured listing?.

+	 *    @type string $post_address            Listing address.

+	 *    @type string $post_city               Listing city.

+	 *    @type string $post_region             Listing region.

+	 *    @type string $post_country            Listing country.

+	 *    @type string $post_locations          Listing locations.

+	 *    @type string $post_zip                Listing zip.

+	 *    @type string $post_latitude           Listing latitude.

+	 *    @type string $post_longitude          Listing longitude.

+	 *    @type string $post_mapview            Listing mapview. Default "ROADMAP".

+	 *    @type string $post_mapzoom            Listing mapzoom Default "9".

+	 *    @type string $geodir_timing           Business timing info.

+	 *    @type string $geodir_contact          Contact number.

+	 *    @type string $geodir_email            Business contact email.

+	 *    @type string $geodir_website          Business website.

+	 *    @type string $geodir_twitter          Twitter link.

+	 *    @type string $geodir_facebook         Facebook link.

+	 *    @type string $geodir_video            Video link.

+	 *    @type string $geodir_special_offers   Speacial offers.

+	 *

+	 * }

+	 * @return bool

+	 */

+	function geodir_save_post_info($post_id, $postinfo_array = array())

+	{

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		/**

+		 * Filter to change Post info

+		 *

+		 * You can use this filter to change Post info.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.

+		 * @param int $post_id The post ID.

+		 */

+		$postmeta = apply_filters('geodir_listinginfo_request', $postinfo_array, $post_id);

+

+		if (!empty($postmeta) && $post_id) {

+			$post_meta_set_query = '';

+

+			foreach ($postmeta as $mkey => $mval) {

+				if (geodir_column_exist($table, $mkey)) {

+					if (is_array($mval)) {

+						$mval = implode(",", $mval);

+					}

+

+					$post_meta_set_query .= $mkey . " = '" . $mval . "', ";

+				}

+			}

 

-        if (!empty($postmeta) && $post_id) {

-            $post_meta_set_query = '';

+			$post_meta_set_query = trim($post_meta_set_query, ", ");

+            

+			if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {

+				return false;

+			}

 

-            foreach ($postmeta as $mkey => $mval) {

-                if (geodir_column_exist($table, $mkey)) {

-                    if (is_array($mval)) {

-                        $mval = implode(",", $mval);

-                    }

+			$post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %

 

-                    $post_meta_set_query .= $mkey . " = '" . $mval . "', ";

-                }

-            }

+			/**

+			 * Called before saving the listing info.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.

+			 * @param int $post_id The post ID.

+			 */

+			do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);

 

-            $post_meta_set_query = trim($post_meta_set_query, ", ");

-            

-            if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {

-                return false;

-            }

+			if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

 

-            $post_meta_set_query = str_replace('%', '%%', $post_meta_set_query);// escape %

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id =%d",

+						array($post_id)

+					)

+				);

 

-            /**

-             * Called before saving the listing info.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param array $postinfo_array See {@see geodir_save_post_info()} for accepted args.

-             * @param int $post_id The post ID.

-             */

-            do_action('geodir_before_save_listinginfo', $postinfo_array, $post_id);

 

-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+			} else {

 

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id =%d",

-                        array($post_id)

-                    )

-                );

+				$wpdb->query(

+					$wpdb->prepare(

+						"INSERT INTO " . $table . " SET post_id = %d," . $post_meta_set_query,

+						array($post_id)

+					)

+				);

 

+			}

 

-            } else {

+			/**

+			 * Called after saving the listing info.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param array $postinfo_array Post info that needs to be saved in detail table.

+			 * @param int $post_id The post ID.

+			 * @see 'geodir_after_save_listing'

+			 */

+			do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);

+

+			return true;

+		} else

+			return false;

 

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "INSERT INTO " . $table . " SET post_id = %d," . $post_meta_set_query,

-                        array($post_id)

-                    )

-                );

+	}

+}

 

-            }

 

-            /**

-             * Called after saving the listing info.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param array $postinfo_array Post info that needs to be saved in detail table.

-             * @param int $post_id The post ID.

-             * @see 'geodir_after_save_listing'

-             */

-            do_action('geodir_after_save_listinginfo', $postinfo_array, $post_id);

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

+	/**

+	 * Save or update post custom fields.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $post_id The post ID.

+	 * @param string $postmeta Detail table column name.

+	 * @param string $meta_value Detail table column value.

+	 * @return void|bool

+	 */

+	function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {

+

+			if (is_array($meta_value)) {

+				$meta_value = implode(",", $meta_value);

+			}

 

-            return true;

-        } else

-            return false;

+			if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

 

-    }

-}

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",

+						array($post_id)

+					)

+				);

 

+			} else {

 

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

-    /**

-     * Save or update post custom fields.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $post_id The post ID.

-     * @param string $postmeta Detail table column name.

-     * @param string $meta_value Detail table column value.

-     * @return void|bool

-     */

-    function geodir_save_post_meta($post_id, $postmeta = '', $meta_value = '')

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        if ($postmeta != '' && geodir_column_exist($table, $postmeta) && $post_id) {

-

-            if (is_array($meta_value)) {

-                $meta_value = implode(",", $meta_value);

-            }

-

-            if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

-

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $postmeta . " = '" . $meta_value . "' where post_id =%d",

-                        array($post_id)

-                    )

-                );

-

-            } else {

-

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",

-                        array($post_id)

-                    )

-                );

-            }

-

-

-        } else

-            return false;

-    }

+				$wpdb->query(

+					$wpdb->prepare(

+						"INSERT INTO " . $table . " SET post_id = %d, " . $postmeta . " = '" . $meta_value . "'",

+						array($post_id)

+					)

+				);

+			}

+

+

+		} else

+			return false;

+	}

 }

 

 if (!function_exists('geodir_delete_post_meta')) {

-    /**

-     * Delete post custom fields.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $post_id The post ID.

-     * @param string $postmeta Detail table column name.

-     * @todo check if this is depreciated

-     * @todo Fix unknown variable mval

-     * @return bool

-     */

-    function geodir_delete_post_meta($post_id, $postmeta)

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        if (is_array($postmeta) && !empty($postmeta) && $post_id) {

-            $post_meta_set_query = '';

-

-            foreach ($postmeta as $mkey) {

-                if ($mval != '')

-                    $post_meta_set_query .= $mkey . " = '', ";

-            }

-

-            $post_meta_set_query = trim($post_meta_set_query, ", ");

+	/**

+	 * Delete post custom fields.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $post_id The post ID.

+	 * @param string $postmeta Detail table column name.

+	 * @todo check if this is depreciated

+	 * @todo Fix unknown variable mval

+	 * @return bool

+	 */

+	function geodir_delete_post_meta($post_id, $postmeta)

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		if (is_array($postmeta) && !empty($postmeta) && $post_id) {

+			$post_meta_set_query = '';

+

+			foreach ($postmeta as $mkey) {

+				if ($mval != '')

+					$post_meta_set_query .= $mkey . " = '', ";

+			}

+

+			$post_meta_set_query = trim($post_meta_set_query, ", ");

             

-            if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {

-                return false;

-            }

-

-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

-

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",

-                        array($post_id)

-                    )

-                );

-

-                return true;

-            }

-

-        } elseif ($postmeta != '' && $post_id) {

-            if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

-

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",

-                        array($post_id)

-                    )

-                );

-

-                return true;

-            }

-

-        } else

-            return false;

-    }

+			if (empty($post_meta_set_query) || trim($post_meta_set_query) == '') {

+				return false;

+			}

+

+			if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

+

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . $table . " SET " . $post_meta_set_query . " where post_id = %d",

+						array($post_id)

+					)

+				);

+

+				return true;

+			}

+

+		} elseif ($postmeta != '' && $post_id) {

+			if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $postmeta . "'") != '') {

+

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . $table . " SET " . $postmeta . "= '' where post_id = %d",

+						array($post_id)

+					)

+				);

+

+				return true;

+			}

+

+		} else

+			return false;

+	}

 }

 

 

 if (!function_exists('geodir_get_post_meta')) {

-    /**

-     * Get post custom meta.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $post_id The post ID.

-     * @param string $meta_key The meta key to retrieve.

-     * @param bool $single Optional. Whether to return a single value. Default false.

-     * @todo single variable not yet implemented.

-     * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true.

-     */

-    function geodir_get_post_meta($post_id, $meta_key, $single = false)

-    {

-        if (!$post_id) {

-            return false;

-        }

-        global $wpdb, $plugin_prefix;

-

-        $all_postypes = geodir_get_posttypes();

-

-        $post_type = get_post_type($post_id);

-

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

-            return false;

-

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

-

-        if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {

-            $meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));

+	/**

+	 * Get post custom meta.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $post_id The post ID.

+	 * @param string $meta_key The meta key to retrieve.

+	 * @param bool $single Optional. Whether to return a single value. Default false.

+	 * @todo single variable not yet implemented.

+	 * @return bool|mixed|null|string Will be an array if $single is false. Will be value of meta data field if $single is true.

+	 */

+	function geodir_get_post_meta($post_id, $meta_key, $single = false)

+	{

+		if (!$post_id) {

+			return false;

+		}

+		global $wpdb, $plugin_prefix;

+

+		$all_postypes = geodir_get_posttypes();

+

+		$post_type = get_post_type($post_id);

+

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

+			return false;

+

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

+

+		if ($wpdb->get_var("SHOW COLUMNS FROM " . $table . " WHERE field = '" . $meta_key . "'") != '') {

+			$meta_value = $wpdb->get_var($wpdb->prepare("SELECT " . $meta_key . " from " . $table . " where post_id = %d", array($post_id)));

             

-            if ($meta_value && $meta_value !== '') {

-                return maybe_serialize($meta_value);

-            } else

-                return $meta_value;

-        } else {

-            return false;

-        }

-    }

+			if ($meta_value && $meta_value !== '') {

+				return maybe_serialize($meta_value);

+			} else

+				return $meta_value;

+		} else {

+			return false;

+		}

+	}

 }

 

 

 if (!function_exists('geodir_save_post_images')) {

-    /**

-     * Save post attachments.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @global object $current_user Current user object.

-     * @param int $post_id The post ID.

-     * @param array $post_image Post image urls as an array.

-     * @param bool $dummy Optional. Is this a dummy listing? Default false.

-     */

-    function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false)

-    {

-

+	/**

+	 * Save post attachments.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @global object $current_user Current user object.

+	 * @param int $post_id The post ID.

+	 * @param array $post_image Post image urls as an array.

+	 * @param bool $dummy Optional. Is this a dummy listing? Default false.

+	 */

+	function geodir_save_post_images($post_id = 0, $post_image = array(), $dummy = false)

+	{

 

-        global $wpdb, $plugin_prefix, $current_user;

 

-        $post_type = get_post_type($post_id);

+		global $wpdb, $plugin_prefix, $current_user;

 

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

+		$post_type = get_post_type($post_id);

 

-        $post_images = geodir_get_images($post_id);

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

 

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $table . " SET featured_image = '' where post_id =%d",

-                array($post_id)

-            )

-        );

+		$post_images = geodir_get_images($post_id);

 

-        $invalid_files = $post_images;

-        $valid_file_ids = array();

-        $valid_files_condition = '';

-        $geodir_uploaddir = '';

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $table . " SET featured_image = '' where post_id =%d",

+				array($post_id)

+			)

+		);

 

-        $remove_files = array();

+		$invalid_files = $post_images;

+		$valid_file_ids = array();

+		$valid_files_condition = '';

+		$geodir_uploaddir = '';

 

-        if (!empty($post_image)) {

+		$remove_files = array();

 

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

+		if (!empty($post_image)) {

 

-            $geodir_uploadpath = $uploads['path'];

-            $geodir_uploadurl = $uploads['url'];

-            $sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : '';

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

 

-            $invalid_files = array();

-            $postcurr_images = array();

+			$geodir_uploadpath = $uploads['path'];

+			$geodir_uploadurl = $uploads['url'];

+			$sub_dir = isset($uploads['subdir']) ? $uploads['subdir'] : '';

 

-            for ($m = 0; $m < count($post_image); $m++) {

-                $menu_order = $m + 1;

+			$invalid_files = array();

+			$postcurr_images = array();

 

-                $file_path = '';

-                /* --------- start ------- */

+			for ($m = 0; $m < count($post_image); $m++) {

+				$menu_order = $m + 1;

 

-                $split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));

+				$file_path = '';

+				/* --------- start ------- */

 

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

+				$split_img_path = explode(str_replace(array('http://','https://'),'',$uploads['baseurl']), str_replace(array('http://','https://'),'',$post_image[$m]));

 

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

 

-                if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {

 

-                    /* --------- end ------- */

-                    $curr_img_url = $post_image[$m];

+				if (!$find_image = $wpdb->get_var($wpdb->prepare("SELECT ID FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE file=%s AND post_id = %d", array($split_img_file_path, $post_id)))) {

 

-                    $image_name_arr = explode('/', $curr_img_url);

+					/* --------- end ------- */

+					$curr_img_url = $post_image[$m];

 

-                    $count_image_name_arr = count($image_name_arr) - 2;

+					$image_name_arr = explode('/', $curr_img_url);

 

-                    $count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0;

+					$count_image_name_arr = count($image_name_arr) - 2;

 

-                    $curr_img_dir = $image_name_arr[$count_image_name_arr];

+					$count_image_name_arr = ($count_image_name_arr >= 0) ? $count_image_name_arr : 0;

 

-                    $filename = end($image_name_arr);

-                    if (strpos($filename, '?') !== false) {

-                        list($filename) = explode('?', $filename);

-                    }

+					$curr_img_dir = $image_name_arr[$count_image_name_arr];

 

-                    $curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url);

-                    $curr_img_dir = str_replace($filename, "", $curr_img_dir);

+					$filename = end($image_name_arr);

+					if (strpos($filename, '?') !== false) {

+						list($filename) = explode('?', $filename);

+					}

 

-                    $img_name_arr = explode('.', $filename);

+					$curr_img_dir = str_replace($uploads['baseurl'], "", $curr_img_url);

+					$curr_img_dir = str_replace($filename, "", $curr_img_dir);

 

-                    $file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename;

-                    if (!empty($img_name_arr) && count($img_name_arr) > 2) {

-                        $new_img_name_arr = $img_name_arr;

-                        if (isset($new_img_name_arr[count($img_name_arr) - 1])) {

-                            unset($new_img_name_arr[count($img_name_arr) - 1]);

-                            $file_title = implode('.', $new_img_name_arr);

-                        }

-                    }

-                    $file_title = sanitize_file_name($file_title);

-                    $file_name = sanitize_file_name($filename);

+					$img_name_arr = explode('.', $filename);

 

-                    $arr_file_type = wp_check_filetype($filename);

+					$file_title = isset($img_name_arr[0]) ? $img_name_arr[0] : $filename;

+					if (!empty($img_name_arr) && count($img_name_arr) > 2) {

+						$new_img_name_arr = $img_name_arr;

+						if (isset($new_img_name_arr[count($img_name_arr) - 1])) {

+							unset($new_img_name_arr[count($img_name_arr) - 1]);

+							$file_title = implode('.', $new_img_name_arr);

+						}

+					}

+					$file_title = sanitize_file_name($file_title);

+					$file_name = sanitize_file_name($filename);

 

-                    $uploaded_file_type = $arr_file_type['type'];

+					$arr_file_type = wp_check_filetype($filename);

 

-                    // Set an array containing a list of acceptable formats

-                    $allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');

+					$uploaded_file_type = $arr_file_type['type'];

 

-                    // If the uploaded file is the right format

-                    if (in_array($uploaded_file_type, $allowed_file_types)) {

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

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

-                        }

+					// Set an array containing a list of acceptable formats

+					$allowed_file_types = array('image/jpg', 'image/jpeg', 'image/gif', 'image/png');

 

-                        if (!is_dir($geodir_uploadpath)) {

-                            mkdir($geodir_uploadpath);

-                        }

+					// If the uploaded file is the right format

+					if (in_array($uploaded_file_type, $allowed_file_types)) {

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

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

+						}

 

-                        $external_img = false;

-                        if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {

-                        } else {

-                            $external_img = true;

-                        }

+						if (!is_dir($geodir_uploadpath)) {

+							mkdir($geodir_uploadpath);

+						}

 

-                        if ($dummy || $external_img) {

-                            $uploaded_file = array();

-                            $uploaded = (array)fetch_remote_file($curr_img_url);

+						$external_img = false;

+						if (strpos(str_replace(array('http://','https://'),'',$curr_img_url), str_replace(array('http://','https://'),'',$uploads['baseurl'])) !== false) {

+						} else {

+							$external_img = true;

+						}

 

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

-                                $new_name = basename($uploaded['file']);

-                                $uploaded_file = $uploaded;

-                            }else{

-                                print_r($uploaded);exit;

-                            }

-                            $external_img = false;

-                        } else {

-                            $new_name = $post_id . '_' . $file_name;

+						if ($dummy || $external_img) {

+							$uploaded_file = array();

+							$uploaded = (array)fetch_remote_file($curr_img_url);

 

-                            if ($curr_img_dir == $sub_dir) {

-                                $img_path = $geodir_uploadpath . '/' . $filename;

-                                $img_url = $geodir_uploadurl . '/' . $filename;

-                            } else {

-                                $img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

-                                $img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

-                            }

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

+								$new_name = basename($uploaded['file']);

+								$uploaded_file = $uploaded;

+							}else{

+								print_r($uploaded);exit;

+							}

+							$external_img = false;

+						} else {

+							$new_name = $post_id . '_' . $file_name;

 

-                            $uploaded_file = '';

+							if ($curr_img_dir == $sub_dir) {

+								$img_path = $geodir_uploadpath . '/' . $filename;

+								$img_url = $geodir_uploadurl . '/' . $filename;

+							} else {

+								$img_path = $uploads_dir . '/temp_' . $current_user->data->ID . '/' . $filename;

+								$img_url = $uploads['url'] . '/temp_' . $current_user->data->ID . '/' . $filename;

+							}

 

-                            if (file_exists($img_path)) {

-                                $uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

-                                $file_path = '';

-                            } else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {

-                                $uploaded_file = true;

-                                $file_path = $curr_img_dir . '/' . $filename;

-                            }

+							$uploaded_file = '';

 

-                            if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

-                                unlink($img_path);

-                        }

+							if (file_exists($img_path)) {

+								$uploaded_file = copy($img_path, $geodir_uploadpath . '/' . $new_name);

+								$file_path = '';

+							} else if (file_exists($uploads['basedir'] . $curr_img_dir . $filename)) {

+								$uploaded_file = true;

+								$file_path = $curr_img_dir . '/' . $filename;

+							}

 

-                        if (!empty($uploaded_file)) {

-                            if (!isset($file_path) || !$file_path) {

-                                $file_path = $sub_dir . '/' . $new_name;

-                            }

+							if ($curr_img_dir != $geodir_uploaddir && file_exists($img_path))

+								unlink($img_path);

+						}

 

-                            $postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);

+						if (!empty($uploaded_file)) {

+							if (!isset($file_path) || !$file_path) {

+								$file_path = $sub_dir . '/' . $new_name;

+							}

 

-                            if ($menu_order == 1) {

+							$postcurr_images[] = str_replace(array('http://','https://'),'',$uploads['baseurl'] . $file_path);

 

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

+							if ($menu_order == 1) {

 

-                            }

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

 

-                            // Set up options array to add this file as an attachment

-                            $attachment = array();

-                            $attachment['post_id'] = $post_id;

-                            $attachment['title'] = $file_title;

-                            $attachment['content'] = '';

-                            $attachment['file'] = $file_path;

-                            $attachment['mime_type'] = $uploaded_file_type;

-                            $attachment['menu_order'] = $menu_order;

-                            $attachment['is_featured'] = 0;

+							}

 

-                            $attachment_set = '';

+							// Set up options array to add this file as an attachment

+							$attachment = array();

+							$attachment['post_id'] = $post_id;

+							$attachment['title'] = $file_title;

+							$attachment['content'] = '';

+							$attachment['file'] = $file_path;

+							$attachment['mime_type'] = $uploaded_file_type;

+							$attachment['menu_order'] = $menu_order;

+							$attachment['is_featured'] = 0;

 

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

-                                if ($val != '')

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

-                            }

+							$attachment_set = '';

 

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

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

+								if ($val != '')

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

+							}

 

-                            $wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

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

+

+							$wpdb->query("INSERT INTO " . GEODIR_ATTACHMENT_TABLE . " SET " . $attachment_set);

 

-                            $valid_file_ids[] = $wpdb->insert_id;

-                        }

+							$valid_file_ids[] = $wpdb->insert_id;

+						}

 

-                    }

+					}

 

 

-                } else {

-                    $valid_file_ids[] = $find_image;

+				} else {

+					$valid_file_ids[] = $find_image;

 

-                    $postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);

+					$postcurr_images[] = str_replace(array('http://','https://'),'',$post_image[$m]);

 

-                    $wpdb->query(

-                        $wpdb->prepare(

-                            "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",

-                            array($menu_order, $split_img_path[1], $post_id)

-                        )

-                    );

+					$wpdb->query(

+						$wpdb->prepare(

+							"UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET menu_order = %d where file =%s AND post_id =%d",

+							array($menu_order, $split_img_path[1], $post_id)

+						)

+					);

 

-                    if ($menu_order == 1)

-                        $wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

+					if ($menu_order == 1)

+						$wpdb->query($wpdb->prepare("UPDATE " . $table . " SET featured_image = %s where post_id =%d", array($split_img_path[1], $post_id)));

 

-                }

+				}

 

 

-            }

+			}

 

-            if (!empty($valid_file_ids)) {

+			if (!empty($valid_file_ids)) {

 

-                $remove_files = $valid_file_ids;

+				$remove_files = $valid_file_ids;

 

-                $remove_files_length = count($remove_files);

-                $remove_files_format = array_fill(0, $remove_files_length, '%d');

-                $format = implode(',', $remove_files_format);

-                $valid_files_condition = " ID NOT IN ($format) AND ";

+				$remove_files_length = count($remove_files);

+				$remove_files_format = array_fill(0, $remove_files_length, '%d');

+				$format = implode(',', $remove_files_format);

+				$valid_files_condition = " ID NOT IN ($format) AND ";

 

-            }

+			}

 

-            //Get and remove all old images of post from database to set by new order

+			//Get and remove all old images of post from database to set by new order

 

-            if (!empty($post_images)) {

+			if (!empty($post_images)) {

 

-                foreach ($post_images as $img) {

+				foreach ($post_images as $img) {

 

-                    if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {

+					if (!in_array(str_replace(array('http://','https://'),'',$img->src), $postcurr_images)) {

 

-                        $invalid_files[] = (object)array('src' => $img->src);

+						$invalid_files[] = (object)array('src' => $img->src);

 

-                    }

+					}

 

-                }

+				}

 

-            }

+			}

 

-            $invalid_files = (object)$invalid_files;

-        }

+			$invalid_files = (object)$invalid_files;

+		}

 

-        $remove_files[] = $post_id;

+		$remove_files[] = $post_id;

 

-        $wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));

+		$wpdb->query($wpdb->prepare("DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE " . $valid_files_condition . " post_id = %d", $remove_files));

 

-        if (!empty($invalid_files))

-            geodir_remove_attachments($invalid_files);

-    }

+		if (!empty($invalid_files))

+			geodir_remove_attachments($invalid_files);

+	}

 

 }

 

@@ -1155,12 +1155,12 @@ 
 function geodir_remove_temp_images()

 {

 

-    global $current_user;

+	global $current_user;

 

-    $uploads = wp_upload_dir();

-    $uploads_dir = $uploads['path'];

+	$uploads = wp_upload_dir();

+	$uploads_dir = $uploads['path'];

 

-    /*	if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){

+	/*	if(is_dir($uploads_dir.'/temp_'.$current_user->data->ID)){

 

 			$dirPath = $uploads_dir.'/temp_'.$current_user->data->ID;

 			if (substr($dirPath, strlen($dirPath) - 1, 1) != '/') {

@@ -1177,8 +1177,8 @@ 
 			rmdir($dirPath);

 	}	*/

 

-    $dirname = $uploads_dir . '/temp_' . $current_user->ID;

-    geodir_delete_directory($dirname);

+	$dirname = $uploads_dir . '/temp_' . $current_user->ID;

+	geodir_delete_directory($dirname);

 }

 

 

@@ -1192,116 +1192,116 @@ 
  */

 function geodir_delete_directory($dirname)

 {

-    $dir_handle = '';

-    if (is_dir($dirname))

-        $dir_handle = opendir($dirname);

-    if (!$dir_handle)

-        return false;

-    while ($file = readdir($dir_handle)) {

-        if ($file != "." && $file != "..") {

-            if (!is_dir($dirname . "/" . $file))

-                unlink($dirname . "/" . $file);

-            else

-                geodir_delete_directory($dirname . '/' . $file);

-        }

-    }

-    closedir($dir_handle);

-    rmdir($dirname);

-    return true;

+	$dir_handle = '';

+	if (is_dir($dirname))

+		$dir_handle = opendir($dirname);

+	if (!$dir_handle)

+		return false;

+	while ($file = readdir($dir_handle)) {

+		if ($file != "." && $file != "..") {

+			if (!is_dir($dirname . "/" . $file))

+				unlink($dirname . "/" . $file);

+			else

+				geodir_delete_directory($dirname . '/' . $file);

+		}

+	}

+	closedir($dir_handle);

+	rmdir($dirname);

+	return true;

 

 }

 

 

 if (!function_exists('geodir_remove_attachments')) {

-    /**

-     * Remove post attachments.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array $postcurr_images Array of image objects.

-     */

-    function geodir_remove_attachments($postcurr_images = array())

-    {

-        // Unlink all past images of post

-        if (!empty($postcurr_images)) {

-

-            $uploads = wp_upload_dir();

-            $uploads_dir = $uploads['path'];

-

-            foreach ($postcurr_images as $postimg) {

-                $image_name_arr = explode('/', $postimg->src);

-                $filename = end($image_name_arr);

-                if (file_exists($uploads_dir . '/' . $filename))

-                    unlink($uploads_dir . '/' . $filename);

-            }

-

-        } // endif

-        // Unlink all past images of post end

-    }

+	/**

+	 * Remove post attachments.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array $postcurr_images Array of image objects.

+	 */

+	function geodir_remove_attachments($postcurr_images = array())

+	{

+		// Unlink all past images of post

+		if (!empty($postcurr_images)) {

+

+			$uploads = wp_upload_dir();

+			$uploads_dir = $uploads['path'];

+

+			foreach ($postcurr_images as $postimg) {

+				$image_name_arr = explode('/', $postimg->src);

+				$filename = end($image_name_arr);

+				if (file_exists($uploads_dir . '/' . $filename))

+					unlink($uploads_dir . '/' . $filename);

+			}

+

+		} // endif

+		// Unlink all past images of post end

+	}

 }

 

 if (!function_exists('geodir_get_featured_image')) {

-    /**

-     * Gets the post featured image.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @global object $post The current post object.

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

-     * @param int|string $post_id The post ID.

-     * @param string $size Optional. Thumbnail size. Default: thumbnail.

-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

-     * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false.

-     * @return bool|object Image details as an object.

-     */

-    function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false)

-    {

-

-        /*$img_arr['src'] = get_the_post_thumbnail_url( $post_id,  'medium');//medium/thumbnail

+	/**

+	 * Gets the post featured image.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @global object $post The current post object.

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

+	 * @param int|string $post_id The post ID.

+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.

+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

+	 * @param bool|string $file Optional. The file path from which you want to get the image details. Default: false.

+	 * @return bool|object Image details as an object.

+	 */

+	function geodir_get_featured_image($post_id = '', $size = '', $no_image = false, $file = false)

+	{

+

+		/*$img_arr['src'] = get_the_post_thumbnail_url( $post_id,  'medium');//medium/thumbnail

         $img_arr['path'] = '';

         $img_arr['width'] = '';

         $img_arr['height'] = '';

         $img_arr['title'] = '';

         return (object)$img_arr;*/

-        global $wpdb, $plugin_prefix, $post;

+		global $wpdb, $plugin_prefix, $post;

 

-        if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {

-            $post_type = $post->post_type;

-        } else {

-            $post_type = get_post_type($post_id);

-        }

+		if (isset($post->ID) && isset($post->post_type) && $post->ID == $post_id) {

+			$post_type = $post->post_type;

+		} else {

+			$post_type = get_post_type($post_id);

+		}

 

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

-            return false;// if not a GD CPT return;

-        }

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

+			return false;// if not a GD CPT return;

+		}

 

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

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

 

-        if (!$file) {

-            if (isset($post->featured_image)) {

-                $file = $post->featured_image;

-            } else {

-                $file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));

-            }

-        }

+		if (!$file) {

+			if (isset($post->featured_image)) {

+				$file = $post->featured_image;

+			} else {

+				$file = $wpdb->get_var($wpdb->prepare("SELECT featured_image FROM " . $table . " WHERE post_id = %d", array($post_id)));

+			}

+		}

 

-        if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {

-            $img_arr = array();

+		if ($file != NULL && $file != '' && (($uploads = wp_upload_dir()) && false === $uploads['error'])) {

+			$img_arr = array();

 

-            $file_info = pathinfo($file);

-            $sub_dir = '';

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

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

+			$file_info = pathinfo($file);

+			$sub_dir = '';

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

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

 

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

-            $uploads_baseurl = $uploads['baseurl'];

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

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

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

 

-            $uploads_url = $uploads_baseurl . $sub_dir;

-            /*

+			$uploads_url = $uploads_baseurl . $sub_dir;

+			/*

              * Allows the filter of image src for such things as CDN change.

              *

              * @since 1.5.7

@@ -1310,158 +1310,158 @@ 
              * @param string $uploads_url The server upload directory url.

              * @param string $uploads_baseurl The uploads dir base url.

              */

-            $img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

-            $img_arr['path'] = $uploads_path . '/' . $file_name;

-            $width = 0;

-            $height = 0;

-            if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

-                $imagesize = getimagesize($img_arr['path']);

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

-                $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-            }

-            $img_arr['width'] = $width;

-            $img_arr['height'] = $height;

-            $img_arr['title'] = '';

-        } elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {

-            foreach ($post_images as $image) {

-                return $image;

-            }

-        } else if ($no_image) {

-            $img_arr = array();

-

-            $default_img = '';

-            if (isset($post->default_category) && $post->default_category) {

-                $default_cat = $post->default_category;

-            } else {

-                $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

-            }

-

-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

-                $default_img = $default_catimg['src'];

-            elseif ($no_image) {

-                $default_img = get_option('geodir_listing_no_img');

-            }

-

-            if (!empty($default_img)) {

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

-                $uploads_baseurl = $uploads['baseurl'];

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

-

-                $img_arr = array();

-

-                $file_info = pathinfo($default_img);

-

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

-

-                $img_arr['src'] = $default_img;

-                $img_arr['path'] = $uploads_path . '/' . $file_name;

-

-                $width = 0;

-                $height = 0;

-                if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

-                    $imagesize = getimagesize($img_arr['path']);

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

-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-                }

-                $img_arr['width'] = $width;

-                $img_arr['height'] = $height;

-

-                $img_arr['title'] = ''; // add the title to the array

-            }

-        }

-

-        if (!empty($img_arr))

-            return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

-        else

-            return false;

-    }

+			$img_arr['src'] = apply_filters('geodir_get_featured_image_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

+			$img_arr['path'] = $uploads_path . '/' . $file_name;

+			$width = 0;

+			$height = 0;

+			if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

+				$imagesize = getimagesize($img_arr['path']);

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

+				$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+			}

+			$img_arr['width'] = $width;

+			$img_arr['height'] = $height;

+			$img_arr['title'] = '';

+		} elseif ($post_images = geodir_get_images($post_id, $size, $no_image, 1)) {

+			foreach ($post_images as $image) {

+				return $image;

+			}

+		} else if ($no_image) {

+			$img_arr = array();

+

+			$default_img = '';

+			if (isset($post->default_category) && $post->default_category) {

+				$default_cat = $post->default_category;

+			} else {

+				$default_cat = geodir_get_post_meta($post_id, 'default_category', true);

+			}

+

+			if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

+				$default_img = $default_catimg['src'];

+			elseif ($no_image) {

+				$default_img = get_option('geodir_listing_no_img');

+			}

+

+			if (!empty($default_img)) {

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

+				$uploads_baseurl = $uploads['baseurl'];

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

+

+				$img_arr = array();

+

+				$file_info = pathinfo($default_img);

+

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

+

+				$img_arr['src'] = $default_img;

+				$img_arr['path'] = $uploads_path . '/' . $file_name;

+

+				$width = 0;

+				$height = 0;

+				if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

+					$imagesize = getimagesize($img_arr['path']);

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

+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+				}

+				$img_arr['width'] = $width;

+				$img_arr['height'] = $height;

+

+				$img_arr['title'] = ''; // add the title to the array

+			}

+		}

+

+		if (!empty($img_arr))

+			return (object)$img_arr;//return (object)array( 'src' => $file_url, 'path' => $file_path );

+		else

+			return false;

+	}

 }

 

 if (!function_exists('geodir_show_featured_image')) {

-    /**

-     * Gets the post featured image.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param int|string $post_id The post ID.

-     * @param string $size Optional. Thumbnail size. Default: thumbnail.

-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

-     * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.

-     * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false.

-     * @return bool|string Returns image html.

-     */

-    function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false)

-    {

-        $image = geodir_get_featured_image($post_id, $size, $no_image, $fimage);

-

-        $html = geodir_show_image($image, $size, $no_image, false);

-

-        if (!empty($html) && $echo) {

-            echo $html;

-        } elseif (!empty($html)) {

-            return $html;

-        } else

-            return false;

-    }

+	/**

+	 * Gets the post featured image.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param int|string $post_id The post ID.

+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.

+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

+	 * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.

+	 * @param bool|string $fimage Optional. The file path from which you want to get the image details. Default: false.

+	 * @return bool|string Returns image html.

+	 */

+	function geodir_show_featured_image($post_id = '', $size = 'thumbnail', $no_image = false, $echo = true, $fimage = false)

+	{

+		$image = geodir_get_featured_image($post_id, $size, $no_image, $fimage);

+

+		$html = geodir_show_image($image, $size, $no_image, false);

+

+		if (!empty($html) && $echo) {

+			echo $html;

+		} elseif (!empty($html)) {

+			return $html;

+		} else

+			return false;

+	}

 }

 

 if (!function_exists('geodir_get_images')) {

-    /**

-     * Gets the post images.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

-     * @param int $post_id The post ID.

-     * @param string $img_size Optional. Thumbnail size.

-     * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false.

-     * @param bool $add_featured Optional. Do you want to include featured images too? Default: true.

-     * @param int|string $limit Optional. Number of images.

-     * @return array|bool Returns images as an array. Each item is an object.

-     */

-    function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '')

-    {

-        global $wpdb;

-        if ($limit) {

-            $limit_q = " LIMIT $limit ";

-        } else {

-            $limit_q = '';

-        }

-        $not_featured = '';

-        $sub_dir = '';

-        if (!$add_featured)

-            $not_featured = " AND is_featured = 0 ";

-

-        $arrImages = $wpdb->get_results(

-            $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",

-                array('%image%', $post_id)

-            )

-        );

-

-        $counter = 0;

-        $return_arr = array();

-

-        if (!empty($arrImages)) {

-            foreach ($arrImages as $attechment) {

-

-                $img_arr = array();

-                $img_arr['id'] = $attechment->ID;

-                $img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0;

-

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

-

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

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

-

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

-                $uploads_baseurl = $uploads['baseurl'];

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

-

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

-

-                $uploads_url = $uploads_baseurl . $sub_dir;

-                /*

+	/**

+	 * Gets the post images.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

+	 * @param int $post_id The post ID.

+	 * @param string $img_size Optional. Thumbnail size.

+	 * @param bool $no_images Optional. Do you want to return the default image when no image is available? Default: false.

+	 * @param bool $add_featured Optional. Do you want to include featured images too? Default: true.

+	 * @param int|string $limit Optional. Number of images.

+	 * @return array|bool Returns images as an array. Each item is an object.

+	 */

+	function geodir_get_images($post_id = 0, $img_size = '', $no_images = false, $add_featured = true, $limit = '')

+	{

+		global $wpdb;

+		if ($limit) {

+			$limit_q = " LIMIT $limit ";

+		} else {

+			$limit_q = '';

+		}

+		$not_featured = '';

+		$sub_dir = '';

+		if (!$add_featured)

+			$not_featured = " AND is_featured = 0 ";

+

+		$arrImages = $wpdb->get_results(

+			$wpdb->prepare(

+				"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d" . $not_featured . " ORDER BY menu_order ASC, ID DESC $limit_q ",

+				array('%image%', $post_id)

+			)

+		);

+

+		$counter = 0;

+		$return_arr = array();

+

+		if (!empty($arrImages)) {

+			foreach ($arrImages as $attechment) {

+

+				$img_arr = array();

+				$img_arr['id'] = $attechment->ID;

+				$img_arr['user_id'] = isset($attechment->user_id) ? $attechment->user_id : 0;

+

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

+

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

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

+

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

+				$uploads_baseurl = $uploads['baseurl'];

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

+

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

+

+				$uploads_url = $uploads_baseurl . $sub_dir;

+				/*

                 * Allows the filter of image src for such things as CDN change.

                 *

                 * @since 1.5.7

@@ -1470,516 +1470,516 @@ 
                 * @param string $uploads_url The server upload directory url.

                 * @param string $uploads_baseurl The uploads dir base url.

                 */

-                $img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

-                $img_arr['path'] = $uploads_path . '/' . $file_name;

-                $width = 0;

-                $height = 0;

-                if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

-                    $imagesize = getimagesize($img_arr['path']);

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

-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-                }

-                $img_arr['width'] = $width;

-                $img_arr['height'] = $height;

-

-                $img_arr['file'] = $file_name; // add the title to the array

-                $img_arr['title'] = $attechment->title; // add the title to the array

-                $img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array

-                $img_arr['content'] = $attechment->content; // add the description to the array

-                $img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.

-

-                $return_arr[] = (object)$img_arr;

-

-                $counter++;

-            }

-            return (object)$return_arr;

-        } else if ($no_images) {

-            $default_img = '';

-            $default_cat = geodir_get_post_meta($post_id, 'default_category', true);

-            $post_type = get_post_type($post_id);

-            if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

-                $default_img = $default_catimg['src'];

-            elseif ($no_images) {

-                $default_img = get_option('geodir_listing_no_img');

-            }

-

-            if (!empty($default_img)) {

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

+				$img_arr['src'] = apply_filters('geodir_get_images_src',$uploads_url . '/' . $file_name,$file_name,$uploads_url,$uploads_baseurl);

+				$img_arr['path'] = $uploads_path . '/' . $file_name;

+				$width = 0;

+				$height = 0;

+				if (is_file($img_arr['path']) && file_exists($img_arr['path'])) {

+					$imagesize = getimagesize($img_arr['path']);

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

+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+				}

+				$img_arr['width'] = $width;

+				$img_arr['height'] = $height;

+

+				$img_arr['file'] = $file_name; // add the title to the array

+				$img_arr['title'] = $attechment->title; // add the title to the array

+				$img_arr['caption'] = isset($attechment->caption) ? $attechment->caption : ''; // add the caption to the array

+				$img_arr['content'] = $attechment->content; // add the description to the array

+				$img_arr['is_approved'] = isset($attechment->is_approved) ? $attechment->is_approved : ''; // used for user image moderation. For backward compatibility Default value is 1.

+

+				$return_arr[] = (object)$img_arr;

+

+				$counter++;

+			}

+			return (object)$return_arr;

+		} else if ($no_images) {

+			$default_img = '';

+			$default_cat = geodir_get_post_meta($post_id, 'default_category', true);

+			$post_type = get_post_type($post_id);

+			if ($default_catimg = geodir_get_default_catimage($default_cat, $post_type))

+				$default_img = $default_catimg['src'];

+			elseif ($no_images) {

+				$default_img = get_option('geodir_listing_no_img');

+			}

+

+			if (!empty($default_img)) {

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

                 

-                $image_path = $default_img;

-                if (!path_is_absolute($image_path)) {

-                    $image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path);

-                }

-

-                $file_info = pathinfo($default_img);

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

-

-                $width = '';

-                $height = '';

-                if (is_file($image_path) && file_exists($image_path)) {

-                    $imagesize = getimagesize($image_path);

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

-                    $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-                }

+				$image_path = $default_img;

+				if (!path_is_absolute($image_path)) {

+					$image_path = str_replace($uploads['baseurl'], $uploads['basedir'], $image_path);

+				}

+

+				$file_info = pathinfo($default_img);

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

+

+				$width = '';

+				$height = '';

+				if (is_file($image_path) && file_exists($image_path)) {

+					$imagesize = getimagesize($image_path);

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

+					$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+				}

                 

-                $img_arr = array();

-                $img_arr['src'] = $default_img;

-                $img_arr['path'] = $image_path;

-                $img_arr['width'] = $width;

-                $img_arr['height'] = $height;

-                $img_arr['file'] = $file_name; // add the title to the array

-                $img_arr['title'] = $file_info['filename']; // add the title to the array

-                $img_arr['content'] = $file_info['filename']; // add the description to the array

-

-                $return_arr[] = (object)$img_arr;

-

-                return $return_arr;

-            } else

-                return false;

-        }

-    }

+				$img_arr = array();

+				$img_arr['src'] = $default_img;

+				$img_arr['path'] = $image_path;

+				$img_arr['width'] = $width;

+				$img_arr['height'] = $height;

+				$img_arr['file'] = $file_name; // add the title to the array

+				$img_arr['title'] = $file_info['filename']; // add the title to the array

+				$img_arr['content'] = $file_info['filename']; // add the description to the array

+

+				$return_arr[] = (object)$img_arr;

+

+				return $return_arr;

+			} else

+				return false;

+		}

+	}

 }

 

 if (!function_exists('geodir_show_image')) {

-    /**

-     * Show image using image details.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param array|object $request Image info either as an array or object.

-     * @param string $size Optional. Thumbnail size. Default: thumbnail.

-     * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

-     * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.

-     * @return bool|string Returns image html.

-     */

-    function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true)

-    {

-        $image = new stdClass();

-

-        $html = '';

-        if (!empty($request)) {

-            if (!is_object($request)){

-                $request = (object)$request;

-            }

-

-            if (isset($request->src) && !isset($request->path)) {

-                $request->path = $request->src;

-            }

-

-            /*

+	/**

+	 * Show image using image details.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param array|object $request Image info either as an array or object.

+	 * @param string $size Optional. Thumbnail size. Default: thumbnail.

+	 * @param bool $no_image Optional. Do you want to return the default image when no image is available? Default: false.

+	 * @param bool $echo Optional. Do you want to print it instead of returning it? Default: true.

+	 * @return bool|string Returns image html.

+	 */

+	function geodir_show_image($request = array(), $size = 'thumbnail', $no_image = false, $echo = true)

+	{

+		$image = new stdClass();

+

+		$html = '';

+		if (!empty($request)) {

+			if (!is_object($request)){

+				$request = (object)$request;

+			}

+

+			if (isset($request->src) && !isset($request->path)) {

+				$request->path = $request->src;

+			}

+

+			/*

              * getimagesize() works faster from path than url so we try and get path if we can.

              */

-            $upload_dir = wp_upload_dir();

-            $img_no_http = str_replace(array("http://", "https://"), "", $request->path);

-            $upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);

-            if (strpos($img_no_http, $upload_no_http) !== false) {

-                $request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);

-            }

+			$upload_dir = wp_upload_dir();

+			$img_no_http = str_replace(array("http://", "https://"), "", $request->path);

+			$upload_no_http = str_replace(array("http://", "https://"), "", $upload_dir['baseurl']);

+			if (strpos($img_no_http, $upload_no_http) !== false) {

+				$request->path = str_replace( $img_no_http,$upload_dir['basedir'], $request->path);

+			}

             

-            $width = 0;

-            $height = 0;

-            if (is_file($request->path) && file_exists($request->path)) {

-                $imagesize = getimagesize($request->path);

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

-                $height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

-            }

-

-            $image->src = $request->src;

-            $image->width = $width;

-            $image->height = $height;

-

-            $max_size = (object)geodir_get_imagesize($size);

-

-            if (!is_wp_error($max_size)) {

-                if ($image->width) {

-                    if ($image->height >= $image->width) {

-                        $width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);

-                    } else if ($image->width < ($max_size->h)) {

-                        $width_per = round((($image->width / $max_size->w) * 100), 2);

-                    } else

-                        $width_per = 100;

-                }

-

-                if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

-                    $html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';

-                } else {

-                    if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){

-                        $html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

-                    }else{

-                        //$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

-                        //$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';

-                        $html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

-

-                    }

-

-                }

-            }

-        }

-

-        if (!empty($html) && $echo) {

-            echo $html;

-        } elseif (!empty($html)) {

-            return $html;

-        } else

-            return false;

-    }

-}

+			$width = 0;

+			$height = 0;

+			if (is_file($request->path) && file_exists($request->path)) {

+				$imagesize = getimagesize($request->path);

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

+				$height = !empty($imagesize) && isset($imagesize[1]) ? $imagesize[1] : '';

+			}

 

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

-    /**

-     * Set post Categories.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $post_id The post ID.

-     * @param array $terms An array of term objects.

-     * @param array $tt_ids An array of term taxonomy IDs.

-     * @param string $taxonomy Taxonomy slug.

-     */

-    function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy)

-    {

-        global $wpdb, $plugin_prefix;

+			$image->src = $request->src;

+			$image->width = $width;

+			$image->height = $height;

 

-        $post_type = get_post_type($post_id);

+			$max_size = (object)geodir_get_imagesize($size);

 

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

+			if (!is_wp_error($max_size)) {

+				if ($image->width) {

+					if ($image->height >= $image->width) {

+						$width_per = round(((($image->width * ($max_size->h / $image->height)) / $max_size->w) * 100), 2);

+					} else if ($image->width < ($max_size->h)) {

+						$width_per = round((($image->width / $max_size->w) * 100), 2);

+					} else

+						$width_per = 100;

+				}

 

-        if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {

+				if (is_admin() && !isset($_REQUEST['geodir_ajax'])){

+					$html = '<div class="geodir_thumbnail"><img style="max-height:' . $max_size->h . 'px;" alt="place image" src="' . $image->src . '"  /></div>';

+				} else {

+					if($size=='widget-thumb' || !get_option('geodir_lazy_load',1)){

+						$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

+					}else{

+						//$html = '<div class="geodir_thumbnail" style="background-image:url(\'' . $image->src . '\');"></div>';

+						//$html = '<div data-src="'.$image->src.'" class="geodir_thumbnail" ></div>';

+						$html = '<div data-src="'.str_replace(' ','%20',$image->src).'" class="geodir_thumbnail geodir_lazy_load_thumbnail" ></div>';

+

+					}

+

+				}

+			}

+		}

+

+		if (!empty($html) && $echo) {

+			echo $html;

+		} elseif (!empty($html)) {

+			return $html;

+		} else

+			return false;

+	}

+}

 

-            if ($taxonomy == $post_type . '_tags') {

-                if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

-                    geodir_save_post_meta($post_id, 'post_tags', $terms);

-                }

-            } elseif ($taxonomy == $post_type . 'category') {

-                $srcharr = array('"', '\\');

-                $replarr = array("&quot;", '');

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

+	/**

+	 * Set post Categories.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $post_id The post ID.

+	 * @param array $terms An array of term objects.

+	 * @param array $tt_ids An array of term taxonomy IDs.

+	 * @param string $taxonomy Taxonomy slug.

+	 */

+	function geodir_set_post_terms($post_id, $terms, $tt_ids, $taxonomy)

+	{

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		if (in_array($post_type, geodir_get_posttypes()) && !wp_is_post_revision($post_id)) {

+

+			if ($taxonomy == $post_type . '_tags') {

+				if (isset($_POST['action']) && $_POST['action'] == 'inline-save') {

+					geodir_save_post_meta($post_id, 'post_tags', $terms);

+				}

+			} elseif ($taxonomy == $post_type . 'category') {

+				$srcharr = array('"', '\\');

+				$replarr = array("&quot;", '');

 

-                $post_obj = get_post($post_id);

+				$post_obj = get_post($post_id);

 

-                $cat_ids = array('0');

-                if (is_array($tt_ids))

-                    $cat_ids = $tt_ids;

+				$cat_ids = array('0');

+				if (is_array($tt_ids))

+					$cat_ids = $tt_ids;

 

 

-                if (!empty($cat_ids)) {

-                    $cat_ids_array = $cat_ids;

-                    $cat_ids_length = count($cat_ids_array);

-                    $cat_ids_format = array_fill(0, $cat_ids_length, '%d');

-                    $format = implode(',', $cat_ids_format);

+				if (!empty($cat_ids)) {

+					$cat_ids_array = $cat_ids;

+					$cat_ids_length = count($cat_ids_array);

+					$cat_ids_format = array_fill(0, $cat_ids_length, '%d');

+					$format = implode(',', $cat_ids_format);

 

-                    $cat_ids_array_del = $cat_ids_array;

-                    $cat_ids_array_del[] = $post_id;

+					$cat_ids_array_del = $cat_ids_array;

+					$cat_ids_array_del[] = $post_id;

 

-                    $wpdb->get_var(

-                        $wpdb->prepare(

-                            "DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",

-                            $cat_ids_array_del

-                        )

-                    );

+					$wpdb->get_var(

+						$wpdb->prepare(

+							"DELETE from " . GEODIR_ICON_TABLE . " WHERE cat_id NOT IN ($format) AND post_id = %d ",

+							$cat_ids_array_del

+						)

+					);

 

 

-                    $post_term = $wpdb->get_col(

-                        $wpdb->prepare(

-                            "SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",

-                            $cat_ids_array

-                        )

-                    );

+					$post_term = $wpdb->get_col(

+						$wpdb->prepare(

+							"SELECT term_id FROM " . $wpdb->term_taxonomy . " WHERE term_taxonomy_id IN($format) GROUP BY term_id",

+							$cat_ids_array

+						)

+					);

 

-                }

+				}

 

-                $post_marker_json = '';

+				$post_marker_json = '';

 

-                if (!empty($post_term)):

+				if (!empty($post_term)):

 

-                    foreach ($post_term as $cat_id):

+					foreach ($post_term as $cat_id):

 

-                        $term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type);

-                        $term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : '';

+						$term_icon_url = get_tax_meta($cat_id, 'ct_cat_icon', false, $post_type);

+						$term_icon = isset($term_icon_url['src']) ? $term_icon_url['src'] : '';

 

-                        $post_title = $post_obj->title;

-                        $title = str_replace($srcharr, $replarr, $post_title);

+						$post_title = $post_obj->title;

+						$title = str_replace($srcharr, $replarr, $post_title);

 

-                        $lat = geodir_get_post_meta($post_id, 'post_latitude', true);

-                        $lng = geodir_get_post_meta($post_id, 'post_longitude', true);

+						$lat = geodir_get_post_meta($post_id, 'post_latitude', true);

+						$lng = geodir_get_post_meta($post_id, 'post_longitude', true);

 

-                        $timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));

-                        $timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);

+						$timing = ' - ' . date('D M j, Y', strtotime(geodir_get_post_meta($post_id, 'st_date', true)));

+						$timing .= ' - ' . geodir_get_post_meta($post_id, 'st_time', true);

 

-                        $json = '{';

-                        $json .= '"id":"' . $post_id . '",';

-                        $json .= '"lat_pos": "' . $lat . '",';

-                        $json .= '"long_pos": "' . $lng . '",';

-                        $json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';

-                        $json .= '"icon":"' . $term_icon . '",';

-                        $json .= '"group":"catgroup' . $cat_id . '"';

-                        $json .= '}';

+						$json = '{';

+						$json .= '"id":"' . $post_id . '",';

+						$json .= '"lat_pos": "' . $lat . '",';

+						$json .= '"long_pos": "' . $lng . '",';

+						$json .= '"marker_id":"' . $post_id . '_' . $cat_id . '",';

+						$json .= '"icon":"' . $term_icon . '",';

+						$json .= '"group":"catgroup' . $cat_id . '"';

+						$json .= '}';

 

 

-                        if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))

-                            $post_marker_json = $json;

+						if ($cat_id == geodir_get_post_meta($post_id, 'default_category', true))

+							$post_marker_json = $json;

 

 

-                        if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

+						if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . GEODIR_ICON_TABLE . " WHERE post_id = %d AND cat_id = %d", array($post_id, $cat_id)))) {

 

-                            $json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET

+							$json_query = $wpdb->prepare("UPDATE " . GEODIR_ICON_TABLE . " SET

 										post_title = %s,

 										json = %s

 										WHERE post_id = %d AND cat_id = %d ",

-                                array($post_title, $json, $post_id, $cat_id));

+								array($post_title, $json, $post_id, $cat_id));

 

-                        } else {

+						} else {

 

-                            $json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET

+							$json_query = $wpdb->prepare("INSERT INTO " . GEODIR_ICON_TABLE . " SET

 										post_id = %d,

 										post_title = %s,

 										cat_id = %d,

 										json = %s",

-                                array($post_id, $post_title, $cat_id, $json));

+								array($post_id, $post_title, $cat_id, $json));

 

-                        }

+						}

 

-                        $wpdb->query($json_query);

+						$wpdb->query($json_query);

 

-                    endforeach;

+					endforeach;

 

-                endif;

+				endif;

 

-                if (!empty($post_term) && is_array($post_term)) {

-                    $categories = implode(',', $post_term);

+				if (!empty($post_term) && is_array($post_term)) {

+					$categories = implode(',', $post_term);

 

-                    if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';

+					if ($categories != '' && $categories != 0) $categories = ',' . $categories . ',';

 

-                    if (empty($post_marker_json))

-                        $post_marker_json = isset($json) ? $json : '';

+					if (empty($post_marker_json))

+						$post_marker_json = isset($json) ? $json : '';

 

-                    if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

+					if ($wpdb->get_var($wpdb->prepare("SELECT post_id from " . $table . " where post_id = %d", array($post_id)))) {

 

-                        $wpdb->query(

-                            $wpdb->prepare(

-                                "UPDATE " . $table . " SET

+						$wpdb->query(

+							$wpdb->prepare(

+								"UPDATE " . $table . " SET

 								" . $taxonomy . " = %s,

 								marker_json = %s

 								where post_id = %d",

-                                array($categories, $post_marker_json, $post_id)

-                            )

-                        );

+								array($categories, $post_marker_json, $post_id)

+							)

+						);

 

-                        if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {

+						if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'inline-save') {

 

-                            $categories = trim($categories, ',');

+							$categories = trim($categories, ',');

 

-                            if ($categories) {

+							if ($categories) {

 

-                                $categories = explode(',', $categories);

+								$categories = explode(',', $categories);

 

-                                $default_category = geodir_get_post_meta($post_id, 'default_category', true);

+								$default_category = geodir_get_post_meta($post_id, 'default_category', true);

 

-                                if (!in_array($default_category, $categories)) {

+								if (!in_array($default_category, $categories)) {

 

-                                    $wpdb->query(

-                                        $wpdb->prepare(

-                                            "UPDATE " . $table . " SET

+									$wpdb->query(

+										$wpdb->prepare(

+											"UPDATE " . $table . " SET

 											default_category = %s

 											where post_id = %d",

-                                            array($categories[0], $post_id)

-                                        )

-                                    );

+											array($categories[0], $post_id)

+										)

+									);

 

-                                    $default_category = $categories[0];

+									$default_category = $categories[0];

 

-                                }

+								}

 

-                                if ($default_category == '')

-                                    $default_category = $categories[0];

+								if ($default_category == '')

+									$default_category = $categories[0];

 

-                                geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');

+								geodir_set_postcat_structure($post_id, $taxonomy, $default_category, '');

 

-                            }

+							}

 

-                        }

+						}

 

 

-                    } else {

+					} else {

 

-                        $wpdb->query(

-                            $wpdb->prepare(

-                                "INSERT INTO " . $table . " SET

+						$wpdb->query(

+							$wpdb->prepare(

+								"INSERT INTO " . $table . " SET

 								post_id = %d,

 								" . $taxonomy . " = %s,

 								marker_json = %s ",

 

-                                array($post_id, $categories, $post_marker_json)

-                            )

-                        );

-                    }

-                }

-            }

-        }

-    }

+								array($post_id, $categories, $post_marker_json)

+							)

+						);

+					}

+				}

+			}

+		}

+	}

 }

 

 if (!function_exists('geodir_get_infowindow_html')) {

-    /**

-     * Set post Map Marker info html.

-     *

-     * @since 1.0.0

-     * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before".

-     * @package GeoDirectory

-     * @global array $geodir_addon_list List of active GeoDirectory extensions.

-     * @global object $gd_session GeoDirectory Session object.

-     * @param object $postinfo_obj The post details object.

-     * @param string $post_preview Is this a post preview?.

-     * @return mixed|string|void

-     */

-    function geodir_get_infowindow_html($postinfo_obj, $post_preview = '')

-    {

-        global $preview, $gd_session;

-        $srcharr = array("'", "/", "-", '"', '\\');

-        $replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

-

-        if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {

-            $ID = '';

-            $plink = '';

-

-            if (isset($postinfo_obj->pid)) {

-                $ID = $postinfo_obj->pid;

-                $plink = get_permalink($ID);

-            }

-

-            $title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title));

-            $lat = $postinfo_obj->post_latitude;

-            $lng = $postinfo_obj->post_longitude;

-        } else {

-            $ID = $postinfo_obj->post_id;

-            $title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan

-            $plink = get_permalink($ID);

-            $lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true));

-            $lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true));

-        }

-

-        // filter field as per price package

-        global $geodir_addon_list;

-        if (isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {

-            $post_type = get_post_type($ID);

-            $package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL;

-            $field_name = 'geodir_contact';

-            if (!check_field_visibility($package_id, $field_name, $post_type)) {

-                $contact = '';

-            }

-

-            $field_name = 'geodir_timing';

-            if (!check_field_visibility($package_id, $field_name, $post_type)) {

-                $timing = '';

-            }

-        }

-

-        if ($lat && $lng) {

-            ob_start(); ?>

+	/**

+	 * Set post Map Marker info html.

+	 *

+	 * @since 1.0.0

+	 * @since 1.5.4 Modified to add new action "geodir_infowindow_meta_before".

+	 * @package GeoDirectory

+	 * @global array $geodir_addon_list List of active GeoDirectory extensions.

+	 * @global object $gd_session GeoDirectory Session object.

+	 * @param object $postinfo_obj The post details object.

+	 * @param string $post_preview Is this a post preview?.

+	 * @return mixed|string|void

+	 */

+	function geodir_get_infowindow_html($postinfo_obj, $post_preview = '')

+	{

+		global $preview, $gd_session;

+		$srcharr = array("'", "/", "-", '"', '\\');

+		$replarr = array("&prime;", "&frasl;", "&ndash;", "&ldquo;", '');

+

+		if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {

+			$ID = '';

+			$plink = '';

+

+			if (isset($postinfo_obj->pid)) {

+				$ID = $postinfo_obj->pid;

+				$plink = get_permalink($ID);

+			}

+

+			$title = str_replace($srcharr, $replarr, ($postinfo_obj->post_title));

+			$lat = $postinfo_obj->post_latitude;

+			$lng = $postinfo_obj->post_longitude;

+		} else {

+			$ID = $postinfo_obj->post_id;

+			$title = str_replace($srcharr, $replarr, htmlentities($postinfo_obj->post_title, ENT_COMPAT, 'UTF-8')); // fix by Stiofan

+			$plink = get_permalink($ID);

+			$lat = htmlentities(geodir_get_post_meta($ID, 'post_latitude', true));

+			$lng = htmlentities(geodir_get_post_meta($ID, 'post_longitude', true));

+		}

+

+		// filter field as per price package

+		global $geodir_addon_list;

+		if (isset($geodir_addon_list['geodir_payment_manager']) && $geodir_addon_list['geodir_payment_manager'] == 'yes') {

+			$post_type = get_post_type($ID);

+			$package_id = isset($postinfo_obj->package_id) && $postinfo_obj->package_id ? $postinfo_obj->package_id : NULL;

+			$field_name = 'geodir_contact';

+			if (!check_field_visibility($package_id, $field_name, $post_type)) {

+				$contact = '';

+			}

+

+			$field_name = 'geodir_timing';

+			if (!check_field_visibility($package_id, $field_name, $post_type)) {

+				$timing = '';

+			}

+		}

+

+		if ($lat && $lng) {

+			ob_start(); ?>

             <div class="gd-bubble" style="">

                 <div class="gd-bubble-inside">

                     <?php

-                    $comment_count = '';

-                    $rating_star = '';

-                    if ($ID != '') {

-                        $rating_star = '';

-                        $comment_count = geodir_get_review_count_total($ID);

-

-                        if (!$preview) {

-                            $post_avgratings = geodir_get_post_rating($ID);

-

-                            $rating_star = geodir_get_rating_stars($post_avgratings, $ID, false);

-

-                            /**

-                             * Filter to change rating stars

-                             *

-                             * You can use this filter to change Rating stars.

-                             *

-                             * @since 1.0.0

-                             * @package GeoDirectory

-                             * @param string $rating_star Rating stars.

-                             * @param float $post_avgratings Average ratings of the post.

-                             * @param int $ID The post ID.

-                             */

-                            $rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);

-                        }

-                    }

-                    ?>

+					$comment_count = '';

+					$rating_star = '';

+					if ($ID != '') {

+						$rating_star = '';

+						$comment_count = geodir_get_review_count_total($ID);

+

+						if (!$preview) {

+							$post_avgratings = geodir_get_post_rating($ID);

+

+							$rating_star = geodir_get_rating_stars($post_avgratings, $ID, false);

+

+							/**

+							 * Filter to change rating stars

+							 *

+							 * You can use this filter to change Rating stars.

+							 *

+							 * @since 1.0.0

+							 * @package GeoDirectory

+							 * @param string $rating_star Rating stars.

+							 * @param float $post_avgratings Average ratings of the post.

+							 * @param int $ID The post ID.

+							 */

+							$rating_star = apply_filters('geodir_review_rating_stars_on_infowindow', $rating_star, $post_avgratings, $ID);

+						}

+					}

+					?>

                     <div class="geodir-bubble_desc">

                         <h4>

                             <a href="<?php if ($plink != '') {

-                                echo $plink;

-                            } else {

-                                echo 'javascript:void(0);';

-                            } ?>"><?php echo $title; ?></a>

+								echo $plink;

+							} else {

+								echo 'javascript:void(0);';

+							} ?>"><?php echo $title; ?></a>

                         </h4>

                         <?php

-                        if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {

-                            $post_images = array();

-                            if (!empty($postinfo_obj->post_images)) {

-                                $post_images = explode(",", $postinfo_obj->post_images);

-                            }

-

-                            if (!empty($post_images)) {

-                                ?>

+						if ($gd_session->get('listing') && isset($post_preview) && $post_preview != '') {

+							$post_images = array();

+							if (!empty($postinfo_obj->post_images)) {

+								$post_images = explode(",", $postinfo_obj->post_images);

+							}

+

+							if (!empty($post_images)) {

+								?>

                                 <div class="geodir-bubble_image"><a href="<?php if ($plink != '') {

-                                        echo $plink;

-                                    } else {

-                                        echo 'javascript:void(0);';

-                                    } ?>"><img alt="bubble image" style="max-height:50px;"

+										echo $plink;

+									} else {

+										echo 'javascript:void(0);';

+									} ?>"><img alt="bubble image" style="max-height:50px;"

                                                src="<?php echo $post_images[0]; ?>"/></a></div>

                             <?php

-                            }else{

-                                echo '<div class="geodir-bubble_image"></div>';

-                            }

-                        } else {

-                            if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {

-                                ?>

+							}else{

+								echo '<div class="geodir-bubble_image"></div>';

+							}

+						} else {

+							if ($image = geodir_show_featured_image($ID, 'widget-thumb', true, false, $postinfo_obj->featured_image)) {

+								?>

                                 <div class="geodir-bubble_image"><a href="<?php echo $plink; ?>"><?php echo $image; ?></a></div>

                             <?php

-                            }else{

-                                echo '<div class="geodir-bubble_image"></div>';

-                            }

-                        }

-                        ?>

+							}else{

+								echo '<div class="geodir-bubble_image"></div>';

+							}

+						}

+						?>

                         <div class="geodir-bubble-meta-side">

                             <?php

-                            /**

-                             * Fires before the meta info in the map info window.

-                             *

-                             * This can be used to add more info to the map info window before the normal meta info.

-                             *

-                             * @since 1.5.4

-                             * @param int $ID The post id.

-                             * @param object $postinfo_obj The posts info as an object.

-                             * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

-                             */

-                            do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);

-

-

-                            echo geodir_show_listing_info('mapbubble');

+							/**

+							 * Fires before the meta info in the map info window.

+							 *

+							 * This can be used to add more info to the map info window before the normal meta info.

+							 *

+							 * @since 1.5.4

+							 * @param int $ID The post id.

+							 * @param object $postinfo_obj The posts info as an object.

+							 * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

+							 */

+							do_action('geodir_infowindow_meta_before', $ID, $postinfo_obj, $post_preview);

+

+

+							echo geodir_show_listing_info('mapbubble');

                             

                                                       

 

-                            /**

-                             * Fires after the meta info in the map info window.

-                             *

-                             * This can be used to add more info to the map info window after the normal meta info.

-                             *

-                             * @since 1.4.2

-                             * @param object $postinfo_obj The posts info as an object.

-                             * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

-                             */

-                            do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );

-                            ?>

+							/**

+							 * Fires after the meta info in the map info window.

+							 *

+							 * This can be used to add more info to the map info window after the normal meta info.

+							 *

+							 * @since 1.4.2

+							 * @param object $postinfo_obj The posts info as an object.

+							 * @param bool|string $post_preview True if currently in post preview page. Empty string if not.                           *

+							 */

+							do_action('geodir_infowindow_meta_after',$postinfo_obj,$post_preview );

+							?>

                         </div>

                         <?php

 

-                        if ($ID) {

+						if ($ID) {

 

-                            $post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);

-                            ?>

+							$post_author = isset($postinfo_obj->post_author) ? $postinfo_obj->post_author : get_post_field('post_author', $ID);

+							?>

                             <div class="geodir-bubble-meta-fade"></div>

 

                             <div class="geodir-bubble-meta-bottom">

@@ -1999,69 +1999,69 @@ 
                 </div>

             </div>

             <?php

-            $html = ob_get_clean();

-            /**

-             * Filter to change infowindow html

-             *

-             * You can use this filter to change infowindow html.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param string $html Infowindow html.

-             * @param object $postinfo_obj The Post object.

-             * @param bool|string $post_preview Is this a post preview?

-             */

-            $html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);

-            return $html;

-        }

-    }

+			$html = ob_get_clean();

+			/**

+			 * Filter to change infowindow html

+			 *

+			 * You can use this filter to change infowindow html.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param string $html Infowindow html.

+			 * @param object $postinfo_obj The Post object.

+			 * @param bool|string $post_preview Is this a post preview?

+			 */

+			$html = apply_filters('geodir_custom_infowindow_html', $html, $postinfo_obj, $post_preview);

+			return $html;

+		}

+	}

 }

 

 

 if (!function_exists('geodir_new_post_default_status')) {

-    /**

-     * Default post status for new posts.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return string Returns the default post status for new posts. Ex: draft, publish etc.

-     */

-    function geodir_new_post_default_status()

-    {

-        if (get_option('geodir_new_post_default_status'))

-            return get_option('geodir_new_post_default_status');

-        else

-            return 'publish';

-

-    }

+	/**

+	 * Default post status for new posts.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return string Returns the default post status for new posts. Ex: draft, publish etc.

+	 */

+	function geodir_new_post_default_status()

+	{

+		if (get_option('geodir_new_post_default_status'))

+			return get_option('geodir_new_post_default_status');

+		else

+			return 'publish';

+

+	}

 }

 

 if (!function_exists('geodir_change_post_status')) {

-    /**

-     * Change post status of a post.

-     *

-     * @global object $wpdb WordPress Database object.

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

-     * @param int|string $post_id The post ID.

-     * @param string $status New post status. Ex: draft, publish etc.

-     */

-    function geodir_change_post_status($post_id = '', $status = '')

-    {

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",

-                array($status, $post_id)

-            )

-        );

-

-

-    }

+	/**

+	 * Change post status of a post.

+	 *

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int|string $post_id The post ID.

+	 * @param string $status New post status. Ex: draft, publish etc.

+	 */

+	function geodir_change_post_status($post_id = '', $status = '')

+	{

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $table . " SET post_status=%s WHERE post_id=%d",

+				array($status, $post_id)

+			)

+		);

+

+

+	}

 }

 

 /**

@@ -2075,13 +2075,13 @@ 
  */

 function geodir_set_post_status($pid, $status)

 {

-    if ($pid) {

-        global $wpdb;

-        $my_post = array();

-        $my_post['post_status'] = $status;

-        $my_post['ID'] = $pid;

-        $last_postid = wp_update_post($my_post);

-    }

+	if ($pid) {

+		global $wpdb;

+		$my_post = array();

+		$my_post['post_status'] = $status;

+		$my_post['ID'] = $pid;

+		$last_postid = wp_update_post($my_post);

+	}

 }

 

 

@@ -2097,384 +2097,384 @@ 
  */

 function geodir_update_poststatus($new_status, $old_status, $post)

 {

-    global $wpdb;

+	global $wpdb;

 

-    $geodir_posttypes = geodir_get_posttypes();

+	$geodir_posttypes = geodir_get_posttypes();

 

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

+	if (!wp_is_post_revision($post->ID) && in_array($post->post_type, $geodir_posttypes)) {

 

-        geodir_change_post_status($post->ID, $new_status);

-    }

+		geodir_change_post_status($post->ID, $new_status);

+	}

 }

 

 

 if (!function_exists('geodir_update_listing_info')) {

-    /**

-     * Update post info.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $updatingpost The updating post ID.

-     * @param int $temppost The temporary post ID.

-     * @todo fix post_id variable

-     */

-    function geodir_update_listing_info($updatingpost, $temppost)

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $post_type = get_post_type($post_id);

-

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

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",

-                array($updatingpost, $temppost)

-            )

-        );

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

-                array($updatingpost, $temppost)

-            )

-        );

-

-        /* Update Attachments*/

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

-                array($updatingpost, $temppost)

-            )

-        );

-

-    }

+	/**

+	 * Update post info.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $updatingpost The updating post ID.

+	 * @param int $temppost The temporary post ID.

+	 * @todo fix post_id variable

+	 */

+	function geodir_update_listing_info($updatingpost, $temppost)

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$post_type = get_post_type($post_id);

+

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

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . $table . " SET `post_id` = %d WHERE `post_id` = %d",

+				array($updatingpost, $temppost)

+			)

+		);

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . GEODIR_ICON_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

+				array($updatingpost, $temppost)

+			)

+		);

+

+		/* Update Attachments*/

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"UPDATE " . GEODIR_ATTACHMENT_TABLE . " SET `post_id` = %d WHERE `post_id` = %d",

+				array($updatingpost, $temppost)

+			)

+		);

+

+	}

 }

 

 

 if (!function_exists('geodir_delete_listing_info')) {

-    /**

-     * Delete Listing info from details table for the given post id.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     * @param int $deleted_postid The post ID.

-     * @param bool $force Optional. Do you want to force delete it? Default: false.

-     * @return bool|void

-     */

-    function geodir_delete_listing_info($deleted_postid, $force = false)

-    {

-        global $wpdb, $plugin_prefix;

-

-        // check for multisite deletions

-        if (strpos($plugin_prefix, $wpdb->prefix) !== false) {

-        } else {

-            return;

-        }

-

-        $post_type = get_post_type($deleted_postid);

-

-        $all_postypes = geodir_get_posttypes();

-

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

-            return false;

-

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

-

-        /* Delete custom post meta*/

-        $wpdb->query(

-            $wpdb->prepare(

-                "DELETE FROM " . $table . " WHERE `post_id` = %d",

-                array($deleted_postid)

-            )

-        );

-

-        /* Delete post map icons*/

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",

-                array($deleted_postid)

-            )

-        );

-

-        /* Delete Attachments*/

-        $postcurr_images = geodir_get_images($deleted_postid);

-

-        $wpdb->query(

-            $wpdb->prepare(

-                "DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",

-                array($deleted_postid)

-            )

-        );

-        geodir_remove_attachments($postcurr_images);

-

-    }

+	/**

+	 * Delete Listing info from details table for the given post id.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 * @param int $deleted_postid The post ID.

+	 * @param bool $force Optional. Do you want to force delete it? Default: false.

+	 * @return bool|void

+	 */

+	function geodir_delete_listing_info($deleted_postid, $force = false)

+	{

+		global $wpdb, $plugin_prefix;

+

+		// check for multisite deletions

+		if (strpos($plugin_prefix, $wpdb->prefix) !== false) {

+		} else {

+			return;

+		}

+

+		$post_type = get_post_type($deleted_postid);

+

+		$all_postypes = geodir_get_posttypes();

+

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

+			return false;

+

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

+

+		/* Delete custom post meta*/

+		$wpdb->query(

+			$wpdb->prepare(

+				"DELETE FROM " . $table . " WHERE `post_id` = %d",

+				array($deleted_postid)

+			)

+		);

+

+		/* Delete post map icons*/

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"DELETE FROM " . GEODIR_ICON_TABLE . " WHERE `post_id` = %d",

+				array($deleted_postid)

+			)

+		);

+

+		/* Delete Attachments*/

+		$postcurr_images = geodir_get_images($deleted_postid);

+

+		$wpdb->query(

+			$wpdb->prepare(

+				"DELETE FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE `post_id` = %d",

+				array($deleted_postid)

+			)

+		);

+		geodir_remove_attachments($postcurr_images);

+

+	}

 }

 

 

 if (!function_exists('geodir_add_to_favorite')) {

-    /**

-     * This function would add listing to favorite listing.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $current_user Current user object.

-     * @param int $post_id The post ID.

-     */

-    function geodir_add_to_favorite($post_id)

-    {

-

-        global $current_user;

-

-        /**

-         * Filter to modify "Unfavorite" text

-         *

-         * You can use this filter to rename "Unfavorite" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Remove from Favorites" text

-         *

-         * You can use this filter to rename "Remove from Favorites" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "fa fa-heart" icon

-         *

-         * You can use this filter to change "fa fa-heart" icon to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

+	/**

+	 * This function would add listing to favorite listing.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $current_user Current user object.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_add_to_favorite($post_id)

+	{

+

+		global $current_user;

+

+		/**

+		 * Filter to modify "Unfavorite" text

+		 *

+		 * You can use this filter to rename "Unfavorite" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Remove from Favorites" text

+		 *

+		 * You can use this filter to rename "Remove from Favorites" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "fa fa-heart" icon

+		 *

+		 * You can use this filter to change "fa fa-heart" icon to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

+

+		$user_meta_data = array();

+		$user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+

+		if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {

+			$user_meta_data[] = $post_id;

+		}

+

+		update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);

+

+		/**

+		 * Called before adding the post from favourites.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param int $post_id The post ID.

+		 */

+		do_action('geodir_before_add_from_favorite', $post_id);

+

+		echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';

+

+		/**

+		 * Called after adding the post from favourites.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param int $post_id The post ID.

+		 */

+		do_action('geodir_after_add_from_favorite', $post_id);

 

-        $user_meta_data = array();

-        $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

-

-        if (empty($user_meta_data) || (!empty($user_meta_data) && !in_array($post_id, $user_meta_data))) {

-            $user_meta_data[] = $post_id;

-        }

-

-        update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);

-

-        /**

-         * Called before adding the post from favourites.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param int $post_id The post ID.

-         */

-        do_action('geodir_before_add_from_favorite', $post_id);

-

-        echo '<a href="javascript:void(0);" title="' . $remove_favourite_text . '" class="geodir-removetofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'remove\');"><i class="'. $favourite_icon .'"></i> ' . $unfavourite_text . '</a>';

-

-        /**

-         * Called after adding the post from favourites.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param int $post_id The post ID.

-         */

-        do_action('geodir_after_add_from_favorite', $post_id);

-

-    }

+	}

 }

 

 if (!function_exists('geodir_remove_from_favorite')) {

-    /**

-     * This function would remove the favourited property earlier.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $current_user Current user object.

-     * @param int $post_id The post ID.

-     */

-    function geodir_remove_from_favorite($post_id)

-    {

-        global $current_user;

-

-        /**

-         * Filter to modify "Add to Favorites" text

-         *

-         * You can use this filter to rename "Add to Favorites" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Favourite" text

-         *

-         * You can use this filter to rename "Favourite" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "fa fa-heart" icon

-         *

-         * You can use this filter to change "fa fa-heart" icon to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

-

-        $user_meta_data = array();

-        $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

-

-        if (!empty($user_meta_data)) {

+	/**

+	 * This function would remove the favourited property earlier.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $current_user Current user object.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_remove_from_favorite($post_id)

+	{

+		global $current_user;

+

+		/**

+		 * Filter to modify "Add to Favorites" text

+		 *

+		 * You can use this filter to rename "Add to Favorites" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Favourite" text

+		 *

+		 * You can use this filter to rename "Favourite" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "fa fa-heart" icon

+		 *

+		 * You can use this filter to change "fa fa-heart" icon to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

+

+		$user_meta_data = array();

+		$user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+

+		if (!empty($user_meta_data)) {

+

+			if (($key = array_search($post_id, $user_meta_data)) !== false) {

+				unset($user_meta_data[$key]);

+			}

 

-            if (($key = array_search($post_id, $user_meta_data)) !== false) {

-                unset($user_meta_data[$key]);

-            }

+		}

 

-        }

+		update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);

 

-        update_user_meta($current_user->data->ID, 'gd_user_favourite_post', $user_meta_data);

+		/**

+		 * Called before removing the post from favourites.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param int $post_id The post ID.

+		 */

+		do_action('geodir_before_remove_from_favorite', $post_id);

 

-        /**

-         * Called before removing the post from favourites.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param int $post_id The post ID.

-         */

-        do_action('geodir_before_remove_from_favorite', $post_id);

+		echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';

 

-        echo '<a href="javascript:void(0);"  title="' . $add_favourite_text . '" class="geodir-addtofav-icon" onclick="javascript:addToFavourite(\'' . $post_id . '\',\'add\');"><i class="'. $favourite_icon .'"></i> ' . $favourite_text . '</a>';

+		/**

+		 * Called after removing the post from favourites.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 * @param int $post_id The post ID.

+		 */

+		do_action('geodir_after_remove_from_favorite', $post_id);

 

-        /**

-         * Called after removing the post from favourites.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         * @param int $post_id The post ID.

-         */

-        do_action('geodir_after_remove_from_favorite', $post_id);

-

-    }

+	}

 }

 

 if (!function_exists('geodir_favourite_html')) {

-    /**

-     * This function would display the html content for add to favorite or remove from favorite.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $current_user Current user object.

-     * @global object $post The current post object.

-     * @param int $user_id The user ID.

-     * @param int $post_id The post ID.

-     */

-    function geodir_favourite_html($user_id, $post_id)

-    {

-

-        global $current_user, $post;

-

-        /**

-         * Filter to modify "Add to Favorites" text

-         *

-         * You can use this filter to rename "Add to Favorites" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Favourite" text

-         *

-         * You can use this filter to rename "Favourite" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Unfavorite" text

-         *

-         * You can use this filter to rename "Unfavorite" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "Remove from Favorites" text

-         *

-         * You can use this filter to rename "Remove from Favorites" text to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);

-

-        /**

-         * Filter to modify "fa fa-heart" icon

-         *

-         * You can use this filter to change "fa fa-heart" icon to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

-

-        /**

-         * Filter to modify "fa fa-heart" icon for "remove from favorites" link

-         *

-         * You can use this filter to change "fa fa-heart" icon to something else.

-         *

-         * @since 1.0.0

-         * @package GeoDirectory

-         */

-        $unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');

-

-        $user_meta_data = '';

-        if (isset($current_user->data->ID))

-            $user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

-

-        if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

+	/**

+	 * This function would display the html content for add to favorite or remove from favorite.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $current_user Current user object.

+	 * @global object $post The current post object.

+	 * @param int $user_id The user ID.

+	 * @param int $post_id The post ID.

+	 */

+	function geodir_favourite_html($user_id, $post_id)

+	{

+

+		global $current_user, $post;

+

+		/**

+		 * Filter to modify "Add to Favorites" text

+		 *

+		 * You can use this filter to rename "Add to Favorites" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$add_favourite_text = apply_filters('geodir_add_favourite_text', ADD_FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Favourite" text

+		 *

+		 * You can use this filter to rename "Favourite" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_text = apply_filters('geodir_favourite_text', FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Unfavorite" text

+		 *

+		 * You can use this filter to rename "Unfavorite" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$remove_favourite_text = apply_filters('geodir_remove_favourite_text', REMOVE_FAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "Remove from Favorites" text

+		 *

+		 * You can use this filter to rename "Remove from Favorites" text to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$unfavourite_text = apply_filters('geodir_unfavourite_text', UNFAVOURITE_TEXT);

+

+		/**

+		 * Filter to modify "fa fa-heart" icon

+		 *

+		 * You can use this filter to change "fa fa-heart" icon to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$favourite_icon = apply_filters('geodir_favourite_icon', 'fa fa-heart');

+

+		/**

+		 * Filter to modify "fa fa-heart" icon for "remove from favorites" link

+		 *

+		 * You can use this filter to change "fa fa-heart" icon to something else.

+		 *

+		 * @since 1.0.0

+		 * @package GeoDirectory

+		 */

+		$unfavourite_icon = apply_filters('geodir_unfavourite_icon', 'fa fa-heart');

+

+		$user_meta_data = '';

+		if (isset($current_user->data->ID))

+			$user_meta_data = get_user_meta($current_user->data->ID, 'gd_user_favourite_post', true);

+

+		if (!empty($user_meta_data) && in_array($post_id, $user_meta_data)) {

+			?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"  ><a

                 class="geodir-removetofav-icon" href="javascript:void(0);"

                 onclick="javascript:addToFavourite(<?php echo $post_id;?>,'remove');"

                 title="<?php echo $remove_favourite_text;?>"><i class="<?php echo $unfavourite_icon; ?>"></i> <?php echo $unfavourite_text;?>

             </a>   </span><?php

 

-        } else {

+		} else {

 

-            if (!isset($current_user->data->ID) || $current_user->data->ID == '') {

-                $script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';

-            } else

-                $script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

+			if (!isset($current_user->data->ID) || $current_user->data->ID == '') {

+				$script_text = 'javascript:window.location.href=\'' . geodir_login_url() . '\'';

+			} else

+				$script_text = 'javascript:addToFavourite(' . $post_id . ',\'add\')';

 

-            ?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

+			?><span class="geodir-addtofav favorite_property_<?php echo $post_id;?>"><a class="geodir-addtofav-icon"

                                                                                         href="javascript:void(0);"

                                                                                         onclick="<?php echo $script_text;?>"

                                                                                         title="<?php echo $add_favourite_text;?>"><i

                     class="<?php echo $favourite_icon; ?>"></i> <?php echo $favourite_text;?></a></span>

         <?php }

-    }

+	}

 }

 

 

@@ -2491,54 +2491,54 @@ 
 function geodir_get_cat_postcount($term = array())

 {

 

-    if (!empty($term)) {

+	if (!empty($term)) {

 

-        global $wpdb, $plugin_prefix;

+		global $wpdb, $plugin_prefix;

 

-        $where = '';

-        $join = '';

-        if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {

-            $taxonomy_obj = get_taxonomy($term->taxonomy);

+		$where = '';

+		$join = '';

+		if (get_query_var('gd_country') != '' || get_query_var('gd_region') != '' || get_query_var('gd_city') != '') {

+			$taxonomy_obj = get_taxonomy($term->taxonomy);

 

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

+			$post_type = $taxonomy_obj->object_type[0];

 

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

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

 

-            /**

-             * Filter to modify the 'join' query

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param object|array $term category / term object that need to be processed.

-             * @param string $join The join query.

-             */

-            $join = apply_filters('geodir_cat_post_count_join', $join, $term);

+			/**

+			 * Filter to modify the 'join' query

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param object|array $term category / term object that need to be processed.

+			 * @param string $join The join query.

+			 */

+			$join = apply_filters('geodir_cat_post_count_join', $join, $term);

 

-            /**

-             * Filter to modify the 'where' query

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param object|array $term category / term object that need to be processed.

-             * @param string $where The where query.

-             */

-            $where = apply_filters('geodir_cat_post_count_where', $where, $term);

+			/**

+			 * Filter to modify the 'where' query

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param object|array $term category / term object that need to be processed.

+			 * @param string $where The where query.

+			 */

+			$where = apply_filters('geodir_cat_post_count_where', $where, $term);

 

-            $count_query = "SELECT count(post_id) FROM

+			$count_query = "SELECT count(post_id) FROM

 							" . $table . " as pd " . $join . "

 							WHERE pd.post_status='publish' AND FIND_IN_SET('" . $term->term_id . "'," . $term->taxonomy . ") " . $where;

 

-            $cat_post_count = $wpdb->get_var($count_query);

-            if (empty($cat_post_count) || is_wp_error($cat_post_count))

-                $cat_post_count = 0;

+			$cat_post_count = $wpdb->get_var($count_query);

+			if (empty($cat_post_count) || is_wp_error($cat_post_count))

+				$cat_post_count = 0;

 

-            return $cat_post_count;

+			return $cat_post_count;

 

-        } else

+		} else

 

-            return $term->count;

-    }

-    return false;

+			return $term->count;

+	}

+	return false;

 

 }

 

@@ -2551,17 +2551,17 @@ 
  */

 function geodir_allow_post_type_frontend()

 {

-    $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

+	$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

 

-    if (!is_admin() && isset($_REQUEST['listing_type'])

-        && !empty($geodir_allow_posttype_frontend)

-        && !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend)

-    ) {

+	if (!is_admin() && isset($_REQUEST['listing_type'])

+		&& !empty($geodir_allow_posttype_frontend)

+		&& !in_array($_REQUEST['listing_type'], $geodir_allow_posttype_frontend)

+	) {

 

-        wp_redirect(home_url());

-        exit;

+		wp_redirect(home_url());

+		exit;

 

-    }

+	}

 

 }

 

@@ -2578,20 +2578,20 @@ 
  */

 function geodir_excerpt_length($length)

 {

-    global $wp_query, $geodir_is_widget_listing;

+	global $wp_query, $geodir_is_widget_listing;

 	if ($geodir_is_widget_listing) {

 		return $length;

 	}

 	

-    if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))

-        $length = get_option('geodir_desc_word_limit');

-    elseif (get_query_var('excerpt_length'))

-        $length = get_query_var('excerpt_length');

+	if (isset($wp_query->query_vars['is_geodir_loop']) && $wp_query->query_vars['is_geodir_loop'] && get_option('geodir_desc_word_limit'))

+		$length = get_option('geodir_desc_word_limit');

+	elseif (get_query_var('excerpt_length'))

+		$length = get_query_var('excerpt_length');

 

-    if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))

-        $length = get_option('geodir_author_desc_word_limit');

+	if (geodir_is_page('author') && get_option('geodir_author_desc_word_limit'))

+		$length = get_option('geodir_author_desc_word_limit');

 

-    return $length;

+	return $length;

 }

 

 /**

@@ -2606,13 +2606,13 @@ 
  */

 function geodir_excerpt_more($more)

 {

-    global $post;

-    $all_postypes = geodir_get_posttypes();

-    if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {

-        return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';

-    }

+	global $post;

+	$all_postypes = geodir_get_posttypes();

+	if (is_array($all_postypes) && in_array($post->post_type, $all_postypes)) {

+		return ' <a href="' . get_permalink($post->ID) . '">' . READ_MORE_TXT . '</a>';

+	}

 

-    return $more;

+	return $more;

 }

 

 

@@ -2629,63 +2629,63 @@ 
  */

 function geodir_update_markers_oncatedit($term_id, $tt_id, $taxonomy)

 {

-    global $plugin_prefix, $wpdb;

+	global $plugin_prefix, $wpdb;

 

-    $gd_taxonomies = geodir_get_taxonomies();

+	$gd_taxonomies = geodir_get_taxonomies();

 

-    if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {

+	if (is_array($gd_taxonomies) && in_array($taxonomy, $gd_taxonomies)) {

 

-        $geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);

-        $table = $plugin_prefix . $geodir_post_type . '_detail';

+		$geodir_post_type = geodir_get_taxonomy_posttype($taxonomy);

+		$table = $plugin_prefix . $geodir_post_type . '_detail';

 

-        $path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);

-        $term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';

+		$path_parts = pathinfo($_REQUEST['ct_cat_icon']['src']);

+		$term_icon = $path_parts['dirname'] . '/cat_icon_' . $term_id . '.png';

 

-        $posts = $wpdb->get_results(

-            $wpdb->prepare(

-                "SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",

-                array($term_id, $taxonomy)

-            )

-        );

+		$posts = $wpdb->get_results(

+			$wpdb->prepare(

+				"SELECT post_id,post_title,post_latitude,post_longitude,default_category FROM " . $table . " WHERE FIND_IN_SET(%s,%1\$s ) ",

+				array($term_id, $taxonomy)

+			)

+		);

 

-        if (!empty($posts)):

-            foreach ($posts as $post_obj) {

+		if (!empty($posts)):

+			foreach ($posts as $post_obj) {

 

-                $lat = $post_obj->post_latitude;

-                $lng = $post_obj->post_longitude;

+				$lat = $post_obj->post_latitude;

+				$lng = $post_obj->post_longitude;

 

-                $json = '{';

-                $json .= '"id":"' . $post_obj->post_id . '",';

-                $json .= '"lat_pos": "' . $lat . '",';

-                $json .= '"long_pos": "' . $lng . '",';

-                $json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';

-                $json .= '"icon":"' . $term_icon . '",';

-                $json .= '"group":"catgroup' . $term_id . '"';

-                $json .= '}';

+				$json = '{';

+				$json .= '"id":"' . $post_obj->post_id . '",';

+				$json .= '"lat_pos": "' . $lat . '",';

+				$json .= '"long_pos": "' . $lng . '",';

+				$json .= '"marker_id":"' . $post_obj->post_id . '_' . $term_id . '",';

+				$json .= '"icon":"' . $term_icon . '",';

+				$json .= '"group":"catgroup' . $term_id . '"';

+				$json .= '}';

 

-                if ($post_obj->default_category == $term_id) {

+				if ($post_obj->default_category == $term_id) {

 

-                    $wpdb->query(

-                        $wpdb->prepare(

-                            "UPDATE " . $table . " SET marker_json = %s where post_id = %d",

-                            array($json, $post_obj->post_id)

-                        )

-                    );

-                }

+					$wpdb->query(

+						$wpdb->prepare(

+							"UPDATE " . $table . " SET marker_json = %s where post_id = %d",

+							array($json, $post_obj->post_id)

+						)

+					);

+				}

 

-                $wpdb->query(

-                    $wpdb->prepare(

-                        "UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",

-                        array($json, $post_obj->post_id, $term_id)

-                    )

-                );

+				$wpdb->query(

+					$wpdb->prepare(

+						"UPDATE " . GEODIR_ICON_TABLE . " SET json = %s WHERE post_id = %d AND cat_id = %d",

+						array($json, $post_obj->post_id, $term_id)

+					)

+				);

 

-            }

+			}

 

 

-        endif;

+		endif;

 

-    }

+	}

 

 }

 

@@ -2699,14 +2699,14 @@ 
  */

 function geodir_get_listing_author($listing_id = '')

 {

-    if ($listing_id == '') {

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

-            $listing_id = $_REQUEST['pid'];

-        }

-    }

-    $listing = get_post(strip_tags($listing_id));

-    $listing_author_id = $listing->post_author;

-    return $listing_author_id;

+	if ($listing_id == '') {

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

+			$listing_id = $_REQUEST['pid'];

+		}

+	}

+	$listing = get_post(strip_tags($listing_id));

+	$listing_author_id = $listing->post_author;

+	return $listing_author_id;

 }

 

 

@@ -2721,11 +2721,11 @@ 
  */

 function geodir_lisiting_belong_to_user($listing_id, $user_id)

 {

-    $listing_author_id = geodir_get_listing_author($listing_id);

-    if ($listing_author_id == $user_id)

-        return true;

-    else

-        return false;

+	$listing_author_id = geodir_get_listing_author($listing_id);

+	if ($listing_author_id == $user_id)

+		return true;

+	else

+		return false;

 

 }

 

@@ -2741,17 +2741,17 @@ 
  */

 function geodir_listing_belong_to_current_user($listing_id = '', $exclude_admin = true)

 {

-    global $current_user;

-    if ($exclude_admin) {

-        foreach ($current_user->caps as $key => $caps) {

-            if (geodir_strtolower($key) == 'administrator') {

-                return true;

-                break;

-            }

-        }

-    }

-

-    return geodir_lisiting_belong_to_user($listing_id, $current_user->ID);

+	global $current_user;

+	if ($exclude_admin) {

+		foreach ($current_user->caps as $key => $caps) {

+			if (geodir_strtolower($key) == 'administrator') {

+				return true;

+				break;

+			}

+		}

+	}

+

+	return geodir_lisiting_belong_to_user($listing_id, $current_user->ID);

 }

 

 

@@ -2767,17 +2767,17 @@ 
 function geodir_only_supportable_attachments_remove($file)

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    $matches = array();

+	$matches = array();

 

-    $pattern = '/-\d+x\d+\./';

-    preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);

+	$pattern = '/-\d+x\d+\./';

+	preg_match($pattern, $file, $matches, PREG_OFFSET_CAPTURE);

 

-    if (empty($matches))

-        return '';

-    else

-        return $file;

+	if (empty($matches))

+		return '';

+	else

+		return $file;

 

 }

 

@@ -2794,78 +2794,78 @@ 
 function geodir_set_wp_featured_image($post_id)

 {

 

-    global $wpdb, $plugin_prefix;

-    $uploads = wp_upload_dir();

+	global $wpdb, $plugin_prefix;

+	$uploads = wp_upload_dir();

 //	print_r($uploads ) ;

-    $post_first_image = $wpdb->get_results(

-        $wpdb->prepare(

-            "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)

-        )

-    );

+	$post_first_image = $wpdb->get_results(

+		$wpdb->prepare(

+			"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE post_id = %d and menu_order = 1  ", array($post_id)

+		)

+	);

 

-    $old_attachment_name = '';

-    $post_thumbnail_id = '';

-    if (has_post_thumbnail($post_id)) {

+	$old_attachment_name = '';

+	$post_thumbnail_id = '';

+	if (has_post_thumbnail($post_id)) {

 

-        if (has_post_thumbnail($post_id)) {

+		if (has_post_thumbnail($post_id)) {

 

-            $post_thumbnail_id = get_post_thumbnail_id($post_id);

+			$post_thumbnail_id = get_post_thumbnail_id($post_id);

 

-            $old_attachment_name = basename(get_attached_file($post_thumbnail_id));

+			$old_attachment_name = basename(get_attached_file($post_thumbnail_id));

 

-        }

-    }

-

-    if (!empty($post_first_image)) {

+		}

+	}

 

-        $post_type = get_post_type($post_id);

+	if (!empty($post_first_image)) {

 

-        $table_name = $plugin_prefix . $post_type . '_detail';

+		$post_type = get_post_type($post_id);

 

-        $wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);

+		$table_name = $plugin_prefix . $post_type . '_detail';

 

-        $new_attachment_name = basename($post_first_image[0]->file);

+		$wpdb->query("UPDATE " . $table_name . " SET featured_image='" . $post_first_image[0]->file . "' WHERE post_id =" . $post_id);

 

-        if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {

+		$new_attachment_name = basename($post_first_image[0]->file);

 

-            if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {

+		if (geodir_strtolower($new_attachment_name) != geodir_strtolower($old_attachment_name)) {

 

-                add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');

+			if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete')) {

 

-                wp_delete_attachment($post_thumbnail_id);

+				add_filter('wp_delete_file', 'geodir_only_supportable_attachments_remove');

 

-            }

-            $filename = $uploads['basedir'] . $post_first_image[0]->file;

+				wp_delete_attachment($post_thumbnail_id);

 

-            $attachment = array(

-                'post_mime_type' => $post_first_image[0]->mime_type,

-                'guid' => $uploads['baseurl'] . $post_first_image[0]->file,

-                'post_parent' => $post_id,

-                'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),

-                'post_content' => ''

-            );

+			}

+			$filename = $uploads['basedir'] . $post_first_image[0]->file;

+

+			$attachment = array(

+				'post_mime_type' => $post_first_image[0]->mime_type,

+				'guid' => $uploads['baseurl'] . $post_first_image[0]->file,

+				'post_parent' => $post_id,

+				'post_title' => preg_replace('/\.[^.]+$/', '', $post_first_image[0]->title),

+				'post_content' => ''

+			);

 

 

-            $id = wp_insert_attachment($attachment, $filename, $post_id);

+			$id = wp_insert_attachment($attachment, $filename, $post_id);

 

-            if (!is_wp_error($id)) {

+			if (!is_wp_error($id)) {

 

-                set_post_thumbnail($post_id, $id);

+				set_post_thumbnail($post_id, $id);

 

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

-                wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));

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

+				wp_update_attachment_metadata($id, wp_generate_attachment_metadata($id, $filename));

 

-            }

+			}

 

-        }

+		}

 

-    } else {

-        //set_post_thumbnail($post_id,-1);

+	} else {

+		//set_post_thumbnail($post_id,-1);

 

-        if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))

-            wp_delete_attachment($post_thumbnail_id);

+		if (has_post_thumbnail($post_id) && $post_thumbnail_id != '' && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'delete'))

+			wp_delete_attachment($post_thumbnail_id);

 

-    }

+	}

 }

 

 

@@ -2880,53 +2880,53 @@ 
  */

 function gd_copy_original_translation()

 {

-    if (function_exists('icl_object_id')) {

-        global $wpdb, $table_prefix, $plugin_prefix;

-        $post_id = absint($_POST['post_id']);

-        $upload_dir = wp_upload_dir();

-        $post_type = get_post_type($_POST['post_id']);

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

-

-        $post_arr = $wpdb->get_results($wpdb->prepare(

-            "SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",

-            array($post_id)

-        )

-            , ARRAY_A);

-

-        $arrImages = $wpdb->get_results(

-            $wpdb->prepare(

-                "SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",

-                array('%image%', $post_id)

-            )

-        );

-        if ($arrImages) {

-            $image_arr = array();

-            foreach ($arrImages as $img) {

-                $image_arr[] = $upload_dir['baseurl'] . $img->file;

-            }

-            $comma_separated = implode(",", $image_arr);

-            $post_arr[0]['post_images'] = $comma_separated;

-        }

-

-

-        $cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];

-        $cat_arr = array_filter(explode(",", $cats));

-        $trans_cat = array();

-        foreach ($cat_arr as $cat) {

-            $trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false);

-        }

-

-

-        $post_arr[0]['categories'] = array_filter($trans_cat);

+	if (function_exists('icl_object_id')) {

+		global $wpdb, $table_prefix, $plugin_prefix;

+		$post_id = absint($_POST['post_id']);

+		$upload_dir = wp_upload_dir();

+		$post_type = get_post_type($_POST['post_id']);

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

+

+		$post_arr = $wpdb->get_results($wpdb->prepare(

+			"SELECT * FROM $wpdb->posts p JOIN " . $table . " gd ON gd.post_id=p.ID WHERE p.ID=%d LIMIT 1",

+			array($post_id)

+		)

+			, ARRAY_A);

+

+		$arrImages = $wpdb->get_results(

+			$wpdb->prepare(

+				"SELECT * FROM " . GEODIR_ATTACHMENT_TABLE . " WHERE mime_type like %s AND post_id = %d ORDER BY menu_order ASC, ID DESC ",

+				array('%image%', $post_id)

+			)

+		);

+		if ($arrImages) {

+			$image_arr = array();

+			foreach ($arrImages as $img) {

+				$image_arr[] = $upload_dir['baseurl'] . $img->file;

+			}

+			$comma_separated = implode(",", $image_arr);

+			$post_arr[0]['post_images'] = $comma_separated;

+		}

+

+

+		$cats = $post_arr[0][$post_arr[0]['post_type'] . 'category'];

+		$cat_arr = array_filter(explode(",", $cats));

+		$trans_cat = array();

+		foreach ($cat_arr as $cat) {

+			$trans_cat[] = icl_object_id($cat, $post_arr[0]['post_type'] . 'category', false);

+		}

+

+

+		$post_arr[0]['categories'] = array_filter($trans_cat);

 //print_r($image_arr);

-        //print_r($arrImages);

-        //echo $_REQUEST['lang'];

+		//print_r($arrImages);

+		//echo $_REQUEST['lang'];

 //print_r($post_arr);

 //print_r($trans_cat);

-        echo json_encode($post_arr[0]);

+		echo json_encode($post_arr[0]);

 

-    }

-    die();

+	}

+	die();

 }

 

 

@@ -2946,54 +2946,54 @@ 
 function geodir_get_custom_fields_type($listing_type = '')

 {

 

-    global $wpdb;

+	global $wpdb;

 

-    if ($listing_type == '')

-        $listing_type = 'gd_place';

+	if ($listing_type == '')

+		$listing_type = 'gd_place';

 

-    $fields_info = array();

+	$fields_info = array();

 

-    $get_data = $wpdb->get_results(

-        $wpdb->prepare(

-            "SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",

-            array($listing_type)

-        )

-    );

+	$get_data = $wpdb->get_results(

+		$wpdb->prepare(

+			"SELECT htmlvar_name, field_type, extra_fields FROM " . GEODIR_CUSTOM_FIELDS_TABLE . " WHERE post_type=%s AND is_active='1'",

+			array($listing_type)

+		)

+	);

 

-    if (!empty($get_data)) {

+	if (!empty($get_data)) {

 

-        foreach ($get_data as $data) {

+		foreach ($get_data as $data) {

 

-            if ($data->field_type == 'address') {

+			if ($data->field_type == 'address') {

 

-                $extra_fields = unserialize($data->extra_fields);

+				$extra_fields = unserialize($data->extra_fields);

 

-                $prefix = $data->htmlvar_name . '_';

+				$prefix = $data->htmlvar_name . '_';

 

-                $fields_info[$prefix . 'address'] = $data->field_type;

+				$fields_info[$prefix . 'address'] = $data->field_type;

 

-                if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])

-                    $fields_info[$prefix . 'zip'] = $data->field_type;

+				if (isset($extra_fields['show_zip']) && $extra_fields['show_zip'])

+					$fields_info[$prefix . 'zip'] = $data->field_type;

 

-            } else {

+			} else {

 

-                $fields_info[$data->htmlvar_name] = $data->field_type;

+				$fields_info[$data->htmlvar_name] = $data->field_type;

 

-            }

+			}

 

-        }

+		}

 

-    }

+	}

 

-    /**

-     * Filter to modify custom fields info using listing post type.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @return array $fields_info Custom fields info.

-     * @param string $listing_type The listing post type.

-     */

-    return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);

+	/**

+	 * Filter to modify custom fields info using listing post type.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @return array $fields_info Custom fields info.

+	 * @param string $listing_type The listing post type.

+	 */

+	return apply_filters('geodir_get_custom_fields_type', $fields_info, $listing_type);

 }

 

 

@@ -3008,58 +3008,58 @@ 
  */

 function geodir_function_post_updated($post_ID, $post_after, $post_before)

 {

-    $post_type = get_post_type($post_ID);

+	$post_type = get_post_type($post_ID);

 

-    if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {

-        // send notification to client when post moves from draft to publish

-        if (!empty($post_after->post_status) && $post_after->post_status == 'publish' && !empty($post_before->post_status) && ($post_before->post_status == 'draft' || $post_before->post_status == 'auto-draft')) {

-            $post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL;

-            $post_author_data = get_userdata($post_author_id);

+	if ($post_type != '' && in_array($post_type, geodir_get_posttypes())) {

+		// send notification to client when post moves from draft to publish

+		if (!empty($post_after->post_status) && $post_after->post_status == 'publish' && !empty($post_before->post_status) && ($post_before->post_status == 'draft' || $post_before->post_status == 'auto-draft')) {

+			$post_author_id = !empty($post_after->post_author) ? $post_after->post_author : NULL;

+			$post_author_data = get_userdata($post_author_id);

 

-            $to_name = geodir_get_client_name($post_author_id);

+			$to_name = geodir_get_client_name($post_author_id);

 

-            $from_email = geodir_get_site_email_id();

-            $from_name = get_site_emailName();

-            $to_email = $post_author_data->user_email;

+			$from_email = geodir_get_site_email_id();

+			$from_name = get_site_emailName();

+			$to_email = $post_author_data->user_email;

 

-            if (!is_email($to_email) && !empty($post_author_data->user_email)) {

-                $to_email = $post_author_data->user_email;

-            }

+			if (!is_email($to_email) && !empty($post_author_data->user_email)) {

+				$to_email = $post_author_data->user_email;

+			}

 

-            $message_type = 'listing_published';

+			$message_type = 'listing_published';

 

-            if (get_option('geodir_post_published_email_subject') == '') {

-                update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));

-            }

+			if (get_option('geodir_post_published_email_subject') == '') {

+				update_option('geodir_post_published_email_subject', __('Listing Published Successfully', 'geodirectory'));

+			}

 

-            if (get_option('geodir_post_published_email_content') == '') {

-                update_option('geodir_post_published_email_content', __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory'));

-            }

+			if (get_option('geodir_post_published_email_content') == '') {

+				update_option('geodir_post_published_email_content', __("<p>Dear [#client_name#],</p><p>Your listing [#listing_link#] has been published. This email is just for your information.</p><p>[#listing_link#]</p><br><p>Thank you for your contribution.</p><p>[#site_name#]</p>", 'geodirectory'));

+			}

 

-            /**

-             * Called before sending the email when listing gets published.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param object $post_after The post object after update.

-             * @param object $post_before The post object before update.

-             */

-            do_action('geodir_before_listing_published_email', $post_after, $post_before);

-            if (is_email($to_email)) {

-                geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);

-            }

+			/**

+			 * Called before sending the email when listing gets published.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param object $post_after The post object after update.

+			 * @param object $post_before The post object before update.

+			 */

+			do_action('geodir_before_listing_published_email', $post_after, $post_before);

+			if (is_email($to_email)) {

+				geodir_sendEmail($from_email, $from_name, $to_email, $to_name, '', '', '', $message_type, $post_ID);

+			}

 

-            /**

-             * Called after sending the email when listing gets published.

-             *

-             * @since 1.0.0

-             * @package GeoDirectory

-             * @param object $post_after The post object after update.

-             * @param object $post_before The post object before update.

-             */

-            do_action('geodir_after_listing_published_email', $post_after, $post_before);

-        }

-    }

+			/**

+			 * Called after sending the email when listing gets published.

+			 *

+			 * @since 1.0.0

+			 * @package GeoDirectory

+			 * @param object $post_after The post object after update.

+			 * @param object $post_before The post object before update.

+			 */

+			do_action('geodir_after_listing_published_email', $post_after, $post_before);

+		}

+	}

 }

 

 add_action('wp_head', 'geodir_fb_like_thumbnail');

@@ -3073,14 +3073,14 @@ 
  */

 function geodir_fb_like_thumbnail(){

 

-    // return if not a single post

-    if(!is_single()){return;}

+	// return if not a single post

+	if(!is_single()){return;}

 

-    global $post;

-    if(isset($post->featured_image) && $post->featured_image){

-        $upload_dir = wp_upload_dir();

-        $thumb = $upload_dir['baseurl'].$post->featured_image;

-        echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";

+	global $post;

+	if(isset($post->featured_image) && $post->featured_image){

+		$upload_dir = wp_upload_dir();

+		$thumb = $upload_dir['baseurl'].$post->featured_image;

+		echo "\n\n<!-- GD Facebook Like Thumbnail -->\n<link rel=\"image_src\" href=\"$thumb\" />\n<!-- End GD Facebook Like Thumbnail -->\n\n";

 

-    }

+	}

 }
\ No newline at end of file

geodirectory-admin/option-pages/create_field.php

Braces +12 added lines, -8 removed lines

@@ -35,23 +35,26 @@ 
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
     
     echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
     
     echo geodir_custom_sort_field_delete($field_id);
 }
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
 
     foreach ($_REQUEST as $pkey => $pval) {
         if (is_array($_REQUEST[$pkey])) {
@@ -77,8 +80,9 @@ 
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id)) {
+            return;
+    }
 
     foreach ($_REQUEST as $pkey => $pval) {
         if (is_array($_REQUEST[$pkey])) {

Indentation +65 added lines, -65 removed lines

@@ -16,100 +16,100 @@
 
 $field_ids = array();
 if (!empty($_REQUEST['licontainer']) && is_array($_REQUEST['licontainer'])) {
-    foreach ($_REQUEST['licontainer'] as $lic_id) {
-        $field_ids[] = sanitize_text_field($lic_id);
-    }
+	foreach ($_REQUEST['licontainer'] as $lic_id) {
+		$field_ids[] = sanitize_text_field($lic_id);
+	}
 }
 
 /* ------- check nonce field ------- */
 if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    echo godir_set_field_order($field_ids);
+	echo godir_set_field_order($field_ids);
 }
 
 if (isset($_REQUEST['update']) && $_REQUEST['update'] == "update" && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    $response = godir_set_sort_field_order($field_ids);
-    if (is_array($response)) {
-        wp_send_json($response);
-    } else {
-        echo $response;
-    }
+	$response = godir_set_sort_field_order($field_ids);
+	if (is_array($response)) {
+		wp_send_json($response);
+	} else {
+		echo $response;
+	}
 }
 
 /* ---- Show field form in admin ---- */
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+	geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
 }
 
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+	geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
 }
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
     
-    echo geodir_custom_field_delete($field_id);
+	echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
     
-    echo geodir_custom_sort_field_delete($field_id);
+	echo geodir_custom_sort_field_delete($field_id);
 }
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
-
-    foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey])) {
-            $tags = 'skip_field';
-        } else {
-            $tags = '';
-        }
-
-        if ($tags != 'skip_field') {
-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
-        }
-    }
-
-    $return = geodir_custom_field_save($_REQUEST);
-
-    if (is_int($return)) {
-        $lastid = $return;
-        geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key);
-    } else {
-        echo $return;
-    }
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
+
+	foreach ($_REQUEST as $pkey => $pval) {
+		if (is_array($_REQUEST[$pkey])) {
+			$tags = 'skip_field';
+		} else {
+			$tags = '';
+		}
+
+		if ($tags != 'skip_field') {
+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
+		}
+	}
+
+	$return = geodir_custom_field_save($_REQUEST);
+
+	if (is_int($return)) {
+		$lastid = $return;
+		geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key);
+	} else {
+		echo $return;
+	}
 }
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
-        return;
-
-    foreach ($_REQUEST as $pkey => $pval) {
-        if (is_array($_REQUEST[$pkey])) {
-            $tags = 'skip_field';
-        } else {
-            $tags = '';
-        }
-
-        if ($tags != 'skip_field') {
-            $_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
-        }
-    }
-
-    $return = geodir_custom_sort_field_save($_REQUEST);
-
-    if (is_int($return)) {
-        $lastid = $return;
-        $default = false;
-        geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default);
-    } else {
-        echo $return;
-    }
+	if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+		return;
+
+	foreach ($_REQUEST as $pkey => $pval) {
+		if (is_array($_REQUEST[$pkey])) {
+			$tags = 'skip_field';
+		} else {
+			$tags = '';
+		}
+
+		if ($tags != 'skip_field') {
+			$_REQUEST[$pkey] = strip_tags($_REQUEST[$pkey], $tags);
+		}
+	}
+
+	$return = geodir_custom_sort_field_save($_REQUEST);
+
+	if (is_int($return)) {
+		$lastid = $return;
+		$default = false;
+		geodir_custom_sort_field_adminhtml($field_type, $lastid, 'submit', $default);
+	} else {
+		echo $return;
+	}
 }
\ No newline at end of file

Spacing +7 added lines, -7 removed lines

@@ -37,23 +37,23 @@ 
 
 /* ---- Show field form in admin ---- */
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    geodir_custom_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+    geodir_custom_field_adminhtml($field_type, $field_id, $field_action, $field_type_key);
 }
 
 if ($field_type != '' && $field_id != '' && $field_action == 'new' && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action,$field_type_key);
+    geodir_custom_sort_field_adminhtml($field_type, $field_id, $field_action, $field_type_key);
 }
 
 /* ---- Delete field ---- */
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
     
     echo geodir_custom_field_delete($field_id);
 }
 
 if ($field_id != '' && $field_action == 'delete' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
     
     echo geodir_custom_sort_field_delete($field_id);
@@ -61,7 +61,7 @@ 
 
 /* ---- Save field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'custom_fields') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
 
     foreach ($_REQUEST as $pkey => $pval) {
@@ -80,7 +80,7 @@ 
 
     if (is_int($return)) {
         $lastid = $return;
-        geodir_custom_field_adminhtml($field_type, $lastid, 'submit',$field_type_key);
+        geodir_custom_field_adminhtml($field_type, $lastid, 'submit', $field_type_key);
     } else {
         echo $return;
     }
@@ -88,7 +88,7 @@ 
 
 /* ---- Save sort field  ---- */
 if ($field_id != '' && $field_action == 'submit' && isset($_REQUEST['_wpnonce']) && isset($_REQUEST['create_field']) && isset($_REQUEST['manage_field_type']) && $_REQUEST['manage_field_type'] == 'sorting_options') {
-    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_' . $field_id))
+    if (!wp_verify_nonce($_REQUEST['_wpnonce'], 'custom_fields_'.$field_id))
         return;
 
     foreach ($_REQUEST as $pkey => $pval) {

geodirectory-admin/admin_db_install.php

Braces +6 added lines, -2 removed lines

@@ -23,8 +23,12 @@
 

         $collate = '';

         if ($wpdb->has_cap('collation')) {

-            if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";

-            if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";

+            if (!empty($wpdb->charset)) {
+            	$collate = "DEFAULT CHARACTER SET $wpdb->charset";
+            }
+            if (!empty($wpdb->collate)) {
+            	$collate .= " COLLATE $wpdb->collate";
+            }
         }

 

 		/**

Spacing +24 added lines, -24 removed lines

@@ -32,35 +32,35 @@ 
 		 *

 		 * @since 1.0.0

 		 */

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

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

 

 

 // rename tables if we need to

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_countries'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_countries TO ".$wpdb->prefix."geodir_countries");

         }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_custom_fields'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_custom_fields TO ".$wpdb->prefix."geodir_custom_fields");

         }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_post_icon'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_post_icon TO ".$wpdb->prefix."geodir_post_icon");

         }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_attachments'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_attachments TO ".$wpdb->prefix."geodir_attachments");

         }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_post_review'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_post_review TO ".$wpdb->prefix."geodir_post_review");

         }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_custom_sort_fields'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO ".$wpdb->prefix."geodir_custom_sort_fields");

         }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");

+        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '".$wpdb->prefix."geodir_gd_place_detail'") == 0) {

+            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO ".$wpdb->prefix."geodir_gd_place_detail");

         }

 

 

         // Table for storing Countries

-        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (

+        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE ".GEODIR_COUNTRIES_TABLE." (

 						CountryId smallint AUTO_INCREMENT NOT NULL ,

 						Country varchar (50) NOT NULL ,

 						FIPS104 varchar (2) NOT NULL ,

@@ -89,11 +89,11 @@ 
         dbDelta($GEODIR_COUNTRIES_TABLE);

 

 

-        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");

+        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM ".GEODIR_COUNTRIES_TABLE."");

 

         if ($country_table_empty == 0) {

 

-            $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES

+            $countries_insert = "INSERT INTO ".GEODIR_COUNTRIES_TABLE." (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES

 	(1, 'Afghanistan', 'AF', 'AF', 'AFG', '4', 'AF', 'Kabul ', 'Asia ', 'Afghan', 'Afghans', 'Afghani ', 'AFA', 26813057, 'Afghanistan', ''),

 	(2, 'Albania', 'AL', 'AL', 'ALB', '8', 'AL', 'Tirana ', 'Europe ', 'Albanian', 'Albanians', 'Lek ', 'ALL', 3510484, 'Albania', ''),

 	(3, 'Algeria', 'AG', 'DZ', 'DZA', '12', 'DZ', 'Algiers ', 'Africa ', 'Algerian', 'Algerians', 'Algerian Dinar ', 'DZD', 31736053, 'Algeria', ''),

@@ -382,7 +382,7 @@ 
 

         // Table for storing location attribute - these are user defined

 

-        $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (

+        $icon_table = "CREATE TABLE ".GEODIR_ICON_TABLE." (

 						id int NOT NULL AUTO_INCREMENT,

 						post_id int( 10 ) NOT NULL,

 						post_title varchar(254) NOT NULL,

@@ -403,7 +403,7 @@ 
 

         // Table for storing post custom fields - these are user defined

 

-        $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (

+        $post_custom_fields = "CREATE TABLE ".GEODIR_CUSTOM_FIELDS_TABLE." (

 							  id int(11) NOT NULL AUTO_INCREMENT,

 							  post_type varchar(100) NULL,

 							  data_type varchar(100) NULL DEFAULT NULL,

@@ -448,7 +448,7 @@ 
         dbDelta($post_custom_fields);

 

         // Table for storing place attribute - these are user defined

-        $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (

+        $post_detail = "CREATE TABLE ".$plugin_prefix."gd_place_detail (

 						post_id int(11) NOT NULL,

 						post_title text NULL DEFAULT NULL,

 						post_status varchar(20) NULL DEFAULT NULL,

@@ -489,7 +489,7 @@ 
 

         // Table for storing place images - these are user defined

 

-        $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (

+        $attechment_table = "CREATE TABLE ".GEODIR_ATTACHMENT_TABLE." (

 						ID int(11) NOT NULL AUTO_INCREMENT,

 						post_id int(11) NOT NULL,

 						user_id int(11) DEFAULT NULL,

@@ -516,7 +516,7 @@ 
         dbDelta($attechment_table);

 

 

-        $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (

+        $custom_sort_fields_table = "CREATE TABLE ".GEODIR_CUSTOM_SORT_FIELDS_TABLE." (

 			id int(11) NOT NULL AUTO_INCREMENT,

 			post_type varchar(255) NOT NULL,

 			data_type varchar(255) NOT NULL,

@@ -545,7 +545,7 @@ 
         dbDelta($custom_sort_fields_table);

 

 

-            $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (

+            $review_table = "CREATE TABLE ".GEODIR_REVIEW_TABLE." (

 			id int(11) NOT NULL AUTO_INCREMENT,

 			post_id int(11) DEFAULT NULL,

 			post_title varchar( 255 ) NULL DEFAULT NULL,

Indentation +155 added lines, -155 removed lines

@@ -6,26 +6,26 @@ 
  * @package GeoDirectory

  */

 if (!function_exists('geodir_create_tables')) {

-    /**

-     * Creates custom db tables for storing GeoDirectory plugin data.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $wpdb WordPress Database object.

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

-     */

-    function geodir_create_tables()

-    {

-

-        global $wpdb, $plugin_prefix;

-

-        $wpdb->hide_errors();

-

-        $collate = '';

-        if ($wpdb->has_cap('collation')) {

-            if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";

-            if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";

-        }

+	/**

+	 * Creates custom db tables for storing GeoDirectory plugin data.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $wpdb WordPress Database object.

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

+	 */

+	function geodir_create_tables()

+	{

+

+		global $wpdb, $plugin_prefix;

+

+		$wpdb->hide_errors();

+

+		$collate = '';

+		if ($wpdb->has_cap('collation')) {

+			if (!empty($wpdb->charset)) $collate = "DEFAULT CHARACTER SET $wpdb->charset";

+			if (!empty($wpdb->collate)) $collate .= " COLLATE $wpdb->collate";

+		}

 

 		/**

 		 * Include any functions needed for upgrades.

@@ -36,31 +36,31 @@ 
 

 

 // rename tables if we need to

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");

-        }

-        if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {

-            $wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");

-        }

-

-

-        // Table for storing Countries

-        $GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_countries'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_countries'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_countries TO " . $wpdb->prefix . "geodir_countries");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_fields'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_custom_fields TO " . $wpdb->prefix . "geodir_custom_fields");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_icon'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_icon'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_post_icon TO " . $wpdb->prefix . "geodir_post_icon");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_attachments'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_attachments'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_attachments TO " . $wpdb->prefix . "geodir_attachments");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_post_review'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_post_review'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_post_review TO " . $wpdb->prefix . "geodir_post_review");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_custom_sort_fields'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_custom_sort_fields'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_custom_sort_fields TO " . $wpdb->prefix . "geodir_custom_sort_fields");

+		}

+		if ($wpdb->query("SHOW TABLES LIKE 'geodir_gd_place_detail'") > 0 && $wpdb->query("SHOW TABLES LIKE '" . $wpdb->prefix . "geodir_gd_place_detail'") == 0) {

+			$wpdb->query("RENAME TABLE geodir_gd_place_detail TO " . $wpdb->prefix . "geodir_gd_place_detail");

+		}

+

+

+		// Table for storing Countries

+		$GEODIR_COUNTRIES_TABLE = "CREATE TABLE " . GEODIR_COUNTRIES_TABLE . " (

 						CountryId smallint AUTO_INCREMENT NOT NULL ,

 						Country varchar (50) NOT NULL ,

 						FIPS104 varchar (2) NOT NULL ,

@@ -79,21 +79,21 @@ 
 						Comment varchar (255) NULL ,

 						PRIMARY KEY  (CountryId)) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the country DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE);

-        dbDelta($GEODIR_COUNTRIES_TABLE);

+		/**

+		 * Filter the SQL query that creates/updates the country DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$GEODIR_COUNTRIES_TABLE = apply_filters('geodir_before_country_table_create', $GEODIR_COUNTRIES_TABLE);

+		dbDelta($GEODIR_COUNTRIES_TABLE);

 

 

-        $country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");

+		$country_table_empty = $wpdb->get_var("SELECT COUNT(CountryId) FROM " . GEODIR_COUNTRIES_TABLE . "");

 

-        if ($country_table_empty == 0) {

+		if ($country_table_empty == 0) {

 

-            $countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES

+			$countries_insert = "INSERT INTO " . GEODIR_COUNTRIES_TABLE . " (`CountryId`, `Country`, `FIPS104`, `ISO2`, `ISO3`, `ISON`, `Internet`, `Capital`, `MapReference`, `NationalitySingular`, `NationalityPlural`, `Currency`, `CurrencyCode`, `Population`, `Title`, `COMMENT`) VALUES

 	(1, 'Afghanistan', 'AF', 'AF', 'AFG', '4', 'AF', 'Kabul ', 'Asia ', 'Afghan', 'Afghans', 'Afghani ', 'AFA', 26813057, 'Afghanistan', ''),

 	(2, 'Albania', 'AL', 'AL', 'ALB', '8', 'AL', 'Tirana ', 'Europe ', 'Albanian', 'Albanians', 'Lek ', 'ALL', 3510484, 'Albania', ''),

 	(3, 'Algeria', 'AG', 'DZ', 'DZA', '12', 'DZ', 'Algiers ', 'Africa ', 'Algerian', 'Algerians', 'Algerian Dinar ', 'DZD', 31736053, 'Algeria', ''),

@@ -368,21 +368,21 @@ 
 	(277, 'Caribbean Netherlands', '--', 'BQ', 'BES', '535', 'BQ', '--', 'Central America and the Caribbean', '--', '--', 'United States dollar', 'USD', 21133, 'Caribbean Netherlands', ''),

 	(278, 'Kosovo', 'XK', 'XK', '--', '--', 'XK', 'Pristina', 'Europe', '--', '--', 'Euro', 'EUR', 1859203, 'Caribbean Netherlands', 'Kosovo')";

 

-            /**

-             * Filter the SQL query that inserts the country DB table data.

-             *

-             * @since 1.0.0

-             * @param string $sql The SQL insert query string.

-             */

-            $countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert);

-            $wpdb->query($countries_insert);

+			/**

+			 * Filter the SQL query that inserts the country DB table data.

+			 *

+			 * @since 1.0.0

+			 * @param string $sql The SQL insert query string.

+			 */

+			$countries_insert = apply_filters('geodir_before_country_data_insert', $countries_insert);

+			$wpdb->query($countries_insert);

 

-        }

+		}

 

 

-        // Table for storing location attribute - these are user defined

+		// Table for storing location attribute - these are user defined

 

-        $icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (

+		$icon_table = "CREATE TABLE " . GEODIR_ICON_TABLE . " (

 						id int NOT NULL AUTO_INCREMENT,

 						post_id int( 10 ) NOT NULL,

 						post_title varchar(254) NOT NULL,

@@ -391,19 +391,19 @@ 
 						PRIMARY KEY  (id)

 						) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the post_icon DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $icon_table = apply_filters('geodir_before_icon_table_create', $icon_table);

+		/**

+		 * Filter the SQL query that creates/updates the post_icon DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$icon_table = apply_filters('geodir_before_icon_table_create', $icon_table);

 

-        dbDelta($icon_table);

+		dbDelta($icon_table);

 

-        // Table for storing post custom fields - these are user defined

+		// Table for storing post custom fields - these are user defined

 

-        $post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (

+		$post_custom_fields = "CREATE TABLE " . GEODIR_CUSTOM_FIELDS_TABLE . " (

 							  id int(11) NOT NULL AUTO_INCREMENT,

 							  post_type varchar(100) NULL,

 							  data_type varchar(100) NULL DEFAULT NULL,

@@ -439,18 +439,18 @@ 
 							  PRIMARY KEY  (id)

 							  ) $collate";

 

-        /**

-         * Filter the SQL query that creates/updates the custom_fields DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields);

+		/**

+		 * Filter the SQL query that creates/updates the custom_fields DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$post_custom_fields = apply_filters('geodir_before_custom_field_table_create', $post_custom_fields);

 

-        dbDelta($post_custom_fields);

+		dbDelta($post_custom_fields);

 

-        // Table for storing place attribute - these are user defined

-        $post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (

+		// Table for storing place attribute - these are user defined

+		$post_detail = "CREATE TABLE " . $plugin_prefix . "gd_place_detail (

 						post_id int(11) NOT NULL,

 						post_title text NULL DEFAULT NULL,

 						post_status varchar(20) NULL DEFAULT NULL,

@@ -477,22 +477,22 @@ 
 						PRIMARY KEY  (post_id)

 						) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the post_detail DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail);

+		/**

+		 * Filter the SQL query that creates/updates the post_detail DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$post_detail = apply_filters('geodir_before_post_detail_table_create', $post_detail);

 

-        dbDelta($post_detail);

+		dbDelta($post_detail);

 

-        // alter post_title

-        //$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL");

+		// alter post_title

+		//$wpdb->query("ALTER TABLE ".$wpdb->prefix."geodir_gd_place_detail MODIFY `post_title` text NULL");

 

-        // Table for storing place images - these are user defined

+		// Table for storing place images - these are user defined

 

-        $attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (

+		$attechment_table = "CREATE TABLE " . GEODIR_ATTACHMENT_TABLE . " (

 						ID int(11) NOT NULL AUTO_INCREMENT,

 						post_id int(11) NOT NULL,

 						user_id int(11) DEFAULT NULL,

@@ -508,18 +508,18 @@ 
 						PRIMARY KEY  (ID)

 						) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the attachments DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table);

+		/**

+		 * Filter the SQL query that creates/updates the attachments DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$attechment_table = apply_filters('geodir_before_attachment_table_create', $attechment_table);

 

-        dbDelta($attechment_table);

+		dbDelta($attechment_table);

 

 

-        $custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (

+		$custom_sort_fields_table = "CREATE TABLE " . GEODIR_CUSTOM_SORT_FIELDS_TABLE . " (

 			id int(11) NOT NULL AUTO_INCREMENT,

 			post_type varchar(255) NOT NULL,

 			data_type varchar(255) NOT NULL,

@@ -537,18 +537,18 @@ 
 			PRIMARY KEY  (id)

 			) $collate ";

 

-        /**

-         * Filter the SQL query that creates/updates the custom_sort_fields DB table structure.

-         *

-         * @since 1.0.0

-         * @param string $sql The SQL insert query string.

-         */

-        $custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table);

+		/**

+		 * Filter the SQL query that creates/updates the custom_sort_fields DB table structure.

+		 *

+		 * @since 1.0.0

+		 * @param string $sql The SQL insert query string.

+		 */

+		$custom_sort_fields_table = apply_filters('geodir_before_sort_fields_table_create', $custom_sort_fields_table);

 

-        dbDelta($custom_sort_fields_table);

+		dbDelta($custom_sort_fields_table);

 

 

-            $review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (

+			$review_table = "CREATE TABLE " . GEODIR_REVIEW_TABLE . " (

 			id int(11) NOT NULL AUTO_INCREMENT,

 			post_id int(11) DEFAULT NULL,

 			post_title varchar( 255 ) NULL DEFAULT NULL,

@@ -572,51 +572,51 @@ 
 			PRIMARY KEY  (id)

 			) $collate  ";

 

-            /**

-             * Filter the SQL query that creates the review DB table structure.

-             *

-             * @since 1.0.0

-             * @param string $sql The SQL insert query string.

-             */

-            $review_table = apply_filters('geodir_before_review_table_create', $review_table);

-            dbDelta($review_table);

+			/**

+			 * Filter the SQL query that creates the review DB table structure.

+			 *

+			 * @since 1.0.0

+			 * @param string $sql The SQL insert query string.

+			 */

+			$review_table = apply_filters('geodir_before_review_table_create', $review_table);

+			dbDelta($review_table);

 

 

 

-        // Alter terms table

-        $term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");

-        if (!$term_icon_column) {

-            $wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");

-        }

+		// Alter terms table

+		$term_icon_column = $wpdb->get_var("SHOW COLUMNS FROM $wpdb->terms where field='term_icon'");

+		if (!$term_icon_column) {

+			$wpdb->query("ALTER TABLE $wpdb->terms ADD `term_icon` TEXT NULL DEFAULT NULL");

+		}

 

-        //require_once(geodir_plugin_path() . '/upgrade.php');

+		//require_once(geodir_plugin_path() . '/upgrade.php');

 

 

-    }

+	}

 } // END MAIN FUNCTION geodir_tables_install

 

 if (!function_exists('geodir_create_default_fields')) {

-    /**

-     * Inserts default custom fields table data into database.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     */

-    function geodir_create_default_fields()

-    {

-

-        $fields = geodir_default_custom_fields('gd_place');

-

-        /**

-         * Filter the array of default custom fields DB table data.

-         *

-         * @since 1.0.0

-         * @param string $fields The default custom fields as an array.

-         */

-        $fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);

-        foreach ($fields as $field_index => $field) {

-            geodir_custom_field_save($field);

-

-        }

-    }

+	/**

+	 * Inserts default custom fields table data into database.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 */

+	function geodir_create_default_fields()

+	{

+

+		$fields = geodir_default_custom_fields('gd_place');

+

+		/**

+		 * Filter the array of default custom fields DB table data.

+		 *

+		 * @since 1.0.0

+		 * @param string $fields The default custom fields as an array.

+		 */

+		$fields = apply_filters('geodir_before_default_custom_fields_saved', $fields);

+		foreach ($fields as $field_index => $field) {

+			geodir_custom_field_save($field);

+

+		}

+	}

 }
\ No newline at end of file

geodirectory-admin/option-pages/permalink_settings_array.php

Indentation +178 added lines, -178 removed lines

@@ -16,184 +16,184 @@
  */
 $geodir_settings['permalink_settings'] = apply_filters('geodir_permalink_settings', array(
 
-    /* Listing Permalink Settings start */
-    array('name' => __('Permalink', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set permalink', 'id' => 'geodir_permalink_settings '),
-
-
-    array('name' => __('Listing Detail Permalink Settings', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_permalink'),
-
-    array(
-        'name' => __('Add location in urls', 'geodirectory'),
-        'desc' => __('Add location slug in listing urls', 'geodirectory'),
-        'id' => 'geodir_add_location_url',
-        'type' => 'checkbox',
-        'std' => '1',
-        'checkboxgroup' => 'start'
-    ),
-
-    array(
-        'name' => __('Add full location in listing urls', 'geodirectory'),
-        'desc' => __('Add full location info with country, region and city slug in listing urls', 'geodirectory'),
-        'id' => 'geodir_show_location_url',
-        'type' => 'radio',
-        'value' => 'all',
-        'std' => 'all',
-        'radiogroup' => ''
-    ),
-
-	array(
-        'name' => __('Add country and city slug in listing urls', 'geodirectory'),
-        'desc' => __('Add country and city slug in listing urls (/country/city/)', 'geodirectory'),
-        'id' => 'geodir_show_location_url',
-        'type' => 'radio',
-        'std' => 'all',
-        'value' => 'country_city',
-        'radiogroup' => ''
-    ),
-	array(
-        'name' => __('Add region and city slug in listing urls', 'geodirectory'),
-        'desc' => __('Add region and city slug in listing urls (/region/city/)', 'geodirectory'),
-        'id' => 'geodir_show_location_url',
-        'type' => 'radio',
-        'std' => 'all',
-        'value' => 'region_city',
-        'radiogroup' => ''
-    ),
-    array(
-        'name' => __('Add only city in listing urls', 'geodirectory'),
-        'desc' => __('Add city slug in listing urls', 'geodirectory'),
-        'id' => 'geodir_show_location_url',
-        'type' => 'radio',
-        'std' => 'all',
-        'value' => 'city',
-        'radiogroup' => 'end'
-    ),
-
-
-
-    array(
-        'name' => __('Add category in listing urls', 'geodirectory'),
-        'desc' => __('Add requested category slugs in listing urls', 'geodirectory'),
-        'id' => 'geodir_add_categories_url',
-        'type' => 'checkbox',
-        'std' => '1',
-    ),
-
-    array(
-        'name' => __('Listing url prefix', 'geodirectory'),
-        'desc' => __('Listing prefix to show in url', 'geodirectory'),
-        'id' => 'geodir_listing_prefix',
-        'type' => 'text',
-        'css' => 'min-width:300px;',
-        'std' => 'places'
-    ),
-
-    array(
-        'name' => __('Location url prefix', 'geodirectory'),
-        'desc' => __('Depreciated, now uses the location page slug', 'geodirectory'),
-        'id' => 'geodir_location_prefix',
-        'type' => 'text',
-        'css' => 'min-width:300px;',
-        'std' => 'location' // Default value to show home top section
-    ),
-
-    array(
-        'name' => __('Location and category url separator', 'geodirectory'),
-        'desc' => __('Separator to show between location and category url slugs in listing urls', 'geodirectory'),
-        'id' => 'geodir_listingurl_separator',
-        'type' => 'text',
-        'css' => 'min-width:300px;',
-        'std' => 'C' // Default value to show home top section
-    ),
-
-    array(
-        'name' => __('Listing detail url separator', 'geodirectory'),
-        'desc' => __('Separator to show before listing slug in listing detail urls', 'geodirectory'),
-        'id' => 'geodir_detailurl_separator',
-        'type' => 'text',
-        'css' => 'min-width:300px;',
-        'std' => 'info' // Default value to show home top section
-    ),
-
-
-    array('type' => 'sectionend', 'id' => 'geodir_permalink'),
-
-    array('name' => __('GeoDirectory Pages', 'geodirectory'),
-        'type' => 'sectionstart',
-        'desc' => '',
-        'id' => 'geodir_pages'),
-
-    array(
-        'name' => __('GD Home page', 'geodirectory'),
-        'desc' => __('Select the page to use for the GD homepage (you must also set this page in Settings>Reading>Front page for it to work)', 'geodirectory'),
-        'id' => 'geodir_home_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Add listing page', 'geodirectory'),
-        'desc' => __('Select the page to use for adding listings', 'geodirectory'),
-        'id' => 'geodir_add_listing_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Listing preview page', 'geodirectory'),
-        'desc' => __('Select the page to use for listing preview', 'geodirectory'),
-        'id' => 'geodir_preview_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Listing success page', 'geodirectory'),
-        'desc' => __('Select the page to use for listing success', 'geodirectory'),
-        'id' => 'geodir_success_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Location page', 'geodirectory'),
-        'desc' => __('Select the page to use for locations', 'geodirectory'),
-        'id' => 'geodir_location_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Terms and Conditions page', 'geodirectory'),
-        'desc' => __('Select the page to use for Terms and Conditions (if enabled)', 'geodirectory'),
-        'id' => 'geodir_term_condition_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Info page', 'geodirectory'),
-        'desc' => __('Select the page to use for Gd general Info', 'geodirectory'),
-        'id' => 'geodir_info_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-    array(
-        'name' => __('Login page', 'geodirectory'),
-        'desc' => __('Select the page to use for Login / Register', 'geodirectory'),
-        'id' => 'geodir_login_page',
-        'type' => 'single_select_page',
-        'class' => 'chosen_select'
-    ),
-
-
-    array('type' => 'sectionend', 'id' => 'geodir_pages'),
-
-    /* Listing Detail Permalink Settings End */
+	/* Listing Permalink Settings start */
+	array('name' => __('Permalink', 'geodirectory'), 'type' => 'no_tabs', 'desc' => 'Settings to set permalink', 'id' => 'geodir_permalink_settings '),
+
+
+	array('name' => __('Listing Detail Permalink Settings', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_permalink'),
+
+	array(
+		'name' => __('Add location in urls', 'geodirectory'),
+		'desc' => __('Add location slug in listing urls', 'geodirectory'),
+		'id' => 'geodir_add_location_url',
+		'type' => 'checkbox',
+		'std' => '1',
+		'checkboxgroup' => 'start'
+	),
+
+	array(
+		'name' => __('Add full location in listing urls', 'geodirectory'),
+		'desc' => __('Add full location info with country, region and city slug in listing urls', 'geodirectory'),
+		'id' => 'geodir_show_location_url',
+		'type' => 'radio',
+		'value' => 'all',
+		'std' => 'all',
+		'radiogroup' => ''
+	),
+
+	array(
+		'name' => __('Add country and city slug in listing urls', 'geodirectory'),
+		'desc' => __('Add country and city slug in listing urls (/country/city/)', 'geodirectory'),
+		'id' => 'geodir_show_location_url',
+		'type' => 'radio',
+		'std' => 'all',
+		'value' => 'country_city',
+		'radiogroup' => ''
+	),
+	array(
+		'name' => __('Add region and city slug in listing urls', 'geodirectory'),
+		'desc' => __('Add region and city slug in listing urls (/region/city/)', 'geodirectory'),
+		'id' => 'geodir_show_location_url',
+		'type' => 'radio',
+		'std' => 'all',
+		'value' => 'region_city',
+		'radiogroup' => ''
+	),
+	array(
+		'name' => __('Add only city in listing urls', 'geodirectory'),
+		'desc' => __('Add city slug in listing urls', 'geodirectory'),
+		'id' => 'geodir_show_location_url',
+		'type' => 'radio',
+		'std' => 'all',
+		'value' => 'city',
+		'radiogroup' => 'end'
+	),
+
+
+
+	array(
+		'name' => __('Add category in listing urls', 'geodirectory'),
+		'desc' => __('Add requested category slugs in listing urls', 'geodirectory'),
+		'id' => 'geodir_add_categories_url',
+		'type' => 'checkbox',
+		'std' => '1',
+	),
+
+	array(
+		'name' => __('Listing url prefix', 'geodirectory'),
+		'desc' => __('Listing prefix to show in url', 'geodirectory'),
+		'id' => 'geodir_listing_prefix',
+		'type' => 'text',
+		'css' => 'min-width:300px;',
+		'std' => 'places'
+	),
+
+	array(
+		'name' => __('Location url prefix', 'geodirectory'),
+		'desc' => __('Depreciated, now uses the location page slug', 'geodirectory'),
+		'id' => 'geodir_location_prefix',
+		'type' => 'text',
+		'css' => 'min-width:300px;',
+		'std' => 'location' // Default value to show home top section
+	),
+
+	array(
+		'name' => __('Location and category url separator', 'geodirectory'),
+		'desc' => __('Separator to show between location and category url slugs in listing urls', 'geodirectory'),
+		'id' => 'geodir_listingurl_separator',
+		'type' => 'text',
+		'css' => 'min-width:300px;',
+		'std' => 'C' // Default value to show home top section
+	),
+
+	array(
+		'name' => __('Listing detail url separator', 'geodirectory'),
+		'desc' => __('Separator to show before listing slug in listing detail urls', 'geodirectory'),
+		'id' => 'geodir_detailurl_separator',
+		'type' => 'text',
+		'css' => 'min-width:300px;',
+		'std' => 'info' // Default value to show home top section
+	),
+
+
+	array('type' => 'sectionend', 'id' => 'geodir_permalink'),
+
+	array('name' => __('GeoDirectory Pages', 'geodirectory'),
+		'type' => 'sectionstart',
+		'desc' => '',
+		'id' => 'geodir_pages'),
+
+	array(
+		'name' => __('GD Home page', 'geodirectory'),
+		'desc' => __('Select the page to use for the GD homepage (you must also set this page in Settings>Reading>Front page for it to work)', 'geodirectory'),
+		'id' => 'geodir_home_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Add listing page', 'geodirectory'),
+		'desc' => __('Select the page to use for adding listings', 'geodirectory'),
+		'id' => 'geodir_add_listing_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Listing preview page', 'geodirectory'),
+		'desc' => __('Select the page to use for listing preview', 'geodirectory'),
+		'id' => 'geodir_preview_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Listing success page', 'geodirectory'),
+		'desc' => __('Select the page to use for listing success', 'geodirectory'),
+		'id' => 'geodir_success_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Location page', 'geodirectory'),
+		'desc' => __('Select the page to use for locations', 'geodirectory'),
+		'id' => 'geodir_location_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Terms and Conditions page', 'geodirectory'),
+		'desc' => __('Select the page to use for Terms and Conditions (if enabled)', 'geodirectory'),
+		'id' => 'geodir_term_condition_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Info page', 'geodirectory'),
+		'desc' => __('Select the page to use for Gd general Info', 'geodirectory'),
+		'id' => 'geodir_info_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+	array(
+		'name' => __('Login page', 'geodirectory'),
+		'desc' => __('Select the page to use for Login / Register', 'geodirectory'),
+		'id' => 'geodir_login_page',
+		'type' => 'single_select_page',
+		'class' => 'chosen_select'
+	),
+
+
+	array('type' => 'sectionend', 'id' => 'geodir_pages'),
+
+	/* Listing Detail Permalink Settings End */
 
 
 )); // End Design settings

geodirectory-functions/compatibility/Divi.php

Indentation +9 added lines, -9 removed lines

@@ -18,11 +18,11 @@ 
  */
 function geodir_divi_signup_body_class($classes)
 {
-    if (geodir_is_page('login')) {
-        $classes = str_replace('et_right_sidebar', 'et_full_width_page', $classes);
-        $classes[] = 'divi-gd-signup';
-    }
-    return $classes;
+	if (geodir_is_page('login')) {
+		$classes = str_replace('et_right_sidebar', 'et_full_width_page', $classes);
+		$classes[] = 'divi-gd-signup';
+	}
+	return $classes;
 }
 
 add_action('geodir_wrapper_close', 'geodir_divi_action_wrapper_close', 11);
@@ -34,8 +34,8 @@ 
  */
 function geodir_divi_action_wrapper_close()
 {
-    if (geodir_is_page('login')) {
-        // We need to close extra divs generated by WRAPPER BEFORE MAIN CONTENT (below) because there is no sidebar on this page
-        echo '</div></div>';
-    }
+	if (geodir_is_page('login')) {
+		// We need to close extra divs generated by WRAPPER BEFORE MAIN CONTENT (below) because there is no sidebar on this page
+		echo '</div></div>';
+	}
 }
\ No newline at end of file

geodirectory-functions/compatibility/Genesis.php

Indentation +168 added lines, -168 removed lines

@@ -17,26 +17,26 @@ 
 function gd_compat_php_genesis()
 {
 // REPLACE GENESIS BREADCRUMBS WITH GD BREADCRUMBS
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_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_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_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);
 
-    // REMOVE PAGE TITLES
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+	// REMOVE PAGE TITLES
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
 
 
 }
@@ -53,25 +53,25 @@ 
 function gd_genesis_compat_left_sidebars()
 {
 
-    if (is_page_geodir_home()) {
-        remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11);
-    } elseif (geodir_is_page('location')) {
-        remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11);
-    } elseif (geodir_is_page('listing')) {
-        remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11);
-    } elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) {
-        //remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 );
-        //add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 );
-    } elseif (geodir_is_page('search')) {
-        remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11);
-    } elseif (geodir_is_page('author')) {
-        remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10);
-        add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11);
-    }
+	if (is_page_geodir_home()) {
+		remove_action('geodir_home_sidebar_left', 'geodir_action_home_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11);
+	} elseif (geodir_is_page('location')) {
+		remove_action('geodir_location_sidebar_left', 'geodir_action_home_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_home_sidebar_left', 11);
+	} elseif (geodir_is_page('listing')) {
+		remove_action('geodir_listings_sidebar_left', 'geodir_action_listings_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_listings_sidebar_left', 11);
+	} elseif (geodir_is_page('detail') && get_option('geodir_detail_sidebar_left_section')) {
+		//remove_action( 'geodir_detail_sidebar', 'geodir_action_details_sidebar', 10 );
+		//add_action( 'geodir_wrapper_close', 'geodir_action_details_sidebar', 11 );
+	} elseif (geodir_is_page('search')) {
+		remove_action('geodir_search_sidebar_left', 'geodir_action_search_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_search_sidebar_left', 11);
+	} elseif (geodir_is_page('author')) {
+		remove_action('geodir_author_sidebar_left', 'geodir_action_author_sidebar_left', 10);
+		add_action('geodir_wrapper_close', 'geodir_action_author_sidebar_left', 11);
+	}
 
 
 }
@@ -88,65 +88,65 @@ 
  */
 function geodir_set_body_scs($classes)
 {
-    $remove_class = false;
-    $new_class = '';
-    if (is_page_geodir_home() || geodir_is_page('location')) {
-        $remove_class = true;
-        if (get_option('geodir_show_home_left_section')) {
-            $new_class .= 'sidebar-';
-        }
-        if (get_option('geodir_show_home_contant_section')) {
-            $new_class .= 'content';
-        }
-        if (get_option('geodir_show_home_right_section')) {
-            $new_class .= '-sidebar';
-        }
-    } elseif (geodir_is_page('listing')) {
-        $remove_class = true;
-        if (get_option('geodir_show_listing_left_section')) {
-            $new_class .= 'sidebar-';
-        }
-        $new_class .= 'content';
-        if (get_option('geodir_show_listing_right_section')) {
-            $new_class .= '-sidebar';
-        }
-    } elseif (geodir_is_page('detail')) {
-        $remove_class = true;
-        if (get_option('geodir_detail_sidebar_left_section')) {
-            $new_class .= 'sidebar-content gd-details-sidebar-left';
-        } else {
-            $new_class .= 'content-sidebar';
-        }
-    } elseif (geodir_is_page('search')) {
-        $remove_class = true;
-        if (get_option('geodir_show_search_left_section')) {
-            $new_class .= 'sidebar-';
-        }
-        $new_class .= 'content';
-        if (get_option('geodir_show_search_right_section')) {
-            $new_class .= '-sidebar';
-        }
-    } elseif (geodir_is_page('author')) {
-        $remove_class = true;
-        if (get_option('geodir_show_author_left_section')) {
-            $new_class .= 'sidebar-';
-        }
-        $new_class .= 'content';
-        if (get_option('geodir_show_author_right_section')) {
-            $new_class .= '-sidebar';
-        }
-    } elseif (geodir_is_page('add-listing')) {
-        $remove_class = true;
-        $new_class .= 'content-sidebar';
-    }
-
-    if ($remove_class) {
-        $classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content'));
-        //str_replace(array('content-sidebar','sidebar-content','content-sidebar-sidebar','sidebar-sidebar-content','sidebar-content-sidebar','full-width-content'),array('','','','','',''),$classes);
-        $classes[] = $new_class;
-    }
-
-    return $classes;
+	$remove_class = false;
+	$new_class = '';
+	if (is_page_geodir_home() || geodir_is_page('location')) {
+		$remove_class = true;
+		if (get_option('geodir_show_home_left_section')) {
+			$new_class .= 'sidebar-';
+		}
+		if (get_option('geodir_show_home_contant_section')) {
+			$new_class .= 'content';
+		}
+		if (get_option('geodir_show_home_right_section')) {
+			$new_class .= '-sidebar';
+		}
+	} elseif (geodir_is_page('listing')) {
+		$remove_class = true;
+		if (get_option('geodir_show_listing_left_section')) {
+			$new_class .= 'sidebar-';
+		}
+		$new_class .= 'content';
+		if (get_option('geodir_show_listing_right_section')) {
+			$new_class .= '-sidebar';
+		}
+	} elseif (geodir_is_page('detail')) {
+		$remove_class = true;
+		if (get_option('geodir_detail_sidebar_left_section')) {
+			$new_class .= 'sidebar-content gd-details-sidebar-left';
+		} else {
+			$new_class .= 'content-sidebar';
+		}
+	} elseif (geodir_is_page('search')) {
+		$remove_class = true;
+		if (get_option('geodir_show_search_left_section')) {
+			$new_class .= 'sidebar-';
+		}
+		$new_class .= 'content';
+		if (get_option('geodir_show_search_right_section')) {
+			$new_class .= '-sidebar';
+		}
+	} elseif (geodir_is_page('author')) {
+		$remove_class = true;
+		if (get_option('geodir_show_author_left_section')) {
+			$new_class .= 'sidebar-';
+		}
+		$new_class .= 'content';
+		if (get_option('geodir_show_author_right_section')) {
+			$new_class .= '-sidebar';
+		}
+	} elseif (geodir_is_page('add-listing')) {
+		$remove_class = true;
+		$new_class .= 'content-sidebar';
+	}
+
+	if ($remove_class) {
+		$classes = array_diff($classes, array('content-sidebar', 'sidebar-content', 'content-sidebar-sidebar', 'sidebar-sidebar-content', 'sidebar-content-sidebar', 'full-width-content'));
+		//str_replace(array('content-sidebar','sidebar-content','content-sidebar-sidebar','sidebar-sidebar-content','sidebar-content-sidebar','full-width-content'),array('','','','','',''),$classes);
+		$classes[] = $new_class;
+	}
+
+	return $classes;
 
 }
 
@@ -160,17 +160,17 @@ 
 function gd_genesis_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();
+	}
 
 
 }
@@ -183,12 +183,12 @@ 
  */
 function geodir_replace_breadcrumb()
 {
-    if (is_front_page() && get_option('geodir_set_as_home') && !geodir_is_page('login')) {
-    } else {
-        echo '<div class="geodir-breadcrumb-bar"><div class="wrap">';
-        geodir_breadcrumb();
-        echo '</div></div>';
-    }
+	if (is_front_page() && get_option('geodir_set_as_home') && !geodir_is_page('login')) {
+	} else {
+		echo '<div class="geodir-breadcrumb-bar"><div class="wrap">';
+		geodir_breadcrumb();
+		echo '</div></div>';
+	}
 }
 
 // Force Full Width on signup page
@@ -201,9 +201,9 @@ 
  */
 function geodir_genesis_meta()
 {
-    if (geodir_is_page('login')) {
-        add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content');
-    }
+	if (geodir_is_page('login')) {
+		add_filter('genesis_pre_get_option_site_layout', '__genesis_return_full_width_content');
+	}
 }
 
 add_action('geodir_add_listing_page_title', 'geodir_add_listing_page_title_genesis_before', 8);
@@ -216,7 +216,7 @@ 
 function geodir_add_listing_page_title_genesis_before()
 {
 
-    echo "<div class='entry' >";
+	echo "<div class='entry' >";
 }
 
 
@@ -230,7 +230,7 @@ 
 function geodir_add_listing_form_genesis_after()
 {
 
-    echo "</div>";
+	echo "</div>";
 }
 
 
@@ -249,38 +249,38 @@ 
 {
 
 
-    $title = '';
-    $subtitle = '';
-
-    if (geodir_is_page('listing')) {
-        echo '<div class="wrap gd-title-wrap">';
-        geodir_action_listings_title();
-        echo '</div>';
-    }
-
-    if (geodir_is_page('add-listing')) {
-        echo '<div class="wrap gd-title-wrap">';
-        geodir_action_add_listing_page_title();
-        echo '</div>';
-    }
-
-    if (geodir_is_page('author')) {
-        echo '<div class="wrap gd-title-wrap">';
-        geodir_action_author_page_title();
-        echo '</div>';
-    }
-
-    if (geodir_is_page('detail') || geodir_is_page('preview')) {
-        echo '<div class="wrap gd-title-wrap">';
-        echo get_the_title();
-        echo '</div>';
-    }
-
-    if (geodir_is_page('search')) {
-        echo '<div class="wrap gd-title-wrap">';
-        geodir_action_search_page_title();
-        echo '</div>';
-    }
+	$title = '';
+	$subtitle = '';
+
+	if (geodir_is_page('listing')) {
+		echo '<div class="wrap gd-title-wrap">';
+		geodir_action_listings_title();
+		echo '</div>';
+	}
+
+	if (geodir_is_page('add-listing')) {
+		echo '<div class="wrap gd-title-wrap">';
+		geodir_action_add_listing_page_title();
+		echo '</div>';
+	}
+
+	if (geodir_is_page('author')) {
+		echo '<div class="wrap gd-title-wrap">';
+		geodir_action_author_page_title();
+		echo '</div>';
+	}
+
+	if (geodir_is_page('detail') || geodir_is_page('preview')) {
+		echo '<div class="wrap gd-title-wrap">';
+		echo get_the_title();
+		echo '</div>';
+	}
+
+	if (geodir_is_page('search')) {
+		echo '<div class="wrap gd-title-wrap">';
+		geodir_action_search_page_title();
+		echo '</div>';
+	}
 }
 
 
@@ -293,8 +293,8 @@ 
  */
 function gd_genesis_listing_page_title_bar()
 {
-    geodir_action_listings_title();
-    //geodir_action_listings_description();
+	geodir_action_listings_title();
+	//geodir_action_listings_description();
 }
 
 
@@ -307,19 +307,19 @@ 
  */
 function gd_compat_php_genesis_geo_1280_fix()
 {
-    if (function_exists('geo1280_search_bar')) {
-        remove_action('genesis_after_header', 'geo1280_search_bar', 20);
-        add_action('genesis_after_header', 'geo1280_search_bar_fix', 4);
+	if (function_exists('geo1280_search_bar')) {
+		remove_action('genesis_after_header', 'geo1280_search_bar', 20);
+		add_action('genesis_after_header', 'geo1280_search_bar_fix', 4);
 
-        //
+		//
 
-        remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20);
-        remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20);
-        add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105);
+		remove_action('genesis_after_header', 'geodir_replace_breadcrumb', 20);
+		remove_action('genesis_before_content_sidebar_wrap', 'geodir_replace_breadcrumb', 20);
+		add_action('geodir_wrapper_open', 'geodir_replace_breadcrumb', 105);
 
-        remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10);
-        add_action('geodir_wrapper_open', 'geo1280_page_title', 101);
-    }
+		remove_action('genesis_before_content_sidebar_wrap', 'geo1280_page_title', 10);
+		add_action('geodir_wrapper_open', 'geo1280_page_title', 101);
+	}
 }
 
 /**
@@ -331,11 +331,11 @@ 
 function geo1280_search_bar_fix()
 {
 
-    echo '<div class="geo1280-placeholder"></div>';
-    if (is_active_sidebar('search-bar')) {
-        genesis_widget_area('search-bar', array(
-            'before' => '<div class="search-bar widget-area"><div class="wrap">',
-            'after' => '</div></div>',
-        ));
-    }
+	echo '<div class="geo1280-placeholder"></div>';
+	if (is_active_sidebar('search-bar')) {
+		genesis_widget_area('search-bar', array(
+			'before' => '<div class="search-bar widget-area"><div class="wrap">',
+			'after' => '</div></div>',
+		));
+	}
 }

geodirectory-functions/compatibility/Multi_News.php

Braces +4 added lines, -2 removed lines

@@ -126,8 +126,10 @@
     $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
     if (preg_match_all("/$regexp/siU", $crums, $matches)) {
         return $matches[0];
-    } else return '';
-}
+    } else {
+    	return '';
+    }
+    }
 
 
 /**

Indentation +87 added lines, -87 removed lines

@@ -16,36 +16,36 @@ 
  */
 function multi_news_action_calls()
 {
-    // REMOVE BREADCRUMB
-    remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
-    remove_action('geodir_search_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);
-
-    //ADD BREADCRUMS
-    add_action('geodir_detail_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_listings_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_author_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_search_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    //add_action('geodir_home_before_main_content', 'gd_mn_replace_breadcrums', 20);
-    add_action('geodir_location_before_main_content', 'gd_mn_replace_breadcrums', 20);
-
-
-    // fix breadcrums
-    add_filter('breadcrumbs_plus_items', 'gd_breadcrumbs_plus_items', 1);
-
-    // REMOVE PAGE TITLES
-    remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
-    // remove_action( 'geodir_add_listing_page_title', 'geodir_action_add_listing_page_title',10);
-    remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
-    remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
-    remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
-
-
-    add_action('geodir_wrapper_content_open', 'gd_mn_extra_wrap', 30, 1);
-    add_action('geodir_wrapper_content_close', 'gd_mn_extra_wrap_end', 3, 1);
+	// REMOVE BREADCRUMB
+	remove_action('geodir_detail_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_listings_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_author_before_main_content', 'geodir_breadcrumb', 20);
+	remove_action('geodir_search_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);
+
+	//ADD BREADCRUMS
+	add_action('geodir_detail_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_listings_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_author_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_search_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	//add_action('geodir_home_before_main_content', 'gd_mn_replace_breadcrums', 20);
+	add_action('geodir_location_before_main_content', 'gd_mn_replace_breadcrums', 20);
+
+
+	// fix breadcrums
+	add_filter('breadcrumbs_plus_items', 'gd_breadcrumbs_plus_items', 1);
+
+	// REMOVE PAGE TITLES
+	remove_action('geodir_listings_page_title', 'geodir_action_listings_title', 10);
+	// remove_action( 'geodir_add_listing_page_title', 'geodir_action_add_listing_page_title',10);
+	remove_action('geodir_details_main_content', 'geodir_action_page_title', 20);
+	remove_action('geodir_search_page_title', 'geodir_action_search_page_title', 10);
+	remove_action('geodir_author_page_title', 'geodir_action_author_page_title', 10);
+
+
+	add_action('geodir_wrapper_content_open', 'gd_mn_extra_wrap', 30, 1);
+	add_action('geodir_wrapper_content_close', 'gd_mn_extra_wrap_end', 3, 1);
 }
 
 /**
@@ -57,11 +57,11 @@ 
  */
 function gd_mn_extra_wrap($page)
 {
-    if ($page == 'add-listing-page') {
-        echo '<div class="site-content page-wrap">';
-    } elseif ($page == 'signup-page') {
-        echo '</div><div class="section full-width-section" style="float: left;width:100%;">';
-    }
+	if ($page == 'add-listing-page') {
+		echo '<div class="site-content page-wrap">';
+	} elseif ($page == 'signup-page') {
+		echo '</div><div class="section full-width-section" style="float: left;width:100%;">';
+	}
 
 }
 
@@ -75,9 +75,9 @@ 
  */
 function gd_mn_extra_wrap_end($page)
 {
-    if ($page == 'add-listing-page') {
-        echo '</div>';
-    }
+	if ($page == 'add-listing-page') {
+		echo '</div>';
+	}
 
 }
 
@@ -91,13 +91,13 @@ 
 function gd_mn_replace_breadcrums()
 {
 
-    if (mom_option('breadcrumb') != 0) { ?>
+	if (mom_option('breadcrumb') != 0) { ?>
         <?php if (mom_option('cats_bread')) {
-            $cclass = '';
-            if (mom_option('cat_slider') == false) {
-                $cclass = 'post-crumbs ';
-            }
-            ?>
+			$cclass = '';
+			if (mom_option('cat_slider') == false) {
+				$cclass = 'post-crumbs ';
+			}
+			?>
             <div class="<?php echo $cclass; ?>entry-crumbs" xmlns:v="http://rdf.data-vocabulary.org/#">
 
                 <?php mom_breadcrumb(); ?>
@@ -119,14 +119,14 @@ 
  */
 function gd_get_breadcrum_links()
 {
-    ob_start();
-    geodir_breadcrumb();
-    $crums = ob_get_contents();
-    ob_get_clean();
-    $regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
-    if (preg_match_all("/$regexp/siU", $crums, $matches)) {
-        return $matches[0];
-    } else return '';
+	ob_start();
+	geodir_breadcrumb();
+	$crums = ob_get_contents();
+	ob_get_clean();
+	$regexp = "<a\s[^>]*href=(\"??)([^\" >]*?)\\1[^>]*>(.*)<\/a>";
+	if (preg_match_all("/$regexp/siU", $crums, $matches)) {
+		return $matches[0];
+	} else return '';
 }
 
 
@@ -140,30 +140,30 @@ 
  */
 function gd_breadcrumbs_plus_items($items)
 {   //print_r($items);exit;
-    $bits = array();
-    $pieces = gd_get_breadcrum_links();
-    //unset($pieces[0]);
-    $bits = $pieces;
+	$bits = array();
+	$pieces = gd_get_breadcrum_links();
+	//unset($pieces[0]);
+	$bits = $pieces;
 
-    $title = $items['last'];
-    if (is_page_geodir_home() || geodir_is_page('location')) {
+	$title = $items['last'];
+	if (is_page_geodir_home() || geodir_is_page('location')) {
 
-    } elseif (geodir_is_page('listing')) {
+	} elseif (geodir_is_page('listing')) {
 
-    } elseif (geodir_is_page('detail')) {
-        ob_start();
-        geodir_action_page_title();
-        $title = ob_get_contents();
-        ob_end_clean();
-    } elseif (geodir_is_page('search')) {
-    } elseif (geodir_is_page('author')) {
-    }
+	} elseif (geodir_is_page('detail')) {
+		ob_start();
+		geodir_action_page_title();
+		$title = ob_get_contents();
+		ob_end_clean();
+	} elseif (geodir_is_page('search')) {
+	} elseif (geodir_is_page('author')) {
+	}
 
-    $title = strip_tags($title);
-    $items = gd_breadcrumbs_plus_items_add($items, $bits, $title);
+	$title = strip_tags($title);
+	$items = gd_breadcrumbs_plus_items_add($items, $bits, $title);
 
 
-    return $items;
+	return $items;
 }
 
 
@@ -179,28 +179,28 @@ 
  */
 function gd_breadcrumbs_plus_items_add($items, $bits, $last)
 {
-    //$pieces = explode("</div>", $items[0]);
-    if (is_array($bits)) {
-        $items = array();
-        $pieces = '';
-        foreach ($bits as $bit) {
-            $pieces .= $bit;
-        }
-        $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>";
-        if (isset($last) && $last) {
-            $items['last'] = $last;
-        }
-    }
-
-    //print_r($items);
-    return $items;
+	//$pieces = explode("</div>", $items[0]);
+	if (is_array($bits)) {
+		$items = array();
+		$pieces = '';
+		foreach ($bits as $bit) {
+			$pieces .= $bit;
+		}
+		$items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>";
+		if (isset($last) && $last) {
+			$items['last'] = $last;
+		}
+	}
+
+	//print_r($items);
+	return $items;
 
 }
 
 add_filter('geodir_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
 add_filter('geodir_location_switcher_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
 function gd_multinews_mobile_menu_caret($html){
-    $html .= '<i class="responsive-caret"></i>';
-    return $html;
+	$html .= '<i class="responsive-caret"></i>';
+	return $html;
 
 }

Spacing +4 added lines, -4 removed lines

@@ -186,7 +186,7 @@ 
         foreach ($bits as $bit) {
             $pieces .= $bit;
         }
-        $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">' . $pieces . "</div>";
+        $items[0] = '<div class="vbreadcrumb" typeof="v:Breadcrumb">'.$pieces."</div>";
         if (isset($last) && $last) {
             $items['last'] = $last;
         }
@@ -197,9 +197,9 @@ 
 
 }
 
-add_filter('geodir_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
-add_filter('geodir_location_switcher_menu_after_sub_ul','gd_multinews_mobile_menu_caret',10,1);
-function gd_multinews_mobile_menu_caret($html){
+add_filter('geodir_menu_after_sub_ul', 'gd_multinews_mobile_menu_caret', 10, 1);
+add_filter('geodir_location_switcher_menu_after_sub_ul', 'gd_multinews_mobile_menu_caret', 10, 1);
+function gd_multinews_mobile_menu_caret($html) {
     $html .= '<i class="responsive-caret"></i>';
     return $html;
 

geodirectory-functions/taxonomy_functions.php

Braces +170 added lines, -121 removed lines

@@ -39,8 +39,9 @@ 
     if (get_option('geodir_show_listing_nav')) {

 

         $menu_class = '';

-        if (geodir_is_page('listing'))

-            $menu_class = 'current-menu-item';

+        if (geodir_is_page('listing')) {
+                    $menu_class = 'current-menu-item';
+        }
 

 

         //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

@@ -52,8 +53,9 @@ 
                     if (in_array($post_type, $show_post_type_main_nav)) {

                         if (get_post_type_archive_link($post_type)) {

                             $menu_class = '';

-                            if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

-                                $menu_class = 'current-menu-item';

+                            if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing')) {
+                                                            $menu_class = 'current-menu-item';
+                            }
                             /**

                              * Filter the menu li class.

                              *

@@ -130,8 +132,9 @@ 
                             if (get_post_type_archive_link($post_type)) {

 

                                 $menu_class = '';

-                                if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

-                                    $menu_class = 'current-menu-item';

+                                if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing')) {
+                                                                    $menu_class = 'current-menu-item';
+                                }
 

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

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

@@ -153,8 +156,9 @@ 
     if (get_option('geodir_show_addlisting_nav')) {

 

         $menu_class = '';

-        if (geodir_is_page('add-listing'))

-            $menu_class = 'current-menu-item';

+        if (geodir_is_page('add-listing')) {
+                    $menu_class = 'current-menu-item';
+        }
 

         //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

         $post_types = geodir_get_posttypes('object');

@@ -170,8 +174,9 @@ 
                                 if (geodir_get_addlisting_link($post_type)) {

 

                                     $menu_class = '';

-                                    if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

-                                        $menu_class = 'current-menu-item';

+                                    if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing')) {
+                                                                            $menu_class = 'current-menu-item';
+                                    }
                                     /**

                                      * Filter the menu li class.

                                      *

@@ -255,8 +260,9 @@ 
                                     if (geodir_get_addlisting_link($post_type)) {

 

                                         $menu_class = '';

-                                        if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

-                                            $menu_class = 'current-menu-item';

+                                        if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing')) {
+                                                                                    $menu_class = 'current-menu-item';
+                                        }
                                         /**

                                          * Filter the menu li class.

                                          *

@@ -311,8 +317,9 @@ 
     }

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

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

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

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

+    else if (is_array($geodir_theme_location) && isset($args['theme_location']) && in_array($args['theme_location'], $geodir_theme_location)) {
+            $menu = str_replace("</ul></div>", geodir_add_nav_menu_items() . "</ul></div>", $menu);
+    }
 

     return $menu;

 

@@ -398,24 +405,28 @@ 
     $geodir_post_type = get_query_var('post_type');

 

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

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

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

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

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

+        if (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') {
+                    $geodir_post_type = get_post_type((int)$_REQUEST['pid']);
+        } elseif (isset($_REQUEST['listing_type'])) {
+                    $geodir_post_type = sanitize_text_field($_REQUEST['listing_type']);
+        }
     }

 

-    if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))

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

+    if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype'])) {
+            $geodir_post_type = sanitize_text_field($_REQUEST['stype']);
+    }
 

-    if (is_tax())

-        $geodir_post_type = geodir_get_taxonomy_posttype();

+    if (is_tax()) {
+            $geodir_post_type = geodir_get_taxonomy_posttype();
+    }
 

 

     $all_postypes = geodir_get_posttypes();

     $all_postypes = stripslashes_deep($all_postypes);

 

-    if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

-        $geodir_post_type = '';

+    if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes)) {
+            $geodir_post_type = '';
+    }
 

 

     return $geodir_post_type;

@@ -462,11 +473,12 @@ 
         endswitch;

     }

 

-    if (!empty($post_types))

-        return $post_types;

-    else

-        return array();

-}

+    if (!empty($post_types)) {
+            return $post_types;
+    } else {
+            return array();
+    }
+    }

 

 /**

  * Get Custom Post Type info.

@@ -483,9 +495,10 @@ 
     $post_types = stripslashes_deep($post_types);

     if (!empty($post_types) && $post_type != '') {

         return $post_types[$post_type];

-    } else

-        return false;

-}

+    } else {
+            return false;
+    }
+    }

 

 if (!function_exists('geodir_get_taxonomies')) {

     /**

@@ -509,18 +522,21 @@ 
             $gd_taxonomies = array_keys($taxonomies);

 

 

-            if ($post_type != '')

-                $gd_taxonomies = array();

+            if ($post_type != '') {
+                            $gd_taxonomies = array();
+            }
 

             $i = 0;

             foreach ($taxonomies as $taxonomy => $args) {

 

-                if ($post_type != '' && $args['object_type'] == $post_type)

-                    $gd_taxonomies[] = $taxonomy;

+                if ($post_type != '' && $args['object_type'] == $post_type) {
+                                    $gd_taxonomies[] = $taxonomy;
+                }
 

                 if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {

-                    if (array_search($taxonomy, $gd_taxonomies) !== false)

-                        unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);

+                    if (array_search($taxonomy, $gd_taxonomies) !== false) {
+                                            unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);
+                    }
                 }

 

             }

@@ -575,10 +591,11 @@ 
                 . ucfirst($category_obj->name) . '</option>';

         }

 

-        if ($echo)

-            echo $html;

-        else

-            return $html;

+        if ($echo) {
+                    echo $html;
+        } else {
+                    return $html;
+        }
     }

 }

 

@@ -612,11 +629,12 @@ 
 

     }

 

-    if (!empty($listing_slug))

-        return $listing_slug;

-    else

-        return false;

-}

+    if (!empty($listing_slug)) {
+            return $listing_slug;
+    } else {
+            return false;
+    }
+    }

 

 

 /**

@@ -647,16 +665,18 @@ 
     if (!empty($taxonomies)) {

         foreach (geodir_get_posttypes() as $pt) {

             $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);

-            if (array_intersect($taxonomies, $object_taxonomies))

-                $post_type[] = $pt;

+            if (array_intersect($taxonomies, $object_taxonomies)) {
+                            $post_type[] = $pt;
+            }
         }

     }

 

-    if (!empty($post_type))

-        return $post_type[0];

-    else

-        return false;

-}

+    if (!empty($post_type)) {
+            return $post_type[0];
+    } else {
+            return false;
+    }
+    }

 

 if (!function_exists('geodir_custom_taxonomy_walker')) {

     /**

@@ -712,18 +732,18 @@ 
                 $checked = '';

 

                 if (in_array($cat_term->term_id, $search_terms)) {

-                    if ($cat_display == 'select' || $cat_display == 'multiselect')

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

-                    else

-                        $checked = 'checked="checked"';

+                    if ($cat_display == 'select' || $cat_display == 'multiselect') {
+                                            $checked = 'selected="selected"';
+                    } else {
+                                            $checked = 'checked="checked"';
+                    }
                 }

 

-                if ($cat_display == 'radio')

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

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

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

-

-                else {

+                if ($cat_display == 'radio') {
+                                    $out .= '<span style="display:block" ><input type="radio" field_type="radio" name="post_category[' . $cat_term->taxonomy . '][]" ' . $main_list_class . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' id="gd-cat-' . $cat_term->term_id . '" >' . $term_check . ucfirst($cat_term->name) . '</span>';
+                } elseif ($cat_display == 'select' || $cat_display == 'multiselect') {
+                                    $out .= '<option ' . $main_list_class . ' style="margin-left:' . $p . 'px;" alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" ' . $checked . $onchange . ' >' . $term_check . ucfirst($cat_term->name) . '</option>';
+                } else {

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

                 }

 

@@ -732,8 +752,9 @@ 
 

             }

 

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

-                $out .= '</div>';

+            if ($cat_display == 'checkbox' || $cat_display == 'radio') {
+                            $out .= '</div>';
+            }
 

             return $out;

         }

@@ -759,18 +780,21 @@ 
         global $exclude_cats, $gd_session;

 

         $cat_exclude = '';

-        if (is_array($exclude_cats) && !empty($exclude_cats))

-            $cat_exclude = serialize($exclude_cats);

+        if (is_array($exclude_cats) && !empty($exclude_cats)) {
+                    $cat_exclude = serialize($exclude_cats);
+        }
 

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

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

 

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

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

+            if (!is_array($post->post_category[$cat_taxonomy])) {
+                            $post_category = $post->post_category[$cat_taxonomy];
+            }
 

             $post_categories = $post->post_category_str;

-            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories))

-                $post_category_str = $post_categories[$cat_taxonomy];

+            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {
+                            $post_category_str = $post_categories[$cat_taxonomy];
+            }
 

         } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {

             global $post;

@@ -961,8 +985,9 @@ 
         if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

             $post_cat_str = $post_categories[$cat_taxonomy];

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

-            if (count($post_cat_array) >= $cat_limit && $cat_limit != 0)

-                $style = "display:none;";

+            if (count($post_cat_array) >= $cat_limit && $cat_limit != 0) {
+                            $style = "display:none;";
+            }
         }

         ?>

         <div class="main_cat_list" style=" <?php if (isset($style)) {

@@ -997,7 +1022,7 @@ 
         print_r($exclude_cats);

         if(is_array( $exclude_cats)){

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

-        }else{

+        } else{

             $exclude_cats = intval($exclude_cats);

         }

 

@@ -1027,7 +1052,10 @@ 
 

             <div class="post_default_category">

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

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

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

         <span> 

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

         </span>

@@ -1127,8 +1155,9 @@ 
         $onchange = ' onchange="show_subcatlist(this.value, this)" ';

 

         $option_selected = '';

-        if (!$selected)

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

+        if (!$selected) {
+                    $option_slected = ' selected="selected" ';
+        }
 

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

 

@@ -1136,8 +1165,9 @@ 
 

         foreach ($cat_terms as $cat_term) {

             $option_selected = '';

-            if ($selected == $cat_term->term_id)

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

+            if ($selected == $cat_term->term_id) {
+                            $option_selected = ' selected="selected" ';
+            }
 

             // Count child terms

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

@@ -1202,8 +1232,9 @@ 
 

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

 

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

-        $listing_slug = 'places';

+    if (!$listing_slug = get_option('geodir_listing_prefix')) {
+            $listing_slug = 'places';
+    }
 

     /**

      * Taxonomies

@@ -1351,7 +1382,7 @@ 
     //print_r( $segments);

     if($gd_wpml_get_languages){

         $langs = $gd_wpml_get_languages;

-    }else{

+    } else{

         global $sitepress;

         $gd_wpml_get_languages = $sitepress->get_active_languages();

     }

@@ -1494,8 +1525,9 @@ 
                             'city_slug' => $post->city_slug

                         );

 

-                    } else

-                        $post_location = geodir_get_location();

+                    } else {
+                                            $post_location = geodir_get_location();
+                    }
 

 

                 } else {

@@ -1524,8 +1556,9 @@ 
                             );

 

                         }

-                    } else

-                        $post_location = geodir_get_location();

+                    } else {
+                                            $post_location = geodir_get_location();
+                    }
                 }

 

 

@@ -1568,8 +1601,9 @@ 
                         $post_terms = $post_terms[0];

                     }

 

-                    if (!$post_terms)

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

+                    if (!$post_terms) {
+                                            $post_terms = geodir_get_post_meta($post->ID, 'default_category', true);
+                    }
 

                     if (!$post_terms) {

                         $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true);

@@ -1583,8 +1617,9 @@ 
 

                 $term = get_term_by('id', $post_terms, $taxonomies);

 

-                if (!empty($term))

-                    $term_request = $term->slug;

+                if (!empty($term)) {
+                                    $term_request = $term->slug;
+                }
                 //$term_request = $term->slug.'/';

             }

 

@@ -1599,15 +1634,20 @@ 
                 $request_term .= $term_request;

 

             } else {

-                if (isset($location_request) && $location_request != '') $request_term = $location_request;

+                if (isset($location_request) && $location_request != '') {
+                	$request_term = $location_request;
+                }
 

-                if (isset($term_request) && $term_request != '') $request_term .= $term_request;

+                if (isset($term_request) && $term_request != '') {
+                	$request_term .= $term_request;
+                }
             }

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

-            if (!empty($request_term))

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

-            else

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

+            if (!empty($request_term)) {
+                            $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
+            } else {
+                            $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);
+            }
             //echo $post_link ;

         }

         // temp cache the permalink

@@ -1649,8 +1689,9 @@ 
             if ($geodir_add_location_url && get_option('geodir_add_location_url')) {

                 $include_location = true;

             }

-        } elseif (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1)

-            $include_location = true;

+        } elseif (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {
+                    $include_location = true;
+        }
 

         if ($include_location) {

             global $post;

@@ -1800,10 +1841,11 @@ 
     if (!is_object($obj_post_type)) {

         return;

     }

-    if ($echo)

-        echo $obj_post_type->labels->singular_name;

-    else

-        return $obj_post_type->labels->singular_name;

+    if ($echo) {
+            echo $obj_post_type->labels->singular_name;
+    } else {
+            return $obj_post_type->labels->singular_name;
+    }
 

 }

 

@@ -1820,14 +1862,16 @@ 
 {

     $all_postypes = geodir_get_posttypes();

 

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

-        return false;

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

     $obj_post_type = get_post_type_object($post_type);

-    if ($echo)

-        echo $obj_post_type->labels->name;

-    else

-        return $obj_post_type->labels->name;

+    if ($echo) {
+            echo $obj_post_type->labels->name;
+    } else {
+            return $obj_post_type->labels->name;
+    }
 

 }

 

@@ -1852,19 +1896,22 @@ 
     $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";

 

     if (is_int($term)) {

-        if (0 == $term)

-            return 0;

+        if (0 == $term) {
+                    return 0;
+        }
         $where = 't.term_id = %d';

-        if (!empty($taxonomy))

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

-        else

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

+        if (!empty($taxonomy)) {
+                    return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
+        } else {
+                    return $wpdb->get_var($wpdb->prepare($select . $where, $term));
+        }
     }

 

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

 

-    if ('' === $slug = sanitize_title($term))

-        return 0;

+    if ('' === $slug = sanitize_title($term)) {
+            return 0;
+    }
 

     $where = 't.slug = %s';

 

@@ -1881,14 +1928,16 @@ 
         $where_fields[] = $taxonomy;

 

 

-        if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))

-            return $result;

+        if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A)) {
+                    return $result;
+        }
 

         return false;

     }

 

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))

-        return $result;

+    if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields))) {
+            return $result;
+    }
 

     return false;

 }

Indentation +1203 added lines, -1203 removed lines

@@ -33,265 +33,265 @@ 
  */

 function geodir_add_nav_menu_items()

 {

-    $items = '';

-    // apply filter to add more navigations // -Filter-Location-Manager

-

-    if (get_option('geodir_show_listing_nav')) {

-

-        $menu_class = '';

-        if (geodir_is_page('listing'))

-            $menu_class = 'current-menu-item';

-

-

-        //SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

-        $post_types = geodir_get_posttypes('object');

-        $show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');

-        if (!empty($post_types)) {

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

-                if (!empty($show_post_type_main_nav)) {

-                    if (in_array($post_type, $show_post_type_main_nav)) {

-                        if (get_post_type_archive_link($post_type)) {

-                            $menu_class = '';

-                            if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

-                                $menu_class = 'current-menu-item';

-                            /**

-                             * Filter the menu li class.

-                             *

-                             * @since 1.0.0

-                             * @param string $menu_class The menu HTML class.

-                             */

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

-                            /**

-                             * Filter the menu a class.

-                             *

-                             * @since 1.0.0

-                             */

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

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

+	$items = '';

+	// apply filter to add more navigations // -Filter-Location-Manager

+

+	if (get_option('geodir_show_listing_nav')) {

+

+		$menu_class = '';

+		if (geodir_is_page('listing'))

+			$menu_class = 'current-menu-item';

+

+

+		//SHOW LISTING OF POST TYPE IN MAIN NAVIGATION

+		$post_types = geodir_get_posttypes('object');

+		$show_post_type_main_nav = get_option('geodir_add_posttype_in_main_nav');

+		if (!empty($post_types)) {

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

+				if (!empty($show_post_type_main_nav)) {

+					if (in_array($post_type, $show_post_type_main_nav)) {

+						if (get_post_type_archive_link($post_type)) {

+							$menu_class = '';

+							if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

+								$menu_class = 'current-menu-item';

+							/**

+							 * Filter the menu li class.

+							 *

+							 * @since 1.0.0

+							 * @param string $menu_class The menu HTML class.

+							 */

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

+							/**

+							 * Filter the menu a class.

+							 *

+							 * @since 1.0.0

+							 */

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

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

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

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

 									</a>

 								</li>';

-                        }

-                    }

-                }

-            }

-        }

-        //END LISTING OF POST TYPE IN MAIN NAVIGATION

-

-        $view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');

-        $is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false;

-        if ($is_listing_sub_meny_exists) {

-            /**

-             * Filter the menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

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

-            /**

-             * Filter the sub menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

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

-            /**

-             * Filter the sub menu ul class.

-             *

-             * @since 1.0.0

-             */

-            $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

-            /**

-             * Filter the menu a class.

-             *

-             * @since 1.0.0

-             */

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

-            /**

-             * Filter the sub menu a class.

-             *

-             * @since 1.0.0

-             */

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

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

+						}

+					}

+				}

+			}

+		}

+		//END LISTING OF POST TYPE IN MAIN NAVIGATION

+

+		$view_posttype_listing = get_option('geodir_add_posttype_in_listing_nav');

+		$is_listing_sub_meny_exists = (!empty($view_posttype_listing)) ? true : false;

+		if ($is_listing_sub_meny_exists) {

+			/**

+			 * Filter the menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

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

+			/**

+			 * Filter the sub menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

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

+			/**

+			 * Filter the sub menu ul class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

+			/**

+			 * Filter the menu a class.

+			 *

+			 * @since 1.0.0

+			 */

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

+			/**

+			 * Filter the sub menu a class.

+			 *

+			 * @since 1.0.0

+			 */

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

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

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

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

-            $post_types = geodir_get_posttypes('object');

+			$post_types = geodir_get_posttypes('object');

 

-            $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

+			$show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

 

-            if (!empty($post_types)) {

-                global $geodir_add_location_url;

-                $geodir_add_location_url = true;

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

-                    if (!empty($show_listing_post_types)) {

-                        if (in_array($post_type, $show_listing_post_types)) {

-                            if (get_post_type_archive_link($post_type)) {

+			if (!empty($post_types)) {

+				global $geodir_add_location_url;

+				$geodir_add_location_url = true;

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

+					if (!empty($show_listing_post_types)) {

+						if (in_array($post_type, $show_listing_post_types)) {

+							if (get_post_type_archive_link($post_type)) {

 

-                                $menu_class = '';

-                                if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

-                                    $menu_class = 'current-menu-item';

+								$menu_class = '';

+								if (geodir_get_current_posttype() == $post_type && geodir_is_page('listing'))

+									$menu_class = 'current-menu-item';

 

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

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

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

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

 														</a>

 													</li>';

-                            }

-                        }

-                    }

-                }

-                $geodir_add_location_url = NULL;

-            }

+							}

+						}

+					}

+				}

+				$geodir_add_location_url = NULL;

+			}

 

-            $items .= '	</ul> ';

-            /**

-             * Filter called after the sub menu closing ul tag for dynamic added menu items.

-             *

-             * @since 1.5.9

-             */

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

-            $items .= '</li>';

-        }

-    }

-

-    if (get_option('geodir_show_addlisting_nav')) {

-

-        $menu_class = '';

-        if (geodir_is_page('add-listing'))

-            $menu_class = 'current-menu-item';

-

-        //SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

-        $post_types = geodir_get_posttypes('object');

-        $show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');

-        $geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

-

-        if (!empty($post_types)) {

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

-                if (!empty($geodir_allow_posttype_frontend)) {

-                    if (in_array($post_type, $geodir_allow_posttype_frontend)) {

-                        if (!empty($show_add_listing_post_types_main_nav)) {

-                            if (in_array($post_type, $show_add_listing_post_types_main_nav)) {

-                                if (geodir_get_addlisting_link($post_type)) {

-

-                                    $menu_class = '';

-                                    if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

-                                        $menu_class = 'current-menu-item';

-                                    /**

-                                     * Filter the menu li class.

-                                     *

-                                     * @since 1.0.0

-                                     * @param string $menu_class The menu HTML class.

-                                     */

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

-                                    /**

-                                     * Filter the menu a class.

-                                     *

-                                     * @since 1.0.0

-                                     */

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

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

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

+			$items .= '	</ul> ';

+			/**

+			 * Filter called after the sub menu closing ul tag for dynamic added menu items.

+			 *

+			 * @since 1.5.9

+			 */

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

+			$items .= '</li>';

+		}

+	}

+

+	if (get_option('geodir_show_addlisting_nav')) {

+

+		$menu_class = '';

+		if (geodir_is_page('add-listing'))

+			$menu_class = 'current-menu-item';

+

+		//SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

+		$post_types = geodir_get_posttypes('object');

+		$show_add_listing_post_types_main_nav = get_option('geodir_add_listing_link_main_nav');

+		$geodir_allow_posttype_frontend = get_option('geodir_allow_posttype_frontend');

+

+		if (!empty($post_types)) {

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

+				if (!empty($geodir_allow_posttype_frontend)) {

+					if (in_array($post_type, $geodir_allow_posttype_frontend)) {

+						if (!empty($show_add_listing_post_types_main_nav)) {

+							if (in_array($post_type, $show_add_listing_post_types_main_nav)) {

+								if (geodir_get_addlisting_link($post_type)) {

+

+									$menu_class = '';

+									if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

+										$menu_class = 'current-menu-item';

+									/**

+									 * Filter the menu li class.

+									 *

+									 * @since 1.0.0

+									 * @param string $menu_class The menu HTML class.

+									 */

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

+									/**

+									 * Filter the menu a class.

+									 *

+									 * @since 1.0.0

+									 */

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

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

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

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

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

 											</a>

 										</li>';

-                                }

-                            }

-                        }

-                    }

-                }

-            }

-        }

-        //END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

-    }

-

-    $view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');

-    $is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false;

-    if ($is_add_listing_sub_meny_exists) {

-

-        if (get_option('geodir_show_addlisting_nav')) {

-            /**

-             * Filter the menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

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

-            /**

-             * Filter the sub menu li class.

-             *

-             * @since 1.0.0

-             * @param string $menu_class The menu HTML class.

-             */

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

-            /**

-             * Filter the sub menu ul class.

-             *

-             * @since 1.0.0

-             */

-            $sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

-            /**

-             * Filter the menu a class.

-             *

-             * @since 1.0.0

-             */

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

-            /**

-             * Filter the sub menu a class.

-             *

-             * @since 1.0.0

-             */

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

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

+								}

+							}

+						}

+					}

+				}

+			}

+		}

+		//END SHOW ADD LISTING POST TYPE IN MAIN NAVIGATION

+	}

+

+	$view_add_posttype_listing = get_option('geodir_add_listing_link_add_listing_nav');

+	$is_add_listing_sub_meny_exists = (!empty($view_add_posttype_listing)) ? true : false;

+	if ($is_add_listing_sub_meny_exists) {

+

+		if (get_option('geodir_show_addlisting_nav')) {

+			/**

+			 * Filter the menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

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

+			/**

+			 * Filter the sub menu li class.

+			 *

+			 * @since 1.0.0

+			 * @param string $menu_class The menu HTML class.

+			 */

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

+			/**

+			 * Filter the sub menu ul class.

+			 *

+			 * @since 1.0.0

+			 */

+			$sub_ul_class = apply_filters('geodir_sub_menu_ul_class', 'sub-menu');

+			/**

+			 * Filter the menu a class.

+			 *

+			 * @since 1.0.0

+			 */

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

+			/**

+			 * Filter the sub menu a class.

+			 *

+			 * @since 1.0.0

+			 */

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

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

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

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

 

-            $post_types = geodir_get_posttypes('object');

-

-            $show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');

-

-            if (!empty($post_types)) {

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

-                    if (!empty($geodir_allow_posttype_frontend)) {

-                        if (in_array($post_type, $geodir_allow_posttype_frontend)) {

-                            if (!empty($show_add_listing_post_types)) {

-                                if (in_array($post_type, $show_add_listing_post_types)) {

-                                    if (geodir_get_addlisting_link($post_type)) {

-

-                                        $menu_class = '';

-                                        if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

-                                            $menu_class = 'current-menu-item';

-                                        /**

-                                         * Filter the menu li class.

-                                         *

-                                         * @since 1.0.0

-                                         * @param string $menu_class The menu HTML class.

-                                         */

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

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

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

+			$post_types = geodir_get_posttypes('object');

+

+			$show_add_listing_post_types = get_option('geodir_add_listing_link_add_listing_nav');

+

+			if (!empty($post_types)) {

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

+					if (!empty($geodir_allow_posttype_frontend)) {

+						if (in_array($post_type, $geodir_allow_posttype_frontend)) {

+							if (!empty($show_add_listing_post_types)) {

+								if (in_array($post_type, $show_add_listing_post_types)) {

+									if (geodir_get_addlisting_link($post_type)) {

+

+										$menu_class = '';

+										if (geodir_get_current_posttype() == $post_type && geodir_is_page('add-listing'))

+											$menu_class = 'current-menu-item';

+										/**

+										 * Filter the menu li class.

+										 *

+										 * @since 1.0.0

+										 * @param string $menu_class The menu HTML class.

+										 */

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

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

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

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

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

 														</a>

 													</li>';

-                                    }

-                                }

-                            }

-                        }

-                    }

-                }

-            }

+									}

+								}

+							}

+						}

+					}

+				}

+			}

 

-            $items .= '	</ul> ';

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

-            $items .= '</li>';

+			$items .= '	</ul> ';

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

+			$items .= '</li>';

 

-        }

-    }

-    // apply filter to add more navigations // -Filter-Location-Manager

-    return $items;

+		}

+	}

+	// apply filter to add more navigations // -Filter-Location-Manager

+	return $items;

 }

 

 

@@ -309,20 +309,20 @@ 
  */

 function geodir_pagemenu_items($menu, $args)

 {

-    $locations = get_nav_menu_locations();

-    $geodir_theme_location = get_option('geodir_theme_location_nav');

-    $geodir_theme_location_nav = array();

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

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

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

-        update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

-    }

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

+	$locations = get_nav_menu_locations();

+	$geodir_theme_location = get_option('geodir_theme_location_nav');

+	$geodir_theme_location_nav = array();

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

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

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

+		update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

+	}

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

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

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

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

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

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

 

-    return $menu;

+	return $menu;

 

 }

 

@@ -342,18 +342,18 @@ 
 function geodir_menu_items($items, $args)

 {

 

-    $location = $args->theme_location;

+	$location = $args->theme_location;

 

-    $geodir_theme_location = get_option('geodir_theme_location_nav');

+	$geodir_theme_location = get_option('geodir_theme_location_nav');

 

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

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

 

-        $items = $items . geodir_add_nav_menu_items();

-        return $items;

+		$items = $items . geodir_add_nav_menu_items();

+		return $items;

 

-    } else {

-        return $items;

-    }

+	} else {

+		return $items;

+	}

 }

 

 /**

@@ -368,25 +368,25 @@ 
  */

 function geodir_get_category_all_array()

 {

-    global $wpdb;

-    $return_array = array();

-

-    $taxonomies = geodir_get_taxonomies();

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

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

-

-    $pn_categories = $wpdb->get_results(

-        $wpdb->prepare(

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

-            array($wpdb->terms . term_id)

-        )

-    );

-

-    foreach ($pn_categories as $pn_categories_obj) {

-        $return_array[] = array("id" => $pn_categories_obj->cat_ID,

-            "title" => $pn_categories_obj->name,);

-    }

-    return $return_array;

+	global $wpdb;

+	$return_array = array();

+

+	$taxonomies = geodir_get_taxonomies();

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

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

+

+	$pn_categories = $wpdb->get_results(

+		$wpdb->prepare(

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

+			array($wpdb->terms . term_id)

+		)

+	);

+

+	foreach ($pn_categories as $pn_categories_obj) {

+		$return_array[] = array("id" => $pn_categories_obj->cat_ID,

+			"title" => $pn_categories_obj->name,);

+	}

+	return $return_array;

 }

 

 

@@ -401,36 +401,36 @@ 
  */

 function geodir_get_current_posttype()

 {

-    global $wp_query, $geodir_post_type;

+	global $wp_query, $geodir_post_type;

 

-    $geodir_post_type = get_query_var('post_type');

+	$geodir_post_type = get_query_var('post_type');

 

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

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

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

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

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

-    }

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

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

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

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

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

+	}

 

-    if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))

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

+	if ((geodir_is_page('search') || geodir_is_page('author')) && isset($_REQUEST['stype']))

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

 

-    if (is_tax())

-        $geodir_post_type = geodir_get_taxonomy_posttype();

+	if (is_tax())

+		$geodir_post_type = geodir_get_taxonomy_posttype();

 

 

-    $all_postypes = geodir_get_posttypes();

-    $all_postypes = stripslashes_deep($all_postypes);

+	$all_postypes = geodir_get_posttypes();

+	$all_postypes = stripslashes_deep($all_postypes);

 

-    if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

-        $geodir_post_type = '';

+	if (is_array($all_postypes) && !in_array($geodir_post_type, $all_postypes))

+		$geodir_post_type = '';

 

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

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

-    }

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

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

+	}

 

 

-    return $geodir_post_type;

+	return $geodir_post_type;

 }

 

 /**

@@ -444,21 +444,21 @@ 
  */

 function geodir_get_default_posttype()

 {

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

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

 

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

-        global $wpdb;

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

-        if ( $has_posts ) {

-            $stype = $post_type; break;

-        }

-    }

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

+		global $wpdb;

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

+		if ( $has_posts ) {

+			$stype = $post_type; break;

+		}

+	}

 

-    if(!$stype){

-        $stype = 'gd_place';

-    }

+	if(!$stype){

+		$stype = 'gd_place';

+	}

 

-    return $stype;

+	return $stype;

 }

 

 /**

@@ -472,21 +472,21 @@ 
  */

 function geodir_get_posttypes($output = 'names')

 {

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

-    $post_types = stripslashes_deep($post_types);

-    if (!empty($post_types)) {

-        switch ($output):

-            case 'object':

-            case 'Object':

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

-                break;

-            case 'array':

-            case 'Array':

-                $post_types = (array)$post_types;

-                break;

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

+	$post_types = stripslashes_deep($post_types);

+	if (!empty($post_types)) {

+		switch ($output):

+			case 'object':

+			case 'Object':

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

+				break;

+			case 'array':

+			case 'Array':

+				$post_types = (array)$post_types;

+				break;

 			case 'options':

-                $post_types = (array)$post_types;

+				$post_types = (array)$post_types;

 				

 				$options = array();

 				if (!empty($post_types)) {

@@ -495,17 +495,17 @@ 
 					}

 				}

 				$post_types = $options;

-                break;

-            default:

-                $post_types = array_keys($post_types);

-                break;

-        endswitch;

-    }

-

-    if (!empty($post_types))

-        return $post_types;

-    else

-        return array();

+				break;

+			default:

+				$post_types = array_keys($post_types);

+				break;

+		endswitch;

+	}

+

+	if (!empty($post_types))

+		return $post_types;

+	else

+		return array();

 }

 

 /**

@@ -518,108 +518,108 @@ 
  */

 function geodir_get_posttype_info($post_type = '')

 {

-    $post_types = array();

-    $post_types = get_option('geodir_post_types');

-    $post_types = stripslashes_deep($post_types);

-    if (!empty($post_types) && $post_type != '') {

-        return $post_types[$post_type];

-    } else

-        return false;

+	$post_types = array();

+	$post_types = get_option('geodir_post_types');

+	$post_types = stripslashes_deep($post_types);

+	if (!empty($post_types) && $post_type != '') {

+		return $post_types[$post_type];

+	} else

+		return false;

 }

 

 if (!function_exists('geodir_get_taxonomies')) {

-    /**

-     * Get all custom taxonomies.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $post_type The post type.

-     * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

-     * @return array|bool Taxonomies on success. false on failure.

-     */

-    function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false)

-    {

+	/**

+	 * Get all custom taxonomies.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $post_type The post type.

+	 * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

+	 * @return array|bool Taxonomies on success. false on failure.

+	 */

+	function geodir_get_taxonomies($post_type = '', $tages_taxonomies = false)

+	{

 

-        $taxonomies = array();

-        $gd_taxonomies = array();

+		$taxonomies = array();

+		$gd_taxonomies = array();

 

-        if ($taxonomies = get_option('geodir_taxonomies')) {

+		if ($taxonomies = get_option('geodir_taxonomies')) {

 

 

-            $gd_taxonomies = array_keys($taxonomies);

+			$gd_taxonomies = array_keys($taxonomies);

 

 

-            if ($post_type != '')

-                $gd_taxonomies = array();

+			if ($post_type != '')

+				$gd_taxonomies = array();

 

-            $i = 0;

-            foreach ($taxonomies as $taxonomy => $args) {

+			$i = 0;

+			foreach ($taxonomies as $taxonomy => $args) {

 

-                if ($post_type != '' && $args['object_type'] == $post_type)

-                    $gd_taxonomies[] = $taxonomy;

+				if ($post_type != '' && $args['object_type'] == $post_type)

+					$gd_taxonomies[] = $taxonomy;

 

-                if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {

-                    if (array_search($taxonomy, $gd_taxonomies) !== false)

-                        unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);

-                }

+				if ($tages_taxonomies === false && strpos($taxonomy, '_tag') !== false) {

+					if (array_search($taxonomy, $gd_taxonomies) !== false)

+						unset($gd_taxonomies[array_search($taxonomy, $gd_taxonomies)]);

+				}

 

-            }

+			}

+

+			$gd_taxonomies = array_values($gd_taxonomies);

+		}

 

-            $gd_taxonomies = array_values($gd_taxonomies);

-        }

-

-        /**

-         * Filter the taxonomies.

-         *

-         * @since 1.0.0

-         * @param array $gd_taxonomies The taxonomy array.

-         */

-        $taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);

-

-        if (!empty($taxonomies)) {

-            return $taxonomies;

-        } else {

-            return false;

-        }

-    }

+		/**

+		 * Filter the taxonomies.

+		 *

+		 * @since 1.0.0

+		 * @param array $gd_taxonomies The taxonomy array.

+		 */

+		$taxonomies = apply_filters('geodir_taxonomy', $gd_taxonomies);

+

+		if (!empty($taxonomies)) {

+			return $taxonomies;

+		} else {

+			return false;

+		}

+	}

 }

 

 if (!function_exists(' geodir_get_categories_dl')) {

-    /**

-     * Get categories dropdown HTML.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $post_type The post type.

-     * @param string $selected The selected value.

-     * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

-     * @param bool $echo Prints the HTML when set to true. Default: true.

-     * @return void|string Dropdown HTML.

-     */

-    function  geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true)

-    {

-

-        $html = '';

-        $taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies);

-

-        $categories = get_terms($taxonomies);

-

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

-

-        foreach ($categories as $category_obj) {

-            $select_opt = '';

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

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

-            }

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

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

-        }

-

-        if ($echo)

-            echo $html;

-        else

-            return $html;

-    }

+	/**

+	 * Get categories dropdown HTML.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $post_type The post type.

+	 * @param string $selected The selected value.

+	 * @param bool $tages_taxonomies Is this a tag taxonomy?. Default: false.

+	 * @param bool $echo Prints the HTML when set to true. Default: true.

+	 * @return void|string Dropdown HTML.

+	 */

+	function  geodir_get_categories_dl($post_type = '', $selected = '', $tages_taxonomies = false, $echo = true)

+	{

+

+		$html = '';

+		$taxonomies = geodir_get_taxonomies($post_type, $tages_taxonomies);

+

+		$categories = get_terms($taxonomies);

+

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

+

+		foreach ($categories as $category_obj) {

+			$select_opt = '';

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

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

+			}

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

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

+		}

+

+		if ($echo)

+			echo $html;

+		else

+			return $html;

+	}

 }

 

 

@@ -634,28 +634,28 @@ 
 function geodir_get_listing_slug($object_type = '')

 {

 

-    $listing_slug = '';

+	$listing_slug = '';

 

-    $post_types = get_option('geodir_post_types');

-    $taxonomies = get_option('geodir_taxonomies');

+	$post_types = get_option('geodir_post_types');

+	$taxonomies = get_option('geodir_taxonomies');

 

 

-    if ($object_type != '') {

-        if (!empty($post_types) && array_key_exists($object_type, $post_types)) {

+	if ($object_type != '') {

+		if (!empty($post_types) && array_key_exists($object_type, $post_types)) {

 

-            $object_info = $post_types[$object_type];

-            $listing_slug = $object_info['listing_slug'];

-        } elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {

-            $object_info = $taxonomies[$object_type];

-            $listing_slug = $object_info['listing_slug'];

-        }

+			$object_info = $post_types[$object_type];

+			$listing_slug = $object_info['listing_slug'];

+		} elseif (!empty($taxonomies) && array_key_exists($object_type, $taxonomies)) {

+			$object_info = $taxonomies[$object_type];

+			$listing_slug = $object_info['listing_slug'];

+		}

 

-    }

+	}

 

-    if (!empty($listing_slug))

-        return $listing_slug;

-    else

-        return false;

+	if (!empty($listing_slug))

+		return $listing_slug;

+	else

+		return false;

 }

 

 

@@ -670,212 +670,212 @@ 
  */

 function geodir_get_taxonomy_posttype($taxonomy = '')

 {

-    global $wp_query;

-

-    $post_type = array();

-    $taxonomies = array();

-

-    if (!empty($taxonomy)) {

-        $taxonomies[] = $taxonomy;

-    } elseif (isset($wp_query->tax_query->queries)) {

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

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

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

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

-    }

-

-    if (!empty($taxonomies)) {

-        foreach (geodir_get_posttypes() as $pt) {

-            $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);

-            if (array_intersect($taxonomies, $object_taxonomies))

-                $post_type[] = $pt;

-        }

-    }

-

-    if (!empty($post_type))

-        return $post_type[0];

-    else

-        return false;

+	global $wp_query;

+

+	$post_type = array();

+	$taxonomies = array();

+

+	if (!empty($taxonomy)) {

+		$taxonomies[] = $taxonomy;

+	} elseif (isset($wp_query->tax_query->queries)) {

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

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

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

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

+	}

+

+	if (!empty($taxonomies)) {

+		foreach (geodir_get_posttypes() as $pt) {

+			$object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);

+			if (array_intersect($taxonomies, $object_taxonomies))

+				$post_type[] = $pt;

+		}

+	}

+

+	if (!empty($post_type))

+		return $post_type[0];

+	else

+		return false;

 }

 

 if (!function_exists('geodir_custom_taxonomy_walker')) {

-    /**

-     * Custom taxonomy walker function.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @param string $cat_taxonomy The taxonomy name.

-     * @param int $cat_parent The parent term ID.

-     * @param bool $hide_empty Hide empty taxonomies? Default: false.

-     * @param int $pading CSS padding in pixels.

-     * @return string|void taxonomy HTML.

-     */

-    function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0)

-    {

-        global $cat_display, $post_cat, $exclude_cats;

-

-        $search_terms = trim($post_cat, ",");

-

-        $search_terms = explode(",", $search_terms);

-

-        $cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));

-

-        $display = '';

-        $onchange = '';

-        $term_check = '';

-        $main_list_class = '';

-        $out = '';

-        //If there are terms, start displaying

-        if (count($cat_terms) > 0) {

-            //Displaying as a list

-            $p = $pading * 20;

-            $pading++;

-

-

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

-                if ($cat_parent == 0) {

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

-                    $main_list_class = 'class="main_list_selecter"';

-                } else {

-                    //$display = 'display:none';

-                    $list_class = 'sub_list gd-sub-cats-list';

-                }

-            }

+	/**

+	 * Custom taxonomy walker function.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @param string $cat_taxonomy The taxonomy name.

+	 * @param int $cat_parent The parent term ID.

+	 * @param bool $hide_empty Hide empty taxonomies? Default: false.

+	 * @param int $pading CSS padding in pixels.

+	 * @return string|void taxonomy HTML.

+	 */

+	function geodir_custom_taxonomy_walker($cat_taxonomy, $cat_parent = 0, $hide_empty = false, $pading = 0)

+	{

+		global $cat_display, $post_cat, $exclude_cats;

+

+		$search_terms = trim($post_cat, ",");

+

+		$search_terms = explode(",", $search_terms);

+

+		$cat_terms = get_terms($cat_taxonomy, array('parent' => $cat_parent, 'hide_empty' => $hide_empty, 'exclude' => $exclude_cats));

+

+		$display = '';

+		$onchange = '';

+		$term_check = '';

+		$main_list_class = '';

+		$out = '';

+		//If there are terms, start displaying

+		if (count($cat_terms) > 0) {

+			//Displaying as a list

+			$p = $pading * 20;

+			$pading++;

+

+

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

+				if ($cat_parent == 0) {

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

+					$main_list_class = 'class="main_list_selecter"';

+				} else {

+					//$display = 'display:none';

+					$list_class = 'sub_list gd-sub-cats-list';

+				}

+			}

 

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

-                $p = 0;

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

-            }

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

+				$p = 0;

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

+			}

 

-            foreach ($cat_terms as $cat_term) {

+			foreach ($cat_terms as $cat_term) {

 

-                $checked = '';

+				$checked = '';

 

-                if (in_array($cat_term->term_id, $search_terms)) {

-                    if ($cat_display == 'select' || $cat_display == 'multiselect')

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

-                    else

-                        $checked = 'checked="checked"';

-                }

+				if (in_array($cat_term->term_id, $search_terms)) {

+					if ($cat_display == 'select' || $cat_display == 'multiselect')

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

+					else

+						$checked = 'checked="checked"';

+				}

 

-                if ($cat_display == 'radio')

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

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

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

+				if ($cat_display == 'radio')

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

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

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

 

-                else {

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

-                }

+				else {

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

+				}

 

-                // Call recurson to print sub cats

-                $out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading);

+				// Call recurson to print sub cats

+				$out .= geodir_custom_taxonomy_walker($cat_taxonomy, $cat_term->term_id, $hide_empty, $pading);

 

-            }

+			}

 

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

-                $out .= '</div>';

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

+				$out .= '</div>';

 

-            return $out;

-        }

-        return;

-    }

+			return $out;

+		}

+		return;

+	}

 }

 

 if (!function_exists('geodir_custom_taxonomy_walker2')) {

-    /**

-     * Custom taxonomy walker function.

-     *

-     * @since 1.0.0

-     * @package GeoDirectory

-     * @global object $post WordPress Post object.

-     * @global object $gd_session GeoDirectory Session object.

-     * @param string $cat_taxonomy The taxonomy name.

-     * @param string $cat_limit Number of categories to display.

-     */

-    function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '')

-    {

-        $post_category = '';

-        $post_category_str = '';

-        global $exclude_cats, $gd_session;

-

-        $cat_exclude = '';

-        if (is_array($exclude_cats) && !empty($exclude_cats))

-            $cat_exclude = serialize($exclude_cats);

-

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

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

-

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

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

-

-            $post_categories = $post->post_category_str;

-            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories))

-                $post_category_str = $post_categories[$cat_taxonomy];

-

-        } elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {

-            global $post;

-

-            $post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true);

-            if (empty($post_category) && isset($post->{$cat_taxonomy})) {

-                $post_category = $post->{$cat_taxonomy};

-            }

+	/**

+	 * Custom taxonomy walker function.

+	 *

+	 * @since 1.0.0

+	 * @package GeoDirectory

+	 * @global object $post WordPress Post object.

+	 * @global object $gd_session GeoDirectory Session object.

+	 * @param string $cat_taxonomy The taxonomy name.

+	 * @param string $cat_limit Number of categories to display.

+	 */

+	function geodir_custom_taxonomy_walker2($cat_taxonomy, $cat_limit = '')

+	{

+		$post_category = '';

+		$post_category_str = '';

+		global $exclude_cats, $gd_session;

+

+		$cat_exclude = '';

+		if (is_array($exclude_cats) && !empty($exclude_cats))

+			$cat_exclude = serialize($exclude_cats);

+

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

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

+

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

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

+

+			$post_categories = $post->post_category_str;

+			if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories))

+				$post_category_str = $post_categories[$cat_taxonomy];

+

+		} elseif ((geodir_is_page('add-listing') && isset($_REQUEST['pid']) && $_REQUEST['pid'] != '') || (is_admin())) {

+			global $post;

+

+			$post_category = geodir_get_post_meta($post->ID, $cat_taxonomy, true);

+			if (empty($post_category) && isset($post->{$cat_taxonomy})) {

+				$post_category = $post->{$cat_taxonomy};

+			}

 

-            $post_categories = get_post_meta($post->ID, 'post_categories', true);

+			$post_categories = get_post_meta($post->ID, 'post_categories', true);

 

-            if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {

-                foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {

-                    if (is_numeric($cat_part)) {

-                        $cat_part_arr[] = $cat_part;

-                    }

-                }

-                if (is_array($cat_part_arr)) {

-                    $post_category = implode(',', $cat_part_arr);

-                }

-            }

+			if (empty($post_category) && !empty($post_categories) && !empty($post_categories[$cat_taxonomy])) {

+				foreach (explode(",", $post_categories[$cat_taxonomy]) as $cat_part) {

+					if (is_numeric($cat_part)) {

+						$cat_part_arr[] = $cat_part;

+					}

+				}

+				if (is_array($cat_part_arr)) {

+					$post_category = implode(',', $cat_part_arr);

+				}

+			}

 

-            if (!empty($post_category)) {

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

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

+			if (!empty($post_category)) {

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

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

 

-            }

+			}

 

-            if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {

+			if ($post_category != '' && is_array($exclude_cats) && !empty($exclude_cats)) {

 

-                $post_category_upd = explode(',', $post_category);

-                $post_category_change = '';

-                foreach ($post_category_upd as $cat) {

+				$post_category_upd = explode(',', $post_category);

+				$post_category_change = '';

+				foreach ($post_category_upd as $cat) {

 

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

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

-                    }

-                }

-                $post_category = $post_category_change;

-            }

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

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

+					}

+				}

+				$post_category = $post_category_change;

+			}

 

 

-            if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

-                $post_category_str = $post_categories[$cat_taxonomy];

-            }

-        }

+			if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

+				$post_category_str = $post_categories[$cat_taxonomy];

+			}

+		}

 

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

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

 

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

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

 

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

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

 

 

-        ?>

+		?>

         <div class="cat_sublist">

             <?php

 

-            $post_id = isset($post->ID) ? $post->ID : '';

+			$post_id = isset($post->ID) ? $post->ID : '';

 

-            if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {

+			if ((geodir_is_page('add-listing') || is_admin()) && !empty($post_categories[$cat_taxonomy])) {

 

-                geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories);

-            }

-            ?>

+				geodir_editpost_categories_html($cat_taxonomy, $post_id, $post_categories);

+			}

+			?>

         </div>

         <script type="text/javascript">

 

@@ -998,22 +998,22 @@ 
 

         </script>

         <?php

-        if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

-            $post_cat_str = $post_categories[$cat_taxonomy];

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

-            if (count($post_cat_array) >= $cat_limit && $cat_limit != 0)

-                $style = "display:none;";

-        }

-        ?>

+		if (!empty($post_categories) && array_key_exists($cat_taxonomy, $post_categories)) {

+			$post_cat_str = $post_categories[$cat_taxonomy];

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

+			if (count($post_cat_array) >= $cat_limit && $cat_limit != 0)

+				$style = "display:none;";

+		}

+		?>

         <div class="main_cat_list" style=" <?php if (isset($style)) {

-            echo $style;

-        }?> ">

+			echo $style;

+		}?> ">

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

-            ?>

+			?>

         </div>

     <?php

 

-    }

+	}

 }

 

 /**

@@ -1030,23 +1030,23 @@ 
  */

 function geodir_addpost_categories_html($request_taxonomy, $parrent, $selected = false, $main_selected = true, $default = false, $exclude = '')

 {

-    global $exclude_cats;

+	global $exclude_cats;

 

-    if ($exclude != '') {

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

+	if ($exclude != '') {

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

 

-        if(is_array( $exclude_cats)){

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

-        }else{

-            $exclude_cats = intval($exclude_cats);

-        }

+		if(is_array( $exclude_cats)){

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

+		}else{

+			$exclude_cats = intval($exclude_cats);

+		}

 

-    }

+	}

 

-    if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) ||

-        (!is_array($exclude_cats) || empty($exclude_cats))

-    ) {

-        ?>

+	if ((is_array($exclude_cats) && !empty($exclude_cats) && !in_array($parrent, $exclude_cats)) ||

+		(!is_array($exclude_cats) || empty($exclude_cats))

+	) {

+		?>

 

         <?php $main_cat = get_term($parrent, $request_taxonomy); ?>

 

@@ -1075,8 +1075,8 @@ 
 

             <br/>

             <?php

-            $cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));

-            if (!empty($cat_terms)) { ?>

+			$cat_terms = get_terms($request_taxonomy, array('parent' => $main_cat->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats));

+			if (!empty($cat_terms)) { ?>

                 <span> <?php printf(__('Add listing in category', 'geodirectory')); ?></span>

                 <?php geodir_get_catlist($request_taxonomy, $parrent, $selected) ?>

             <?php } ?>

@@ -1098,53 +1098,53 @@ 
 function geodir_editpost_categories_html($request_taxonomy, $request_postid, $post_categories)

 {

 

-    if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {

-        $post_cat_str = $post_categories[$request_taxonomy];

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

-        if (is_array($post_cat_array)) {

-            $post_cat_array = array_unique( $post_cat_array );

+	if (!empty($post_categories) && array_key_exists($request_taxonomy, $post_categories)) {

+		$post_cat_str = $post_categories[$request_taxonomy];

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

+		if (is_array($post_cat_array)) {

+			$post_cat_array = array_unique( $post_cat_array );

 

 			foreach ($post_cat_array as $post_cat_html) {

 

-                $post_cat_info = explode(":", $post_cat_html);

-                $post_maincat_str = $post_cat_info[0];

+				$post_cat_info = explode(":", $post_cat_html);

+				$post_maincat_str = $post_cat_info[0];

 

-                if (!empty($post_maincat_str)) {

-                    $post_maincat_info = explode(",", $post_maincat_str);

-                    $post_maincat_id = $post_maincat_info[0];

-                    ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

-                    (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

-                }

-                $post_sub_catid = '';

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

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

-                }

+				if (!empty($post_maincat_str)) {

+					$post_maincat_info = explode(",", $post_maincat_str);

+					$post_maincat_id = $post_maincat_info[0];

+					($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

+					(end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

+				}

+				$post_sub_catid = '';

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

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

+				}

 

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

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

 

-            }

-        } else {

+			}

+		} else {

 

-            $post_cat_info = explode(":", $post_cat_str);

-            $post_maincat_str = $post_cat_info[0];

+			$post_cat_info = explode(":", $post_cat_str);

+			$post_maincat_str = $post_cat_info[0];

 

-            $post_sub_catid = '';

+			$post_sub_catid = '';

 

-            if (!empty($post_maincat_str)) {

-                $post_maincat_info = explode(",", $post_maincat_str);

-                $post_maincat_id = $post_maincat_info[0];

-                ($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

-                (end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

-            }

+			if (!empty($post_maincat_str)) {

+				$post_maincat_info = explode(",", $post_maincat_str);

+				$post_maincat_id = $post_maincat_info[0];

+				($post_maincat_info[1] == 'y') ? $post_maincat_selected = true : $post_maincat_selected = false;

+				(end($post_maincat_info) == 'd') ? $post_maincat_default = true : $post_maincat_default = false;

+			}

 

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

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

-            }

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

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

+			}

 

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

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

 

-        }

-    }

+		}

+	}

 }

 

 /**

@@ -1158,35 +1158,35 @@ 
  */

 function geodir_get_catlist($cat_taxonomy, $parrent = 0, $selected = false)

 {

-    global $exclude_cats;

+	global $exclude_cats;

 

-    $cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));

+	$cat_terms = get_terms($cat_taxonomy, array('parent' => $parrent, 'hide_empty' => false, 'exclude' => $exclude_cats));

 

-    if (!empty($cat_terms)) {

-        $onchange = '';

-        $onchange = ' onchange="show_subcatlist(this.value, this)" ';

+	if (!empty($cat_terms)) {

+		$onchange = '';

+		$onchange = ' onchange="show_subcatlist(this.value, this)" ';

 

-        $option_selected = '';

-        if (!$selected)

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

+		$option_selected = '';

+		if (!$selected)

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

 

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

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

 

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

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

 

-        foreach ($cat_terms as $cat_term) {

-            $option_selected = '';

-            if ($selected == $cat_term->term_id)

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

+		foreach ($cat_terms as $cat_term) {

+			$option_selected = '';

+			if ($selected == $cat_term->term_id)

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

 

-            // Count child terms

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

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

+			// Count child terms

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

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

 

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

-        }

-        echo '</select>';

-    }

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

+		}

+		echo '</select>';

+	}

 }

 

 /**

@@ -1202,28 +1202,28 @@ 
  */

 function geodir_custom_update_messages($messages)

 {

-    global $post, $post_ID;

-

-    $post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');

-

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

-

-        $messages[$post_type] = array(

-            0 => '', // Unused. Messages start at index 1.

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

-            2 => __('Custom field updated.', 'geodirectory'),

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

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

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

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

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

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

-            9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

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

-        );

-    }

-

-    return $messages;

+	global $post, $post_ID;

+

+	$post_types = get_post_types(array('show_ui' => true, '_builtin' => false), 'objects');

+

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

+

+		$messages[$post_type] = array(

+			0 => '', // Unused. Messages start at index 1.

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

+			2 => __('Custom field updated.', 'geodirectory'),

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

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

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

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

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

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

+			9 => sprintf(__('%s scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, date_i18n(__('M j, Y @ G:i', 'geodirectory'), strtotime($post->post_date)), esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

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

+		);

+	}

+

+	return $messages;

 }

 

 

@@ -1238,183 +1238,183 @@ 
 function geodir_register_defaults()

 {

 

-    global $wpdb;

-

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

-

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

-        $listing_slug = 'places';

-

-    /**

-     * Taxonomies

-     **/

-    //if ( ! taxonomy_exists('gd_place_tags') )

-    {

-

-        $gd_placetags = array();

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

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

-        $gd_placetags['args'] = array(

-            'public' => true,

-            'hierarchical' => false,

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

-            'query_var' => true,

-

-            'labels' => array(

-                'name' => __('Place Tags', 'geodirectory'),

-                'singular_name' => __('Place Tag', 'geodirectory'),

-                'search_items' => __('Search Place Tags', 'geodirectory'),

-                'popular_items' => __('Popular Place Tags', 'geodirectory'),

-                'all_items' => __('All Place Tags', 'geodirectory'),

-                'edit_item' => __('Edit Place Tag', 'geodirectory'),

-                'update_item' => __('Update Place Tag', 'geodirectory'),

-                'add_new_item' => __('Add New Place Tag', 'geodirectory'),

-                'new_item_name' => __('New Place Tag Name', 'geodirectory'),

-                'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),

-                'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),

-                'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),

-            ),

-        );

-

-

-        $geodir_taxonomies = get_option('geodir_taxonomies');

-        $geodir_taxonomies['gd_place_tags'] = $gd_placetags;

-        update_option('geodir_taxonomies', $geodir_taxonomies);

-

-

-        // Update post types and delete tmp options

-        flush_rewrite_rules();

-

-    }

-

-    //if ( ! taxonomy_exists('gd_placecategory') )

-    {

-

-        $gd_placecategory = array();

-        $gd_placecategory['object_type'] = 'gd_place';

-        $gd_placecategory['listing_slug'] = $listing_slug;

-        $gd_placecategory['args'] = array(

-            'public' => true,

-            'hierarchical' => true,

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

-            'query_var' => true,

-            'labels' => array(

-                'name' => __('Place Categories', 'geodirectory'),

-                'singular_name' => __('Place Category', 'geodirectory'),

-                'search_items' => __('Search Place Categories', 'geodirectory'),

-                'popular_items' => __('Popular Place Categories', 'geodirectory'),

-                'all_items' => __('All Place Categories', 'geodirectory'),

-                'edit_item' => __('Edit Place Category', 'geodirectory'),

-                'update_item' => __('Update Place Category', 'geodirectory'),

-                'add_new_item' => __('Add New Place Category', 'geodirectory'),

-                'new_item_name' => __('New Place Category', 'geodirectory'),

-                'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),

-            ),

-        );

-

-

-        $geodir_taxonomies = get_option('geodir_taxonomies');

-        $geodir_taxonomies['gd_placecategory'] = $gd_placecategory;

-        update_option('geodir_taxonomies', $geodir_taxonomies);

-

-

-        flush_rewrite_rules();

-    }

-

-    /**

-     * Post Types

-     **/

-

-    //if ( ! post_type_exists('gd_place') )

-    {

-

-        $labels = array(

-            'name' => __('Places', 'geodirectory'),

-            'singular_name' => __('Place', 'geodirectory'),

-            'add_new' => __('Add New', 'geodirectory'),

-            'add_new_item' => __('Add New Place', 'geodirectory'),

-            'edit_item' => __('Edit Place', 'geodirectory'),

-            'new_item' => __('New Place', 'geodirectory'),

-            'view_item' => __('View Place', 'geodirectory'),

-            'search_items' => __('Search Places', 'geodirectory'),

-            'not_found' => __('No Place Found', 'geodirectory'),

-            'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));

-

-        $place_default = array(

-            'labels' => $labels,

-            'can_export' => true,

-            'capability_type' => 'post',

-            'description' => 'Place post type.',

-            'has_archive' => $listing_slug,

-            'hierarchical' => false,

-            'map_meta_cap' => true,

-            'menu_icon' => $menu_icon,

-            'public' => true,

-            'query_var' => true,

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

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

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

-

-        //Update custom post types

-        $geodir_post_types = get_option('geodir_post_types');

-        $geodir_post_types['gd_place'] = $place_default;

-        update_option('geodir_post_types', $geodir_post_types);

-

-        // Update post types and delete tmp options

-        flush_rewrite_rules();

-    }

-

-

-    geodir_register_taxonomies();

-    geodir_register_post_types();

-

-    //die;

+	global $wpdb;

+

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

+

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

+		$listing_slug = 'places';

+

+	/**

+	 * Taxonomies

+	 **/

+	//if ( ! taxonomy_exists('gd_place_tags') )

+	{

+

+		$gd_placetags = array();

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

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

+		$gd_placetags['args'] = array(

+			'public' => true,

+			'hierarchical' => false,

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

+			'query_var' => true,

+

+			'labels' => array(

+				'name' => __('Place Tags', 'geodirectory'),

+				'singular_name' => __('Place Tag', 'geodirectory'),

+				'search_items' => __('Search Place Tags', 'geodirectory'),

+				'popular_items' => __('Popular Place Tags', 'geodirectory'),

+				'all_items' => __('All Place Tags', 'geodirectory'),

+				'edit_item' => __('Edit Place Tag', 'geodirectory'),

+				'update_item' => __('Update Place Tag', 'geodirectory'),

+				'add_new_item' => __('Add New Place Tag', 'geodirectory'),

+				'new_item_name' => __('New Place Tag Name', 'geodirectory'),

+				'add_or_remove_items' => __('Add or remove Place tags', 'geodirectory'),

+				'choose_from_most_used' => __('Choose from the most used Place tags', 'geodirectory'),

+				'separate_items_with_commas' => __('Separate Place tags with commas', 'geodirectory'),

+			),

+		);

+

+

+		$geodir_taxonomies = get_option('geodir_taxonomies');

+		$geodir_taxonomies['gd_place_tags'] = $gd_placetags;

+		update_option('geodir_taxonomies', $geodir_taxonomies);

+

+

+		// Update post types and delete tmp options

+		flush_rewrite_rules();

+

+	}

+

+	//if ( ! taxonomy_exists('gd_placecategory') )

+	{

+

+		$gd_placecategory = array();

+		$gd_placecategory['object_type'] = 'gd_place';

+		$gd_placecategory['listing_slug'] = $listing_slug;

+		$gd_placecategory['args'] = array(

+			'public' => true,

+			'hierarchical' => true,

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

+			'query_var' => true,

+			'labels' => array(

+				'name' => __('Place Categories', 'geodirectory'),

+				'singular_name' => __('Place Category', 'geodirectory'),

+				'search_items' => __('Search Place Categories', 'geodirectory'),

+				'popular_items' => __('Popular Place Categories', 'geodirectory'),

+				'all_items' => __('All Place Categories', 'geodirectory'),

+				'edit_item' => __('Edit Place Category', 'geodirectory'),

+				'update_item' => __('Update Place Category', 'geodirectory'),

+				'add_new_item' => __('Add New Place Category', 'geodirectory'),

+				'new_item_name' => __('New Place Category', 'geodirectory'),

+				'add_or_remove_items' => __('Add or remove Place categories', 'geodirectory'),

+			),

+		);

+

+

+		$geodir_taxonomies = get_option('geodir_taxonomies');

+		$geodir_taxonomies['gd_placecategory'] = $gd_placecategory;

+		update_option('geodir_taxonomies', $geodir_taxonomies);

+

+

+		flush_rewrite_rules();

+	}

+

+	/**

+	 * Post Types

+	 **/

+

+	//if ( ! post_type_exists('gd_place') )

+	{

+

+		$labels = array(

+			'name' => __('Places', 'geodirectory'),

+			'singular_name' => __('Place', 'geodirectory'),

+			'add_new' => __('Add New', 'geodirectory'),

+			'add_new_item' => __('Add New Place', 'geodirectory'),

+			'edit_item' => __('Edit Place', 'geodirectory'),

+			'new_item' => __('New Place', 'geodirectory'),

+			'view_item' => __('View Place', 'geodirectory'),

+			'search_items' => __('Search Places', 'geodirectory'),

+			'not_found' => __('No Place Found', 'geodirectory'),

+			'not_found_in_trash' => __('No Place Found In Trash', 'geodirectory'));

+

+		$place_default = array(

+			'labels' => $labels,

+			'can_export' => true,

+			'capability_type' => 'post',

+			'description' => 'Place post type.',

+			'has_archive' => $listing_slug,

+			'hierarchical' => false,

+			'map_meta_cap' => true,

+			'menu_icon' => $menu_icon,

+			'public' => true,

+			'query_var' => true,

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

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

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

+

+		//Update custom post types

+		$geodir_post_types = get_option('geodir_post_types');

+		$geodir_post_types['gd_place'] = $place_default;

+		update_option('geodir_post_types', $geodir_post_types);

+

+		// Update post types and delete tmp options

+		flush_rewrite_rules();

+	}

+

+

+	geodir_register_taxonomies();

+	geodir_register_post_types();

+

+	//die;

 

 }

 

 $gd_wpml_get_languages = "";

 function gd_wpml_get_lang_from_url($url){

 

-    global $gd_wpml_get_languages;

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

+	global $gd_wpml_get_languages;

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

 

 

-    //

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

+	//

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

 

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

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

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

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

 

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

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

 

 

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

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

 

-    //print_r( $segments);

-    if($gd_wpml_get_languages){

-        $langs = $gd_wpml_get_languages;

-    }else{

-        global $sitepress;

-        $gd_wpml_get_languages = $sitepress->get_active_languages();

-    }

+	//print_r( $segments);

+	if($gd_wpml_get_languages){

+		$langs = $gd_wpml_get_languages;

+	}else{

+		global $sitepress;

+		$gd_wpml_get_languages = $sitepress->get_active_languages();

+	}

 

-    if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {

-        return $segments[0];

-    }

+	if (isset($segments[0]) && $segments[0] && array_key_exists($segments[0], $gd_wpml_get_languages)) {

+		return $segments[0];

+	}

 

-    return false;

+	return false;

 

 

 }

 

 function gd_wpml_slug_translation_turned_on($post_type) {

 

-    global $sitepress;

-    $settings = $sitepress->get_settings();

-    return isset($settings['posts_slug_translation']['types'][$post_type])

-    && $settings['posts_slug_translation']['types'][$post_type]

-    && isset($settings['posts_slug_translation']['on'])

-    && $settings['posts_slug_translation']['on'];

+	global $sitepress;

+	$settings = $sitepress->get_settings();

+	return isset($settings['posts_slug_translation']['types'][$post_type])

+	&& $settings['posts_slug_translation']['types'][$post_type]

+	&& isset($settings['posts_slug_translation']['on'])

+	&& $settings['posts_slug_translation']['on'];

 }

 

 

@@ -1439,150 +1439,150 @@ 
  */

 function geodir_listing_permalink_structure($post_link, $post_obj, $leavename, $sample)

 {

-    //echo $post_link."<br />".$sample ;

+	//echo $post_link."<br />".$sample ;

 

 

-    global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache;

-    if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {

-    } elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {

-        return $post_link;

-    } else {

-        $orig_post = $post;

-        $post = $post_obj;

-    }

+	global $wpdb, $wp_query, $plugin_prefix, $post, $comment_post_cache, $gd_permalink_cache;

+	if (isset($post_obj->ID) && isset($post->ID) && $post_obj->ID == $post->ID) {

+	} elseif (isset($post_obj->post_status) && $post_obj->post_status == 'auto-draft') {

+		return $post_link;

+	} else {

+		$orig_post = $post;

+		$post = $post_obj;

+	}

 

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

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

 

 

-        $post_types = get_option('geodir_post_types');

-        $slug = $post_types[$post->post_type]['rewrite']['slug'];

+		$post_types = get_option('geodir_post_types');

+		$slug = $post_types[$post->post_type]['rewrite']['slug'];

 

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

-        if(function_exists('icl_object_id')){

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

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

+		if(function_exists('icl_object_id')){

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

 

-                $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

-                    $slug,

-                    'WordPress',

-                    'URL slug: ' . $slug,

-                    $language_code);

+				$org_slug = $slug;

+				$slug = apply_filters( 'wpml_translate_single_string',

+					$slug,

+					'WordPress',

+					'URL slug: ' . $slug,

+					$language_code);

 

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

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

 

-            }

-        }

+			}

+		}

 

-        if (function_exists('geodir_location_geo_home_link')) {

-            remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

-        }

+		if (function_exists('geodir_location_geo_home_link')) {

+			remove_filter('home_url', 'geodir_location_geo_home_link', 100000);

+		}

         

-        // Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.

-        $site_url = trailingslashit(get_bloginfo('url'));

+		// Fix slug problem when slug matches part of host or base url/ Ex: url -> www.abcxyz.com & slug -> xyz.

+		$site_url = trailingslashit(get_bloginfo('url'));

         

-        if (function_exists('geodir_location_geo_home_link')) {

-            add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

-        }

-

-        $fix_url = strpos($post_link, $site_url) === 0 ? true : false;

-        if ($fix_url) {

-            $post_link = str_replace($site_url, '', $post_link);

-        }

-

-        $post_link = trailingslashit(

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

-        );

-

-        if ($fix_url) {

-            $post_link = $site_url . $post_link;

-        }

-

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

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

-        }

-        if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {

-            $post_id = $post->ID;

-            if (isset($orig_post)) {

-                $post = $orig_post;

-            }

-            return $gd_permalink_cache[$post_id];

-        }

+		if (function_exists('geodir_location_geo_home_link')) {

+			add_filter('home_url', 'geodir_location_geo_home_link', 100000, 2);

+		}

 

-        if (!isset($post->post_locations)) {

-            $post_type = $post->post_type;

-            $ID = $post->ID;

-            $post2 = $wpdb->get_row(

-                $wpdb->prepare(

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

-                    array($post->ID)

-                )

-            );

+		$fix_url = strpos($post_link, $site_url) === 0 ? true : false;

+		if ($fix_url) {

+			$post_link = str_replace($site_url, '', $post_link);

+		}

+

+		$post_link = trailingslashit(

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

+		);

+

+		if ($fix_url) {

+			$post_link = $site_url . $post_link;

+		}

 

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

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

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

+		}

+		if (isset($gd_permalink_cache[$post->ID]) && $gd_permalink_cache[$post->ID] && !$sample) {

+			$post_id = $post->ID;

+			if (isset($orig_post)) {

+				$post = $orig_post;

+			}

+			return $gd_permalink_cache[$post_id];

+		}

 

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

-        }

+		if (!isset($post->post_locations)) {

+			$post_type = $post->post_type;

+			$ID = $post->ID;

+			$post2 = $wpdb->get_row(

+				$wpdb->prepare(

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

+					array($post->ID)

+				)

+			);

 

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

 

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

+		}

 

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

 

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

-                $location_request = '';

 

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

 

-                if (!empty($post->post_locations)) {

-                    $geodir_arr_locations = explode(',', $post->post_locations);

-                    if (count($geodir_arr_locations) == 3) {

-                        $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

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

-                        $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

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

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

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

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

+				$location_request = '';

 

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

-                            'region_slug' => $post->region_slug,

-                            'city_slug' => $post->city_slug

-                        );

 

-                    } else

-                        $post_location = geodir_get_location();

+				if (!empty($post->post_locations)) {

+					$geodir_arr_locations = explode(',', $post->post_locations);

+					if (count($geodir_arr_locations) == 3) {

+						$post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

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

+						$post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

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

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

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

 

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

+							'region_slug' => $post->region_slug,

+							'city_slug' => $post->city_slug

+						);

 

-                } else {

+					} else

+						$post_location = geodir_get_location();

 

-                    $post_location_sql = $wpdb->get_results(

-                        $wpdb->prepare(

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

-                            array($post->ID)

-                        )

-                    );

-

-                    if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {

-

-                        $geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);

-                        if (count($geodir_arr_locations) == 3) {

-                            $post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

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

-                            $post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

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

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

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

-

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

-                                'region_slug' => $post->region_slug,

-                                'city_slug' => $post->city_slug

-                            );

 

-                        }

-                    } else

-                        $post_location = geodir_get_location();

-                }

+				} else {

+

+					$post_location_sql = $wpdb->get_results(

+						$wpdb->prepare(

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

+							array($post->ID)

+						)

+					);

+

+					if (!empty($post_location_sql) && is_array($post_location_sql) && !empty($post_location_sql[0]->post_locations)) {

+

+						$geodir_arr_locations = explode(',', $post_location_sql[0]->post_locations);

+						if (count($geodir_arr_locations) == 3) {

+							$post->city_slug = str_replace('[', '', $geodir_arr_locations[0]);

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

+							$post->region_slug = str_replace('[', '', $geodir_arr_locations[1]);

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

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

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

+

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

+								'region_slug' => $post->region_slug,

+								'city_slug' => $post->city_slug

+							);

+

+						}

+					} else

+						$post_location = geodir_get_location();

+				}

 

 

-                if (!empty($post_location)) {

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

+				if (!empty($post_location)) {

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

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

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

 					

@@ -1600,78 +1600,78 @@ 
 					$location_slug[] = $city_slug;

 					

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

-                }

-            }

+				}

+			}

 

-            if (get_option('geodir_add_categories_url')) {

+			if (get_option('geodir_add_categories_url')) {

 

-                $term_request = '';

-                $taxonomies = geodir_get_taxonomies($post->post_type);

+				$term_request = '';

+				$taxonomies = geodir_get_taxonomies($post->post_type);

 

-                $taxonomies = end($taxonomies);

+				$taxonomies = end($taxonomies);

 

-                if (!empty($post->default_category)) {

-                    $post_terms = $post->default_category;

-                } else {

-                    $post_terms = '';

+				if (!empty($post->default_category)) {

+					$post_terms = $post->default_category;

+				} else {

+					$post_terms = '';

 

-                    if (isset($post->{$taxonomies})) {

-                        $post_terms = explode(",", trim($post->{$taxonomies}, ","));

-                        $post_terms = $post_terms[0];

-                    }

+					if (isset($post->{$taxonomies})) {

+						$post_terms = explode(",", trim($post->{$taxonomies}, ","));

+						$post_terms = $post_terms[0];

+					}

 

-                    if (!$post_terms)

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

+					if (!$post_terms)

+						$post_terms = geodir_get_post_meta($post->ID, 'default_category', true);

 

-                    if (!$post_terms) {

-                        $post_terms = geodir_get_post_meta($post->ID, $taxonomies, true);

+					if (!$post_terms) {

+						$post_terms = geodir_get_post_meta($post->ID, $taxonomies, true);

 

-                        if ($post_terms) {

-                            $post_terms = explode(",", trim($post_terms, ","));

-                            $post_terms = $post_terms[0];

-                        }

-                    }

-                }

+						if ($post_terms) {

+							$post_terms = explode(",", trim($post_terms, ","));

+							$post_terms = $post_terms[0];

+						}

+					}

+				}

 

-                $term = get_term_by('id', $post_terms, $taxonomies);

+				$term = get_term_by('id', $post_terms, $taxonomies);

 

-                if (!empty($term))

-                    $term_request = $term->slug;

-                //$term_request = $term->slug.'/';

-            }

+				if (!empty($term))

+					$term_request = $term->slug;

+				//$term_request = $term->slug.'/';

+			}

 

-            $request_term = '';

-            $listingurl_separator = '';

-            //$detailurl_separator = get_option('geodir_detailurl_separator');

-            $detailurl_separator = '';

-            if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {

-                $request_term = $location_request;

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

-                //$request_term .= $listingurl_separator.'/'.$term_request;

-                $request_term .= $term_request;

+			$request_term = '';

+			$listingurl_separator = '';

+			//$detailurl_separator = get_option('geodir_detailurl_separator');

+			$detailurl_separator = '';

+			if (isset($location_request) && $location_request != '' && isset($term_request) && $term_request != '') {

+				$request_term = $location_request;

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

+				//$request_term .= $listingurl_separator.'/'.$term_request;

+				$request_term .= $term_request;

 

-            } else {

-                if (isset($location_request) && $location_request != '') $request_term = $location_request;

+			} else {

+				if (isset($location_request) && $location_request != '') $request_term = $location_request;

 

-                if (isset($term_request) && $term_request != '') $request_term .= $term_request;

-            }

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

-            if (!empty($request_term))

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

-            else

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

-            //echo $post_link ;

-        }

-        // temp cache the permalink

-        if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {

-            $gd_permalink_cache[$post->ID] = $post_link;

-        }

-    }

-    if (isset($orig_post)) {

-        $post = $orig_post;

-    }

-    //echo $post_link ;

-    return $post_link;

+				if (isset($term_request) && $term_request != '') $request_term .= $term_request;

+			}

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

+			if (!empty($request_term))

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

+			else

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

+			//echo $post_link ;

+		}

+		// temp cache the permalink

+		if (!$sample && (!isset($_REQUEST['geodir_ajax']) || (isset($_REQUEST['geodir_ajax']) && $_REQUEST['geodir_ajax'] != 'add_listing'))) {

+			$gd_permalink_cache[$post->ID] = $post_link;

+		}

+	}

+	if (isset($orig_post)) {

+		$post = $orig_post;

+	}

+	//echo $post_link ;

+	return $post_link;

 

 }

 

@@ -1688,103 +1688,103 @@ 
  * @return string The term link.

  */

 function geodir_term_link($termlink, $term, $taxonomy) {

-    $geodir_taxonomies = geodir_get_taxonomies('', true);

+	$geodir_taxonomies = geodir_get_taxonomies('', true);

 

-    if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {

-        global $geodir_add_location_url, $gd_session;

-        $include_location = false;

-        $request_term = array();

+	if (isset($taxonomy) && !empty($geodir_taxonomies) && in_array($taxonomy, $geodir_taxonomies)) {

+		global $geodir_add_location_url, $gd_session;

+		$include_location = false;

+		$request_term = array();

 

-        $listing_slug = geodir_get_listing_slug($taxonomy);

+		$listing_slug = geodir_get_listing_slug($taxonomy);

 

-        if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {

-            if ($geodir_add_location_url && get_option('geodir_add_location_url')) {

-                $include_location = true;

-            }

-        } elseif (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1)

-            $include_location = true;

+		if ($geodir_add_location_url != NULL && $geodir_add_location_url != '') {

+			if ($geodir_add_location_url && get_option('geodir_add_location_url')) {

+				$include_location = true;

+			}

+		} elseif (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1)

+			$include_location = true;

 

-        if ($include_location) {

-            global $post;

+		if ($include_location) {

+			global $post;

 			

 			$location_manager = defined('POST_LOCATION_TABLE') ? true : false;

 			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

             

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

-                $location_terms = array(

-                    'gd_country' => $post->country_slug,

-                    'gd_region' => $post->region_slug,

-                    'gd_city' => $post->city_slug

-                );

+				$location_terms = array(

+					'gd_country' => $post->country_slug,

+					'gd_region' => $post->region_slug,

+					'gd_city' => $post->city_slug

+				);

 				

 				if ($neighbourhood_active && !empty($location_terms['gd_city']) && $gd_ses_neighbourhood = $gd_session->get('gd_neighbourhood')) {

 					$location_terms['gd_neighbourhood'] = $gd_ses_neighbourhood;

 				}

-            } else {

-                $location_terms = geodir_get_current_location_terms('query_vars');

-            }

+			} else {

+				$location_terms = geodir_get_current_location_terms('query_vars');

+			}

 

-            $geodir_show_location_url = get_option('geodir_show_location_url');

-            $location_terms = geodir_remove_location_terms($location_terms);

+			$geodir_show_location_url = get_option('geodir_show_location_url');

+			$location_terms = geodir_remove_location_terms($location_terms);

 

-            if (!empty($location_terms)) {

+			if (!empty($location_terms)) {

 

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

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

 

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

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

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

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

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

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

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

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

 

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

-                } else {

-                    $termlink = geodir_getlink($termlink, $request_term);

-                }

-            }

-        }

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

+				} else {

+					$termlink = geodir_getlink($termlink, $request_term);

+				}

+			}

+		}

 

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

-        /* we can replace this with the below function

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

+		/* we can replace this with the below function

         if(function_exists('icl_object_id')){

             global $sitepress;

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

             $termlink = $sitepress->post_type_archive_link_filter( $termlink, $post_type);

         }*/

 

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

-        if(function_exists('icl_object_id')){

-            $post_types = get_option('geodir_post_types');

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

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

+		if(function_exists('icl_object_id')){

+			$post_types = get_option('geodir_post_types');

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

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

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

-            if ( gd_wpml_slug_translation_turned_on( $post_type )) {

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

+			if ( gd_wpml_slug_translation_turned_on( $post_type )) {

 

-                global $sitepress;

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

-                $language_code = gd_wpml_get_lang_from_url($termlink);

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

+				global $sitepress;

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

+				$language_code = gd_wpml_get_lang_from_url($termlink);

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

 

-                $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

-                    $slug,

-                    'WordPress',

-                    'URL slug: ' . $slug,

-                    $language_code);

+				$org_slug = $slug;

+				$slug = apply_filters( 'wpml_translate_single_string',

+					$slug,

+					'WordPress',

+					'URL slug: ' . $slug,

+					$language_code);

 

 

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

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

 

-                $termlink = trailingslashit(

+				$termlink = trailingslashit(

 

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

-                );

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

+				);

 

-            }

-        }

+			}

+		}

 

-    }

+	}

 	

-    return $termlink;

+	return $termlink;

 }

 

 /**

@@ -1810,14 +1810,14 @@ 
 	if (in_array($post_type, geodir_get_posttypes())) {

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

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

-                $location_terms = array(

-                    'gd_country' => $post->country_slug,

-                    'gd_region' => $post->region_slug,

-                    'gd_city' => $post->city_slug

-                );

-            } else {

-                $location_terms = geodir_get_current_location_terms('query_vars');

-            }

+				$location_terms = array(

+					'gd_country' => $post->country_slug,

+					'gd_region' => $post->region_slug,

+					'gd_city' => $post->city_slug

+				);

+			} else {

+				$location_terms = geodir_get_current_location_terms('query_vars');

+			}

 			

 			$location_terms = geodir_remove_location_terms($location_terms);

 			

@@ -1848,14 +1848,14 @@ 
  */

 function get_post_type_singular_label($post_type, $echo = false)

 {

-    $obj_post_type = get_post_type_object($post_type);

-    if (!is_object($obj_post_type)) {

-        return;

-    }

-    if ($echo)

-        echo $obj_post_type->labels->singular_name;

-    else

-        return $obj_post_type->labels->singular_name;

+	$obj_post_type = get_post_type_object($post_type);

+	if (!is_object($obj_post_type)) {

+		return;

+	}

+	if ($echo)

+		echo $obj_post_type->labels->singular_name;

+	else

+		return $obj_post_type->labels->singular_name;

 

 }

 

@@ -1870,16 +1870,16 @@ 
  */

 function get_post_type_plural_label($post_type, $echo = false)

 {

-    $all_postypes = geodir_get_posttypes();

+	$all_postypes = geodir_get_posttypes();

 

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

-        return false;

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

+		return false;

 

-    $obj_post_type = get_post_type_object($post_type);

-    if ($echo)

-        echo $obj_post_type->labels->name;

-    else

-        return $obj_post_type->labels->name;

+	$obj_post_type = get_post_type_object($post_type);

+	if ($echo)

+		echo $obj_post_type->labels->name;

+	else

+		return $obj_post_type->labels->name;

 

 }

 

@@ -1898,51 +1898,51 @@ 
  */

 function geodir_term_exists($term, $taxonomy = '', $parent = 0)

 {

-    global $wpdb;

-

-    $select = "SELECT term_id FROM $wpdb->terms as t WHERE ";

-    $tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";

-

-    if (is_int($term)) {

-        if (0 == $term)

-            return 0;

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

-        if (!empty($taxonomy))

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

-        else

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

-    }

+	global $wpdb;

+

+	$select = "SELECT term_id FROM $wpdb->terms as t WHERE ";

+	$tax_select = "SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE ";

+

+	if (is_int($term)) {

+		if (0 == $term)

+			return 0;

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

+		if (!empty($taxonomy))

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

+		else

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

+	}

 

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

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

 

-    if ('' === $slug = sanitize_title($term))

-        return 0;

+	if ('' === $slug = sanitize_title($term))

+		return 0;

 

-    $where = 't.slug = %s';

+	$where = 't.slug = %s';

 

-    $where_fields = array($slug);

-    if (!empty($taxonomy)) {

-        $parent = (int)$parent;

-        if ($parent > 0) {

-            $where_fields[] = $parent;

-            $else_where_fields[] = $parent;

-            $where .= ' AND tt.parent = %d';

+	$where_fields = array($slug);

+	if (!empty($taxonomy)) {

+		$parent = (int)$parent;

+		if ($parent > 0) {

+			$where_fields[] = $parent;

+			$else_where_fields[] = $parent;

+			$where .= ' AND tt.parent = %d';

 

-        }

+		}

 

-        $where_fields[] = $taxonomy;

+		$where_fields[] = $taxonomy;

 

 

-        if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))

-            return $result;

+		if ($result = $wpdb->get_row($wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $where_fields), ARRAY_A))

+			return $result;

 

-        return false;

-    }

+		return false;

+	}

 

-    if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))

-        return $result;

+	if ($result = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms as t WHERE $where", $where_fields)))

+		return $result;

 

-    return false;

+	return false;

 }

 

 /**

@@ -1954,7 +1954,7 @@ 
 function geodir_get_term_icon_rebuild()

 {

 

-    update_option('gd_term_icons', '');

+	update_option('gd_term_icons', '');

 

 }

 

@@ -1972,60 +1972,60 @@ 
  */

 function geodir_get_term_icon($term_id = false, $rebuild = false)

 {

-    global $wpdb;

-    if (!$rebuild) {

-        $terms_icons = get_option('gd_term_icons');

-    } else {

-        $terms_icons = '';

-    }

-

-    if (empty($terms_icons)) {

-        $default_icon_url = get_option('geodir_default_marker_icon');

-        $taxonomy = geodir_get_taxonomies();

-        $post_types = geodir_get_posttypes();

-        $tax_arr = array();

-        foreach ($post_types as $post_type) {

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

-        }

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

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

-        //$terms = get_terms( $taxonomy );

-

-        if($terms) {

-            foreach ($terms as $term) {

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

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

+	global $wpdb;

+	if (!$rebuild) {

+		$terms_icons = get_option('gd_term_icons');

+	} else {

+		$terms_icons = '';

+	}

 

-            }

-        }

+	if (empty($terms_icons)) {

+		$default_icon_url = get_option('geodir_default_marker_icon');

+		$taxonomy = geodir_get_taxonomies();

+		$post_types = geodir_get_posttypes();

+		$tax_arr = array();

+		foreach ($post_types as $post_type) {

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

+		}

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

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

+		//$terms = get_terms( $taxonomy );

 

-        if($a_terms) {

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

+		if($terms) {

+			foreach ($terms as $term) {

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

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

 

-                foreach ($t2 as $term) {

-                    $term_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt);

-                    if ($term_icon) {

-                        $term_icon_url = $term_icon["src"];

-                    } else {

-                        $term_icon_url = $default_icon_url;

-                    }

-                    $terms_icons[$term->term_id] = $term_icon_url;

-                }

-            }

-        }

+			}

+		}

+

+		if($a_terms) {

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

+

+				foreach ($t2 as $term) {

+					$term_icon = get_tax_meta($term->term_id, 'ct_cat_icon', false, $pt);

+					if ($term_icon) {

+						$term_icon_url = $term_icon["src"];

+					} else {

+						$term_icon_url = $default_icon_url;

+					}

+					$terms_icons[$term->term_id] = $term_icon_url;

+				}

+			}

+		}

 

-        update_option('gd_term_icons', $terms_icons);

-    }

+		update_option('gd_term_icons', $terms_icons);

+	}

 

-    if ($term_id && isset($terms_icons[$term_id])) {

-        return $terms_icons[$term_id];

-    } elseif ($term_id && !isset($terms_icons[$term_id])) {

-        return get_option('geodir_default_marker_icon');

-    }

+	if ($term_id && isset($terms_icons[$term_id])) {

+		return $terms_icons[$term_id];

+	} elseif ($term_id && !isset($terms_icons[$term_id])) {

+		return get_option('geodir_default_marker_icon');

+	}

 

-    if (is_ssl()) {

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

-    }

+	if (is_ssl()) {

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

+	}

 

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

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

 }
\ No newline at end of file

Spacing +131 added lines, -131 removed lines

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

                              * @param string $menu_class The menu HTML class.

                              */

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

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

                             /**

                              * Filter the menu a class.

                              *

                              * @since 1.0.0

                              */

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

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

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

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

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

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

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

 									</a>

 								</li>';

                         }

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

              * @param string $menu_class The menu HTML class.

              */

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

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

             /**

              * Filter the sub menu li class.

              *

              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

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

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

             /**

              * Filter the sub menu ul class.

              *

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

              */

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

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

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

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

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

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

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

             $post_types = geodir_get_posttypes('object');

 

             $show_listing_post_types = get_option('geodir_add_posttype_in_listing_nav');

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

                                     $menu_class = 'current-menu-item';

 

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

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

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

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

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

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

 														</a>

 													</li>';

                             }

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

              * @since 1.5.9

              */

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

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

             $items .= '</li>';

         }

     }

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

                                      * @param string $menu_class The menu HTML class.

                                      */

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

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

                                     /**

                                      * Filter the menu a class.

                                      *

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

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

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

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

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

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

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

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

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

 											</a>

 										</li>';

                                 }

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

              * @param string $menu_class The menu HTML class.

              */

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

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

             /**

              * Filter the sub menu li class.

              *

              * @since 1.0.0

              * @param string $menu_class The menu HTML class.

              */

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

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

             /**

              * Filter the sub menu ul class.

              *

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

              */

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

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

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

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

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

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

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

 

             $post_types = geodir_get_posttypes('object');

 

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

                                          * @param string $menu_class The menu HTML class.

                                          */

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

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

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

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

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

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

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

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

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

 														</a>

 													</li>';

                                     }

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

 

             $items .= '	</ul> ';

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

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

             $items .= '</li>';

 

         }

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

     $geodir_theme_location_nav = array();

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

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

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

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

         update_option('geodir_theme_location_nav', $geodir_theme_location_nav);

     }

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

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

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

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

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

 

     return $menu;

 

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

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

 

-        $items = $items . geodir_add_nav_menu_items();

+        $items = $items.geodir_add_nav_menu_items();

         return $items;

 

     } else {

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

     $taxonomies = geodir_get_taxonomies();

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

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

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

 

     $pn_categories = $wpdb->get_results(

         $wpdb->prepare(

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

-            array($wpdb->terms . term_id)

+            array($wpdb->terms.term_id)

         )

     );

 

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

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

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

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

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

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

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

     }

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

         $geodir_post_type = '';

 

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

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

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

     }

 

@@ -444,17 +444,17 @@ 
  */

 function geodir_get_default_posttype()

 {

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

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

 

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

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

         global $wpdb;

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

-        if ( $has_posts ) {

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

+        if ($has_posts) {

             $stype = $post_type; break;

         }

     }

 

-    if(!$stype){

+    if (!$stype) {

         $stype = 'gd_place';

     }

 

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

             case 'object':

             case 'Object':

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

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

                 break;

             case 'array':

             case 'Array':

-                $post_types = (array)$post_types;

+                $post_types = (array) $post_types;

                 break;

 			case 'options':

-                $post_types = (array)$post_types;

+                $post_types = (array) $post_types;

 				

 				$options = array();

 				if (!empty($post_types)) {

@@ -604,15 +604,15 @@ 
 

         $categories = get_terms($taxonomies);

 

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

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

 

         foreach ($categories as $category_obj) {

             $select_opt = '';

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

                 $select_opt = 'selected="selected"';

             }

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

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

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

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

         }

 

         if ($echo)

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

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

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

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

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

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

     }

 

@@ -734,7 +734,7 @@ 
 

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

                 if ($cat_parent == 0) {

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

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

                     $main_list_class = 'class="main_list_selecter"';

                 } else {

                     //$display = 'display:none';

@@ -744,7 +744,7 @@ 
 

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

                 $p = 0;

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

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

             }

 

             foreach ($cat_terms as $cat_term) {

@@ -759,12 +759,12 @@ 
                 }

 

                 if ($cat_display == 'radio')

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

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

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

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

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

 

                 else {

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

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

                 }

 

                 // Call recurson to print sub cats

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

 

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

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

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

 

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

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

@@ -835,7 +835,7 @@ 
 

             if (!empty($post_category)) {

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

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

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

 

             }

 

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

 

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

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

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

                     }

                 }

                 $post_category = $post_category_change;

@@ -858,11 +858,11 @@ 
             }

         }

 

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

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

 

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

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

 

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

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

 

 

         ?>

@@ -881,14 +881,14 @@ 
 

             function show_subcatlist(main_cat, catObj) {

                 if (main_cat != '') {

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

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

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

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

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

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

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

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

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

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

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

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

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

 						return false;

 					}

 					<?php } ?>

@@ -927,7 +927,7 @@ 
             }

 

             function update_listing_cat(el) {

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

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

                 var cat_ids = '';

                 var main_cat = '';

                 var sub_cat = '';

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

             echo $style;

         }?> ">

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

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

             ?>

         </div>

     <?php

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

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

 

-        if(is_array( $exclude_cats)){

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

-        }else{

+        if (is_array($exclude_cats)) {

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

+        } else {

             $exclude_cats = intval($exclude_cats);

         }

 

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

 

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

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

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

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

             <?php /* ?>

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

 		<?php */ ?>

 

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

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

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

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

        <span> 

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

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

         </span>

             <br/>

 

             <div class="post_default_category">

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

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

+                <input type="radio" name="post_default_category" value="<?php echo $main_cat->term_id; ?>"

+                       onchange="update_listing_cat()" <?php if ($default) echo ' checked="checked" '; ?>   />

         <span> 

-        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name));?>

+        <?php printf(__('Set %s as default category', 'geodirectory'), geodir_ucwords($main_cat->name)); ?>

         </span>

             </div>

 

@@ -1102,7 +1102,7 @@ 
         $post_cat_str = $post_categories[$request_taxonomy];

         $post_cat_array = explode("#", $post_cat_str);

         if (is_array($post_cat_array)) {

-            $post_cat_array = array_unique( $post_cat_array );

+            $post_cat_array = array_unique($post_cat_array);

 

 			foreach ($post_cat_array as $post_cat_html) {

 

@@ -1117,7 +1117,7 @@ 
                 }

                 $post_sub_catid = '';

                 if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                    $post_sub_catid = (int)$post_cat_info[1];

+                    $post_sub_catid = (int) $post_cat_info[1];

                 }

 

                 geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1138,7 +1138,7 @@ 
             }

 

             if (isset($post_cat_info[1]) && !empty($post_cat_info[1])) {

-                $post_sub_catid = (int)$post_cat_info[1];

+                $post_sub_catid = (int) $post_cat_info[1];

             }

 

             geodir_addpost_categories_html($request_taxonomy, $post_maincat_id, $post_sub_catid, $post_maincat_selected, $post_maincat_default);

@@ -1170,9 +1170,9 @@ 
         if (!$selected)

             $option_slected = ' selected="selected" ';

 

-        echo '<select field_type="select" id="' . sanitize_text_field($cat_taxonomy) . '" class="chosen_select" ' . $onchange . ' option-ajaxChosen="false" >';

+        echo '<select field_type="select" id="'.sanitize_text_field($cat_taxonomy).'" class="chosen_select" '.$onchange.' option-ajaxChosen="false" >';

 

-        echo '<option value="" ' . $option_selected . ' >' . __('Select Category', 'geodirectory') . '</option>';

+        echo '<option value="" '.$option_selected.' >'.__('Select Category', 'geodirectory').'</option>';

 

         foreach ($cat_terms as $cat_term) {

             $option_selected = '';

@@ -1180,10 +1180,10 @@ 
                 $option_selected = ' selected="selected" ';

 

             // Count child terms

-            $child_terms = get_terms( $cat_taxonomy, array( 'parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1 ) );

-            $has_child = !empty( $child_terms ) ? 't' : 'f';

+            $child_terms = get_terms($cat_taxonomy, array('parent' => $cat_term->term_id, 'hide_empty' => false, 'exclude' => $exclude_cats, 'number' => 1));

+            $has_child = !empty($child_terms) ? 't' : 'f';

 

-            echo '<option  ' . $option_selected . ' alt="' . $cat_term->taxonomy . '" title="' . ucfirst($cat_term->name) . '" value="' . $cat_term->term_id . '" _hc="' . $has_child . '" >' . ucfirst($cat_term->name) . '</option>';

+            echo '<option  '.$option_selected.' alt="'.$cat_term->taxonomy.'" title="'.ucfirst($cat_term->name).'" value="'.$cat_term->term_id.'" _hc="'.$has_child.'" >'.ucfirst($cat_term->name).'</option>';

         }

         echo '</select>';

     }

@@ -1214,7 +1214,7 @@ 
             2 => __('Custom field updated.', 'geodirectory'),

             3 => __('Custom field deleted.', 'geodirectory'),

             4 => sprintf(__('%s updated.', 'geodirectory'), $post_object->labels->singular_name),

-            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int)$_GET['revision'], false)) : false,

+            5 => isset($_GET['revision']) ? sprintf(__('%s restored to revision from %s', 'geodirectory'), $post_object->labels->singular_name, wp_post_revision_title((int) $_GET['revision'], false)) : false,

             6 => sprintf(__('%s published. <a href="%s">View %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(get_permalink($post_ID)), $post_object->labels->singular_name),

             7 => sprintf(__('%s saved.', 'geodirectory'), $post_object->labels->singular_name),

             8 => sprintf(__('%s submitted. <a target="_blank" href="%s">Preview %s</a>', 'geodirectory'), $post_object->labels->singular_name, esc_url(add_query_arg('preview', 'true', get_permalink($post_ID))), $post_object->labels->singular_name),

@@ -1240,7 +1240,7 @@ 
 

     global $wpdb;

 

-    $menu_icon = geodir_plugin_url() . '/geodirectory-assets/images/favicon.ico';

+    $menu_icon = geodir_plugin_url().'/geodirectory-assets/images/favicon.ico';

 

     if (!$listing_slug = get_option('geodir_listing_prefix'))

         $listing_slug = 'places';

@@ -1253,11 +1253,11 @@ 
 

         $gd_placetags = array();

         $gd_placetags['object_type'] = 'gd_place';

-        $gd_placetags['listing_slug'] = $listing_slug . '/tags';

+        $gd_placetags['listing_slug'] = $listing_slug.'/tags';

         $gd_placetags['args'] = array(

             'public' => true,

             'hierarchical' => false,

-            'rewrite' => array('slug' => $listing_slug . '/tags', 'with_front' => false, 'hierarchical' => true),

+            'rewrite' => array('slug' => $listing_slug.'/tags', 'with_front' => false, 'hierarchical' => true),

             'query_var' => true,

 

             'labels' => array(

@@ -1351,7 +1351,7 @@ 
             'menu_icon' => $menu_icon,

             'public' => true,

             'query_var' => true,

-            'rewrite' => array('slug' => $listing_slug , 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

+            'rewrite' => array('slug' => $listing_slug, 'with_front' => false, 'hierarchical' => true, 'feeds' => true),

             'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', /*'revisions', 'post-formats'*/),

             'taxonomies' => array('gd_placecategory', 'gd_place_tags'));

 

@@ -1373,27 +1373,27 @@ 
 }

 

 $gd_wpml_get_languages = "";

-function gd_wpml_get_lang_from_url($url){

+function gd_wpml_get_lang_from_url($url) {

 

     global $gd_wpml_get_languages;

-    if(isset($_REQUEST['lang']) && $_REQUEST['lang']){return $_REQUEST['lang'];}

+    if (isset($_REQUEST['lang']) && $_REQUEST['lang']) {return $_REQUEST['lang']; }

 

 

     //

-    $url = str_replace(array("http://","https://"),"",$url);

+    $url = str_replace(array("http://", "https://"), "", $url);

 

     // site_url() seems to work better than get_bloginfo('url') here, WPML can change get_bloginfo('url') to add the lang.

-    $site_url = str_replace(array("http://","https://"),"",site_url());

+    $site_url = str_replace(array("http://", "https://"), "", site_url());

 

-    $url = str_replace($site_url,"",$url);

+    $url = str_replace($site_url, "", $url);

 

 

     $segments = explode('/', trim($url, '/'));

 

     //print_r( $segments);

-    if($gd_wpml_get_languages){

+    if ($gd_wpml_get_languages) {

         $langs = $gd_wpml_get_languages;

-    }else{

+    } else {

         global $sitepress;

         $gd_wpml_get_languages = $sitepress->get_active_languages();

     }

@@ -1458,17 +1458,17 @@ 
         $slug = $post_types[$post->post_type]['rewrite']['slug'];

 

         // Alter the CPT slug if WPML is set to do so

-        if(function_exists('icl_object_id')){

-            if ( gd_wpml_slug_translation_turned_on( $post->post_type ) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

+        if (function_exists('icl_object_id')) {

+            if (gd_wpml_slug_translation_turned_on($post->post_type) && $language_code = gd_wpml_get_lang_from_url($post_link)) {

 

                 $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

+                $slug = apply_filters('wpml_translate_single_string',

                     $slug,

                     'WordPress',

-                    'URL slug: ' . $slug,

+                    'URL slug: '.$slug,

                     $language_code);

 

-                if(!$slug){$slug = $org_slug;}

+                if (!$slug) {$slug = $org_slug; }

 

             }

         }

@@ -1490,11 +1490,11 @@ 
         }

 

         $post_link = trailingslashit(

-            preg_replace(  "/" . preg_quote( $slug, "/" ) . "/", $slug ."/%gd_taxonomy%",$post_link, 1 )

+            preg_replace("/".preg_quote($slug, "/")."/", $slug."/%gd_taxonomy%", $post_link, 1)

         );

 

         if ($fix_url) {

-            $post_link = $site_url . $post_link;

+            $post_link = $site_url.$post_link;

         }

 

         if (isset($comment_post_cache[$post->ID])) {

@@ -1513,12 +1513,12 @@ 
             $ID = $post->ID;

             $post2 = $wpdb->get_row(

                 $wpdb->prepare(

-                    "SELECT * from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+                    "SELECT * from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",

                     array($post->ID)

                 )

             );

 

-            $post = (object)array_merge((array)$post, (array)$post2);

+            $post = (object) array_merge((array) $post, (array) $post2);

 

             $comment_post_cache[$post->ID] = $post;

         }

@@ -1527,7 +1527,7 @@ 
 

         if (false !== strpos($post_link, '%gd_taxonomy%')) {

 

-            if ( apply_filters("geodir_add_location_url_to_url",get_option('geodir_add_location_url'),$post->post_type,$post)) {

+            if (apply_filters("geodir_add_location_url_to_url", get_option('geodir_add_location_url'), $post->post_type, $post)) {

                 $location_request = '';

 

 

@@ -1541,7 +1541,7 @@ 
                         $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

                         $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                        $post_location = (object)array('country_slug' => $post->country_slug,

+                        $post_location = (object) array('country_slug' => $post->country_slug,

                             'region_slug' => $post->region_slug,

                             'city_slug' => $post->city_slug

                         );

@@ -1554,7 +1554,7 @@ 
 

                     $post_location_sql = $wpdb->get_results(

                         $wpdb->prepare(

-                            "SELECT post_locations from " . $plugin_prefix . $post->post_type . "_detail WHERE post_id = %d ",

+                            "SELECT post_locations from ".$plugin_prefix.$post->post_type."_detail WHERE post_id = %d ",

                             array($post->ID)

                         )

                     );

@@ -1570,7 +1570,7 @@ 
                             $post->country_slug = str_replace('[', '', $geodir_arr_locations[2]);

                             $post->country_slug = str_replace(']', '', $post->country_slug);

 

-                            $post_location = (object)array('country_slug' => $post->country_slug,

+                            $post_location = (object) array('country_slug' => $post->country_slug,

                                 'region_slug' => $post->region_slug,

                                 'city_slug' => $post->city_slug

                             );

@@ -1599,7 +1599,7 @@ 
 					}

 					$location_slug[] = $city_slug;

 					

-					$location_request .= implode('/', $location_slug) . '/';

+					$location_request .= implode('/', $location_slug).'/';

                 }

             }

 

@@ -1657,9 +1657,9 @@ 
             }

             $request_term = trim($request_term, '/');

             if (!empty($request_term))

-                $post_link = str_replace('%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+                $post_link = str_replace('%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);

             else

-                $post_link = str_replace('/%gd_taxonomy%', $request_term . $detailurl_separator, $post_link);

+                $post_link = str_replace('/%gd_taxonomy%', $request_term.$detailurl_separator, $post_link);

             //echo $post_link ;

         }

         // temp cache the permalink

@@ -1710,7 +1710,7 @@ 
 			$location_manager = defined('POST_LOCATION_TABLE') ? true : false;

 			$neighbourhood_active = $location_manager && get_option('location_neighbourhoods') ? true : false;

             

-			if(geodir_is_page('detail') && isset($post->country_slug)){

+			if (geodir_is_page('detail') && isset($post->country_slug)) {

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

@@ -1729,12 +1729,12 @@ 
 

             if (!empty($location_terms)) {

 

-                $url_separator = '';//get_option('geodir_listingurl_separator');

+                $url_separator = ''; //get_option('geodir_listingurl_separator');

 

                 if (get_option('permalink_structure') != '') {

-                    $old_listing_slug = '/' . $listing_slug . '/';

+                    $old_listing_slug = '/'.$listing_slug.'/';

                     $request_term = implode("/", $location_terms);

-                    $new_listing_slug = '/' . $listing_slug . '/' . $request_term . '/';

+                    $new_listing_slug = '/'.$listing_slug.'/'.$request_term.'/';

 

                     $termlink = substr_replace($termlink, $new_listing_slug, strpos($termlink, $old_listing_slug), strlen($old_listing_slug));

                 } else {

@@ -1752,31 +1752,31 @@ 
         }*/

 

         // Alter the CPT slug if WPML is set to do so

-        if(function_exists('icl_object_id')){

+        if (function_exists('icl_object_id')) {

             $post_types = get_option('geodir_post_types');

-            $post_type = str_replace("category","",$taxonomy);

-			$post_type = str_replace("_tags","",$post_type);

+            $post_type = str_replace("category", "", $taxonomy);

+			$post_type = str_replace("_tags", "", $post_type);

             $slug = $post_types[$post_type]['rewrite']['slug'];

-            if ( gd_wpml_slug_translation_turned_on( $post_type )) {

+            if (gd_wpml_slug_translation_turned_on($post_type)) {

 

                 global $sitepress;

                 $default_lang = $sitepress->get_default_language();

                 $language_code = gd_wpml_get_lang_from_url($termlink);

-                if(!$language_code ){$language_code  = $default_lang;}

+                if (!$language_code) {$language_code = $default_lang; }

 

                 $org_slug = $slug;

-                $slug = apply_filters( 'wpml_translate_single_string',

+                $slug = apply_filters('wpml_translate_single_string',

                     $slug,

                     'WordPress',

-                    'URL slug: ' . $slug,

+                    'URL slug: '.$slug,

                     $language_code);

 

 

-                if(!$slug){$slug = $org_slug;}

+                if (!$slug) {$slug = $org_slug; }

 

                 $termlink = trailingslashit(

 

-                    preg_replace(  "/" . preg_quote( $org_slug, "/" ) . "/", $slug  ,$termlink, 1 )

+                    preg_replace("/".preg_quote($org_slug, "/")."/", $slug, $termlink, 1)

                 );

 

             }

@@ -1809,7 +1809,7 @@ 
 	

 	if (in_array($post_type, geodir_get_posttypes())) {

 		if (get_option('geodir_add_location_url') && $gd_session->get('gd_multi_location') == 1) {

-			if(geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

+			if (geodir_is_page('detail') && !empty($post) && isset($post->country_slug)) {

                 $location_terms = array(

                     'gd_country' => $post->country_slug,

                     'gd_region' => $post->region_slug,

@@ -1826,7 +1826,7 @@ 
 					$location_terms = implode("/", $location_terms);

 					$location_terms = rtrim($location_terms, '/');

 					

-					$link .= urldecode($location_terms) . '/';

+					$link .= urldecode($location_terms).'/';

 				} else {

 					$link = geodir_getlink($link, $location_terms);

 				}

@@ -1908,9 +1908,9 @@ 
             return 0;

         $where = 't.term_id = %d';

         if (!empty($taxonomy))

-            return $wpdb->get_row($wpdb->prepare($tax_select . $where . " AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

+            return $wpdb->get_row($wpdb->prepare($tax_select.$where." AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);

         else

-            return $wpdb->get_var($wpdb->prepare($select . $where, $term));

+            return $wpdb->get_var($wpdb->prepare($select.$where, $term));

     }

 

     $term = trim(wp_unslash($term));

@@ -1922,7 +1922,7 @@ 
 

     $where_fields = array($slug);

     if (!empty($taxonomy)) {

-        $parent = (int)$parent;

+        $parent = (int) $parent;

         if ($parent > 0) {

             $where_fields[] = $parent;

             $else_where_fields[] = $parent;

@@ -1985,13 +1985,13 @@ 
         $post_types = geodir_get_posttypes();

         $tax_arr = array();

         foreach ($post_types as $post_type) {

-            $tax_arr[] = "'" . $post_type . "category'";

+            $tax_arr[] = "'".$post_type."category'";

         }

         $tax_c = implode(',', $tax_arr);

         $terms = $wpdb->get_results("SELECT * FROM $wpdb->term_taxonomy WHERE taxonomy IN ($tax_c)");

         //$terms = get_terms( $taxonomy );

 

-        if($terms) {

+        if ($terms) {

             foreach ($terms as $term) {

                 $post_type = str_replace("category", "", $term->taxonomy);

                 $a_terms[$post_type][] = $term;

@@ -1999,7 +1999,7 @@ 
             }

         }

 

-        if($a_terms) {

+        if ($a_terms) {

             foreach ($a_terms as $pt => $t2) {

 

                 foreach ($t2 as $term) {

@@ -2024,7 +2024,7 @@ 
     }

 

     if (is_ssl()) {

-        $terms_icons = str_replace("http:","https:",$terms_icons );

+        $terms_icons = str_replace("http:", "https:", $terms_icons);

     }

 

     return apply_filters('geodir_get_term_icons', $terms_icons, $term_id);

geodirectory-templates/geodir-signup.php

Indentation +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
  * If user is not signed in, redirect home.
  */
 if (get_current_user_id()) {
-    wp_redirect(home_url(), 302);
-    exit;
+	wp_redirect(home_url(), 302);
+	exit;
 }
 
 // call header